solid-js 1.5.4 → 1.5.5

package/dist/dev.cjs

@@ -338,7 +338,7 @@ function createResource(pSource, pFetcher, pOptions) {
       value: value(),
       refetching
     }));
-    if (typeof p !== "object" || !("then" in p)) {
+    if (typeof p !== "object" || !(p && "then" in p)) {
       loadEnd(pr, p);
       return p;
     }
@@ -522,6 +522,7 @@ function devComponent(Comp, props) {
     });
     return Comp(props);
   }), undefined, true);
+  c.props = props;
   c.observers = null;
   c.observerSlots = null;
   c.state = 0;

package/dist/dev.js

@@ -334,7 +334,7 @@ function createResource(pSource, pFetcher, pOptions) {
       value: value(),
       refetching
     }));
-    if (typeof p !== "object" || !("then" in p)) {
+    if (typeof p !== "object" || !(p && "then" in p)) {
       loadEnd(pr, p);
       return p;
     }
@@ -518,6 +518,7 @@ function devComponent(Comp, props) {
     });
     return Comp(props);
   }), undefined, true);
+  c.props = props;
   c.observers = null;
   c.observerSlots = null;
   c.state = 0;

package/dist/solid.cjs

@@ -330,7 +330,7 @@ function createResource(pSource, pFetcher, pOptions) {
       value: value(),
       refetching
     }));
-    if (typeof p !== "object" || !("then" in p)) {
+    if (typeof p !== "object" || !(p && "then" in p)) {
       loadEnd(pr, p);
       return p;
     }

package/dist/solid.js

@@ -326,7 +326,7 @@ function createResource(pSource, pFetcher, pOptions) {
       value: value(),
       refetching
     }));
-    if (typeof p !== "object" || !("then" in p)) {
+    if (typeof p !== "object" || !(p && "then" in p)) {
       loadEnd(pr, p);
       return p;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",

package/types/reactive/signal.d.ts

@@ -256,10 +256,7 @@ export declare type ResourceOptions<T, S = unknown> = {
 export declare type InitializedResourceOptions<T, S = unknown> = ResourceOptions<T, S> & {
     initialValue: T;
 };
-export declare type ResourceReturn<T, R = unknown> = [
-    Resource<T>,
-    ResourceActions<T | undefined, R>
-];
+export declare type ResourceReturn<T, R = unknown> = [Resource<T>, ResourceActions<T | undefined, R>];
 export declare type InitializedResourceReturn<T, R = unknown> = [
     InitializedResource<T>,
     ResourceActions<T, R>
@@ -447,6 +444,10 @@ export declare type Transition = [Accessor<boolean>, (fn: () => void) => Promise
  */
 export declare function useTransition(): Transition;
 export declare function resumeEffects(e: Computation<any>[]): void;
+export interface DevComponent<T> extends Memo<JSX.Element> {
+    props: T;
+    componentName: string;
+}
 export declare function devComponent<T>(Comp: (props: T) => JSX.Element, props: T): JSX.Element;
 export declare function hashValue(v: any): string;
 export declare function registerGraph(name: string, value: {

package/web/dist/dev.cjs

@@ -373,10 +373,10 @@ function eventHandler(e) {
 }
 function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   props || (props = {});
-  if (!skipChildren && "children" in props) {
+  if (!skipChildren) {
     solidJs.createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
   }
-  props.ref && props.ref(node);
+  solidJs.createRenderEffect(() => props.ref && props.ref(node));
   solidJs.createRenderEffect(() => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }

package/web/dist/dev.js

@@ -370,10 +370,10 @@ function eventHandler(e) {
 }
 function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   props || (props = {});
-  if (!skipChildren && "children" in props) {
+  if (!skipChildren) {
     createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
   }
-  props.ref && props.ref(node);
+  createRenderEffect(() => props.ref && props.ref(node));
   createRenderEffect(() => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }

package/web/dist/server.cjs

@@ -526,7 +526,7 @@ function ssrStyle(value) {
 }
 function ssrElement(tag, props, children, needsId) {
   let result = `<${tag}${needsId ? ssrHydrationKey() : ""} `;
-  if (typeof props === "function") props = props();
+  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++) {
@@ -567,6 +567,13 @@ function escape(s, attr) {
   const t = typeof s;
   if (t !== "string") {
     if (!attr && t === "function") return escape(s(), attr);
+    if (!attr && Array.isArray(s)) {
+      let r = "";
+      for (let i = 0; i < s.length; i++) r += resolveSSRNode(escape(s[i], attr));
+      return {
+        t: r
+      };
+    }
     if (attr && t === "boolean") return String(s);
     return s;
   }

package/web/dist/server.js

@@ -523,7 +523,7 @@ function ssrStyle(value) {
 }
 function ssrElement(tag, props, children, needsId) {
   let result = `<${tag}${needsId ? ssrHydrationKey() : ""} `;
-  if (typeof props === "function") props = props();
+  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++) {
@@ -564,6 +564,13 @@ function escape(s, attr) {
   const t = typeof s;
   if (t !== "string") {
     if (!attr && t === "function") return escape(s(), attr);
+    if (!attr && Array.isArray(s)) {
+      let r = "";
+      for (let i = 0; i < s.length; i++) r += resolveSSRNode(escape(s[i], attr));
+      return {
+        t: r
+      };
+    }
     if (attr && t === "boolean") return String(s);
     return s;
   }

package/web/dist/web.cjs

@@ -370,10 +370,10 @@ function eventHandler(e) {
 }
 function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   props || (props = {});
-  if (!skipChildren && "children" in props) {
+  if (!skipChildren) {
     solidJs.createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
   }
-  props.ref && props.ref(node);
+  solidJs.createRenderEffect(() => props.ref && props.ref(node));
   solidJs.createRenderEffect(() => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }

package/web/dist/web.js

@@ -367,10 +367,10 @@ function eventHandler(e) {
 }
 function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   props || (props = {});
-  if (!skipChildren && "children" in props) {
+  if (!skipChildren) {
     createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
   }
-  props.ref && props.ref(node);
+  createRenderEffect(() => props.ref && props.ref(node));
   createRenderEffect(() => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }