@valbuild/next 0.25.0 → 0.27.0

package/package.json

@@ -8,7 +8,7 @@
     "next",
     "react"
   ],
-  "version": "0.25.0",
+  "version": "0.27.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest"
@@ -40,9 +40,9 @@
     "exports": true
   },
   "dependencies": {
-    "@valbuild/core": "~0.25.0",
-    "@valbuild/react": "~0.25.0",
-    "@valbuild/server": "~0.25.0"
+    "@valbuild/core": "~0.27.0",
+    "@valbuild/react": "~0.27.0",
+    "@valbuild/server": "~0.27.0"
   },
   "peerDependencies": {
     "next": ">=13.4.0",
@@ -50,5 +50,10 @@
   },
   "externals": [
     "next"
+  ],
+  "files": [
+    "dist",
+    "client",
+    "server"
   ]
 }

package/.babelrc.json

@@ -1,10 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-react",
-      {
-        "runtime": "automatic"
-      }
-    ]
-  ]
-}

package/jest.config.js

@@ -1,4 +0,0 @@
-/** @type {import("jest").Config} */
-module.exports = {
-  preset: "../../jest.preset",
-};

package/src/ValProvider.tsx

@@ -1,5 +0,0 @@
-"use client";
-
-// Adds "use client" directive for Next:
-import { ValProvider as ReactValProvider } from "@valbuild/react";
-export const ValProvider = ReactValProvider;

package/src/client/index.ts

@@ -1 +0,0 @@
-export { useVal } from "./useVal";

package/src/client/useVal.ts

@@ -1,40 +0,0 @@
-import {
-  GenericSelector,
-  Internal,
-  ModuleId,
-  SelectorOf,
-  SelectorSource,
-} from "@valbuild/core";
-import {
-  StegaOfSource,
-  getModuleIds,
-  stegaEncode,
-} from "@valbuild/react/stega";
-import { useValStore } from "@valbuild/react";
-import { useEffect, useState, useSyncExternalStore } from "react";
-
-export function useVal<T extends SelectorSource>(
-  selector: T
-): SelectorOf<T> extends GenericSelector<infer S> ? StegaOfSource<S> : never {
-  const valStore = useValStore();
-  const moduleIds = getModuleIds(selector) as ModuleId[];
-  const moduleMap = useSyncExternalStore(
-    valStore.subscribe(moduleIds),
-    valStore.getSnapshot(moduleIds),
-    valStore.getServerSnapshot(moduleIds)
-  );
-  const [enabled, setEnabled] = useState(false);
-  useEffect(() => {
-    setEnabled(
-      document.cookie.includes(`${Internal.VAL_ENABLE_COOKIE_NAME}=true`)
-    );
-  }, []);
-  return stegaEncode(selector, {
-    disabled: !enabled,
-    getModule: (moduleId) => {
-      if (moduleMap) {
-        return moduleMap[moduleId as ModuleId];
-      }
-    },
-  });
-}

package/src/index.ts

@@ -1,42 +0,0 @@
-// Core (excluding initVal)
-export { Schema, type SerializedSchema } from "@valbuild/core";
-export type { SourceObject, SourcePrimitive, Source } from "@valbuild/core";
-export type { ValModule, SerializedModule } from "@valbuild/core";
-export type { FileSource } from "@valbuild/core";
-export type { RichTextSource, RichText } from "@valbuild/core";
-export {
-  type Val,
-  type SerializedVal,
-  type ModuleId,
-  type ModulePath,
-  type SourcePath,
-  type JsonOfSource,
-} from "@valbuild/core";
-export type { Json, JsonPrimitive } from "@valbuild/core";
-export type { ValidationErrors, ValidationError } from "@valbuild/core";
-export type { ValidationFix } from "@valbuild/core";
-export * as expr from "@valbuild/core";
-export { FILE_REF_PROP } from "@valbuild/core";
-export { VAL_EXTENSION, type SourceArray } from "@valbuild/core";
-export { derefPatch } from "@valbuild/core";
-export {
-  type SelectorSource,
-  type SelectorOf,
-  GenericSelector,
-} from "@valbuild/core";
-
-// React
-export { ValRichText } from "@valbuild/react";
-
-// Stega
-export { type ValEncodedString } from "@valbuild/react/stega";
-
-// Next specific
-export { ValProvider } from "./ValProvider";
-export { initVal } from "./initVal";
-
-// Auto-tag JSX with Val paths:
-import { autoTagJSX } from "@valbuild/react/stega";
-
-// NOTE! Side effects:
-autoTagJSX();

