solid-js 1.3.0 → 1.3.4

package/store/types/server.d.ts

@@ -1,50 +1,15 @@
+import { SetStoreFunction, Store } from "store";
 export declare const $RAW: unique symbol;
-declare type AddSymbolToPrimitive<T> = T extends {
-    [Symbol.toPrimitive]: infer V;
-} ? {
-    [Symbol.toPrimitive]: V;
-} : {};
-declare type AddCallable<T> = T extends {
-    (...x: any[]): infer V;
-} ? {
-    (...x: Parameters<T>): V;
-} : {};
-declare type NotWrappable = string | number | boolean | Function | null;
-export declare type Store<T> = {
-    [P in keyof T]: T[P] extends object ? Store<T[P]> : T[P];
-} & {
-    [$RAW]?: T;
-} & AddSymbolToPrimitive<T> & AddCallable<T>;
 export declare function isWrappable(obj: any): boolean;
 export declare function unwrap<T>(item: any): T;
 export declare function setProperty(state: any, property: string | number, value: any, force?: boolean): void;
 export declare function updatePath(current: any, path: any[], traversed?: (number | string)[]): void;
-declare type StoreSetter<T> = Partial<T> | ((prevState: T extends NotWrappable ? T : Store<T>, traversed?: (string | number)[]) => Partial<T> | void);
-declare type StorePathRange = {
-    from?: number;
-    to?: number;
-    by?: number;
-};
-declare type ArrayFilterFn<T> = (item: T extends any[] ? T[number] : never, index: number) => boolean;
-declare type Part<T> = keyof T | Array<keyof T> | StorePathRange | ArrayFilterFn<T>;
-declare type Next<T, K> = K extends keyof T ? T[K] : K extends Array<keyof T> ? T[K[number]] : T extends any[] ? K extends StorePathRange ? T[number] : K extends ArrayFilterFn<T> ? T[number] : never : never;
-export interface SetStoreFunction<T> {
-    <Setter extends StoreSetter<T>>(...args: [Setter]): void;
-    <K1 extends Part<T>, Setter extends StoreSetter<Next<T, K1>>>(...args: [K1, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, Setter extends StoreSetter<Next<Next<T, K1>, K2>>>(...args: [K1, K2, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, Setter extends StoreSetter<Next<Next<Next<T, K1>, K2>, K3>>>(...args: [K1, K2, K3, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, Setter extends StoreSetter<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>>(...args: [K1, K2, K3, K4, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, Setter extends StoreSetter<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>>(...args: [K1, K2, K3, K4, K5, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, Setter extends StoreSetter<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>>(...args: [K1, K2, K3, K4, K5, K6, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, K7 extends Part<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>, Setter extends StoreSetter<Next<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>, K7>>>(...args: [K1, K2, K3, K4, K5, K6, K7, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, K7 extends Part<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>, K8 extends Part<Next<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>, K7>>>(...args: [K1, K2, K3, K4, K5, K6, K7, K8, ...(Part<any> | StoreSetter<any>)[]]): void;
-}
 export declare function createStore<T>(state: T | Store<T>): [Store<T>, SetStoreFunction<T>];
 export declare function createMutable<T>(state: T | Store<T>): Store<T>;
 declare type ReconcileOptions = {
     key?: string | null;
     merge?: boolean;
 };
-export declare function reconcile<T>(value: T | Store<T>, options?: ReconcileOptions): (state: T extends NotWrappable ? T : Store<T>) => void;
-export declare function produce<T>(fn: (state: T) => void): (state: T extends NotWrappable ? T : Store<T>) => T extends NotWrappable ? T : Store<T>;
+export declare function reconcile<T>(value: T | Store<T>, options?: ReconcileOptions): (state: Store<T>) => void;
+export declare function produce<T>(fn: (state: T) => void): (state: Store<T>) => Store<T>;
 export {};

package/store/types/store.d.ts

@@ -1,72 +1,44 @@
-import { $PROXY, Accessor } from "../..";
+import { Accessor } from "../..";
 export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
-export declare type StoreNode = {
-    [$NODE]?: any;
-    [$PROXY]?: any;
-    [$NAME]?: string;
-    [k: string]: any;
-    [k: number]: any;
-};
-declare type AddSymbolToPrimitive<T> = T extends {
-    [Symbol.toPrimitive]: infer V;
-} ? {
-    [Symbol.toPrimitive]: V;
-} : {};
-declare type AddSymbolIterator<T> = T extends {
-    [Symbol.iterator]: infer V;
-} ? {
-    [Symbol.iterator]: V;
-} : {};
-declare type AddSymbolToStringTag<T> = T extends {
-    [Symbol.toStringTag]: infer V;
-} ? {
-    [Symbol.toStringTag]: V;
-} : {};
-declare type AddCallable<T> = T extends {
-    (...x: any[]): infer V;
-} ? {
-    (...x: Parameters<T>): V;
-} : {};
-export declare type NotWrappable = string | number | boolean | Function | null;
-export declare type Store<T> = {
-    [P in keyof T]: T[P] extends object ? Store<T[P]> & T[P] : T[P];
-} & {
-    [$RAW]?: T;
-} & AddSymbolToPrimitive<T> & AddSymbolIterator<T> & AddSymbolToStringTag<T> & AddCallable<T>;
+export declare type StoreNode = Record<keyof any, any>;
+export declare type NotWrappable = string | number | bigint | symbol | boolean | Function | null | undefined;
+export declare type Store<T> = DeepReadonly<T>;
 export declare function isWrappable(obj: any): any;
 export declare function unwrap<T extends StoreNode>(item: any, set?: Set<unknown>): T;
 export declare function getDataNodes(target: StoreNode): any;
-export declare function proxyDescriptor(target: StoreNode, property: string | number | symbol): PropertyDescriptor | undefined;
+export declare function proxyDescriptor(target: StoreNode, property: keyof any): PropertyDescriptor | undefined;
 export declare function ownKeys(target: StoreNode): (string | symbol)[];
 export declare function createDataNode(): Accessor<void> & {
     $: () => void;
 };
-export declare function setProperty(state: StoreNode, property: string | number, value: any): void;
-export declare function updatePath(current: StoreNode, path: any[], traversed?: (number | string)[]): void;
-export declare type Readonly<T> = {
-    readonly [K in keyof T]: DeepReadonly<T[K]>;
+export declare function setProperty(state: StoreNode, property: keyof any, value: any): void;
+export declare function updatePath(current: StoreNode, path: any[], traversed?: (keyof any)[]): void;
+export declare type DeepReadonly<T> = {
+    readonly [K in keyof T]: T[K] extends NotWrappable ? T[K] : DeepReadonly<T[K]>;
 };
-export declare type DeepReadonly<T> = T extends [infer A] ? Readonly<[A]> : T extends [infer A, infer B] ? Readonly<[A, B]> : T extends [infer A, infer B, infer C] ? Readonly<[A, B, C]> : T extends [infer A, infer B, infer C, infer D] ? Readonly<[A, B, C, D]> : T extends [infer A, infer B, infer C, infer D, infer E] ? Readonly<[A, B, C, D, E]> : T extends [infer A, infer B, infer C, infer D, infer E, infer F] ? Readonly<[A, B, C, D, E, F]> : T extends [infer A, infer B, infer C, infer D, infer E, infer F, infer G] ? Readonly<[A, B, C, D, E, F, G]> : T extends [infer A, infer B, infer C, infer D, infer E, infer F, infer G, infer H] ? Readonly<[A, B, C, D, E, F, G, H]> : T extends object ? Readonly<T> : T;
-export declare type StoreSetter<T> = Partial<T> | ((prevState: T extends NotWrappable ? T : Store<DeepReadonly<T>>, traversed?: (string | number)[]) => Partial<T | DeepReadonly<T>> | void);
+export declare type StoreSetter<T> = T | Partial<T> | ((prevState: T, traversed?: (keyof any)[]) => Partial<T> | void);
 export declare type StorePathRange = {
     from?: number;
     to?: number;
     by?: number;
 };
-export declare type ArrayFilterFn<T> = (item: T extends any[] ? T[number] : never, index: number) => boolean;
-export declare type Part<T> = T extends any[] ? keyof T | Array<keyof T> | ArrayFilterFn<T> | StorePathRange : T extends object ? keyof T | Array<keyof T> : never;
-export declare type NullableNext<T, K> = K extends keyof T ? T[K] : K extends Array<keyof T> ? T[K[number]] : T extends any[] ? K extends StorePathRange ? T[number] : K extends ArrayFilterFn<T> ? T[number] : never : never;
-export declare type Next<T, K> = NonNullable<NullableNext<T, K>>;
-export interface SetStoreFunction<T> {
-    <Setter extends StoreSetter<T>>(...args: [Setter]): void;
-    <K1 extends Part<T>, Setter extends StoreSetter<NullableNext<T, K1>>>(...args: [K1, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, Setter extends StoreSetter<NullableNext<Next<T, K1>, K2>>>(...args: [K1, K2, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, Setter extends StoreSetter<NullableNext<Next<Next<T, K1>, K2>, K3>>>(...args: [K1, K2, K3, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, Setter extends StoreSetter<NullableNext<Next<Next<Next<T, K1>, K2>, K3>, K4>>>(...args: [K1, K2, K3, K4, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, Setter extends StoreSetter<NullableNext<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>>(...args: [K1, K2, K3, K4, K5, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, Setter extends StoreSetter<NullableNext<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>>(...args: [K1, K2, K3, K4, K5, K6, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, K7 extends Part<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>, Setter extends StoreSetter<NullableNext<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>, K7>>>(...args: [K1, K2, K3, K4, K5, K6, K7, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, K7 extends Part<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>, K8 extends Part<Next<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>, K7>>>(...args: [K1, K2, K3, K4, K5, K6, K7, K8, ...(Part<any> | StoreSetter<any>)[]]): void;
+export declare type ArrayFilterFn<T> = (item: T, index: number) => boolean;
+export declare type Part<T> = [T] extends [never] ? never : [keyof T] extends [never] ? never : keyof T | (keyof T)[] | (number extends keyof T ? ArrayFilterFn<T[number]> | StorePathRange : never);
+export declare type Next<T, K extends Part<T>> = [K] extends [never] ? never : K extends keyof T ? T[K] : K extends (keyof T)[] ? T[K[number]] : number extends keyof T ? T[number] : never;
+export declare type WrappableNext<T, K extends Part<T>> = Exclude<Next<T, K>, NotWrappable>;
+declare type DistributeRest<T, K extends Part<T>> = K extends K ? [K, ...Rest<Next<T, K>>] : never;
+export declare type Rest<T> = 0 extends 1 & T ? [...(keyof any)[], any] : [StoreSetter<T>] | (T extends NotWrappable ? never : DistributeRest<T, Part<T>>);
+export declare type SetStoreFunction<T> = _SetStoreFunction<Store<T>>;
+interface _SetStoreFunction<T> {
+    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, K4 extends Part<T3>, K5 extends Part<T4>, K6 extends Part<T5>, K7 extends Part<T6>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>, T3 extends WrappableNext<T2, K3>, T4 extends WrappableNext<T3, K4>, T5 extends WrappableNext<T4, K5>, T6 extends WrappableNext<T5, K6>>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5, k6: K6, k7: K7, ...rest: Rest<Next<T6, K7>>): void;
+    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, K4 extends Part<T3>, K5 extends Part<T4>, K6 extends Part<T5>, K7 extends Part<T6>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>, T3 extends WrappableNext<T2, K3>, T4 extends WrappableNext<T3, K4>, T5 extends WrappableNext<T4, K5>, T6 extends WrappableNext<T5, K6>>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5, k6: K6, k7: K7, setter: StoreSetter<Next<T6, K7>>): void;
+    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, K4 extends Part<T3>, K5 extends Part<T4>, K6 extends Part<T5>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>, T3 extends WrappableNext<T2, K3>, T4 extends WrappableNext<T3, K4>, T5 extends WrappableNext<T4, K5>>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5, k6: K6, setter: StoreSetter<Next<T5, K6>>): void;
+    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, K4 extends Part<T3>, K5 extends Part<T4>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>, T3 extends WrappableNext<T2, K3>, T4 extends WrappableNext<T3, K4>>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5, setter: StoreSetter<Next<T4, K5>>): void;
+    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, K4 extends Part<T3>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>, T3 extends WrappableNext<T2, K3>>(k1: K1, k2: K2, k3: K3, k4: K4, setter: StoreSetter<Next<T3, K4>>): void;
+    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>>(k1: K1, k2: K2, k3: K3, setter: StoreSetter<Next<T2, K3>>): void;
+    <K1 extends Part<T>, K2 extends Part<T1>, T1 extends WrappableNext<T, K1>>(k1: K1, k2: K2, setter: StoreSetter<Next<T1, K2>>): void;
+    <K extends Part<T>>(k: K, setter: StoreSetter<Next<T, K>>): void;
+    (setter: StoreSetter<T>): void;
 }
 /**
  * creates a reactive store that can be read through a proxy object and written with a setter function

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createReaction, createDeferred, createSelector, createMemo, createResource, onMount, onCleanup, onError, untrack, batch, on, enableScheduling, enableExternalSource, startTransition, useTransition, refetchResources, createContext, useContext, children, getListener, getOwner, runWithOwner, equalFn, $DEVCOMP, $PROXY } from "./reactive/signal";
-export type { Accessor, Setter, Resource, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, Context, ReturnTypes } from "./reactive/signal";
+export type { Accessor, Setter, Signal, Resource, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, Context, ReturnTypes } from "./reactive/signal";
 export * from "./reactive/observable";
 export * from "./reactive/scheduler";
 export * from "./reactive/array";

package/types/reactive/signal.d.ts

@@ -204,13 +204,13 @@ export declare type ResourceActions<T> = {
     refetch: (info?: unknown) => void;
 };
 export declare type ResourceReturn<T> = [Resource<T>, ResourceActions<T>];
-export declare type ResourceSource<S> = S | false | null | (() => S | false | null);
+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> = {
     value: T | undefined;
     refetching?: unknown;
 };
-export declare type ResourceOptions<T> = T extends undefined ? {
+export declare type ResourceOptions<T> = undefined extends T ? {
     initialValue?: T;
     name?: string;
     globalRefetch?: boolean;

package/types/render/component.d.ts

@@ -13,8 +13,9 @@ export declare type Component<P = {}> = (props: PropsWithChildren<P>) => JSX.Ele
  */
 export declare type ComponentProps<T extends keyof JSX.IntrinsicElements | Component<any>> = T extends Component<infer P> ? P : T extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[T] : {};
 export declare function createComponent<T>(Comp: (props: T) => JSX.Element, props: T): JSX.Element;
+declare type UnboxLazy<T> = T extends () => infer U ? U : T;
 declare type BoxedTupleTypes<T extends any[]> = {
-    [P in keyof T]: [T[P]];
+    [P in keyof T]: [UnboxLazy<T[P]>];
 }[Exclude<keyof T, keyof any[]>];
 declare type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 declare type UnboxIntersection<T> = T extends {

package/types/render/flow.d.ts

@@ -77,6 +77,7 @@ export declare type MatchProps<T> = {
  * @description https://www.solidjs.com/docs/latest/api#%3Cswitch%3E%2F%3Cmatch%3E
  */
 export declare function Match<T>(props: MatchProps<T>): JSX.Element;
+export declare function resetErrorBoundaries(): void;
 /**
  * catches uncaught errors inside components and renders a fallback content
  *

package/types/server/rendering.d.ts

@@ -55,6 +55,7 @@ declare type MatchProps<T> = {
     children: string | ((item: T) => string);
 };
 export declare function Match<T>(props: MatchProps<T>): MatchProps<T>;
+export declare function resetErrorBoundaries(): void;
 export declare function ErrorBoundary(props: {
     fallback: string | ((err: any, reset: () => void) => string);
     children: string;
@@ -62,10 +63,12 @@ export declare function ErrorBoundary(props: {
 export interface Resource<T> {
     (): T | undefined;
     loading: boolean;
+    error: any;
 }
 declare type SuspenseContextType = {
     resources: Map<string, {
         loading: boolean;
+        error: any;
     }>;
     completed: () => void;
 };

package/universal/package.json

@@ -4,5 +4,15 @@
   "module": "./dist/universal.js",
   "types": "./types/index.d.ts",
   "type": "module",
-  "sideEffects": false
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "development": {
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
+      },
+      "import": "./dist/universal.js",
+      "require": "./dist/universal.cjs"
+    }
+  }
 }

package/web/dist/dev.cjs

@@ -59,7 +59,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -88,7 +88,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -347,6 +347,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (solidJs.sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -403,13 +404,13 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? value : current;
+    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else console.warn(`Unrecognized value. Skipped inserting`, value);
   return current;
@@ -449,7 +450,7 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
   } else parent.insertBefore(node, marker);
@@ -539,6 +540,9 @@ function Dynamic(props) {
     const component = p.component;
     switch (typeof component) {
       case "function":
+        Object.assign(component, {
+          [solidJs.$DEVCOMP]: true
+        });
         return solidJs.untrack(() => component(others));
       case "string":
         const isSvg = SVGElements.has(component);

package/web/dist/dev.js

@@ -1,4 +1,4 @@
-import { createMemo, createRoot, createRenderEffect, sharedConfig, enableHydration, createSignal, onCleanup, splitProps, untrack } from 'solid-js';
+import { createMemo, createRoot, createRenderEffect, sharedConfig, enableHydration, createSignal, onCleanup, splitProps, $DEVCOMP, untrack } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, mergeProps } from 'solid-js';
 
 const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
@@ -56,7 +56,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -85,7 +85,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -344,6 +344,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -400,13 +401,13 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? value : current;
+    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else console.warn(`Unrecognized value. Skipped inserting`, value);
   return current;
@@ -446,7 +447,7 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
   } else parent.insertBefore(node, marker);
@@ -536,6 +537,9 @@ function Dynamic(props) {
     const component = p.component;
     switch (typeof component) {
       case "function":
+        Object.assign(component, {
+          [$DEVCOMP]: true
+        });
         return untrack(() => component(others));
       case "string":
         const isSvg = SVGElements.has(component);

package/web/dist/server.cjs

@@ -322,12 +322,13 @@ function renderToStream(code, options = {}) {
   const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
+      writeTasks();
       onCompleteAll && onCompleteAll(result);
       writable && writable.end();
       completed = true;
     }
   };
-  const writeInitialScript = () => {
+  const writeTasks = () => {
     if (tasks.length && !completed) {
       buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks.join(";")}</script>`);
       tasks.length = 0;
@@ -354,7 +355,7 @@ function renderToStream(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
@@ -369,7 +370,7 @@ function renderToStream(code, options = {}) {
     registerFragment(key) {
       registry.set(key, []);
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       tasks.push(`_$HY.init("${key}")`);
@@ -575,8 +576,8 @@ function getHydrationKey() {
 function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
-}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!xs>`;
+} = {}) {
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!--xs-->`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {
@@ -586,7 +587,7 @@ function injectAssets(assets, html) {
 }
 function injectScripts(html, scripts, nonce) {
   const tag = `<script${nonce ? ` nonce="${nonce}"` : ""}>${scripts}</script>`;
-  const index = html.indexOf("<!xs>");
+  const index = html.indexOf("<!--xs-->");
   if (index > -1) {
     return html.slice(0, index) + tag + html.slice(index);
   }
@@ -607,7 +608,7 @@ function waitForFragments(registry, key) {
 function serializeSet(registry, key, value) {
   const exist = registry.get(value);
   if (exist) return `_$HY.set("${key}", _$HY.r["${exist}"][0]);`;
-  registry.set(value, key);
+  value !== null && typeof value === "object" && registry.set(value, key);
   return `_$HY.set("${key}", ${devalue(value)});`;
 }
 function pipeToNodeWritable(code, writable, options = {}) {

package/web/dist/server.js

@@ -319,12 +319,13 @@ function renderToStream(code, options = {}) {
   const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
+      writeTasks();
       onCompleteAll && onCompleteAll(result);
       writable && writable.end();
       completed = true;
     }
   };
-  const writeInitialScript = () => {
+  const writeTasks = () => {
     if (tasks.length && !completed) {
       buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks.join(";")}</script>`);
       tasks.length = 0;
@@ -351,7 +352,7 @@ function renderToStream(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
@@ -366,7 +367,7 @@ function renderToStream(code, options = {}) {
     registerFragment(key) {
       registry.set(key, []);
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       tasks.push(`_$HY.init("${key}")`);
@@ -572,8 +573,8 @@ function getHydrationKey() {
 function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
-}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!xs>`;
+} = {}) {
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!--xs-->`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {
@@ -583,7 +584,7 @@ function injectAssets(assets, html) {
 }
 function injectScripts(html, scripts, nonce) {
   const tag = `<script${nonce ? ` nonce="${nonce}"` : ""}>${scripts}</script>`;
-  const index = html.indexOf("<!xs>");
+  const index = html.indexOf("<!--xs-->");
   if (index > -1) {
     return html.slice(0, index) + tag + html.slice(index);
   }
@@ -604,7 +605,7 @@ function waitForFragments(registry, key) {
 function serializeSet(registry, key, value) {
   const exist = registry.get(value);
   if (exist) return `_$HY.set("${key}", _$HY.r["${exist}"][0]);`;
-  registry.set(value, key);
+  value !== null && typeof value === "object" && registry.set(value, key);
   return `_$HY.set("${key}", ${devalue(value)});`;
 }
 function pipeToNodeWritable(code, writable, options = {}) {

package/web/dist/web.cjs

@@ -59,7 +59,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -88,7 +88,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -346,6 +346,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (solidJs.sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -402,13 +403,13 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? value : current;
+    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else ;
   return current;
@@ -448,7 +449,7 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
   } else parent.insertBefore(node, marker);

package/web/dist/web.js

@@ -56,7 +56,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -85,7 +85,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -343,6 +343,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -399,13 +400,13 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? value : current;
+    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else ;
   return current;
@@ -445,7 +446,7 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
   } else parent.insertBefore(node, marker);