solid-js 1.8.17 → 1.8.19

package/types/server/rendering.d.ts

@@ -2,227 +2,158 @@ import { Accessor, Setter, Signal } from "./reactive.js";
 import type { JSX } from "../jsx.js";
 export type Component<P = {}> = (props: P) => JSX.Element;
 export type VoidProps<P = {}> = P & {
-  children?: never;
+    children?: never;
 };
 export type VoidComponent<P = {}> = Component<VoidProps<P>>;
 export type ParentProps<P = {}> = P & {
-  children?: JSX.Element;
+    children?: JSX.Element;
 };
 export type ParentComponent<P = {}> = Component<ParentProps<P>>;
 export type FlowProps<P = {}, C = JSX.Element> = P & {
-  children: C;
+    children: C;
 };
 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>;
+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;
+    context?: HydrationContext;
+    getContextId(): string;
+    getNextContextId(): string;
 };
 export declare const sharedConfig: SharedConfig;
 export declare function createUniqueId(): string;
 export declare function createComponent<T>(Comp: (props: T) => JSX.Element, props: T): JSX.Element;
 export declare function mergeProps<T, U>(source: T, source1: U): T & U;
 export declare function mergeProps<T, U, V>(source: T, source1: U, source2: V): T & U & V;
-export declare function mergeProps<T, U, V, W>(
-  source: T,
-  source1: U,
-  source2: V,
-  source3: W
-): T & U & V & W;
-export declare function splitProps<T extends object, K1 extends keyof T>(
-  props: T,
-  ...keys: [K1[]]
-): [Pick<T, K1>, Omit<T, K1>];
-export declare function splitProps<T extends object, K1 extends keyof T, K2 extends keyof T>(
-  props: T,
-  ...keys: [K1[], K2[]]
-): [Pick<T, K1>, Pick<T, K2>, Omit<T, K1 | K2>];
-export declare function splitProps<
-  T extends object,
-  K1 extends keyof T,
-  K2 extends keyof T,
-  K3 extends keyof T
->(
-  props: T,
-  ...keys: [K1[], K2[], K3[]]
-): [Pick<T, K1>, Pick<T, K2>, Pick<T, K3>, Omit<T, K1 | K2 | K3>];
-export declare function splitProps<
-  T extends object,
-  K1 extends keyof T,
-  K2 extends keyof T,
-  K3 extends keyof T,
-  K4 extends keyof T
->(
-  props: T,
-  ...keys: [K1[], K2[], K3[], K4[]]
-): [Pick<T, K1>, Pick<T, K2>, Pick<T, K3>, Pick<T, K4>, Omit<T, K1 | K2 | K3 | K4>];
-export declare function splitProps<
-  T extends object,
-  K1 extends keyof T,
-  K2 extends keyof T,
-  K3 extends keyof T,
-  K4 extends keyof T,
-  K5 extends keyof T
->(
-  props: T,
-  ...keys: [K1[], K2[], K3[], K4[], K5[]]
-): [
-  Pick<T, K1>,
-  Pick<T, K2>,
-  Pick<T, K3>,
-  Pick<T, K4>,
-  Pick<T, K5>,
-  Omit<T, K1 | K2 | K3 | K4 | K5>
+export declare function mergeProps<T, U, V, W>(source: T, source1: U, source2: V, source3: W): T & U & V & W;
+export declare function splitProps<T extends object, K1 extends keyof T>(props: T, ...keys: [K1[]]): [Pick<T, K1>, Omit<T, K1>];
+export declare function splitProps<T extends object, K1 extends keyof T, K2 extends keyof T>(props: T, ...keys: [K1[], K2[]]): [Pick<T, K1>, Pick<T, K2>, Omit<T, K1 | K2>];
+export declare function splitProps<T extends object, K1 extends keyof T, K2 extends keyof T, K3 extends keyof T>(props: T, ...keys: [K1[], K2[], K3[]]): [Pick<T, K1>, Pick<T, K2>, Pick<T, K3>, Omit<T, K1 | K2 | K3>];
+export declare function splitProps<T extends object, K1 extends keyof T, K2 extends keyof T, K3 extends keyof T, K4 extends keyof T>(props: T, ...keys: [K1[], K2[], K3[], K4[]]): [Pick<T, K1>, Pick<T, K2>, Pick<T, K3>, Pick<T, K4>, Omit<T, K1 | K2 | K3 | K4>];
+export declare function splitProps<T extends object, K1 extends keyof T, K2 extends keyof T, K3 extends keyof T, K4 extends keyof T, K5 extends keyof T>(props: T, ...keys: [K1[], K2[], K3[], K4[], K5[]]): [
+    Pick<T, K1>,
+    Pick<T, K2>,
+    Pick<T, K3>,
+    Pick<T, K4>,
+    Pick<T, K5>,
+    Omit<T, K1 | K2 | K3 | K4 | K5>
 ];
 export declare function For<T>(props: {
-  each: T[];
-  fallback?: string;
-  children: (item: T, index: () => number) => string;
+    each: T[];
+    fallback?: string;
+    children: (item: T, index: () => number) => string;
 }): string | any[] | undefined;
 export declare function Index<T>(props: {
-  each: T[];
-  fallback?: string;
-  children: (item: () => T, index: number) => string;
+    each: T[];
+    fallback?: string;
+    children: (item: () => T, index: number) => string;
 }): string | any[] | undefined;
 /**
  * Conditionally render its children or an optional fallback component
- * @description https://www.solidjs.com/docs/latest/api#show
+ * @description https://docs.solidjs.com/reference/components/show
  */
 export declare function Show<T>(props: {
-  when: T | undefined | null | false;
-  keyed?: boolean;
-  fallback?: string;
-  children: string | ((item: NonNullable<T> | Accessor<NonNullable<T>>) => string);
+    when: T | undefined | null | false;
+    keyed?: boolean;
+    fallback?: string;
+    children: string | ((item: NonNullable<T> | Accessor<NonNullable<T>>) => string);
 }): string;
 export declare function Switch(props: {
-  fallback?: string;
-  children: MatchProps<unknown> | MatchProps<unknown>[];
+    fallback?: string;
+    children: MatchProps<unknown> | MatchProps<unknown>[];
 }): string;
 type MatchProps<T> = {
-  when: T | false;
-  keyed?: boolean;
-  children: string | ((item: NonNullable<T> | Accessor<NonNullable<T>>) => string);
+    when: T | false;
+    keyed?: boolean;
+    children: string | ((item: NonNullable<T> | Accessor<NonNullable<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;
-}):
-  | string
-  | ((err: any, reset: () => void) => string)
-  | {
-      t: string;
-    };
+    fallback: string | ((err: any, reset: () => void) => string);
+    children: string;
+}): string | ((err: any, reset: () => void) => string) | {
+    t: string;
+};
 export interface Resource<T> {
-  (): T | undefined;
-  state: "unresolved" | "pending" | "ready" | "refreshing" | "errored";
-  loading: boolean;
-  error: any;
-  latest: T | undefined;
+    (): T | undefined;
+    state: "unresolved" | "pending" | "ready" | "refreshing" | "errored";
+    loading: boolean;
+    error: any;
+    latest: T | undefined;
 }
 type SuspenseContextType = {
-  resources: Map<
-    string,
-    {
-      loading: boolean;
-      error: any;
-    }
-  >;
-  completed: () => void;
+    resources: Map<string, {
+        loading: boolean;
+        error: any;
+    }>;
+    completed: () => void;
 };
 export type ResourceActions<T> = {
-  mutate: Setter<T>;
-  refetch: (info?: unknown) => void;
+    mutate: Setter<T>;
+    refetch: (info?: unknown) => void;
 };
 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;