package/src/initVal.ts

@@ -1,9 +0,0 @@
-import { initVal as createValSystem, type InitVal } from "@valbuild/core";
-
-export const initVal = (): InitVal => {
-  const { s, val } = createValSystem();
-  return {
-    s,
-    val,
-  };
-};

package/src/server/fetchVal.ts

@@ -1,123 +0,0 @@
-import { stegaEncode, type StegaOfSource } from "@valbuild/react/stega";
-import {
-  SelectorSource,
-  SelectorOf,
-  GenericSelector,
-  ModuleId,
-} from "@valbuild/core";
-import { ValApi } from "@valbuild/core";
-import { result } from "@valbuild/core/fp";
-import { Internal } from "@valbuild/core";
-import { draftMode } from "next/headers";
-
-const valApiEndpoints = "/api/val"; // TODO: get from config
-export function fetchVal<T extends SelectorSource>(
-  selector: T
-): SelectorOf<T> extends GenericSelector<infer S>
-  ? Promise<StegaOfSource<S>>
-  : never {
-  const enabled = safeDraftModeEnabled();
-  if (enabled) {
-    getHost().then((host) => {
-      //
-      if (host) {
-        // TODO: Use the content.val.build endpoints directly
-        const api = new ValApi(`${host}${valApiEndpoints}`);
-        // Optimize: only fetch the modules needed, also cache by module id and revalidate when patched
-        // const valModuleIds = getModuleIds(selector);
-        return api
-          .getModules({
-            patch: true,
-            includeSource: true,
-            headers: getValHeaders(),
-          })
-          .then((res) => {
-            if (result.isOk(res)) {
-              const { modules } = res.value;
-              return stegaEncode(selector, {
-                getModule: (moduleId) => {
-                  const module = modules[moduleId as ModuleId];
-                  if (module) {
-                    return module.source;
-                  }
-                },
-              });
-            } else {
-              console.error("Val: could not fetch modules", res.error);
-            }
-            return stegaEncode(selector, {});
-          })
-          .catch((err) => {
-            console.error("Val: failed while checking modules", err);
-            return selector;
-          }) as SelectorOf<T> extends GenericSelector<infer S>
-          ? Promise<StegaOfSource<S>>
-          : never;
-      }
-    });
-  }
-  return stegaEncode(selector, {
-    disabled: !enabled,
-  });
-}
-
-async function getHost() {
-  // TODO: does NextJs have a way to determine this?
-  try {
-    const { headers } = await import("next/headers");
-    const hs = headers();
-    const host = hs.get("host");
-    let proto = "https";
-    if (hs.get("x-forwarded-proto") === "http") {
-      proto = "http";
-    } else if (hs.get("referer")?.startsWith("http://")) {
-      proto = "http";
-    } else if (host?.startsWith("localhost")) {
-      proto = "http";
-    }
-    if (host && proto) {
-      return `${proto}://${host}`;
-    }
-    return null;
-  } catch (err) {
-    console.error(
-      "Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.",
-      err
-    );
-    return null;
-  }
-}
-
-function getValHeaders(): Record<string, string> {
-  try {
-    // const cs = cookies(); // TODO: simply get all headers?
-    const cs = {
-      get: (s: string) => ({ value: s }),
-    };
-    const session = cs.get(Internal.VAL_SESSION_COOKIE);
-    if (session) {
-      return {
-        Cookie: `${Internal.VAL_SESSION_COOKIE}=${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 {};
-  }
-}
-
-function safeDraftModeEnabled() {
-  try {
-    return draftMode().isEnabled;
-  } catch (err) {
-    console.error(
-      "Val: could not read draft mode! fetchVal can only be used server-side. Use useVal on clients.",
-      err
-    );
-    return false;
-  }
-}

package/src/server/index.ts

@@ -1 +0,0 @@
-export { fetchVal } from "./fetchVal";

package/tsconfig.json

@@ -1,22 +0,0 @@
-{
-  "compilerOptions": {
-    "esModuleInterop": true,
-    "strict": true,
-    "allowJs": true,
-    "isolatedModules": true,
-    "jsx": "react-jsx",
-    "lib": ["es6", "dom"],
-    "module": "CommonJS",
-    "noEmit": true,
-    "target": "ES5",
-    "outDir": "dist",
-    "rootDir": "src",
-    "skipLibCheck": true
-  },
-  "include": [
-    "src/**/*",
-    "../react/stega/autoTagJSX.ts",
-    "../react/stega/fetchVal.ts"
-  ],
-  "exclude": ["dist/**"]
-}