@solidjs/start 0.7.1 → 0.7.2

package/server/fetchEvent.ts

@@ -1,113 +0,0 @@
-import {
-  H3Event,
-  appendResponseHeader,
-  getRequestIP,
-  getResponseHeader,
-  getResponseHeaders,
-  getResponseStatus,
-  getResponseStatusText,
-  getWebRequest,
-  removeResponseHeader,
-  setHeader,
-  setResponseHeader,
-  setResponseStatus
-} from "vinxi/http";
-import type { FetchEvent, ResponseStub } from "./types";
-
-const fetchEventSymbol = Symbol("fetchEvent");
-
-export function createFetchEvent(event: H3Event): FetchEvent {
-  return {
-    request: getWebRequest(event),
-    response: createResponseStub(event),
-    clientAddress: getRequestIP(event),
-    locals: {},
-    nativeEvent: event
-  };
-}
-
-export function cloneEvent<T extends FetchEvent>(fetchEvent: T): T {
-  return {
-    ...fetchEvent
-  };
-}
-
-export function getFetchEvent(h3Event: H3Event): FetchEvent {
-  if (!(h3Event as any)[fetchEventSymbol]) {
-    const fetchEvent = createFetchEvent(h3Event);
-    (h3Event as any)[fetchEventSymbol] = fetchEvent;
-  }
-
-  return (h3Event as any)[fetchEventSymbol];
-}
-
-export function mergeResponseHeaders(h3Event: H3Event, headers: Headers) {
-  for (const [key, value] of headers.entries()) {
-    setHeader(h3Event, key, value);
-  }
-}
-
-class HeaderProxy {
-  constructor(private event: H3Event) {}
-  get(key: string) {
-    const h = getResponseHeader(this.event, key);
-    return Array.isArray(h) ? h.join(", ") : (h as string) || null;
-  }
-  has(key: string) {
-    return this.get(key) !== undefined;
-  }
-  set(key: string, value: string) {
-    return setResponseHeader(this.event, key, value);
-  }
-  delete(key: string) {
-    return removeResponseHeader(this.event, key);
-  }
-  append(key: string, value: string) {
-    appendResponseHeader(this.event, key, value);
-  }
-  getSetCookie() {
-    const cookies = getResponseHeader(this.event, "Set-Cookie");
-    return Array.isArray(cookies) ? cookies : [cookies as string];
-  }
-  forEach(fn: (value: string, key: string, object: Headers) => void) {
-    return Object.entries(getResponseHeaders(this.event)).forEach(([key, value]) =>
-      fn(Array.isArray(value) ? value.join(", ") : (value as string), key, this)
-    );
-  }
-  entries() {
-    return Object.entries(getResponseHeaders(this.event))
-      .map(
-        ([key, value]) => [key, Array.isArray(value) ? value.join(", ") : value] as [string, string]
-      )
-      [Symbol.iterator]();
-  }
-  keys() {
-    return Object.keys(getResponseHeaders(this.event))[Symbol.iterator]();
-  }
-  values() {
-    return Object.values(getResponseHeaders(this.event))
-      .map(value => (Array.isArray(value) ? value.join(", ") : (value as string)))
-      [Symbol.iterator]();
-  }
-  [Symbol.iterator]() {
-    return this.entries()[Symbol.iterator]();
-  }
-}
-
-function createResponseStub(event: H3Event): ResponseStub {
-  return {
-    get status() {
-      return getResponseStatus(event);
-    },
-    set status(v) {
-      setResponseStatus(event, v);
-    },
-    get statusText() {
-      return getResponseStatusText(event);
-    },
-    set statusText(v) {
-      setResponseStatus(event, getResponseStatus(), v);
-    },
-    headers: new HeaderProxy(event)
-  };
-}

package/server/handler.ts

