solid-js 1.3.0-rc.1 → 1.3.0

package/web/dist/dev.cjs

@@ -551,75 +551,51 @@ function Dynamic(props) {
 
 Object.defineProperty(exports, 'ErrorBoundary', {
   enumerable: true,
-  get: function () {
-    return solidJs.ErrorBoundary;
-  }
+  get: function () { return solidJs.ErrorBoundary; }
 });
 Object.defineProperty(exports, 'For', {
   enumerable: true,
-  get: function () {
-    return solidJs.For;
-  }
+  get: function () { return solidJs.For; }
 });
 Object.defineProperty(exports, 'Index', {
   enumerable: true,
-  get: function () {
-    return solidJs.Index;
-  }
+  get: function () { return solidJs.Index; }
 });
 Object.defineProperty(exports, 'Match', {
   enumerable: true,
-  get: function () {
-    return solidJs.Match;
-  }
+  get: function () { return solidJs.Match; }
 });
 Object.defineProperty(exports, 'Show', {
   enumerable: true,
-  get: function () {
-    return solidJs.Show;
-  }
+  get: function () { return solidJs.Show; }
 });
 Object.defineProperty(exports, 'Suspense', {
   enumerable: true,
-  get: function () {
-    return solidJs.Suspense;
-  }
+  get: function () { return solidJs.Suspense; }
 });
 Object.defineProperty(exports, 'SuspenseList', {
   enumerable: true,
-  get: function () {
-    return solidJs.SuspenseList;
-  }
+  get: function () { return solidJs.SuspenseList; }
 });
 Object.defineProperty(exports, 'Switch', {
   enumerable: true,
-  get: function () {
-    return solidJs.Switch;
-  }
+  get: function () { return solidJs.Switch; }
 });
 Object.defineProperty(exports, 'createComponent', {
   enumerable: true,
-  get: function () {
-    return solidJs.createComponent;
-  }
+  get: function () { return solidJs.createComponent; }
 });
 Object.defineProperty(exports, 'effect', {
   enumerable: true,
-  get: function () {
-    return solidJs.createRenderEffect;
-  }
+  get: function () { return solidJs.createRenderEffect; }
 });
 Object.defineProperty(exports, 'getOwner', {
   enumerable: true,
-  get: function () {
-    return solidJs.getOwner;
-  }
+  get: function () { return solidJs.getOwner; }
 });
 Object.defineProperty(exports, 'mergeProps', {
   enumerable: true,
-  get: function () {
-    return solidJs.mergeProps;
-  }
+  get: function () { return solidJs.mergeProps; }
 });
 exports.Aliases = Aliases;
 exports.Assets = Assets;

package/web/dist/server.cjs

@@ -258,6 +258,7 @@ function renderToStringAsync(code, options = {}) {
     renderId,
     timeoutMs = 30000
   } = options;
+  const dedupe = new WeakMap();
   const context = solidJs.sharedConfig.context = {
     id: renderId || "",
     count: 0,
@@ -268,8 +269,8 @@ function renderToStringAsync(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
-      if (!p || typeof p !== "object" || !("then" in p)) return scripts += `_$HY.set("${id}", ${devalue(p)});`;
-      p.then(d => scripts += `_$HY.set("${id}", ${devalue(d)});`).catch(() => scripts += `_$HY.set("${id}", {});`);
+      if (!p || typeof p !== "object" || !("then" in p)) return scripts += serializeSet(dedupe, id, p);
+      p.then(d => scripts += serializeSet(dedupe, id, d)).catch(() => scripts += `_$HY.set("${id}", {});`);
     }
   };
   const timeout = new Promise((_, reject) => setTimeout(() => reject("renderToString timed out"), timeoutMs));
@@ -318,6 +319,7 @@ function renderToStream(code, options = {}) {
   const tmp = [];
   const tasks = [];
   const registry = new Map();
+  const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
       onCompleteAll && onCompleteAll(result);
@@ -356,11 +358,11 @@ function renderToStream(code, options = {}) {
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
-      if (!p || typeof p !== "object" || !("then" in p)) return tasks.push(`_$HY.set("${id}", ${devalue(p)})`);
+      if (!p || typeof p !== "object" || !("then" in p)) return tasks.push(serializeSet(dedupe, id, p));
       tasks.push(`_$HY.init("${id}")`);
       p.then(d => {
-        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", ${devalue(d)})</script>`);
-      }).catch(err => {
+        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${serializeSet(dedupe, id, d)}</script>`);
+      }).catch(() => {
         !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", {})</script>`);
       });
     },
@@ -574,7 +576,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 }) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,n=t(s);n&&!e.completed.has(n)&&e.events.push([n,o])})))),e.init=(e,t)=>{o[e]=[new Promise(((e,o)=>t=e)),t]},e.set=(e,t,s)=>{(s=o[e])&&s[1](t),o[e]=[t]},e.unset=e=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!xs>`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {
@@ -602,6 +604,12 @@ function waitForFragments(registry, key) {
   }
   return false;
 }
+function serializeSet(registry, key, value) {
+  const exist = registry.get(value);
+  if (exist) return `_$HY.set("${key}", _$HY.r["${exist}"][0]);`;
+  registry.set(value, key);
+  return `_$HY.set("${key}", ${devalue(value)});`;
+}
 function pipeToNodeWritable(code, writable, options = {}) {
   if (options.onReady) {
     options.onCompleteShell = () => {
@@ -648,63 +656,43 @@ function Portal(props) {
 
 Object.defineProperty(exports, 'ErrorBoundary', {
   enumerable: true,
-  get: function () {
-    return solidJs.ErrorBoundary;
-  }
+  get: function () { return solidJs.ErrorBoundary; }
 });
 Object.defineProperty(exports, 'For', {
   enumerable: true,
-  get: function () {
-    return solidJs.For;
-  }
+  get: function () { return solidJs.For; }
 });
 Object.defineProperty(exports, 'Index', {
   enumerable: true,
-  get: function () {
-    return solidJs.Index;
-  }
+  get: function () { return solidJs.Index; }
 });
 Object.defineProperty(exports, 'Match', {
   enumerable: true,
-  get: function () {
-    return solidJs.Match;
-  }
+  get: function () { return solidJs.Match; }
 });
 Object.defineProperty(exports, 'Show', {
   enumerable: true,
-  get: function () {
-    return solidJs.Show;
-  }
+  get: function () { return solidJs.Show; }
 });
 Object.defineProperty(exports, 'Suspense', {
   enumerable: true,
-  get: function () {
-    return solidJs.Suspense;
-  }
+  get: function () { return solidJs.Suspense; }
 });
 Object.defineProperty(exports, 'SuspenseList', {
   enumerable: true,
-  get: function () {
-    return solidJs.SuspenseList;
-  }
+  get: function () { return solidJs.SuspenseList; }
 });
 Object.defineProperty(exports, 'Switch', {
   enumerable: true,
-  get: function () {
-    return solidJs.Switch;
-  }
+  get: function () { return solidJs.Switch; }
 });
 Object.defineProperty(exports, 'createComponent', {
   enumerable: true,
-  get: function () {
-    return solidJs.createComponent;
-  }
+  get: function () { return solidJs.createComponent; }
 });
 Object.defineProperty(exports, 'mergeProps', {
   enumerable: true,
-  get: function () {
-    return solidJs.mergeProps;
-  }
+  get: function () { return solidJs.mergeProps; }
 });
 exports.Assets = Assets;
 exports.Dynamic = Dynamic;

package/web/dist/server.js

@@ -255,6 +255,7 @@ function renderToStringAsync(code, options = {}) {
     renderId,
     timeoutMs = 30000
   } = options;
+  const dedupe = new WeakMap();
   const context = sharedConfig.context = {
     id: renderId || "",
     count: 0,
@@ -265,8 +266,8 @@ function renderToStringAsync(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
-      if (!p || typeof p !== "object" || !("then" in p)) return scripts += `_$HY.set("${id}", ${devalue(p)});`;
-      p.then(d => scripts += `_$HY.set("${id}", ${devalue(d)});`).catch(() => scripts += `_$HY.set("${id}", {});`);
+      if (!p || typeof p !== "object" || !("then" in p)) return scripts += serializeSet(dedupe, id, p);
+      p.then(d => scripts += serializeSet(dedupe, id, d)).catch(() => scripts += `_$HY.set("${id}", {});`);
     }
   };
   const timeout = new Promise((_, reject) => setTimeout(() => reject("renderToString timed out"), timeoutMs));
@@ -315,6 +316,7 @@ function renderToStream(code, options = {}) {
   const tmp = [];
   const tasks = [];
   const registry = new Map();
+  const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
       onCompleteAll && onCompleteAll(result);
@@ -353,11 +355,11 @@ function renderToStream(code, options = {}) {
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
-      if (!p || typeof p !== "object" || !("then" in p)) return tasks.push(`_$HY.set("${id}", ${devalue(p)})`);
+      if (!p || typeof p !== "object" || !("then" in p)) return tasks.push(serializeSet(dedupe, id, p));
       tasks.push(`_$HY.init("${id}")`);
       p.then(d => {
-        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", ${devalue(d)})</script>`);
-      }).catch(err => {
+        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${serializeSet(dedupe, id, d)}</script>`);
+      }).catch(() => {
         !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", {})</script>`);
       });
     },
