solid-js 1.6.10 → 1.7.0-beta.0

package/types/server/reactive.d.ts

@@ -2,18 +2,18 @@ export declare const equalFn: <T>(a: T, b: T) => boolean;
 export declare const $PROXY: unique symbol;
 export declare const $TRACK: unique symbol;
 export declare const $DEVCOMP: unique symbol;
-export declare const DEV: {};
-export declare type Accessor<T> = () => T;
-export declare type Setter<T> = undefined extends T ? <U extends T>(value?: (U extends Function ? never : U) | ((prev?: T) => U)) => U : <U extends T>(value: (U extends Function ? never : U) | ((prev: T) => U)) => U;
-export declare type Signal<T> = [get: Accessor<T>, set: Setter<T>];
+export declare const DEV: undefined;
+export type Accessor<T> = () => T;
+export type Setter<T> = undefined extends T ? <U extends T>(value?: (U extends Function ? never : U) | ((prev?: T) => U)) => U : <U extends T>(value: (U extends Function ? never : U) | ((prev: T) => U)) => U;
+export type Signal<T> = [get: Accessor<T>, set: Setter<T>];
 export declare const BRANCH: unique symbol;
-export declare function castError(err: any): string | Error;
+export declare function castError(err: unknown): Error;
 export declare let Owner: Owner | null;
 interface Owner {
     owner: Owner | null;
     context: any | null;
 }
