@lightspeed-js/core 0.4.0 → 0.4.2

package/dist/compile.js

@@ -345,15 +345,17 @@ function transformRules(css, scopes, scopeId, renames) {
     const bodyEnd = matchBrace(css, i);
     const body = css.slice(i + 1, bodyEnd);
     i = bodyEnd + 1;
-    const trimmed = prelude.text.trim();
+    const leading = /^(?:\s|\/\*[\s\S]*?\*\/)*/.exec(prelude.text)?.[0] ?? "";
+    const rule = prelude.text.slice(leading.length);
+    const trimmed = rule.trim();
     if (trimmed.startsWith("@")) {
       const name = trimmed.split(/[\s({]/)[0].toLowerCase();
       if (name.endsWith("keyframes")) {
-        out += `${renameKeyframe(prelude.text, scopeId)}{${body}}`;
+        out += `${leading}${renameKeyframe(rule, scopeId)}{${body}}`;
       } else if (NESTED_AT_RULES.has(name)) {
-        out += `${prelude.text}{${transformRules(body, scopes, scopeId, renames)}}`;
+        out += `${leading}${rule}{${transformRules(body, scopes, scopeId, renames)}}`;
       } else {
-        out += `${prelude.text}{${body}}`;
+        out += `${leading}${rule}{${body}}`;
       }
       continue;
     }

package/dist/index.js

@@ -1330,7 +1330,11 @@ class Mounter {
     };
     if (adopt) {
       const adopted = [];
-      if (this.adoptNodes(Array.from(fragment.childNodes), adopt, context, adopted)) {
+      if (!parent)
+        context.rootSlots = groupSlotFills(slotNodes);
+      const adoptedAll = this.adoptNodes(Array.from(fragment.childNodes), adopt, context, adopted);
+      delete context.rootSlots;
+      if (adoptedAll) {
         for (const marker of adopted) {
           await this.mountMarker(marker, instance, context);
         }
@@ -1491,6 +1495,8 @@ class Mounter {
     const children = Array.from(node.childNodes);
     for (let i = 0;i < children.length; i++) {
       const child = children[i];
+      if (child.parentNode !== node)
+        continue;
       if (!isMarkerStart(child)) {
         this.collect(child, context, skip, markers);
         continue;
@@ -1588,9 +1594,15 @@ class Mounter {
             d = found.length;
             continue;
           }
+          const name = found[d].data.slice(SLOT_MARK.length);
+          const region = [];
+          d++;
           while (d < found.length && !isSlotEnd(found[d]))
-            d++;
+            region.push(found[d++]);
           d++;
+          if (context.rootSlots && !this.adoptNodes(context.rootSlots.get(name) ?? [], region, context, markers)) {
+            return false;
+          }
           continue;
         }
         const target = found[d++];
@@ -2637,6 +2649,7 @@ class LightspeedRuntime {
         fail(`Error executing logic for ${instance.id}:`, error);
       }
     }
+    this.runUpdateCallbacks(instance);
     this.instances.set(instanceId, instance);
     return instance;
   }
@@ -2667,8 +2680,6 @@ class LightspeedRuntime {
         instance.addLogicCleanup(callback);
       },
       onUpdate: (callback) => {
-        if (this.ssg)
-          return;
         instance.updateCallbacks.push(callback);
       },
       defineProps: (propsDefinition) => {
@@ -3031,7 +3042,13 @@ function createLightspeedApp(options) {
   return new LightspeedRuntime(options);
 }
 function serializeNodes(nodes) {
-  return nodes.map((node) => node.nodeType === 1 ? node.outerHTML : node.textContent ?? "").join("");
+  const document2 = nodes[0]?.ownerDocument;
+  if (!document2)
+    return "";
+  const template = document2.createElement("template");
+  for (const node of nodes)
+    template.content.appendChild(node.cloneNode(true));
+  return template.innerHTML;
 }
 // src/runtime/helpers.ts
 function reactive(target) {

package/dist/ssg.js

@@ -1353,7 +1353,11 @@ class Mounter {
     };
     if (adopt) {
       const adopted = [];
-      if (this.adoptNodes(Array.from(fragment.childNodes), adopt, context, adopted)) {
+      if (!parent)
+        context.rootSlots = groupSlotFills(slotNodes);
+      const adoptedAll = this.adoptNodes(Array.from(fragment.childNodes), adopt, context, adopted);
+      delete context.rootSlots;
+      if (adoptedAll) {
         for (const marker of adopted) {
           await this.mountMarker(marker, instance, context);
         }
@@ -1514,6 +1518,8 @@ class Mounter {
     const children = Array.from(node.childNodes);
     for (let i = 0;i < children.length; i++) {
       const child = children[i];
+      if (child.parentNode !== node)
+        continue;
       if (!isMarkerStart(child)) {
         this.collect(child, context, skip, markers);
         continue;
@@ -1611,9 +1617,15 @@ class Mounter {
             d = found.length;
             continue;
           }
+          const name = found[d].data.slice(SLOT_MARK.length);
+          const region = [];
+          d++;
           while (d < found.length && !isSlotEnd(found[d]))
-            d++;
+            region.push(found[d++]);
           d++;
+          if (context.rootSlots && !this.adoptNodes(context.rootSlots.get(name) ?? [], region, context, markers)) {
+            return false;
+          }
           continue;
         }
         const target = found[d++];
@@ -2745,6 +2757,7 @@ class LightspeedRuntime {
         fail(`Error executing logic for ${instance.id}:`, error);
       }
     }
+    this.runUpdateCallbacks(instance);
     this.instances.set(instanceId, instance);
     return instance;
   }
@@ -2775,8 +2788,6 @@ class LightspeedRuntime {
         instance.addLogicCleanup(callback);
       },
       onUpdate: (callback) => {
-        if (this.ssg)
-          return;
         instance.updateCallbacks.push(callback);
       },
       defineProps: (propsDefinition) => {
@@ -3136,7 +3147,13 @@ class LightspeedRuntime {
   }
 }
 function serializeNodes(nodes) {
-  return nodes.map((node) => node.nodeType === 1 ? node.outerHTML : node.textContent ?? "").join("");
+  const document2 = nodes[0]?.ownerDocument;
+  if (!document2)
+    return "";
+  const template = document2.createElement("template");
+  for (const node of nodes)
+    template.content.appendChild(node.cloneNode(true));
+  return template.innerHTML;
 }
 
 // src/ssg/render.ts
@@ -3434,13 +3451,11 @@ function allComments(document2) {
   return comments;
 }
 function serialiseBetween(start, end) {
-  let html = "";
-  let current = start.nextSibling;
-  while (current && current !== end) {
-    html += current.nodeType === 1 ? current.outerHTML : current.textContent ?? "";
-    current = current.nextSibling;
+  const template = start.ownerDocument.createElement("template");
+  for (let current = start.nextSibling;current && current !== end; current = current.nextSibling) {
+    template.content.appendChild(current.cloneNode(true));
   }
-  return html;
+  return template.innerHTML;
 }
 // src/compile/expressions.ts
 function expressionKey(expr, params) {
@@ -3943,15 +3958,17 @@ function transformRules(css, scopes, scopeId, renames) {
     const bodyEnd = matchBrace(css, i);
     const body = css.slice(i + 1, bodyEnd);
     i = bodyEnd + 1;
-    const trimmed = prelude.text.trim();
+    const leading = /^(?:\s|\/\*[\s\S]*?\*\/)*/.exec(prelude.text)?.[0] ?? "";
+    const rule = prelude.text.slice(leading.length);
+    const trimmed = rule.trim();
     if (trimmed.startsWith("@")) {
       const name = trimmed.split(/[\s({]/)[0].toLowerCase();
       if (name.endsWith("keyframes")) {
-        out += `${renameKeyframe(prelude.text, scopeId)}{${body}}`;
+        out += `${leading}${renameKeyframe(rule, scopeId)}{${body}}`;
       } else if (NESTED_AT_RULES.has(name)) {
-        out += `${prelude.text}{${transformRules(body, scopes, scopeId, renames)}}`;
+        out += `${leading}${rule}{${transformRules(body, scopes, scopeId, renames)}}`;
       } else {
-        out += `${prelude.text}{${body}}`;
+        out += `${leading}${rule}{${body}}`;
       }
       continue;
     }

package/dist/vite.js

@@ -784,7 +784,11 @@ class Mounter {
     };
     if (adopt) {
       const adopted = [];
-      if (this.adoptNodes(Array.from(fragment.childNodes), adopt, context, adopted)) {
+      if (!parent)
+        context.rootSlots = groupSlotFills(slotNodes);
+      const adoptedAll = this.adoptNodes(Array.from(fragment.childNodes), adopt, context, adopted);
+      delete context.rootSlots;
+      if (adoptedAll) {
         for (const marker of adopted) {
           await this.mountMarker(marker, instance, context);
         }
@@ -945,6 +949,8 @@ class Mounter {
     const children = Array.from(node.childNodes);
     for (let i = 0;i < children.length; i++) {
       const child = children[i];
+      if (child.parentNode !== node)
+        continue;
       if (!isMarkerStart(child)) {
         this.collect(child, context, skip, markers);
         continue;
@@ -1042,9 +1048,15 @@ class Mounter {
             d = found.length;
             continue;
           }
+          const name = found[d].data.slice(SLOT_MARK.length);
+          const region = [];
+          d++;
           while (d < found.length && !isSlotEnd(found[d]))
-            d++;
+            region.push(found[d++]);
           d++;
+          if (context.rootSlots && !this.adoptNodes(context.rootSlots.get(name) ?? [], region, context, markers)) {
+            return false;
+          }
           continue;
         }
         const target = found[d++];
@@ -2207,15 +2219,17 @@ function transformRules(css, scopes, scopeId, renames) {
     const bodyEnd = matchBrace(css, i);
     const body = css.slice(i + 1, bodyEnd);
     i = bodyEnd + 1;
-    const trimmed = prelude.text.trim();
+    const leading = /^(?:\s|\/\*[\s\S]*?\*\/)*/.exec(prelude.text)?.[0] ?? "";
+    const rule = prelude.text.slice(leading.length);
+    const trimmed = rule.trim();
     if (trimmed.startsWith("@")) {
       const name = trimmed.split(/[\s({]/)[0].toLowerCase();
       if (name.endsWith("keyframes")) {
-        out += `${renameKeyframe(prelude.text, scopeId)}{${body}}`;
+        out += `${leading}${renameKeyframe(rule, scopeId)}{${body}}`;
       } else if (NESTED_AT_RULES.has(name)) {
-        out += `${prelude.text}{${transformRules(body, scopes, scopeId, renames)}}`;
+        out += `${leading}${rule}{${transformRules(body, scopes, scopeId, renames)}}`;
       } else {
-        out += `${prelude.text}{${body}}`;
+        out += `${leading}${rule}{${body}}`;
       }
       continue;
     }
@@ -4134,6 +4148,7 @@ class LightspeedRuntime {
         fail(`Error executing logic for ${instance.id}:`, error);
       }
     }
+    this.runUpdateCallbacks(instance);
     this.instances.set(instanceId, instance);
     return instance;
   }
@@ -4164,8 +4179,6 @@ class LightspeedRuntime {
         instance.addLogicCleanup(callback);
       },
       onUpdate: (callback) => {
-        if (this.ssg)
-          return;
         instance.updateCallbacks.push(callback);
       },
       defineProps: (propsDefinition) => {
@@ -4525,7 +4538,13 @@ class LightspeedRuntime {
   }
 }
 function serializeNodes(nodes) {
-  return nodes.map((node) => node.nodeType === 1 ? node.outerHTML : node.textContent ?? "").join("");
+  const document2 = nodes[0]?.ownerDocument;
+  if (!document2)
+    return "";
+  const template = document2.createElement("template");
+  for (const node of nodes)
+    template.content.appendChild(node.cloneNode(true));
+  return template.innerHTML;
 }
 
 // src/ssg/render.ts
@@ -4823,13 +4842,11 @@ function allComments(document2) {
   return comments;
 }
 function serialiseBetween(start, end) {
-  let html = "";
-  let current = start.nextSibling;
-  while (current && current !== end) {
-    html += current.nodeType === 1 ? current.outerHTML : current.textContent ?? "";
-    current = current.nextSibling;
+  const template = start.ownerDocument.createElement("template");
+  for (let current = start.nextSibling;current && current !== end; current = current.nextSibling) {
+    template.content.appendChild(current.cloneNode(true));
   }
-  return html;
+  return template.innerHTML;
 }
 
 // src/vite/layout.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightspeed-js/core",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Lightspeed: a compile-first framework for islands of reactivity in static HTML.",
   "keywords": [
     "lightspeed",