@@ -571,7 +573,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 }) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,n=t(s);n&&!e.completed.has(n)&&e.events.push([n,o])})))),e.init=(e,t)=>{o[e]=[new Promise(((e,o)=>t=e)),t]},e.set=(e,t,s)=>{(s=o[e])&&s[1](t),o[e]=[t]},e.unset=e=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!xs>`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {
@@ -599,6 +601,12 @@ function waitForFragments(registry, key) {
   }
   return false;
 }
+function serializeSet(registry, key, value) {
+  const exist = registry.get(value);
+  if (exist) return `_$HY.set("${key}", _$HY.r["${exist}"][0]);`;
+  registry.set(value, key);
+  return `_$HY.set("${key}", ${devalue(value)});`;
+}
 function pipeToNodeWritable(code, writable, options = {}) {
   if (options.onReady) {
     options.onCompleteShell = () => {

package/web/dist/web.cjs

@@ -550,75 +550,51 @@ function Dynamic(props) {
 
 Object.defineProperty(exports, 'ErrorBoundary', {
   enumerable: true,
-  get: function () {
-    return solidJs.ErrorBoundary;
-  }
+  get: function () { return solidJs.ErrorBoundary; }
 });
 Object.defineProperty(exports, 'For', {
   enumerable: true,
-  get: function () {
-    return solidJs.For;
-  }
+  get: function () { return solidJs.For; }
 });
 Object.defineProperty(exports, 'Index', {
   enumerable: true,
-  get: function () {
-    return solidJs.Index;
-  }
+  get: function () { return solidJs.Index; }
 });
 Object.defineProperty(exports, 'Match', {
   enumerable: true,
-  get: function () {
-    return solidJs.Match;
-  }
+  get: function () { return solidJs.Match; }
 });
 Object.defineProperty(exports, 'Show', {
   enumerable: true,
-  get: function () {
-    return solidJs.Show;
-  }
+  get: function () { return solidJs.Show; }
 });
 Object.defineProperty(exports, 'Suspense', {
   enumerable: true,
-  get: function () {
-    return solidJs.Suspense;
-  }
+  get: function () { return solidJs.Suspense; }
 });
 Object.defineProperty(exports, 'SuspenseList', {
   enumerable: true,
-  get: function () {
-    return solidJs.SuspenseList;
-  }
+  get: function () { return solidJs.SuspenseList; }
 });
 Object.defineProperty(exports, 'Switch', {
   enumerable: true,
-  get: function () {
-    return solidJs.Switch;
-  }
+  get: function () { return solidJs.Switch; }
 });
 Object.defineProperty(exports, 'createComponent', {
   enumerable: true,
-  get: function () {
-    return solidJs.createComponent;
-  }
+  get: function () { return solidJs.createComponent; }
 });
 Object.defineProperty(exports, 'effect', {
   enumerable: true,
-  get: function () {
-    return solidJs.createRenderEffect;
-  }
+  get: function () { return solidJs.createRenderEffect; }
 });
 Object.defineProperty(exports, 'getOwner', {
   enumerable: true,
-  get: function () {
-    return solidJs.getOwner;
-  }
+  get: function () { return solidJs.getOwner; }
 });
 Object.defineProperty(exports, 'mergeProps', {
   enumerable: true,
-  get: function () {
-    return solidJs.mergeProps;
-  }
+  get: function () { return solidJs.mergeProps; }
 });
 exports.Aliases = Aliases;
 exports.Assets = Assets;