solid-js 1.9.2 → 1.9.4

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

@@ -17,7 +17,7 @@ function handleError(err, owner = Owner) {
   try {
     for (const f of fns) f(error);
   } catch (e) {
-    handleError(e, owner && owner.owner || null);
+    handleError(e, (owner && owner.owner) || null);
   }
 }
 const UNOWNED = {
@@ -35,19 +35,23 @@ function createOwner() {
     cleanups: null
   };
   if (Owner) {
-    if (!Owner.owned) Owner.owned = [o];else Owner.owned.push(o);
+    if (!Owner.owned) Owner.owned = [o];
+    else Owner.owned.push(o);
   }
   return o;
 }
 function createRoot(fn, detachedOwner) {
   const owner = Owner,
     current = detachedOwner === undefined ? owner : detachedOwner,
-    root = fn.length === 0 ? UNOWNED : {
-      context: current ? current.context : null,
-      owner: current,
-      owned: null,
-      cleanups: null
-    };
+    root =
+      fn.length === 0
+        ? UNOWNED
+        : {
+            context: current ? current.context : null,
+            owner: current,
+            owned: null,
+            cleanups: null
+          };
   Owner = root;
   let result;
   try {
@@ -60,9 +64,12 @@ function createRoot(fn, detachedOwner) {
   return result;
 }
 function createSignal(value, options) {
-  return [() => value, v => {
-    return value = typeof v === "function" ? v(value) : v;
-  }];
+  return [
+    () => value,
+    v => {
+      return (value = typeof v === "function" ? v(value) : v);
+    }
+  ];
 }
 function createComputed(fn, value) {
   Owner = createOwner();
@@ -119,7 +126,8 @@ function on(deps, fn, options = {}) {
 function onMount(fn) {}
 function onCleanup(fn) {
   if (Owner) {
-    if (!Owner.cleanups) Owner.cleanups = [fn];else Owner.cleanups.push(fn);
+    if (!Owner.cleanups) Owner.cleanups = [fn];
+    else Owner.cleanups.push(fn);
   }
   return fn;
 }
@@ -160,7 +168,9 @@ function createContext(defaultValue) {
   };
 }
 function useContext(context) {
-  return Owner && Owner.context && Owner.context[context.id] !== undefined ? Owner.context[context.id] : context.defaultValue;
+  return Owner && Owner.context && Owner.context[context.id] !== undefined
+    ? Owner.context[context.id]
+    : context.defaultValue;
 }
 function getOwner() {
   return Owner;
@@ -237,7 +247,8 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
+      const handler =
+        typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
       if (!handler) {
         return {
           unsubscribe() {}
@@ -266,7 +277,7 @@ function from(producer) {
   const [s, set] = createSignal(undefined);
   if ("subscribe" in producer) {
     const unsub = producer.subscribe(v => set(() => v));
-    onCleanup(() => "unsubscribe" in unsub ? unsub.unsubscribe() : unsub());
+    onCleanup(() => ("unsubscribe" in unsub ? unsub.unsubscribe() : unsub()));
   } else {
     const clean = producer(set);
     onCleanup(clean);
@@ -300,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;
@@ -309,7 +366,7 @@ function resolveSSRNode(node) {
     let mapped = "";
     for (let i = 0, len = node.length; i < len; i++) {
       if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
-      mapped += resolveSSRNode(prev = node[i]);
+      mapped += resolveSSRNode((prev = node[i]));
     }
     return mapped;
   }
@@ -324,7 +381,8 @@ const sharedConfig = {
     return getContextId(this.context.count);
   },
   getNextContextId() {
-    if (!this.context) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    if (!this.context)
+      throw new Error(`getNextContextId cannot be used under non-hydrating context`);
     return getContextId(this.context.count++);
   }
 };
@@ -337,11 +395,13 @@ function setHydrateContext(context) {
   sharedConfig.context = context;
 }
 function nextHydrateContext() {
-  return sharedConfig.context ? {
-    ...sharedConfig.context,
-    id: sharedConfig.getNextContextId(),
-    count: 0
-  } : undefined;
+  return sharedConfig.context
+    ? {
+        ...sharedConfig.context,
+        id: sharedConfig.getNextContextId(),
+        count: 0
+      }
+    : undefined;
 }
 function createUniqueId() {
   return sharedConfig.getNextContextId();
@@ -416,7 +476,11 @@ function Index(props) {
 }
 function Show(props) {
   let c;
-  return props.when ? typeof (c = props.children) === "function" ? c(props.keyed ? props.when : () => props.when) : c : props.fallback || "";
+  return props.when
+    ? typeof (c = props.children) === "function"
+      ? c(props.keyed ? props.when : () => props.when)
+      : c
+    : props.fallback || "";
 }
 function Switch(props) {
   let conditions = props.children;
@@ -453,28 +517,26 @@ function ErrorBoundary(props) {
   }
   createMemo(() => {
     clean = Owner;
-    return catchError(() => res = props.children, err => {
-      error = err;
-      !sync && ctx.replace("e" + id, displayFallback);
-      sync = true;
-    });
+    return catchError(
+      () => (res = props.children),
+      err => {
+        error = err;
+        !sync && ctx.replace("e" + id, displayFallback);
+        sync = true;
+      }
+    );
   });
   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;
   }
@@ -487,13 +549,17 @@ function createResource(source, fetcher, options = {}) {
   if (sharedConfig.context.async && options.ssrLoadFrom !== "initial") {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
-      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
+      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error)
+        resource.ref[1].refetch();
       return resource.ref;
     }
   }
   const read = () => {
     if (error) throw error;
-    const resolved = options.ssrLoadFrom !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
+    const resolved =
+      options.ssrLoadFrom !== "initial" &&
+      sharedConfig.context.async &&
+      "data" in sharedConfig.context.resources[id];
     if (!resolved && resourceContext) resourceContext.push(id);
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
@@ -514,7 +580,7 @@ function createResource(source, fetcher, options = {}) {
   });
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
+    if (!ctx.async) return (read.loading = !!(typeof source === "function" ? source() : source));
     if (ctx.resources && id in ctx.resources && "data" in ctx.resources[id]) {
       value = ctx.resources[id].data;
       return;
@@ -536,21 +602,23 @@ function createResource(source, fetcher, options = {}) {
     if (p != undefined && typeof p === "object" && "then" in p) {
       read.loading = true;
       read.state = "pending";
-      p = p.then(res => {
-        read.loading = false;
-        read.state = "ready";
-        ctx.resources[id].data = res;
-        p = null;
-        notifySuspense(contexts);
-        return res;
-      }).catch(err => {
-        read.loading = false;
-        read.state = "errored";
-        read.error = error = castError(err);
-        p = null;
-        notifySuspense(contexts);
-        throw error;
-      });
+      p = p
+        .then(res => {
+          read.loading = false;
+          read.state = "ready";
+          ctx.resources[id].data = res;
+          p = null;
+          notifySuspense(contexts);
+          return res;
+        })
+        .catch(err => {
+          read.loading = false;
+          read.state = "errored";
+          read.error = error = castError(err);
+          p = null;
+          notifySuspense(contexts);
+          throw error;
+        });
       if (ctx.serialize) ctx.serialize(id, p, options.deferStream);
       return p;
     }
@@ -560,17 +628,20 @@ function createResource(source, fetcher, options = {}) {
     return ctx.resources[id].data;
   }
   if (options.ssrLoadFrom !== "initial") load();
-  return resource.ref = [read, {
-    refetch: load,
-    mutate: v => value = v
-  }];
+  return (resource.ref = [
+    read,
+    {
+      refetch: load,
+      mutate: v => (value = v)
+    }
+  ]);
 }
 function lazy(fn) {
   let p;
   let load = id => {
     if (!p) {
       p = fn();
-      p.then(mod => p.resolved = mod.default);
+      p.then(mod => (p.resolved = mod.default));
       if (id) sharedConfig.context.lazy[id] = p;
     }
     return p;
@@ -579,7 +650,8 @@ function lazy(fn) {
   const wrap = props => {
     const id = sharedConfig.context.id;
     let ref = sharedConfig.context.lazy[id];
-    if (ref) p = ref;else load(id);
+    if (ref) p = ref;
+    else load(id);
     if (p.resolved) return p.resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
@@ -591,10 +663,12 @@ function lazy(fn) {
       contexts.add(ctx);
     }
     if (sharedConfig.context.async) {
-      sharedConfig.context.block(p.then(() => {
-        track.loading = false;
-        notifySuspense(contexts);
-      }));
+      sharedConfig.context.block(
+        p.then(() => {
+          track.loading = false;
+          notifySuspense(contexts);
+        })
+      );
     }
     return "";
   };
@@ -622,9 +696,12 @@ function startTransition(fn) {
   fn();
 }
 function useTransition() {
-  return [() => false, fn => {
-    fn();
-  }];
+  return [
+    () => false,
+    fn => {
+      fn();
+    }
+  ];
 }
 function SuspenseList(props) {
   return props.children;
@@ -634,15 +711,17 @@ function Suspense(props) {
   const ctx = sharedConfig.context;
   const id = sharedConfig.getContextId();
   const o = createOwner();
-  const value = ctx.suspense[id] || (ctx.suspense[id] = {
-    resources: new Map(),
-    completed: () => {
-      const res = runSuspense();
-      if (suspenseComplete(value)) {
-        done(resolveSSRNode(res));
+  const value =
+    ctx.suspense[id] ||
+    (ctx.suspense[id] = {
+      resources: new Map(),
+      completed: () => {
+        const res = runSuspense();
+        if (suspenseComplete(value)) {
+          done(resolveSSRNode(escape(res)));
+        }
       }
-    }
-  });
+    });
   function suspenseError(err) {
     if (!done || !done(undefined, err)) {
       runWithOwner(o.owner, () => {
@@ -656,12 +735,14 @@ function Suspense(props) {
       count: 0
     });
     cleanNode(o);
-    return runWithOwner(o, () => createComponent(SuspenseContext.Provider, {
-      value,
-      get children() {
-        return catchError(() => props.children, suspenseError);
-      }
-    }));
+    return runWithOwner(o, () =>
+      createComponent(SuspenseContext.Provider, {
+        value,
+        get children() {
+          return catchError(() => props.children, suspenseError);
+        }
+      })
+    );
   }
   const res = runSuspense();
   if (suspenseComplete(value)) {
@@ -678,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;
@@ -693,4 +776,58 @@ function Suspense(props) {
   }, suspenseError);
 }
 
-export { $DEVCOMP, $PROXY, $TRACK, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, catchError, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export {
+  $DEVCOMP,
+  $PROXY,
+  $TRACK,
+  DEV,
+  ErrorBoundary,
+  For,
+  Index,
+  Match,
+  Show,
+  Suspense,
+  SuspenseList,
+  Switch,
+  batch,
+  catchError,
+  children,
+  createComponent,
+  createComputed,
+  createContext,
+  createDeferred,
+  createEffect,
+  createMemo,
+  createReaction,
+  createRenderEffect,
+  createResource,
+  createRoot,
+  createSelector,
+  createSignal,
+  createUniqueId,
+  enableExternalSource,
+  enableHydration,
+  enableScheduling,
+  equalFn,
+  from,
+  getListener,
+  getOwner,
+  indexArray,
+  lazy,
+  mapArray,
+  mergeProps,
+  observable,
+  on,
+  onCleanup,
+  onError,
+  onMount,
+  requestCallback,
+  resetErrorBoundaries,
+  runWithOwner,
+  sharedConfig,
+  splitProps,
+  startTransition,
+  untrack,
+  useContext,
+  useTransition
+};

package/dist/solid.cjs

@@ -257,14 +257,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,