@valbuild/next 0.34.0 → 0.35.0

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var core = require('@valbuild/core');
 var internal = require('@valbuild/react/internal');
+var ValNextProvider = require('./ValNextProvider-ae031b12.cjs.dev.js');
 var stega = require('@valbuild/react/stega');
 
 function _interopNamespace(e) {
@@ -26,15 +27,73 @@ function _interopNamespace(e) {
 
 var core__namespace = /*#__PURE__*/_interopNamespace(core);
 
-var ValProvider = internal.ValProvider;
+var ValProvider = ValNextProvider.ValNextProvider;
 
-var initVal = function initVal() {
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
+}
+
+function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+
+function ownKeys(e, r) {
+  var t = Object.keys(e);
+  if (Object.getOwnPropertySymbols) {
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
+  }
+  return t;
+}
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      _defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+    });
+  }
+  return e;
+}
+
+var initVal = function initVal(config) {
   var _createValSystem = core.initVal(),
     s = _createValSystem.s,
-    val = _createValSystem.val;
+    val = _createValSystem.val,
+    systemConfig = _createValSystem.config;
+  var currentConfig = _objectSpread2(_objectSpread2(_objectSpread2({}, systemConfig), config), {}, {
+    valConfigPath: (config === null || config === void 0 ? void 0 : config.valConfigPath) || "./val.config"
+  });
   return {
     s: s,
-    val: val
+    val: val,
+    config: currentConfig
   };
 };
 

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var core = require('@valbuild/core');
 var internal = require('@valbuild/react/internal');
+var ValNextProvider = require('./ValNextProvider-fe84f6a9.cjs.prod.js');
 var stega = require('@valbuild/react/stega');
 
 function _interopNamespace(e) {
@@ -26,15 +27,73 @@ function _interopNamespace(e) {
 
 var core__namespace = /*#__PURE__*/_interopNamespace(core);
 
-var ValProvider = internal.ValProvider;
+var ValProvider = ValNextProvider.ValNextProvider;
 
-var initVal = function initVal() {
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
+}
+
+function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+
+function ownKeys(e, r) {
+  var t = Object.keys(e);
+  if (Object.getOwnPropertySymbols) {
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
+  }
+  return t;
+}
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      _defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+    });
+  }
+  return e;
+}
+
+var initVal = function initVal(config) {
   var _createValSystem = core.initVal(),
     s = _createValSystem.s,
-    val = _createValSystem.val;
+    val = _createValSystem.val,
+    systemConfig = _createValSystem.config;
+  var currentConfig = _objectSpread2(_objectSpread2(_objectSpread2({}, systemConfig), config), {}, {
+    valConfigPath: (config === null || config === void 0 ? void 0 : config.valConfigPath) || "./val.config"
+  });
   return {
     s: s,
-    val: val
+    val: val,
+    config: currentConfig
   };
 };
 

package/dist/valbuild-next.esm.js

@@ -2,19 +2,77 @@ import { initVal as initVal$1 } from '@valbuild/core';
 import * as core from '@valbuild/core';
 export { core as expr };
 export { FILE_REF_PROP, GenericSelector, Schema, VAL_EXTENSION, derefPatch } from '@valbuild/core';
-import { ValProvider as ValProvider$1 } from '@valbuild/react/internal';
 export { ValRichText } from '@valbuild/react/internal';
+import { ValNextProvider } from './ValNextProvider-3676dacc.esm.js';
 import { autoTagJSX } from '@valbuild/react/stega';
 
-var ValProvider = ValProvider$1;
+var ValProvider = ValNextProvider;
 
-var initVal = function initVal() {
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
+}
+
+function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+
+function ownKeys(e, r) {
+  var t = Object.keys(e);
+  if (Object.getOwnPropertySymbols) {
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
+  }
+  return t;
+}
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      _defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+    });
+  }
+  return e;
+}
+
+var initVal = function initVal(config) {
   var _createValSystem = initVal$1(),
     s = _createValSystem.s,
-    val = _createValSystem.val;
+    val = _createValSystem.val,
+    systemConfig = _createValSystem.config;
+  var currentConfig = _objectSpread2(_objectSpread2(_objectSpread2({}, systemConfig), config), {}, {
+    valConfigPath: (config === null || config === void 0 ? void 0 : config.valConfigPath) || "./val.config"
+  });
   return {
     s: s,
-    val: val
+    val: val,
+    config: currentConfig
   };
 };
 