@@ -1,112 +0,0 @@
-import { sharedConfig } from "solid-js";
-import { renderToStream, renderToString } from "solid-js/web";
-import { provideRequestEvent } from "solid-js/web/storage";
-import {
-  eventHandler,
-  sendRedirect,
-  setHeader,
-  setResponseStatus,
-  type HTTPEvent
-} from "vinxi/http";
-import { matchAPIRoute } from "../router/routes";
-import { getFetchEvent } from "./fetchEvent";
-import { createPageEvent } from "./pageEvent";
-import type { APIEvent, FetchEvent, HandlerOptions, PageEvent } from "./types";
-
-export function createBaseHandler(
-  fn: (context: PageEvent) => unknown,
-  createPageEvent: (event: FetchEvent) => Promise<PageEvent>,
-  options: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>) = {}
-) {
-  return eventHandler({
-    handler: (e: HTTPEvent) => {
-      const event = getFetchEvent(e);
-
-      return provideRequestEvent(event, async () => {
-        // api
-        const match = matchAPIRoute(new URL(event.request.url).pathname, event.request.method);
-        if (match) {
-          const mod = await match.handler.import();
-          const fn = mod[event.request.method];
-          (event as APIEvent).params = match.params || {};
-          // @ts-ignore
-          sharedConfig.context = { event };
-          const res = await fn(event);
-          if (res !== undefined) return res;
-          if (event.request.method !== "GET") {
-            throw new Error(
-              `API handler for ${event.request.method} "${event.request.url}" did not return a response.`
-            );
-          }
-        }
-
-        // render
-        const context = await createPageEvent(event);
-        if (typeof options === "function") options = await options(context);
-        const mode = options.mode || "stream";
-        // @ts-ignore
-        if (options.nonce) context.nonce = options.nonce;
-        if (mode === "sync" || !import.meta.env.START_SSR) {
-          const html = renderToString(() => {
-            (sharedConfig.context as any).event = context;
-            return fn(context);
-          }, options);
-          if (context.response && context.response.headers.get("Location")) {
-            return sendRedirect(e, context.response.headers.get("Location")!);
-          }
-          return html;
-        }
-        let cloned = { ...options };
-        if (cloned.onCompleteAll) {
-          const og = cloned.onCompleteAll;
-          cloned.onCompleteAll = options => {
-            handleStreamCompleteRedirect(context)(options);
-            og(options);
-          };
-        } else cloned.onCompleteAll = handleStreamCompleteRedirect(context);
-        if (cloned.onCompleteShell) {
-          const og = cloned.onCompleteShell;
-          cloned.onCompleteShell = options => {
-            handleShellCompleteRedirect(context, e)();
-            og(options);
-          };
-        } else cloned.onCompleteShell = handleShellCompleteRedirect(context, e);
-        const stream = renderToStream(() => {
-          (sharedConfig.context as any).event = context;
-          return fn(context);
-        }, cloned);
-        if (context.response && context.response.headers.get("Location")) {
-          return sendRedirect(e, context.response.headers.get("Location")!);
-        }
-        if (mode === "async") return stream;
-        // fix cloudflare streaming
-        const { writable, readable } = new TransformStream();
-        stream.pipeTo(writable);
-        return readable;
-      });
-    }
-  });
-}
-
-function handleShellCompleteRedirect(context: PageEvent, e: HTTPEvent) {
-  return () => {
-    if (context.response && context.response.headers.get("Location")) {
-      setResponseStatus(e, 302);
-      setHeader(e, "Location", context.response.headers.get("Location")!);
-    }
-  };
-}
-
-function handleStreamCompleteRedirect(context: PageEvent) {
-  return ({ write }: { write: (html: string) => void }) => {
-    const to = context.response && context.response.headers.get("Location");
-    to && write(`<script>window.location="${to}"</script>`);
-  };
-}
-
-export function createHandler(
-  fn: (context: PageEvent) => unknown,
-  options?: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>)
-) {
-  return createBaseHandler(fn, createPageEvent, options);
-}

package/server/islands/index.tsx

