solid-js 1.9.3 → 1.9.5

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2023 Ryan Carniato
+Copyright (c) 2016-2025 Ryan Carniato
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/dev.cjs

@@ -144,6 +144,7 @@ function nextHydrateContext() {
   };
 }
 
+const IS_DEV = true;
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
 const SUPPORTS_PROXY = typeof Proxy === "function";
@@ -174,7 +175,8 @@ let ExecCount = 0;
 const DevHooks = {
   afterUpdate: null,
   afterCreateOwner: null,
-  afterCreateSignal: null
+  afterCreateSignal: null,
+  afterRegisterGraph: null
 };
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
@@ -215,8 +217,12 @@ function createSignal(value, options) {
   };
   {
     if (options.name) s.name = options.name;
-    if (DevHooks.afterCreateSignal) DevHooks.afterCreateSignal(s);
-    if (!options.internal) registerGraph(s);
+    if (options.internal) {
+      s.internal = true;
+    } else {
+      registerGraph(s);
+      if (DevHooks.afterCreateSignal) DevHooks.afterCreateSignal(s);
+    }
   }
   const setter = value => {
     if (typeof value === "function") {
@@ -275,14 +281,14 @@ function createResource(pSource, pFetcher, pOptions) {
   let source;
   let fetcher;
   let options;
-  if (arguments.length === 2 && typeof pFetcher === "object" || arguments.length === 1) {
-    source = true;
-    fetcher = pSource;
-    options = pFetcher || {};
-  } else {
+  if (typeof pFetcher === "function") {
     source = pSource;
     fetcher = pFetcher;
     options = pOptions || {};
+  } else {
+    source = true;
+    fetcher = pSource;
+    options = pFetcher || {};
   }
   let pr = null,
     initP = NO_INIT,
@@ -578,9 +584,11 @@ function devComponent(Comp, props) {
   return c.tValue !== undefined ? c.tValue : c.value;
 }
 function registerGraph(value) {
-  if (!Owner) return;
-  if (Owner.sourceMap) Owner.sourceMap.push(value);else Owner.sourceMap = [value];
-  value.graph = Owner;
+  if (Owner) {
+    if (Owner.sourceMap) Owner.sourceMap.push(value);else Owner.sourceMap = [value];
+    value.graph = Owner;
+  }
+  if (DevHooks.afterRegisterGraph) DevHooks.afterRegisterGraph(value);
 }
 function createContext(defaultValue, options) {
   const id = Symbol("context");
@@ -691,7 +699,7 @@ function writeSignal(node, value, isComp) {
         }
         if (Updates.length > 10e5) {
           Updates = [];
-          if (true) throw new Error("Potential Infinite Loop Detected.");
+          if (IS_DEV) throw new Error("Potential Infinite Loop Detected.");
           throw new Error();
         }
       }, false);
@@ -1097,8 +1105,8 @@ function observable(input) {
     }
   };
 }
-function from(producer) {
-  const [s, set] = createSignal(undefined, {
+function from(producer, initalValue = undefined) {
+  const [s, set] = createSignal(initalValue, {
     equals: false
   });
   if ("subscribe" in producer) {
@@ -1462,7 +1470,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) ? untrack(() => {
-      if (true) Object.assign(Comp, {
+      if (IS_DEV) Object.assign(Comp, {
         [$DEVCOMP]: true
       });
       if (!ctx || sharedConfig.done) return Comp(props);
@@ -1501,8 +1509,11 @@ function Index(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => keyed ? a === b : !a === !b,
+  const conditionValue = createMemo(() => props.when, undefined, {
+    name: "condition value"
+  } );
+  const condition = keyed ? conditionValue : createMemo(conditionValue, undefined, {
+    equals: (a, b) => !a === !b,
     name: "condition"
   } );
   return createMemo(() => {
@@ -1512,7 +1523,7 @@ function Show(props) {
       const fn = typeof child === "function" && child.length > 0;
       return fn ? untrack(() => child(keyed ? c : () => {
         if (!untrack(condition)) throw narrowedError("Show");
-        return props.when;
+        return conditionValue();
       })) : child;
     }
     return props.fallback;
@@ -1521,35 +1532,38 @@ function Show(props) {
   } );
 }
 function Switch(props) {
-  let keyed = false;
-  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
-  const conditions = children(() => props.children),
-    evalConditions = createMemo(() => {
-      let conds = conditions();
-      if (!Array.isArray(conds)) conds = [conds];
-      for (let i = 0; i < conds.length; i++) {
-        const c = conds[i].when;
-        if (c) {
-          keyed = !!conds[i].keyed;
-          return [i, c, conds[i]];
-        }
-      }
-      return [-1];
-    }, undefined, {
-      equals,
-      name: "eval conditions"
-    } );
+  const chs = children(() => props.children);
+  const switchFunc = createMemo(() => {
+    const ch = chs();
+    const mps = Array.isArray(ch) ? ch : [ch];
+    let func = () => undefined;
+    for (let i = 0; i < mps.length; i++) {
+      const index = i;
+      const mp = mps[i];
+      const prevFunc = func;
+      const conditionValue = createMemo(() => prevFunc() ? undefined : mp.when, undefined, {
+        name: "condition value"
+      } );
+      const condition = mp.keyed ? conditionValue : createMemo(conditionValue, undefined, {
+        equals: (a, b) => !a === !b,
+        name: "condition"
+      } );
+      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+    }
+    return func;
+  });
   return createMemo(() => {
-    const [index, when, cond] = evalConditions();
-    if (index < 0) return props.fallback;
-    const c = cond.children;
-    const fn = typeof c === "function" && c.length > 0;
-    return fn ? untrack(() => c(keyed ? when : () => {
-      if (untrack(evalConditions)[0] !== index) throw narrowedError("Match");
-      return cond.when;
-    })) : c;
+    const sel = switchFunc()();
+    if (!sel) return props.fallback;
+    const [index, conditionValue, mp] = sel;
+    const child = mp.children;
+    const fn = typeof child === "function" && child.length > 0;
+    return fn ? untrack(() => child(mp.keyed ? conditionValue() : () => {
+      if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+      return conditionValue();
+    })) : child;
   }, undefined, {
-    name: "value"
+    name: "eval conditions"
   } );
 }
 function Match(props) {

package/dist/dev.js

@@ -144,6 +144,7 @@ function nextHydrateContext() {
   };
 }
 
+const IS_DEV = true;
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
 const SUPPORTS_PROXY = typeof Proxy === "function";
@@ -174,7 +175,8 @@ let ExecCount = 0;
 const DevHooks = {
   afterUpdate: null,
   afterCreateOwner: null,
-  afterCreateSignal: null
+  afterCreateSignal: null,
+  afterRegisterGraph: null
 };
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
@@ -220,8 +222,12 @@ function createSignal(value, options) {
   };
   {
     if (options.name) s.name = options.name;
-    if (DevHooks.afterCreateSignal) DevHooks.afterCreateSignal(s);
-    if (!options.internal) registerGraph(s);
+    if (options.internal) {
+      s.internal = true;
+    } else {
+      registerGraph(s);
+      if (DevHooks.afterCreateSignal) DevHooks.afterCreateSignal(s);
+    }
   }
   const setter = value => {
     if (typeof value === "function") {
@@ -289,14 +295,14 @@ function createResource(pSource, pFetcher, pOptions) {
   let source;
   let fetcher;
   let options;
-  if ((arguments.length === 2 && typeof pFetcher === "object") || arguments.length === 1) {
-    source = true;
-    fetcher = pSource;
-    options = pFetcher || {};
-  } else {
+  if (typeof pFetcher === "function") {
     source = pSource;
     fetcher = pFetcher;
     options = pOptions || {};
+  } else {
+    source = true;
+    fetcher = pSource;
+    options = pFetcher || {};
   }
   let pr = null,
     initP = NO_INIT,
@@ -648,10 +654,12 @@ function devComponent(Comp, props) {
   return c.tValue !== undefined ? c.tValue : c.value;
 }
 function registerGraph(value) {
-  if (!Owner) return;
-  if (Owner.sourceMap) Owner.sourceMap.push(value);
-  else Owner.sourceMap = [value];
-  value.graph = Owner;
+  if (Owner) {
+    if (Owner.sourceMap) Owner.sourceMap.push(value);
+    else Owner.sourceMap = [value];
+    value.graph = Owner;
+  }
+  if (DevHooks.afterRegisterGraph) DevHooks.afterRegisterGraph(value);
 }
 function createContext(defaultValue, options) {
   const id = Symbol("context");
@@ -765,7 +773,7 @@ function writeSignal(node, value, isComp) {
         }
         if (Updates.length > 10e5) {
           Updates = [];
-          if (true) throw new Error("Potential Infinite Loop Detected.");
+          if (IS_DEV) throw new Error("Potential Infinite Loop Detected.");
           throw new Error();
         }
       }, false);
@@ -1198,8 +1206,8 @@ function observable(input) {
     }
   };
 }
-function from(producer) {
-  const [s, set] = createSignal(undefined, {
+function from(producer, initalValue = undefined) {
+  const [s, set] = createSignal(initalValue, {
     equals: false
   });
   if ("subscribe" in producer) {
@@ -1595,7 +1603,7 @@ function lazy(fn) {
     return createMemo(() =>
       (Comp = comp())
         ? untrack(() => {
-            if (true)
+            if (IS_DEV)
               Object.assign(Comp, {
                 [$DEVCOMP]: true
               });
@@ -1646,10 +1654,15 @@ function Index(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => (keyed ? a === b : !a === !b),
-    name: "condition"
+  const conditionValue = createMemo(() => props.when, undefined, {
+    name: "condition value"
   });
+  const condition = keyed
+    ? conditionValue
+    : createMemo(conditionValue, undefined, {
+        equals: (a, b) => !a === !b,
+        name: "condition"
+      });
   return createMemo(
     () => {
       const c = condition();
@@ -1663,7 +1676,7 @@ function Show(props) {
                   ? c
                   : () => {
                       if (!untrack(condition)) throw narrowedError("Show");
-                      return props.when;
+                      return conditionValue();
                     }
               )
             )
@@ -1678,50 +1691,51 @@ function Show(props) {
   );
 }
 function Switch(props) {
-  let keyed = false;
-  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
-  const conditions = children(() => props.children),
-    evalConditions = createMemo(
-      () => {
-        let conds = conditions();
-        if (!Array.isArray(conds)) conds = [conds];
-        for (let i = 0; i < conds.length; i++) {
-          const c = conds[i].when;
-          if (c) {
-            keyed = !!conds[i].keyed;
-            return [i, c, conds[i]];
-          }
-        }
-        return [-1];
-      },
-      undefined,
-      {
-        equals,
-        name: "eval conditions"
-      }
-    );
+  const chs = children(() => props.children);
+  const switchFunc = createMemo(() => {
+    const ch = chs();
+    const mps = Array.isArray(ch) ? ch : [ch];
+    let func = () => undefined;
+    for (let i = 0; i < mps.length; i++) {
+      const index = i;
+      const mp = mps[i];
+      const prevFunc = func;
+      const conditionValue = createMemo(() => (prevFunc() ? undefined : mp.when), undefined, {
+        name: "condition value"
+      });
+      const condition = mp.keyed
+        ? conditionValue
+        : createMemo(conditionValue, undefined, {
+            equals: (a, b) => !a === !b,
+            name: "condition"
+          });
+      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+    }
+    return func;
+  });
   return createMemo(
     () => {
-      const [index, when, cond] = evalConditions();
-      if (index < 0) return props.fallback;
-      const c = cond.children;
-      const fn = typeof c === "function" && c.length > 0;
+      const sel = switchFunc()();
+      if (!sel) return props.fallback;
+      const [index, conditionValue, mp] = sel;
+      const child = mp.children;
+      const fn = typeof child === "function" && child.length > 0;
       return fn
         ? untrack(() =>
-            c(
-              keyed
-                ? when
+            child(
+              mp.keyed
+                ? conditionValue()
                 : () => {
-                    if (untrack(evalConditions)[0] !== index) throw narrowedError("Match");
-                    return cond.when;
+                    if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+                    return conditionValue();
                   }
             )
           )
-        : c;
+        : child;
     },
     undefined,
     {
-      name: "value"
+      name: "eval conditions"
     }
   );
 }

package/dist/server.cjs

@@ -302,6 +302,51 @@ function mutateContext(o, key, value) {
   }
 }
 
+function escape(s, attr) {
+  const t = typeof s;
+  if (t !== "string") {
+    if (t === "function") return escape(s());
+    if (Array.isArray(s)) {
+      for (let i = 0; i < s.length; i++) s[i] = escape(s[i]);
+      return s;
+    }
+    return s;
+  }
+  const delim = "<";
+  const escDelim = "&lt;";
+  let iDelim = s.indexOf(delim);
+  let iAmp = s.indexOf("&");
+  if (iDelim < 0 && iAmp < 0) return s;
+  let left = 0,
+    out = "";
+  while (iDelim >= 0 && iAmp >= 0) {
+    if (iDelim < iAmp) {
+      if (left < iDelim) out += s.substring(left, iDelim);
+      out += escDelim;
+      left = iDelim + 1;
+      iDelim = s.indexOf(delim, left);
+    } else {
+      if (left < iAmp) out += s.substring(left, iAmp);
+      out += "&amp;";
+      left = iAmp + 1;
+      iAmp = s.indexOf("&", left);
+    }
+  }
+  if (iDelim >= 0) {
+    do {
+      if (left < iDelim) out += s.substring(left, iDelim);
+      out += escDelim;
+      left = iDelim + 1;
+      iDelim = s.indexOf(delim, left);
+    } while (iDelim >= 0);
+  } else while (iAmp >= 0) {
+    if (left < iAmp) out += s.substring(left, iAmp);
+    out += "&amp;";
+    left = iAmp + 1;
+    iAmp = s.indexOf("&", left);
+  }
+  return left < s.length ? out + s.substring(left) : out;
+}
 function resolveSSRNode(node) {
   const t = typeof node;
   if (t === "string") return node;
@@ -464,19 +509,14 @@ function ErrorBoundary(props) {
   if (error) return displayFallback();
   sync = false;
   return {
-    t: `<!--!$e${id}-->${resolveSSRNode(res)}<!--!$/e${id}-->`
+    t: `<!--!$e${id}-->${resolveSSRNode(escape(res))}<!--!$/e${id}-->`
   };
 }
 const SuspenseContext = createContext();
 let resourceContext = null;
 function createResource(source, fetcher, options = {}) {
-  if (arguments.length === 2) {
-    if (typeof fetcher === "object") {
-      options = fetcher;
-      fetcher = source;
-      source = true;
-    }
-  } else if (arguments.length === 1) {
+  if (typeof fetcher !== "function") {
+    options = fetcher || {};
     fetcher = source;
     source = true;
   }
@@ -641,7 +681,7 @@ function Suspense(props) {
     completed: () => {
       const res = runSuspense();
       if (suspenseComplete(value)) {
-        done(resolveSSRNode(res));
+        done(resolveSSRNode(escape(res)));
       }
     }
   });
@@ -680,7 +720,7 @@ function Suspense(props) {
         noHydrate: true
       });
       const res = {
-        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!--pl-${id}-->`
+        t: `<template id="pl-${id}"></template>${resolveSSRNode(escape(props.fallback))}<!--pl-${id}-->`
       };
       setHydrateContext(ctx);
       return res;

package/dist/server.js

@@ -311,6 +311,52 @@ function mutateContext(o, key, value) {
   }
 }
 
+function escape(s, attr) {
+  const t = typeof s;
+  if (t !== "string") {
+    if (t === "function") return escape(s());
+    if (Array.isArray(s)) {
+      for (let i = 0; i < s.length; i++) s[i] = escape(s[i]);
+      return s;
+    }
+    return s;
+  }
+  const delim = "<";
+  const escDelim = "&lt;";
+  let iDelim = s.indexOf(delim);
+  let iAmp = s.indexOf("&");
+  if (iDelim < 0 && iAmp < 0) return s;
+  let left = 0,
+    out = "";
+  while (iDelim >= 0 && iAmp >= 0) {
+    if (iDelim < iAmp) {
+      if (left < iDelim) out += s.substring(left, iDelim);
+      out += escDelim;
+      left = iDelim + 1;
+      iDelim = s.indexOf(delim, left);
+    } else {
+      if (left < iAmp) out += s.substring(left, iAmp);
+      out += "&amp;";
+      left = iAmp + 1;
+      iAmp = s.indexOf("&", left);
+    }
+  }
+  if (iDelim >= 0) {
+    do {
+      if (left < iDelim) out += s.substring(left, iDelim);
+      out += escDelim;
+      left = iDelim + 1;
+      iDelim = s.indexOf(delim, left);
+    } while (iDelim >= 0);
+  } else
+    while (iAmp >= 0) {
+      if (left < iAmp) out += s.substring(left, iAmp);
+      out += "&amp;";
+      left = iAmp + 1;
+      iAmp = s.indexOf("&", left);
+    }
+  return left < s.length ? out + s.substring(left) : out;
+}
 function resolveSSRNode(node) {
   const t = typeof node;
   if (t === "string") return node;
@@ -483,19 +529,14 @@ function ErrorBoundary(props) {
   if (error) return displayFallback();
   sync = false;
   return {
-    t: `<!--!$e${id}-->${resolveSSRNode(res)}<!--!$/e${id}-->`
+    t: `<!--!$e${id}-->${resolveSSRNode(escape(res))}<!--!$/e${id}-->`
   };
 }
 const SuspenseContext = createContext();
 let resourceContext = null;
 function createResource(source, fetcher, options = {}) {
-  if (arguments.length === 2) {
-    if (typeof fetcher === "object") {
-      options = fetcher;
-      fetcher = source;
-      source = true;
-    }
-  } else if (arguments.length === 1) {
+  if (typeof fetcher !== "function") {
+    options = fetcher || {};
     fetcher = source;
     source = true;
   }
@@ -677,7 +718,7 @@ function Suspense(props) {
       completed: () => {
         const res = runSuspense();
         if (suspenseComplete(value)) {
-          done(resolveSSRNode(res));
+          done(resolveSSRNode(escape(res)));
         }
       }
     });
@@ -718,7 +759,9 @@ function Suspense(props) {
         noHydrate: true
       });
       const res = {
-        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!--pl-${id}-->`
+        t: `<template id="pl-${id}"></template>${resolveSSRNode(
+          escape(props.fallback)
+        )}<!--pl-${id}-->`
       };
       setHydrateContext(ctx);
       return res;