package/package.json

@@ -8,7 +8,7 @@
     "next",
     "react"
   ],
-  "version": "0.34.0",
+  "version": "0.35.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest"
@@ -20,6 +20,10 @@
       "module": "./dist/valbuild-next.esm.js",
       "default": "./dist/valbuild-next.cjs.js"
     },
+    "./rsc": {
+      "module": "./rsc/dist/valbuild-next-rsc.esm.js",
+      "default": "./rsc/dist/valbuild-next-rsc.cjs.js"
+    },
     "./client": {
       "module": "./client/dist/valbuild-next-client.esm.js",
       "default": "./client/dist/valbuild-next-client.cjs.js"
@@ -35,17 +39,21 @@
     "entrypoints": [
       "./index.ts",
       "./server/index.ts",
-      "./client/index.ts"
+      "./client/index.ts",
+      "./rsc/index.ts"
     ],
     "exports": true
   },
   "dependencies": {
-    "@valbuild/core": "~0.34.0",
-    "@valbuild/react": "~0.34.0",
-    "@valbuild/server": "~0.34.0",
+    "@valbuild/core": "~0.35.0",
+    "@valbuild/react": "~0.35.0",
+    "@valbuild/server": "~0.35.0",
     "client-only": "^0.0.1",
     "server-only": "^0.0.1"
   },
+  "devDependencies": {
+    "next": "^13.4.0"
+  },
   "peerDependencies": {
     "next": ">=13.4.0",
     "react": ">=18.2.0"
@@ -56,6 +64,7 @@
   "files": [
     "dist",
     "client",
-    "server"
+    "server",
+    "rsc"
   ]
 }

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

@@ -0,0 +1,2 @@
+export * from "../../dist/declarations/src/rsc/index";
+//# sourceMappingURL=valbuild-next-rsc.cjs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"valbuild-next-rsc.cjs.d.ts","sourceRoot":"","sources":["../../dist/declarations/src/rsc/index.d.ts"],"names":[],"mappings":"AAAA"}

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

@@ -0,0 +1,159 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('server-only');
+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;
+    try {
+      enabled = isEnabled();
+    } catch (err) {
+      console.error("Val: could not check if Val is enabled! This might be due to an error to check draftMode. fetchVal can only be used server-side. Use useVal on clients.", err);
+    }
+    if (enabled) {
+      var headers;
+      try {
+        headers = getHeaders();
+        if (!(headers instanceof Headers)) {
+          throw new Error("Expected an instance of Headers. Check Val rsc config.");
+        }
+      } catch (err) {
+        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 host = headers && getHost(headers);
+      if (host && cookies && isProxyMode(config)) {
+        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,
+          headers: getValAuthHeaders(cookies)
+        }).then(function (res) {
+          if (fp.result.isOk(res)) {
+            var modules = res.value.modules;
+            return stega.stegaEncode(selector, {
+              getModule: function getModule(moduleId) {
+                var module = modules[moduleId];
+                if (module) {
+                  return module.source;
+                }
+              }
+            });
+          } else {
+            console.error("Val: could not fetch modules", res.error);
+          }
+          return stega.stegaEncode(selector, {});
+        })["catch"](function (err) {
+          console.error("Val: failed while checking modules", err);
+          return selector;
+        });
+      }
+    }
+    return stega.stegaEncode(selector, {
+      disabled: !enabled
+    });
+  };
+};
+function getHost(headers) {
+  var _headers$get;
+  // TODO: does NextJs have a way to determine this?
+  var host = headers.get("host");
+  var proto = "https";
+  if (headers.get("x-forwarded-proto") === "http") {
+    proto = "http";
+  } else if ((_headers$get = headers.get("referer")) !== null && _headers$get !== void 0 && _headers$get.startsWith("http://")) {
+    proto = "http";
+  } else if (host !== null && host !== void 0 && host.startsWith("localhost")) {
+    proto = "http";
+  }
+  if (host && proto) {
+    return "".concat(proto, "://").concat(host);
+  }
+  return null;
+}
+function isProxyMode(opts) {
+  var maybeApiKey = opts.apiKey || process.env.VAL_API_KEY;
+  var maybeValSecret = opts.valSecret || process.env.VAL_SECRET;
+  var isProxyMode = opts.mode === "proxy" || opts.mode === undefined && (maybeApiKey || maybeValSecret);
+  return !!isProxyMode;
+}
+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 {};
+  }
+}
+var valApiEndpoints = "/api/val";
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function initValRsc(config, rscNextConfig) {
+  return {
+    fetchValStega: initFetchValStega(config, valApiEndpoints,
+    // TODO: get from config
+    function () {
+      return rscNextConfig.draftMode().isEnabled;
+    }, function () {
+      return rscNextConfig.headers();
+    }, function () {
+      return rscNextConfig.cookies();
+    })
+  };
+}
+
+exports.initValRsc = initValRsc;

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