@@ -1,103 +0,0 @@
-// @refresh skip
-import { lazy, sharedConfig, type Component, type ComponentProps } from "solid-js";
-import { Hydration, NoHydration, getRequestEvent } from "solid-js/web";
-// import { IslandManifest } from "./types";
-import { splitProps } from "./utils";
-
-declare module "solid-js" {
-  namespace JSX {
-    interface IntrinsicElements {
-      "solid-island": {
-        "data-props": string;
-        "data-id": string;
-        "data-when": "idle" | "load";
-        children: JSX.Element;
-      };
-      "solid-children": {
-        children: JSX.Element;
-      };
-    }
-  }
-}
-
-export function createIslandReference<T extends Component<any>>(
-  Comp:
-    | T
-    | (() => Promise<{
-        default: T;
-      }>),
-  id: string,
-  name: string
-): T {
-  let Component = Comp as T;
-
-  if (!import.meta.env.START_ISLANDS) {
-    // TODO: have some sane semantics for islands used in non-island mode
-    return lazy(Comp as () => Promise<{ default: T }>);
-  }
-
-  function IslandComponent(props: ComponentProps<T>) {
-    return (
-      <Component {...props}>
-        <NoHydration>{props.children}</NoHydration>
-      </Component>
-    );
-  }
-
-  return ((compProps: ComponentProps<T>) => {
-    if (import.meta.env.SSR) {
-      const context = getRequestEvent();
-      const [, props] = splitProps(compProps, ["children"] as any);
-      const [, spreadProps] = splitProps(compProps, [] as any);
-
-      let fpath: string;
-      let styles: string[] = [];
-      // if (import.meta.env.PROD) {
-      //   let x = context.env.manifest?.[path] as IslandManifest;
-      //   context.$islands.add(path);
-      //   if (x) {
-      //     fpath = x.script.href;
-      //     styles = x.assets.filter(v => v.type == "style").map(v => v.href);
-      //   }
-      // } else {
-      fpath = id + "#" + name;
-      // }
-
-      const serialize = (props: ComponentProps<T>) => {
-        let offset = 0;
-        let el = JSON.stringify(props, (key, value) => {
-          if (value && value.t) {
-            offset++;
-            return undefined;
-          }
-          return value;
-        });
-
-        return {
-          "data-props": el,
-          "data-offset": offset
-        };
-      };
-
-      // @ts-expect-error
-      if (!sharedConfig.context?.noHydrate) {
-        return <Component {...compProps} />;
-      }
-
-      return (
-        <Hydration>
-          <solid-island
-            data-id={fpath!}
-            data-when={(props as any)["client:idle"] ? "idle" : "load"}
-            data-css={JSON.stringify(styles)}
-            {...serialize(props)}
-          >
-            <IslandComponent {...spreadProps} />
-          </solid-island>
-        </Hydration>
-      );
-    } else {
-      return <Component {...compProps} />;
-    }
-  }) as T;
-}

package/server/islands/utils.tsx

@@ -1,89 +0,0 @@
-// @refresh skip
-// TODO rename to utils.ts?
-// @ts-nocheck
-import { $PROXY } from "solid-js";
-
-function trueFn() {
-  return true;
-}
-const propTraps = {
-  get(_, property, receiver) {
-    if (property === $PROXY) return receiver;
-    return _.get(property);
-  },
-  has(_, property) {
-    return _.has(property);
-  },
-  set: trueFn,
-  deleteProperty: trueFn,
-  getOwnPropertyDescriptor(_, property) {
-    return {
-      configurable: true,
-      enumerable: true,
-      get() {
-        return _.get(property);
-      },
-      set: trueFn,
-      deleteProperty: trueFn
-    };
-  },
-  ownKeys(_) {
-    return _.keys();
-  }
-};
-export function splitProps<T>(props: T, ...keys: (keyof T)[]): [T, T] {
-  const blocked = new Set(keys.flat());
-  const descriptors = Object.getOwnPropertyDescriptors(props);
-  const isProxy = $PROXY in props;
-  if (!isProxy) keys.push(Object.keys(descriptors).filter(k => !blocked.has(k)));
-
-  const res = keys.map(k => {
-    const clone = {};
-    for (let i = 0; i < k.length; i++) {
-      const key = k[i];
-      let cache;
-      Object.defineProperty(clone, key, {
-        enumerable: descriptors[key]?.enumerable ?? false,
-        configurable: true,
-        get() {
-          if (cache) {
-            return cache;
-          }
-          let val = props[key];
-          if (val?.t) {
-            val.t = `<solid-children>${val.t}</solid-children>`;
-          } else if (Array.isArray(val) && val.every(v => v?.t)) {
-            val = {
-              t: `<solid-children>${val.map(v => `${v.t}`).join("\n")}</solid-children>`
-            };
-          }
-          cache = val;
-          return val;
-        },
-        set() {
-          return true;
-        }
-      });
-    }
-    return clone;
-  });
-  if (isProxy) {
-    res.push(
-      new Proxy(
-        {
-          get(property) {
-            return blocked.has(property) ? undefined : props[property];
-          },
-          has(property) {
-            return blocked.has(property) ? false : property in props;
-          },
-          keys() {
-            return Object.keys(props).filter(k => !blocked.has(k));
-          }
-        },
-        propTraps
-      )
-    );
-  }
-  return res;
-}

package/server/pageEvent.ts