+    value: T | undefined;
+    refetching?: unknown;
 };
-export type ResourceOptions<T> = undefined extends T
-  ? {
-      initialValue?: T;
-      name?: string;
-      deferStream?: boolean;
-      ssrLoadFrom?: "initial" | "server";
-      storage?: () => Signal<T | undefined>;
-      onHydrated?: <S, T>(k: S, info: ResourceFetcherInfo<T>) => void;
-    }
-  : {
-      initialValue: T;
-      name?: string;
-      deferStream?: boolean;
-      ssrLoadFrom?: "initial" | "server";
-      storage?: (v?: T) => Signal<T | undefined>;
-      onHydrated?: <S, T>(k: S, info: ResourceFetcherInfo<T>) => void;
-    };
-export declare function createResource<T, S = true>(
-  fetcher: ResourceFetcher<S, T>,
-  options?: ResourceOptions<undefined>
-): ResourceReturn<T | undefined>;
-export declare function createResource<T, S = true>(
-  fetcher: ResourceFetcher<S, T>,
-  options: ResourceOptions<T>
-): ResourceReturn<T>;
-export declare function createResource<T, S>(
-  source: ResourceSource<S>,
-  fetcher: ResourceFetcher<S, T>,
-  options?: ResourceOptions<undefined>
-): ResourceReturn<T | undefined>;
-export declare function createResource<T, S>(
-  source: ResourceSource<S>,
-  fetcher: ResourceFetcher<S, T>,
-  options: ResourceOptions<T>
-): ResourceReturn<T>;
-export declare function lazy<T extends Component<any>>(
-  fn: () => Promise<{
-    default: T;
-  }>
-): T & {
-  preload: () => Promise<{
+export type ResourceOptions<T> = undefined extends T ? {
+    initialValue?: T;
+    name?: string;
+    deferStream?: boolean;
+    ssrLoadFrom?: "initial" | "server";
+    storage?: () => Signal<T | undefined>;
+    onHydrated?: <S, T>(k: S, info: ResourceFetcherInfo<T>) => void;
+} : {
+    initialValue: T;
+    name?: string;
+    deferStream?: boolean;
+    ssrLoadFrom?: "initial" | "server";
+    storage?: (v?: T) => Signal<T | undefined>;
+    onHydrated?: <S, T>(k: S, info: ResourceFetcherInfo<T>) => void;
+};
+export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined>;
+export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
+export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined>;
+export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
+export declare function lazy<T extends Component<any>>(fn: () => Promise<{
     default: T;
-  }>;
+}>): T & {
+    preload: () => Promise<{
+        default: T;
+    }>;
 };
 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];
 type HydrationContext = {
-  id: string;
-  count: number;
-  serialize: (id: string, v: Promise<any> | any, deferStream?: boolean) => void;
-  nextRoot: (v: any) => string;
-  replace: (id: string, replacement: () => any) => void;
-  block: (p: Promise<any>) => void;
-  resources: Record<string, any>;
-  suspense: Record<string, SuspenseContextType>;
-  registerFragment: (v: string) => (v?: string, err?: any) => boolean;
-  lazy: Record<string, Promise<any>>;
-  async?: boolean;
-  noHydrate: boolean;
+    id: string;
+    count: number;
+    serialize: (id: string, v: Promise<any> | any, deferStream?: boolean) => void;
+    nextRoot: (v: any) => string;
+    replace: (id: string, replacement: () => any) => void;
+    block: (p: Promise<any>) => void;
+    resources: Record<string, any>;
+    suspense: Record<string, SuspenseContextType>;
+    registerFragment: (v: string) => (v?: string, err?: any) => boolean;
+    lazy: Record<string, Promise<any>>;
+    async?: boolean;
+    noHydrate: boolean;
 };
 export declare function SuspenseList(props: {
-  children: string;
-  revealOrder: "forwards" | "backwards" | "together";
-  tail?: "collapsed" | "hidden";
+    children: string;
+    revealOrder: "forwards" | "backwards" | "together";
+    tail?: "collapsed" | "hidden";
 }): string;
