solid-js 1.3.7 → 1.3.8

package/dist/dev.cjs

@@ -124,7 +124,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -158,14 +158,13 @@ let Effects = null;
 let ExecCount = 0;
 let rootCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !"_SOLID_DEV_" ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   if (owner) root.name = `${owner.name}-r${rootCount++}`;
   Owner = root;
@@ -405,7 +404,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -1015,7 +1015,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1353,7 +1353,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/dist/dev.js

@@ -120,7 +120,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -154,14 +154,13 @@ let Effects = null;
 let ExecCount = 0;
 let rootCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !"_SOLID_DEV_" ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   if (owner) root.name = `${owner.name}-r${rootCount++}`;
   Owner = root;
@@ -401,7 +400,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -1011,7 +1011,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1349,7 +1349,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/dist/server.cjs

@@ -231,7 +231,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return sharedConfig.context ? { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   } : undefined;
 }

package/dist/server.js

@@ -227,7 +227,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return sharedConfig.context ? { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   } : undefined;
 }

package/dist/solid.cjs

@@ -124,7 +124,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -157,14 +157,13 @@ let Updates = null;
 let Effects = null;
 let ExecCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !false ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   Owner = root;
   Listener = null;
@@ -402,7 +401,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -934,7 +934,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1269,7 +1269,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/dist/solid.js

@@ -120,7 +120,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -153,14 +153,13 @@ let Updates = null;
 let Effects = null;
 let ExecCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !false ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   Owner = root;
   Listener = null;
@@ -398,7 +397,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -930,7 +930,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1265,7 +1265,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/package.json

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

package/types/reactive/signal.d.ts

@@ -437,6 +437,8 @@ export declare function createContext<T>(defaultValue: T): Context<T>;
  * @description https://www.solidjs.com/docs/latest/api#usecontext
  */
 export declare function useContext<T>(context: Context<T>): T;
+export declare type ResolvedJSXElement = Exclude<JSX.Element, JSX.ArrayElement | JSX.FunctionElement>;
+export declare type ResolvedChildren = ResolvedJSXElement | ResolvedJSXElement[];
 /**
  * Resolves child elements to help interact with children
  *
@@ -445,7 +447,7 @@ export declare function useContext<T>(context: Context<T>): T;
  *
  * @description https://www.solidjs.com/docs/latest/api#children
  */
-export declare function children(fn: Accessor<JSX.Element>): Accessor<JSX.Element>;
+export declare function children(fn: Accessor<JSX.Element>): Accessor<ResolvedChildren>;
 export declare type SuspenseContextType = {
     increment?: () => void;
     decrement?: () => void;

package/web/dist/dev.cjs

@@ -404,7 +404,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (solidJs.sharedConfig.context && current && current.length) 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);

package/web/dist/dev.js

@@ -401,7 +401,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (sharedConfig.context && current && current.length) 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);

package/web/dist/web.cjs

@@ -403,7 +403,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (solidJs.sharedConfig.context && current && current.length) 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);

package/web/dist/web.js

@@ -400,7 +400,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (sharedConfig.context && current && current.length) 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);