@@ -1,50 +0,0 @@
-import {
-  getCookie,
-  setCookie
-} from "vinxi/http";
-import { createRoutes } from "../router/FileRoutes";
-import { FetchEvent, PageEvent } from "./types";
-
-function initFromFlash(ctx: FetchEvent) {
-  const flash = getCookie(ctx.nativeEvent, "flash");
-  if (!flash) return;
-  let param = JSON.parse(flash);
-  if (!param || !param.result) return;
-  const input = [...param.input.slice(0, -1), new Map(param.input[param.input.length - 1])];
-  setCookie(ctx.nativeEvent, "flash", "", { maxAge: 0 });
-  return {
-    input,
-    url: param.url,
-    pending: false,
-    result: param.error ? new Error(param.result) : param.result,
-  };
-}
-
-export async function createPageEvent(ctx: FetchEvent) {
-  const clientManifest = import.meta.env.MANIFEST["client"]!;
-  const serverManifest = import.meta.env.MANIFEST["ssr"]!;
-  ctx.response.headers.set("Content-Type", "text/html");
-  // const prevPath = ctx.request.headers.get("x-solid-referrer");
-  // const mutation = ctx.request.headers.get("x-solid-mutation") === "true";
-  const pageEvent: PageEvent = Object.assign(ctx, {
-    manifest: await clientManifest.json(),
-    assets: [
-      ...(await clientManifest.inputs[clientManifest.handler]!.assets()),
-      ...(import.meta.env.START_ISLANDS
-        ? (await serverManifest.inputs[serverManifest.handler]!.assets()).filter(
-            s => (s as any).attrs.rel !== "modulepreload"
-          )
-        : [])
-    ],
-    router: {
-      submission: initFromFlash(ctx) as any
-    },
-    routes: createRoutes(),
-    // prevUrl: prevPath || "",
-    // mutation: mutation,
-    // $type: FETCH_EVENT,
-    $islands: new Set<string>()
-  });
-
-  return pageEvent;
-}

package/server/renderAsset.tsx

@@ -1,23 +0,0 @@
-// @refresh skip
-// TODO rename to renderAsset.ts?
-import type { JSX } from "solid-js";
-import type { Asset } from "./types";
-
-const assetMap = {
-  style: (props: { attrs: JSX.StyleHTMLAttributes<HTMLStyleElement>; children?: JSX.Element }) => (
-    <style {...props.attrs}>{props.children}</style>
-  ),
-  link: (props: { attrs: JSX.LinkHTMLAttributes<HTMLLinkElement> }) => <link {...props.attrs} />,
-  script: (props: { attrs: JSX.ScriptHTMLAttributes<HTMLScriptElement>; key: string | undefined }) => {
-    return props.attrs.src ? (
-      <script {...props.attrs} id={props.key}>
-        {" "}
-      </script>
-    ) : null;
-  }
-};
-
-export function renderAsset(asset: Asset) {
-  let { tag, attrs: { key, ...attrs } = { key: undefined }, children } = asset as any;
-  return (assetMap as any)[tag]({ attrs, key, children });
-}

package/server/serverFunction.tsx

@@ -1,6 +0,0 @@
-import { getRequestEvent } from "solid-js/web";
-import type { ServerFunctionMeta } from "./types";
-
-export function getServerFunctionMeta(): ServerFunctionMeta | undefined {
-  return getRequestEvent()?.locals.serverFunctionMeta;
-}

package/server/spa/StartServer.tsx

@@ -1,52 +0,0 @@
-// @refresh skip
-// @ts-ignore
-import type { Component } from "solid-js";
-import { NoHydration, getRequestEvent, ssr } from "solid-js/web";
-import { renderAsset } from "../renderAsset";
-import type { DocumentComponentProps, PageEvent } from "../types";
-
-const docType = ssr("<!DOCTYPE html>");
-
-export function StartServer(props: { document: Component<DocumentComponentProps> }) {
-  const context = getRequestEvent() as PageEvent;
-  // @ts-ignore
-  const nonce = context.nonce;
-  return (
-    <NoHydration>
-      {docType as unknown as any}
-      <props.document
-        assets={<>{context.assets.map((m: any) => renderAsset(m))}</>}
-        scripts={
-          nonce ? (
-            <>
-              <script
-                nonce={nonce}
-                innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`}
-              />
-              <script
-                type="module"
-                src={
-                  import.meta.env.MANIFEST["client"]!.inputs[
-                    import.meta.env.MANIFEST["client"]!.handler
-                  ]!.output.path
-                }
-              />
-            </>
-          ) : (
-            <>
-              <script innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`} />
-              <script
-                type="module"
-                src={
-                  import.meta.env.MANIFEST["client"]!.inputs[
-                    import.meta.env.MANIFEST["client"]!.handler
-                  ]!.output.path
-                }
-              />
-            </>
-          )
-        }
-      />
-    </NoHydration>
-  );
-}

package/server/spa/handler.ts