@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === "production") {
+  module.exports = require("./valbuild-next-rsc.cjs.prod.js");
+} else {
+  module.exports = require("./valbuild-next-rsc.cjs.dev.js");
+}

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

@@ -0,0 +1,159 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('server-only');
+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;
+    try {
+      enabled = isEnabled();
+    } catch (err) {
+      console.error("Val: could not check if Val is enabled! This might be due to an error to check draftMode. fetchVal can only be used server-side. Use useVal on clients.", err);
+    }
+    if (enabled) {
+      var headers;
+      try {
+        headers = getHeaders();
+        if (!(headers instanceof Headers)) {
+          throw new Error("Expected an instance of Headers. Check Val rsc config.");
+        }
+      } catch (err) {
+        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 host = headers && getHost(headers);
+      if (host && cookies && isProxyMode(config)) {
+        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,
+          headers: getValAuthHeaders(cookies)
+        }).then(function (res) {
+          if (fp.result.isOk(res)) {
+            var modules = res.value.modules;
+            return stega.stegaEncode(selector, {
+              getModule: function getModule(moduleId) {
+                var module = modules[moduleId];
+                if (module) {
+                  return module.source;
+                }
+              }
+            });
+          } else {
+            console.error("Val: could not fetch modules", res.error);
+          }
+          return stega.stegaEncode(selector, {});
+        })["catch"](function (err) {
+          console.error("Val: failed while checking modules", err);
+          return selector;
+        });
+      }
+    }
+    return stega.stegaEncode(selector, {
+      disabled: !enabled
+    });
+  };
+};
+function getHost(headers) {
+  var _headers$get;
+  // TODO: does NextJs have a way to determine this?
+  var host = headers.get("host");
+  var proto = "https";
+  if (headers.get("x-forwarded-proto") === "http") {
+    proto = "http";
+  } else if ((_headers$get = headers.get("referer")) !== null && _headers$get !== void 0 && _headers$get.startsWith("http://")) {
+    proto = "http";
+  } else if (host !== null && host !== void 0 && host.startsWith("localhost")) {
+    proto = "http";
+  }
+  if (host && proto) {
+    return "".concat(proto, "://").concat(host);
+  }
+  return null;
+}
+function isProxyMode(opts) {
+  var maybeApiKey = opts.apiKey || process.env.VAL_API_KEY;
+  var maybeValSecret = opts.valSecret || process.env.VAL_SECRET;
+  var isProxyMode = opts.mode === "proxy" || opts.mode === undefined && (maybeApiKey || maybeValSecret);
+  return !!isProxyMode;
+}
+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 {};
+  }
+}
+var valApiEndpoints = "/api/val";
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function initValRsc(config, rscNextConfig) {
+  return {
+    fetchValStega: initFetchValStega(config, valApiEndpoints,
+    // TODO: get from config
+    function () {
+      return rscNextConfig.draftMode().isEnabled;
+    }, function () {
+      return rscNextConfig.headers();
+    }, function () {
+      return rscNextConfig.cookies();
+    })
+  };
+}
+
+exports.initValRsc = initValRsc;