@solidjs/start 0.4.0-alpha.2 → 0.4.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "0.4.0-alpha.2",
+  "version": "0.4.0-alpha.4",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -13,7 +13,7 @@
     "shared",
     "*.d.ts"
   ],
-  "types": "./index.tsx",
+  "types": "./shared/index.tsx",
   "exports": {
     ".": "./shared/index.tsx",
     "./config": "./config/index.js",

package/server/page-event.tsx

@@ -1,4 +1,12 @@
-import { getCookie, setCookie, setResponseHeader } from "vinxi/server";
+import {
+  appendResponseHeader,
+  getCookie,
+  getResponseHeader,
+  removeResponseHeader,
+  setCookie,
+  setResponseHeader,
+  setResponseStatus
+} from "vinxi/server";
 import { createRoutes } from "../shared/FileRoutes";
 import { FetchEvent, PageEvent } from "./types";
 
@@ -32,6 +40,34 @@ export async function createPageEvent(ctx: FetchEvent) {
     ],
     initialSubmission: initFromFlash(ctx),
     routes: createRoutes(),
+    components: {
+      status: props => {
+        setResponseStatus(ctx, props.code, props.text);
+        return () => setResponseStatus(ctx, 200);
+      },
+      header: props => {
+        if (props.append) {
+          appendResponseHeader(ctx, props.name, props.value);
+        } else {
+          setResponseHeader(ctx, props.name, props.value);
+        }
+
+        return () => {
+          const value = getResponseHeader(ctx, props.name);
+
+          // Todo: review this logic still the same in H3
+          // H3 supports arrays so its possible there is no need to split..
+          // typeof check here is to guard but ultimately may be unneeded
+          if (value && typeof value === "string") {
+            const values = value.split(", ");
+            const index = values.indexOf(props.value);
+            index !== -1 && values.splice(index, 1);
+            if (values.length) setResponseHeader(ctx, props.name, values.join(", "));
+            else removeResponseHeader(ctx, props.name);
+          }
+        };
+      }
+    },
     // prevUrl: prevPath || "",
     // mutation: mutation,
     // $type: FETCH_EVENT,

package/shared/HttpHeader.tsx

@@ -1,30 +1,10 @@
 import { onCleanup } from "solid-js";
 import { getRequestEvent, isServer } from "solid-js/web";
-import { appendResponseHeader, getResponseHeader, removeResponseHeader, setResponseHeader } from "vinxi/server";
 
 export function HttpHeader(props: { name: string; value: string; append?: boolean }) {
   if (isServer) {
     const event = getRequestEvent();
-    if (props.append) {
-      appendResponseHeader(event, props.name, props.value);
-    } else {
-      setResponseHeader(event, props.name, props.value);
-    }
-
-    onCleanup(() => {
-      const value = getResponseHeader(event, props.name);
-
-      // Todo: review this logic still the same in H3
-      // H3 supports arrays so its possible there is no need to split..
-      // typeof check here is to guard but ultimately may be unneeded
-      if (value && typeof value === "string") {
-        const values = value.split(", ");
-        const index = values.indexOf(props.value);
-        index !== -1 && values.splice(index, 1);
-        if (values.length) setResponseHeader(event, props.name, values.join(", "));
-        else removeResponseHeader(event, props.name);
-      }
-    });
+    if (event) onCleanup((event as any).components.header(props));
   }
 
   return null;

package/shared/HttpStatusCode.tsx

@@ -1,14 +1,10 @@
 import { onCleanup } from "solid-js";
 import { getRequestEvent, isServer } from "solid-js/web";
-import { setResponseStatus } from "vinxi/server";
 
 export function HttpStatusCode(props: { code: number, text?: string }) {
   if (isServer) {
-    const context = getRequestEvent()!;
-    setResponseStatus(context, props.code, props.text);
-    onCleanup(() => {
-      setResponseStatus(context, 200);
-    });
+    const event = getRequestEvent();
+    if (event) onCleanup((event as any).components.status(props));
   }
   return null;
 }