@@ -1,24 +0,0 @@
-import { createBaseHandler } from "../handler";
-import { FetchEvent, HandlerOptions, PageEvent } from "../types";
-
-export function createHandler(
-  fn: (context: PageEvent) => unknown,
-  options?: HandlerOptions | ((context: PageEvent) => HandlerOptions)
-) {
-  return createBaseHandler(fn, createPageEvent, options);
-}
-
-export async function createPageEvent(ctx: FetchEvent) {
-  const clientManifest = import.meta.env.MANIFEST["client"]!;
-  const pageEvent: PageEvent = Object.assign(ctx, {
-    manifest: await clientManifest.json(),
-    assets: [...(await clientManifest.inputs[clientManifest.handler]!.assets())],
-    routes: [],
-    // prevUrl: "",
-    // mutation: false,
-    // $type: FETCH_EVENT,
-    $islands: new Set<string>()
-  });
-
-  return pageEvent;
-}

package/server/types.ts

@@ -1,81 +0,0 @@
-import type { JSX } from "solid-js";
-import { RequestEvent } from "solid-js/web";
-import { HTTPEvent } from "vinxi/http";
-
-// export const FETCH_EVENT = "$FETCH";
-
-export type DocumentComponentProps = {
-  assets: JSX.Element;
-  scripts: JSX.Element;
-  children?: JSX.Element;
-};
-
-export type Asset = {
-  tag: "style";
-  attrs: JSX.StyleHTMLAttributes<HTMLStyleElement> & { key?: string };
-  children?: JSX.Element;
-} | {
-  tag: "script";
-  attrs: JSX.ScriptHTMLAttributes<HTMLScriptElement> & { key?: string };
-} | {
-  tag: "link";
-  attrs: JSX.LinkHTMLAttributes<HTMLLinkElement> & { key?: string };
-};
-
-export type HandlerOptions = {
-  mode?: "sync" | "async" | "stream";
-  nonce?: string;
-  renderId?: string;
-  onCompleteAll?: (options: { write: (v: any) => void }) => void;
-  onCompleteShell?: (options: { write: (v: any) => void }) => void;
-};
-
-export type ContextMatches = {
-  originalPath: string;
-  pattern: string;
-  path: string;
-  params: unknown;
-};
-
-export interface ResponseStub {
-  status?: number;
-  statusText?: string;
-  headers: Headers;
-}
-export interface FetchEvent {
-  request: Request;
-  response: ResponseStub;
-  clientAddress?: string;
-  locals: RequestEventLocals;
-  nativeEvent: HTTPEvent;
-}
-export interface RequestEventLocals {
-  [key: string | symbol]: any;
-}
-export interface PageEvent extends RequestEvent {
-  manifest: any;
-  assets: any;
-  routes: any[];
-  // prevUrl: string | null;
-  // $type: typeof FETCH_EVENT;
-  $islands: Set<string>;
-  // mutation: boolean;
-}
-
-export interface APIEvent extends FetchEvent {
-  params: { [key: string]: string };
-}
-
-export interface APIHandler {
-  (event: APIEvent): Promise<any>;
-}
-
-export interface ServerFunctionMeta {
-  id: string;
-}
-
-declare module "solid-js/web" {
-  interface RequestEvent extends FetchEvent {
-    serverOnly?: boolean;
-  }
-}

package/shared/ErrorBoundary.tsx

@@ -1,23 +0,0 @@
-// @refresh skip
-import { ErrorBoundary as DefaultErrorBoundary, type ParentProps } from "solid-js";
-import { isServer } from "solid-js/web";
-import { HttpStatusCode } from "./HttpStatusCode";
-import { DevOverlay } from "./dev-overlay";
-
-export const ErrorBoundary = import.meta.env.DEV && import.meta.env.START_DEV_OVERLAY
-  ? (props: ParentProps) => <DevOverlay>{props.children}</DevOverlay>
-  : (props: ParentProps) => {
-    const message = isServer ? "500 | Internal Server Error" : "Error | Uncaught Client Exception";
-    return (
-      <DefaultErrorBoundary
-        fallback={
-          <>
-            <span style="font-size:1.5em;text-align:center;position:fixed;left:0px;bottom:55%;width:100%;">{message}</span>
-            <HttpStatusCode code={500} />
-          </>
-        }
-      >
-        {props.children}
-      </DefaultErrorBoundary>
-    )
-  };

package/shared/GET.ts

@@ -1,5 +0,0 @@
-export function GET<T extends (...args: any[]) => any>(fn: T) {
-  return (...args: Parameters<T>) => {
-    return (fn as any).GET(...args) as ReturnType<T>;
-  };
-}