-export declare function createRoot<T>(fn: (dispose: () => void) => T, detachedOwner?: Owner): T;
+export declare function createRoot<T>(fn: (dispose: () => void) => T, detachedOwner?: typeof Owner): T;
 export declare function createSignal<T>(value: T, options?: {
     equals?: false | ((prev: T, next: T) => boolean);
     name?: string;
@@ -35,7 +35,7 @@ export declare function onCleanup(fn: () => void): () => void;
 export declare function cleanNode(node: {
     cleanups?: Function[] | null;
 }): void;
-export declare function onError(fn: (err: any) => void): void;
+export declare function onError(fn: (err: Error) => void): void;
 export declare function getListener(): null;
 export interface Context<T> {
     id: symbol;
@@ -48,11 +48,11 @@ export interface Context<T> {
 export declare function createContext<T>(defaultValue?: T): Context<T>;
 export declare function useContext<T>(context: Context<T>): T;
 export declare function getOwner(): Owner | null;
-declare type ChildrenReturn = Accessor<any> & {
+type ChildrenReturn = Accessor<any> & {
     toArray: () => any[];
 };
 export declare function children(fn: () => any): ChildrenReturn;
-export declare function runWithOwner<T>(o: Owner, fn: () => T): T | undefined;
+export declare function runWithOwner<T>(o: typeof Owner, fn: () => T): T | undefined;
 export declare function lookup(owner: Owner | null, key: symbol | string): any;
 export interface Task {
     id: number;
@@ -67,7 +67,7 @@ export declare function cancelCallback(task: Task): void;
 export declare function mapArray<T, U>(list: () => T[], mapFn: (v: T, i: () => number) => U, options?: {
     fallback?: () => any;
 }): () => U[];
-export declare type ObservableObserver<T> = ((v: T) => void) | {
+export type ObservableObserver<T> = ((v: T) => void) | {
     next: (v: T) => void;
     error?: (v: any) => void;
     complete?: (v: boolean) => void;

package/types/server/rendering.d.ts

@@ -1,22 +1,22 @@
 import { Setter, Signal } from "./reactive.js";
 import type { JSX } from "../jsx.js";
-export declare type Component<P = {}> = (props: P) => JSX.Element;
-export declare type VoidProps<P = {}> = P & {
+export type Component<P = {}> = (props: P) => JSX.Element;
+export type VoidProps<P = {}> = P & {
     children?: never;
 };
-export declare type VoidComponent<P = {}> = Component<VoidProps<P>>;
-export declare type ParentProps<P = {}> = P & {
+export type VoidComponent<P = {}> = Component<VoidProps<P>>;
+export type ParentProps<P = {}> = P & {
     children?: JSX.Element;
 };
-export declare type ParentComponent<P = {}> = Component<ParentProps<P>>;
-export declare type FlowProps<P = {}, C = JSX.Element> = P & {
+export type ParentComponent<P = {}> = Component<ParentProps<P>>;
+export type FlowProps<P = {}, C = JSX.Element> = P & {
     children: C;
 };
-export declare type FlowComponent<P = {}, C = JSX.Element> = Component<FlowProps<P, C>>;
-export declare type Ref<T> = T | ((val: T) => void);
-export declare type ValidComponent = keyof JSX.IntrinsicElements | Component<any> | (string & {});
-export declare type ComponentProps<T extends ValidComponent> = T extends Component<infer P> ? P : T extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[T] : Record<string, unknown>;
-declare type SharedConfig = {
+export type FlowComponent<P = {}, C = JSX.Element> = Component<FlowProps<P, C>>;
+export type Ref<T> = T | ((val: T) => void);
+export type ValidComponent = keyof JSX.IntrinsicElements | Component<any> | (string & {});
+export type ComponentProps<T extends ValidComponent> = T extends Component<infer P> ? P : T extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[T] : Record<string, unknown>;
+type SharedConfig = {
     context?: HydrationContext;
 };
 export declare const sharedConfig: SharedConfig;
@@ -57,7 +57,7 @@ export declare function Switch(props: {
     fallback?: string;
     children: MatchProps<unknown> | MatchProps<unknown>[];
 }): string;
-declare type MatchProps<T> = {
+type MatchProps<T> = {
     when: T | false;
     keyed?: boolean;
     children: string | ((item: T) => string);
@@ -77,25 +77,25 @@ export interface Resource<T> {
     error: any;
     latest: T | undefined;
 }
-declare type SuspenseContextType = {
+type SuspenseContextType = {
     resources: Map<string, {
         loading: boolean;
         error: any;
     }>;
     completed: () => void;
 };
-export declare type ResourceActions<T> = {
+export type ResourceActions<T> = {
     mutate: Setter<T>;
     refetch: (info?: unknown) => void;
 };
-export declare type ResourceReturn<T> = [Resource<T>, ResourceActions<T>];
-export declare type ResourceSource<S> = S | false | null | undefined | (() => S | false | null | undefined);
-export declare type ResourceFetcher<S, T> = (k: S, info: ResourceFetcherInfo<T>) => T | Promise<T>;
-export declare type ResourceFetcherInfo<T> = {
+export type ResourceReturn<T> = [Resource<T>, ResourceActions<T>];
+export type ResourceSource<S> = S | false | null | undefined | (() => S | false | null | undefined);
+export type ResourceFetcher<S, T> = (k: S, info: ResourceFetcherInfo<T>) => T | Promise<T>;
+export type ResourceFetcherInfo<T> = {
     value: T | undefined;
     refetching?: unknown;
 };
-export declare type ResourceOptions<T> = undefined extends T ? {
+export type ResourceOptions<T> = undefined extends T ? {
     initialValue?: T;
     name?: string;
     deferStream?: boolean;
@@ -125,7 +125,7 @@ export declare function enableScheduling(): void;
 export declare function enableHydration(): void;
 export declare function startTransition(fn: () => any): void;
 export declare function useTransition(): [() => boolean, (fn: () => any) => void];
-declare type HydrationContext = {
+type HydrationContext = {
     id: string;
     count: number;
     writeResource: (id: string, v: Promise<any> | any, error?: boolean, deferStream?: boolean) => void;
@@ -146,7 +146,7 @@ export declare function SuspenseList(props: {
 export declare function Suspense(props: {
     fallback?: string;
     children: string;
-}): string | number | boolean | Node | JSX.ArrayElement | JSX.FunctionElement | {
+}): string | number | boolean | Node | JSX.ArrayElement | {
     t: string;
 } | null | undefined;
 export {};

package/web/dist/server.cjs

@@ -261,6 +261,7 @@ function toRefParam(index) {
   return ref;
 }
 
+const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)$/i;
 const REPLACE_SCRIPT = `function $df(e,t,n,o,d){if(n=document.getElementById(e),o=document.getElementById("pl-"+e)){for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)d=o.nextSibling,o.remove(),o=d;o.replaceWith(n.content)}n.remove(),_$HY.set(e,t),_$HY.fe(e)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
@@ -522,13 +523,14 @@ function ssrStyle(value) {
 }
 function ssrElement(tag, props, children, needsId) {
   let result = `<${tag}${needsId ? ssrHydrationKey() : ""} `;
+  const skipChildren = VOID_ELEMENTS.test(tag);
   if (props == null) props = {};else if (typeof props === "function") props = props();
   const keys = Object.keys(props);
   let classResolved;
   for (let i = 0; i < keys.length; i++) {
     const prop = keys[i];
     if (ChildProperties.has(prop)) {
-      if (children === undefined) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
+      if (children === undefined && !skipChildren) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
       continue;
     }
     const value = props[prop];
@@ -548,6 +550,11 @@ function ssrElement(tag, props, children, needsId) {
     }
     if (i !== keys.length - 1) result += " ";
   }
+  if (skipChildren) {
+    return {
+      t: result + '/>'
+    };
+  }
   return {
     t: result + `>${resolveSSRNode(children)}</${tag}>`
   };

package/web/dist/server.js

@@ -260,6 +260,7 @@ function toRefParam(index) {
   return ref;
 }
 
+const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)$/i;
 const REPLACE_SCRIPT = `function $df(e,t,n,o,d){if(n=document.getElementById(e),o=document.getElementById("pl-"+e)){for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)d=o.nextSibling,o.remove(),o=d;o.replaceWith(n.content)}n.remove(),_$HY.set(e,t),_$HY.fe(e)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
@@ -521,13 +522,14 @@ function ssrStyle(value) {
 }
 function ssrElement(tag, props, children, needsId) {
   let result = `<${tag}${needsId ? ssrHydrationKey() : ""} `;
+  const skipChildren = VOID_ELEMENTS.test(tag);
   if (props == null) props = {};else if (typeof props === "function") props = props();
   const keys = Object.keys(props);
   let classResolved;
   for (let i = 0; i < keys.length; i++) {
     const prop = keys[i];
     if (ChildProperties.has(prop)) {
-      if (children === undefined) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
+      if (children === undefined && !skipChildren) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
       continue;
     }
     const value = props[prop];
@@ -547,6 +549,11 @@ function ssrElement(tag, props, children, needsId) {
     }
     if (i !== keys.length - 1) result += " ";
   }
+  if (skipChildren) {
+    return {
+      t: result + '/>'
+    };
+  }
   return {
     t: result + `>${resolveSSRNode(children)}</${tag}>`
   };

package/web/types/index.d.ts

@@ -1,5 +1,5 @@
 import { hydrate as hydrateCore } from "./client.js";
-import { JSX, Accessor, ComponentProps, ValidComponent } from "solid-js";
+import { JSX, ComponentProps, ValidComponent } from "solid-js";
 export * from "./client.js";
 export { For, Show, Suspense, SuspenseList, Switch, Match, Index, ErrorBoundary, mergeProps } from "solid-js";
 export * from "./server-mock.js";
@@ -21,7 +21,7 @@ export declare function Portal<T extends boolean = false, S extends boolean = fa
     } : {}) & (S extends true ? SVGGElement : HTMLDivElement)) => void);
     children: JSX.Element;
 }): Text;
-export declare type DynamicProps<T extends ValidComponent, P = ComponentProps<T>> = {
+export type DynamicProps<T extends ValidComponent, P = ComponentProps<T>> = {
     [K in keyof P]: P[K];
 } & {
     component: T | undefined;
@@ -33,4 +33,4 @@ export declare type DynamicProps<T extends ValidComponent, P = ComponentProps<T>
  * ```
  * @description https://www.solidjs.com/docs/latest/api#dynamic
  */
-export declare function Dynamic<T extends ValidComponent>(props: DynamicProps<T>): Accessor<JSX.Element>;
+export declare function Dynamic<T extends ValidComponent>(props: DynamicProps<T>): JSX.Element;

package/web/types/server-mock.d.ts

@@ -42,7 +42,7 @@ export declare function escape(html: string): string;
  * @deprecated Replaced by ssrElement
  */
 export declare function ssrSpread(props: any, isSVG: boolean, skipChildren: boolean): void;
-export declare type LegacyResults = {
+export type LegacyResults = {
     startWriting: () => void;
 };
 /**