solid-js 1.9.3 → 2.0.0-experimental.0

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;
@@ -695,6 +735,40 @@ function Suspense(props) {
   }, suspenseError);
 }
 
+function isWrappable(obj) {
+  return obj != null && typeof obj === "object" && !Object.isFrozen(obj);
+}
+function unwrap(item) {
+  return item;
+}
+function setProperty(state, property, value) {
+  if (state[property] === value) return;
+  if (value === undefined) {
+    delete state[property];
+  } else state[property] = value;
+}
+function createStore(state) {
+  function setStore(fn) {
+    fn(state);
+  }
+  return [state, setStore];
+}
+function reconcile(value) {
+  return state => {
+    if (!isWrappable(state) || !isWrappable(value)) return value;
+    const targetKeys = Object.keys(value);
+    const previousKeys = Object.keys(state);
+    for (let i = 0, len = targetKeys.length; i < len; i++) {
+      const key = targetKeys[i];
+      setProperty(state, key, value[key]);
+    }
+    for (let i = 0, len = previousKeys.length; i < len; i++) {
+      if (value[previousKeys[i]] === undefined) setProperty(state, previousKeys[i], undefined);
+    }
+    return state;
+  };
+}
+
 exports.$DEVCOMP = $DEVCOMP;
 exports.$PROXY = $PROXY;
 exports.$TRACK = $TRACK;
@@ -711,7 +785,6 @@ exports.batch = batch;
 exports.catchError = catchError;
 exports.children = children;
 exports.createComponent = createComponent;
-exports.createComputed = createComputed;
 exports.createContext = createContext;
 exports.createDeferred = createDeferred;
 exports.createEffect = createEffect;
@@ -722,6 +795,7 @@ exports.createResource = createResource;
 exports.createRoot = createRoot;
 exports.createSelector = createSelector;
 exports.createSignal = createSignal;
+exports.createStore = createStore;
 exports.createUniqueId = createUniqueId;
 exports.enableExternalSource = enableExternalSource;
 exports.enableHydration = enableHydration;
@@ -731,6 +805,7 @@ exports.from = from;
 exports.getListener = getListener;
 exports.getOwner = getOwner;
 exports.indexArray = indexArray;
+exports.isWrappable = isWrappable;
 exports.lazy = lazy;
 exports.mapArray = mapArray;
 exports.mergeProps = mergeProps;
@@ -739,6 +814,7 @@ exports.on = on;
 exports.onCleanup = onCleanup;
 exports.onError = onError;
 exports.onMount = onMount;
+exports.reconcile = reconcile;
 exports.requestCallback = requestCallback;
 exports.resetErrorBoundaries = resetErrorBoundaries;
 exports.runWithOwner = runWithOwner;
@@ -746,5 +822,6 @@ exports.sharedConfig = sharedConfig;
 exports.splitProps = splitProps;
 exports.startTransition = startTransition;
 exports.untrack = untrack;
+exports.unwrap = unwrap;
 exports.useContext = useContext;
 exports.useTransition = useTransition;

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;
@@ -733,6 +776,40 @@ function Suspense(props) {
   }, suspenseError);
 }
 
+function isWrappable(obj) {
+  return obj != null && typeof obj === "object" && !Object.isFrozen(obj);
+}
+function unwrap(item) {
+  return item;
+}
+function setProperty(state, property, value) {
+  if (state[property] === value) return;
+  if (value === undefined) {
+    delete state[property];
+  } else state[property] = value;
+}
+function createStore(state) {
+  function setStore(fn) {
+    fn(state);
+  }
+  return [state, setStore];
+}
+function reconcile(value) {
+  return state => {
+    if (!isWrappable(state) || !isWrappable(value)) return value;
+    const targetKeys = Object.keys(value);
+    const previousKeys = Object.keys(state);
+    for (let i = 0, len = targetKeys.length; i < len; i++) {
+      const key = targetKeys[i];
+      setProperty(state, key, value[key]);
+    }
+    for (let i = 0, len = previousKeys.length; i < len; i++) {
+      if (value[previousKeys[i]] === undefined) setProperty(state, previousKeys[i], undefined);
+    }
+    return state;
+  };
+}
+
 export {
   $DEVCOMP,
   $PROXY,
@@ -750,7 +827,6 @@ export {
   catchError,
   children,
   createComponent,
-  createComputed,
   createContext,
   createDeferred,
   createEffect,
@@ -761,6 +837,7 @@ export {
   createRoot,
   createSelector,
   createSignal,
+  createStore,
   createUniqueId,
   enableExternalSource,
   enableHydration,
@@ -770,6 +847,7 @@ export {
   getListener,
   getOwner,
   indexArray,
+  isWrappable,
   lazy,
   mapArray,
   mergeProps,
@@ -778,6 +856,7 @@ export {
   onCleanup,
   onError,
   onMount,
+  reconcile,
   requestCallback,
   resetErrorBoundaries,
   runWithOwner,
@@ -785,6 +864,7 @@ export {
   splitProps,
   startTransition,
   untrack,
+  unwrap,
   useContext,
   useTransition
 };