solid-js 1.3.11 → 1.3.12

package/dist/server.cjs

@@ -331,16 +331,16 @@ function ErrorBoundary(props) {
 }
 const SuspenseContext = createContext();
 let resourceContext = null;
-function createResource(fn, fetcher, options = {}) {
+function createResource(source, fetcher, options = {}) {
   if (arguments.length === 2) {
     if (typeof fetcher === "object") {
       options = fetcher;
-      fetcher = fn;
-      fn = true;
+      fetcher = source;
+      source = true;
     }
   } else if (arguments.length === 1) {
-    fetcher = fn;
-    fn = true;
+    fetcher = source;
+    source = true;
   }
   const contexts = new Set();
   const id = sharedConfig.context.id + sharedConfig.context.count++;
@@ -372,23 +372,27 @@ function createResource(fn, fetcher, options = {}) {
   read.error = undefined;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
+    if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
     }
     resourceContext = [];
-    const lookup = typeof fn === "function" ? fn() : fn;
+    const lookup = typeof source === "function" ? source() : source;
     if (resourceContext.length) {
-      p = Promise.all(resourceContext).then(() => fetcher(fn(), () => value));
+      p = Promise.all(resourceContext).then(() => fetcher(source(), {
+        value
+      }));
     }
     resourceContext = null;
     if (!p) {
       if (lookup == null || lookup === false) return;
-      p = fetcher(lookup, () => value);
+      p = fetcher(lookup, {
+        value
+      });
     }
-    read.loading = true;
-    if ("then" in p) {
+    if (p && "then" in p) {
+      read.loading = true;
       if (ctx.writeResource) ctx.writeResource(id, p);
       return p.then(res => {
         read.loading = false;

package/dist/server.js

@@ -327,16 +327,16 @@ function ErrorBoundary(props) {
 }
 const SuspenseContext = createContext();
 let resourceContext = null;
-function createResource(fn, fetcher, options = {}) {
+function createResource(source, fetcher, options = {}) {
   if (arguments.length === 2) {
     if (typeof fetcher === "object") {
       options = fetcher;
-      fetcher = fn;
-      fn = true;
+      fetcher = source;
+      source = true;
     }
   } else if (arguments.length === 1) {
-    fetcher = fn;
-    fn = true;
+    fetcher = source;
+    source = true;
   }
   const contexts = new Set();
   const id = sharedConfig.context.id + sharedConfig.context.count++;
@@ -368,23 +368,27 @@ function createResource(fn, fetcher, options = {}) {
   read.error = undefined;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
+    if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
     }
     resourceContext = [];
-    const lookup = typeof fn === "function" ? fn() : fn;
+    const lookup = typeof source === "function" ? source() : source;
     if (resourceContext.length) {
-      p = Promise.all(resourceContext).then(() => fetcher(fn(), () => value));
+      p = Promise.all(resourceContext).then(() => fetcher(source(), {
+        value
+      }));
     }
     resourceContext = null;
     if (!p) {
       if (lookup == null || lookup === false) return;
-      p = fetcher(lookup, () => value);
+      p = fetcher(lookup, {
+        value
+      });
     }
-    read.loading = true;
-    if ("then" in p) {
+    if (p && "then" in p) {
+      read.loading = true;
       if (ctx.writeResource) ctx.writeResource(id, p);
       return p.then(res => {
         read.loading = false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "f880eac70b79292cb3452bfbe27a9a94f283d605"
+  "gitHead": "e7671349791bd239fbe20c54c266ae085a7f09f2"
 }

package/types/server/reactive.d.ts

@@ -1,8 +1,9 @@
-import type { Accessor, Setter } from "../reactive/signal";
 export declare const equalFn: <T>(a: T, b: T) => boolean;
 export declare const $PROXY: 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 let Owner: Owner | null;
 interface Owner {
     owner: Owner | null;

package/types/server/rendering.d.ts

@@ -1,3 +1,4 @@
+import { Setter } from "./reactive";
 import type { JSX } from "../jsx";
 declare type PropsWithChildren<P> = P & {
     children?: JSX.Element;
@@ -72,19 +73,32 @@ declare type SuspenseContextType = {
     }>;
     completed: () => void;
 };
-declare type ResourceReturn<T> = [
-    Resource<T>,
-    {
-        mutate: (v: T | undefined) => T | undefined;
-        refetch: () => void;
-    }
-];
-export declare function createResource<T, U = true>(fetcher: (k: U, getPrev: () => T | undefined) => T | Promise<T>, options?: {
-    initialValue?: T;
-}): ResourceReturn<T>;
-export declare function createResource<T, U>(fn: U | false | (() => U | false), fetcher: (k: U, getPrev: () => T | undefined) => T | Promise<T>, options?: {
+export declare 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> = {
+    value: T | undefined;
+    refetching?: unknown;
+};
+export declare type ResourceOptions<T> = undefined extends T ? {
     initialValue?: T;
-}): ResourceReturn<T>;
+    name?: string;
+    globalRefetch?: boolean;
+    onHydrated?: <S, T>(k: S, info: ResourceFetcherInfo<T>) => void;
+} : {
+    initialValue: T;
+    name?: string;
+    globalRefetch?: boolean;
+    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 refetchResources(info?: unknown): void;
 export declare function lazy(fn: () => Promise<{
     default: any;

package/web/dist/dev.cjs

@@ -357,6 +357,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
         multi = marker !== undefined;
   parent = multi && current[0] && current[0].parentNode || parent;
   if (t === "string" || t === "number") {
+    if (solidJs.sharedConfig.context) return current;
     if (t === "number") value = value.toString();
     if (multi) {
       let node = current[0];
@@ -474,9 +475,19 @@ function NoHydration(props) {
   return solidJs.sharedConfig.context ? undefined : props.children;
 }
 
-function renderToString(fn, options) {}
-function renderToStringAsync(fn, options) {}
-function renderToStream(fn, options) {}
+function throwInBrowser(func) {
+  const err = new Error(`${func.name} is not supported in the browser, returning undefined`);
+  console.error(err);
+}
+function renderToString(fn, options) {
+  throwInBrowser(renderToString);
+}
+function renderToStringAsync(fn, options) {
+  throwInBrowser(renderToStringAsync);
+}
+function renderToStream(fn, options) {
+  throwInBrowser(renderToStream);
+}
 function ssr(template, ...nodes) {}
 function resolveSSRNode(node) {}
 function ssrClassList(value) {}

package/web/dist/dev.js

@@ -354,6 +354,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
         multi = marker !== undefined;
   parent = multi && current[0] && current[0].parentNode || parent;
   if (t === "string" || t === "number") {
+    if (sharedConfig.context) return current;
     if (t === "number") value = value.toString();
     if (multi) {
       let node = current[0];
@@ -471,9 +472,19 @@ function NoHydration(props) {
   return sharedConfig.context ? undefined : props.children;
 }
 
-function renderToString(fn, options) {}
-function renderToStringAsync(fn, options) {}
-function renderToStream(fn, options) {}
+function throwInBrowser(func) {
+  const err = new Error(`${func.name} is not supported in the browser, returning undefined`);
+  console.error(err);
+}
+function renderToString(fn, options) {
+  throwInBrowser(renderToString);
+}
+function renderToStringAsync(fn, options) {
+  throwInBrowser(renderToStringAsync);
+}
+function renderToStream(fn, options) {
+  throwInBrowser(renderToStream);
+}
 function ssr(template, ...nodes) {}
 function resolveSSRNode(node) {}
 function ssrClassList(value) {}

package/web/dist/server.cjs

@@ -233,7 +233,7 @@ function stringifyString(str) {
 }
 
 const REPLACE_SCRIPT = `function $df(e,y,t,g){t=document.getElementById(e),g=document.getElementById("pl"+e),g&&g.replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
-const FRAGMENT_REPLACE = /<!\[([\d.]+)\]>/;
+const FRAGMENT_REPLACE = /<!\[([\d-]+)\]>/;
 function renderToString(code, options = {}) {
   let scripts = "";
   solidJs.sharedConfig.context = {

package/web/dist/server.js

@@ -230,7 +230,7 @@ function stringifyString(str) {
 }
 
 const REPLACE_SCRIPT = `function $df(e,y,t,g){t=document.getElementById(e),g=document.getElementById("pl"+e),g&&g.replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
-const FRAGMENT_REPLACE = /<!\[([\d.]+)\]>/;
+const FRAGMENT_REPLACE = /<!\[([\d-]+)\]>/;
 function renderToString(code, options = {}) {
   let scripts = "";
   sharedConfig.context = {

package/web/dist/web.cjs

@@ -356,6 +356,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
         multi = marker !== undefined;
   parent = multi && current[0] && current[0].parentNode || parent;
   if (t === "string" || t === "number") {
+    if (solidJs.sharedConfig.context) return current;
     if (t === "number") value = value.toString();
     if (multi) {
       let node = current[0];
@@ -473,9 +474,19 @@ function NoHydration(props) {
   return solidJs.sharedConfig.context ? undefined : props.children;
 }
 
-function renderToString(fn, options) {}
-function renderToStringAsync(fn, options) {}
-function renderToStream(fn, options) {}
+function throwInBrowser(func) {
+  const err = new Error(`${func.name} is not supported in the browser, returning undefined`);
+  console.error(err);
+}
+function renderToString(fn, options) {
+  throwInBrowser(renderToString);
+}
+function renderToStringAsync(fn, options) {
+  throwInBrowser(renderToStringAsync);
+}
+function renderToStream(fn, options) {
+  throwInBrowser(renderToStream);
+}
 function ssr(template, ...nodes) {}
 function resolveSSRNode(node) {}
 function ssrClassList(value) {}

package/web/dist/web.js

@@ -353,6 +353,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
         multi = marker !== undefined;
   parent = multi && current[0] && current[0].parentNode || parent;
   if (t === "string" || t === "number") {
+    if (sharedConfig.context) return current;
     if (t === "number") value = value.toString();
     if (multi) {
       let node = current[0];
@@ -470,9 +471,19 @@ function NoHydration(props) {
   return sharedConfig.context ? undefined : props.children;
 }
 
-function renderToString(fn, options) {}
-function renderToStringAsync(fn, options) {}
-function renderToStream(fn, options) {}
+function throwInBrowser(func) {
+  const err = new Error(`${func.name} is not supported in the browser, returning undefined`);
+  console.error(err);
+}
+function renderToString(fn, options) {
+  throwInBrowser(renderToString);
+}
+function renderToStringAsync(fn, options) {
+  throwInBrowser(renderToStringAsync);
+}
+function renderToStream(fn, options) {
+  throwInBrowser(renderToStream);
+}
 function ssr(template, ...nodes) {}
 function resolveSSRNode(node) {}
 function ssrClassList(value) {}

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

@@ -10,8 +10,12 @@ export declare function renderToStringAsync<T>(fn: () => T, options?: {
 export declare function renderToStream<T>(fn: () => T, options?: {
     nonce?: string;
     renderId?: string;
-    onCompleteShell?: () => void;
-    onCompleteAll?: () => void;
+    onCompleteShell?: (info: {
+        write: (v: string) => void;
+    }) => void;
+    onCompleteAll?: (info: {
+        write: (v: string) => void;
+    }) => void;
 }): {
     pipe: (writable: {
         write: (v: string) => void;