Merge 97bdfa3 into d8e0e8e

solidjs · Sep 23, 2023 · 2b64ea4 · 2b64ea4
2 parents d8e0e8e + 97bdfa3
commit 2b64ea4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/packages/solid/src/render/component.ts b/packages/solid/src/render/component.ts
@@ -388,3 +388,14 @@ export function createUniqueId(): string {
   const ctx = sharedConfig.context;
   return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
+
+export function createServerValue<T>(cb: () => T): T {
+  const ctx = sharedConfig.context;
+  if (ctx && sharedConfig.load) {
+    const id = `${ctx.id}${ctx.count++}`;
+    // TODO we should check if the value is actually serialized
+    // otherwise we fallback to `cb()`
+    return sharedConfig.load(id);
+  }
+  return cb();
+}
diff --git a/packages/solid/src/server/rendering.ts b/packages/solid/src/server/rendering.ts
@@ -68,6 +68,15 @@ export function createUniqueId(): string {
   return `${ctx.id}${ctx.count++}`;
 }
 
+export function createServerValue<T>(cb: () => T): T {
+  const ctx = sharedConfig.context;
+  const value = cb();
+  if (ctx) {
+    ctx.serialize(`${ctx.id}${ctx.count++}`, value, true);
+  }
+  return value;
+}
+
 export function createComponent<T>(Comp: (props: T) => JSX.Element, props: T): JSX.Element {
   if (sharedConfig.context && !sharedConfig.context.noHydrate) {
     const c = sharedConfig.context;