-export declare function Suspense(props: { fallback?: string; children: string }):
-  | string
-  | number
-  | boolean
-  | Node
-  | JSX.ArrayElement
-  | {
-      t: string;
-    }
-  | null
-  | undefined;
+export declare function Suspense(props: {
+    fallback?: string;
+    children: string;
+}): string | number | boolean | Node | JSX.ArrayElement | {
+    t: string;
+} | null | undefined;
 export {};

package/universal/dist/dev.js

@@ -1,11 +1,4 @@
-import {
-  createRoot,
-  createRenderEffect,
-  mergeProps,
-  createMemo,
-  createComponent,
-  untrack
-} from "solid-js";
+import { createRoot, createRenderEffect, mergeProps, createMemo, createComponent, untrack } from 'solid-js';
 
 function createRenderer$1({
   createElement,
@@ -39,7 +32,7 @@ function createRenderer$1({
         current = cleanChildren(parent, current, marker, node);
       } else {
         if (current !== "" && typeof current === "string") {
-          replaceText(getFirstChild(parent), (current = value));
+          replaceText(getFirstChild(parent), current = value);
         } else {
           cleanChildren(parent, current, marker, createTextNode(value));
           current = value;
@@ -57,14 +50,12 @@ function createRenderer$1({
     } else if (Array.isArray(value)) {
       const array = [];
       if (normalizeIncomingArray(array, value, unwrapArray)) {
-        createRenderEffect(
-          () => (current = insertExpression(parent, array, current, marker, true))
-        );
+        createRenderEffect(() => current = insertExpression(parent, array, current, marker, true));
         return () => current;
       }
       if (array.length === 0) {
         const replacement = cleanChildren(parent, current, marker);
-        if (multi) return (current = replacement);
+        if (multi) return current = replacement;
       } else {
         if (Array.isArray(current)) {
           if (current.length === 0) {
@@ -73,13 +64,13 @@ function createRenderer$1({
         } else if (current == null || current === "") {
           appendNodes(parent, array);
         } else {
-          reconcileArrays(parent, (multi && current) || [getFirstChild(parent)], array);
+          reconcileArrays(parent, multi && current || [getFirstChild(parent)], array);
         }
       }
       current = array;
     } else {
       if (Array.isArray(current)) {
-        if (multi) return (current = cleanChildren(parent, current, marker, value));
+        if (multi) return current = cleanChildren(parent, current, marker, value);
         cleanChildren(parent, current, null, value);
       } else if (current == null || current === "" || !getFirstChild(parent)) {
         insertNode(parent, value);
@@ -93,16 +84,14 @@ function createRenderer$1({
     for (let i = 0, len = array.length; i < len; i++) {
       let item = array[i],
         t;
-      if (item == null || item === true || item === false);
-      else if (Array.isArray(item)) {
+      if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
         dynamic = normalizeIncomingArray(normalized, item) || dynamic;
       } else if ((t = typeof item) === "string" || t === "number") {
         normalized.push(createTextNode(item));
       } else if (t === "function") {
         if (unwrap) {
           while (typeof item === "function") item = item();
-          dynamic =
-            normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item]) || dynamic;
+          dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item]) || dynamic;
         } else {
           normalized.push(item);
           dynamic = true;
@@ -130,8 +119,7 @@ function createRenderer$1({
         bEnd--;
       }
       if (aEnd === aStart) {
-        const node =
-          bEnd < bLength ? (bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart]) : after;
+        const node = bEnd < bLength ? bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart] : after;
         while (bStart < bEnd) insertNode(parentNode, b[bStart++], node);
       } else if (bEnd === bStart) {
         while (aStart < aEnd) {
@@ -171,7 +159,7 @@ function createRenderer$1({
   function cleanChildren(parent, current, marker, replacement) {
     if (marker === undefined) {
       let removed;
-      while ((removed = getFirstChild(parent))) removeNode(parent, removed);
+      while (removed = getFirstChild(parent)) removeNode(parent, removed);
       replacement && insertNode(parent, replacement);
       return "";
     }
@@ -182,9 +170,7 @@ function createRenderer$1({
         const el = current[i];
         if (node !== el) {
           const isParent = getParentNode(el) === parent;
-          if (!inserted && !i)
-            isParent ? replaceNode(parent, node, el) : insertNode(parent, node, marker);
-          else isParent && removeNode(parent, el);
+          if (!inserted && !i) isParent ? replaceNode(parent, node, el) : insertNode(parent, node, marker);else isParent && removeNode(parent, el);
         } else inserted = true;
       }
     } else insertNode(parent, node, marker);
@@ -200,9 +186,7 @@ function createRenderer$1({
   function spreadExpression(node, props, prevProps = {}, skipChildren) {
     props || (props = {});
     if (!skipChildren) {
-      createRenderEffect(
-        () => (prevProps.children = insertExpression(node, props.children, prevProps.children))
-      );
+      createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
     }
     createRenderEffect(() => props.ref && props.ref(node));
     createRenderEffect(() => {

package/universal/dist/universal.js

@@ -1,11 +1,4 @@
-import {
-  createRoot,
-  createRenderEffect,
-  mergeProps,
-  createMemo,
-  createComponent,
-  untrack
-} from "solid-js";
+import { createRoot, createRenderEffect, mergeProps, createMemo, createComponent, untrack } from 'solid-js';
 
 function createRenderer$1({
   createElement,
@@ -39,7 +32,7 @@ function createRenderer$1({
         current = cleanChildren(parent, current, marker, node);
       } else {
         if (current !== "" && typeof current === "string") {
-          replaceText(getFirstChild(parent), (current = value));
+          replaceText(getFirstChild(parent), current = value);
         } else {
           cleanChildren(parent, current, marker, createTextNode(value));
           current = value;
@@ -57,14 +50,12 @@ function createRenderer$1({
     } else if (Array.isArray(value)) {
       const array = [];
       if (normalizeIncomingArray(array, value, unwrapArray)) {
-        createRenderEffect(
-          () => (current = insertExpression(parent, array, current, marker, true))
-        );
+        createRenderEffect(() => current = insertExpression(parent, array, current, marker, true));
         return () => current;
       }
       if (array.length === 0) {
         const replacement = cleanChildren(parent, current, marker);
-        if (multi) return (current = replacement);
+        if (multi) return current = replacement;
       } else {
         if (Array.isArray(current)) {
           if (current.length === 0) {
@@ -73,13 +64,13 @@ function createRenderer$1({
         } else if (current == null || current === "") {
           appendNodes(parent, array);
         } else {
-          reconcileArrays(parent, (multi && current) || [getFirstChild(parent)], array);
+          reconcileArrays(parent, multi && current || [getFirstChild(parent)], array);
         }
       }
       current = array;
     } else {
       if (Array.isArray(current)) {
-        if (multi) return (current = cleanChildren(parent, current, marker, value));
+        if (multi) return current = cleanChildren(parent, current, marker, value);
         cleanChildren(parent, current, null, value);
       } else if (current == null || current === "" || !getFirstChild(parent)) {
         insertNode(parent, value);
@@ -93,16 +84,14 @@ function createRenderer$1({
     for (let i = 0, len = array.length; i < len; i++) {
       let item = array[i],
         t;
-      if (item == null || item === true || item === false);
-      else if (Array.isArray(item)) {
+      if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
         dynamic = normalizeIncomingArray(normalized, item) || dynamic;
       } else if ((t = typeof item) === "string" || t === "number") {
         normalized.push(createTextNode(item));
       } else if (t === "function") {
         if (unwrap) {
           while (typeof item === "function") item = item();
-          dynamic =
-            normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item]) || dynamic;
+          dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item]) || dynamic;
         } else {
           normalized.push(item);
           dynamic = true;
@@ -130,8 +119,7 @@ function createRenderer$1({
         bEnd--;
       }
       if (aEnd === aStart) {
-        const node =
-          bEnd < bLength ? (bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart]) : after;
+        const node = bEnd < bLength ? bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart] : after;
         while (bStart < bEnd) insertNode(parentNode, b[bStart++], node);
       } else if (bEnd === bStart) {
         while (aStart < aEnd) {
@@ -171,7 +159,7 @@ function createRenderer$1({
   function cleanChildren(parent, current, marker, replacement) {
     if (marker === undefined) {
       let removed;
-      while ((removed = getFirstChild(parent))) removeNode(parent, removed);
+      while (removed = getFirstChild(parent)) removeNode(parent, removed);
       replacement && insertNode(parent, replacement);
       return "";
     }
@@ -182,9 +170,7 @@ function createRenderer$1({
         const el = current[i];
         if (node !== el) {
           const isParent = getParentNode(el) === parent;
-          if (!inserted && !i)
-            isParent ? replaceNode(parent, node, el) : insertNode(parent, node, marker);
-          else isParent && removeNode(parent, el);
+          if (!inserted && !i) isParent ? replaceNode(parent, node, el) : insertNode(parent, node, marker);else isParent && removeNode(parent, el);
         } else inserted = true;
       }
     } else insertNode(parent, node, marker);
@@ -200,9 +186,7 @@ function createRenderer$1({
   function spreadExpression(node, props, prevProps = {}, skipChildren) {
     props || (props = {});
     if (!skipChildren) {
-      createRenderEffect(
-        () => (prevProps.children = insertExpression(node, props.children, prevProps.children))
-      );
+      createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
     }
     createRenderEffect(() => props.ref && props.ref(node));
     createRenderEffect(() => {

package/universal/types/index.d.ts

@@ -1,4 +1,2 @@
 import type { RendererOptions, Renderer } from "./universal.js";
-export declare function createRenderer<NodeType>(
-  options: RendererOptions<NodeType>
-): Renderer<NodeType>;
+export declare function createRenderer<NodeType>(options: RendererOptions<NodeType>): Renderer<NodeType>;

package/universal/types/universal.d.ts

@@ -27,3 +27,4 @@ export interface Renderer<NodeType> {
 }
 
 export function createRenderer<NodeType>(options: RendererOptions<NodeType>): Renderer<NodeType>;
+

package/web/dist/dev.cjs

@@ -222,7 +222,7 @@ function spread(node, props = {}, isSVG, skipChildren) {
   if (!skipChildren) {
     solidJs.createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
   }
-  solidJs.createRenderEffect(() => typeof props.ref === "function" ? use(props.ref, node) : props.ref = node);
+  solidJs.createRenderEffect(() => typeof props.ref === "function" && use(props.ref, node));
   solidJs.createRenderEffect(() => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }
@@ -419,7 +419,10 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
   parent = multi && current[0] && current[0].parentNode || parent;
   if (t === "string" || t === "number") {
     if (hydrating) return current;
-    if (t === "number") value = value.toString();
+    if (t === "number") {
+      value = value.toString();
+      if (value === current) return current;
+    }
     if (multi) {
       let node = current[0];
       if (node && node.nodeType === 3) {
@@ -532,8 +535,7 @@ function gatherHydratable(element, root) {
   }
 }
 function getHydrationKey() {
-  const hydrate = solidJs.sharedConfig.context;
-  return `${hydrate.id}${hydrate.count++}`;
+  return solidJs.sharedConfig.getNextContextId();
 }
 function NoHydration(props) {
   return solidJs.sharedConfig.context ? undefined : props.children;