@lightspeed-js/core 0.4.1 → 0.4.3

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

@@ -1495,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;
@@ -2647,6 +2649,7 @@ class LightspeedRuntime {
         fail(`Error executing logic for ${instance.id}:`, error);
       }
     }
+    this.runUpdateCallbacks(instance);
     this.instances.set(instanceId, instance);
     return instance;
   }
@@ -2677,8 +2680,6 @@ class LightspeedRuntime {
         instance.addLogicCleanup(callback);
       },
       onUpdate: (callback) => {
-        if (this.ssg)
-          return;
         instance.updateCallbacks.push(callback);
       },
       defineProps: (propsDefinition) => {
@@ -2751,8 +2752,6 @@ class LightspeedRuntime {
         reasons.push(`${instance.models} two-way binding(s)`);
       if (instance.wantsMount)
         reasons.push("onMounted");
-      if (instance.updateCallbacks.length)
-        reasons.push("onUpdate");
       const cells = [...instance.runtimeCells].filter((key) => !this.cells.isBakedOnly(key) && (key !== "route" || options.routeIsLive));
       if (cells.length)
         reasons.push(`reads ${cells.join(", ")}`);

package/dist/ssg.js

@@ -1518,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;
@@ -2755,6 +2757,7 @@ class LightspeedRuntime {
         fail(`Error executing logic for ${instance.id}:`, error);
       }
     }
+    this.runUpdateCallbacks(instance);
     this.instances.set(instanceId, instance);
     return instance;
   }
@@ -2785,8 +2788,6 @@ class LightspeedRuntime {
         instance.addLogicCleanup(callback);
       },
       onUpdate: (callback) => {
-        if (this.ssg)
-          return;
         instance.updateCallbacks.push(callback);
       },
       defineProps: (propsDefinition) => {
@@ -2859,8 +2860,6 @@ class LightspeedRuntime {
         reasons.push(`${instance.models} two-way binding(s)`);
       if (instance.wantsMount)
         reasons.push("onMounted");
-      if (instance.updateCallbacks.length)
-        reasons.push("onUpdate");
       const cells = [...instance.runtimeCells].filter((key) => !this.cells.isBakedOnly(key) && (key !== "route" || options.routeIsLive));
       if (cells.length)
         reasons.push(`reads ${cells.join(", ")}`);
@@ -3957,15 +3956,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

@@ -949,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;
@@ -2217,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;
     }
@@ -4144,6 +4148,7 @@ class LightspeedRuntime {
         fail(`Error executing logic for ${instance.id}:`, error);
       }
     }
+    this.runUpdateCallbacks(instance);
     this.instances.set(instanceId, instance);
     return instance;
   }
@@ -4174,8 +4179,6 @@ class LightspeedRuntime {
         instance.addLogicCleanup(callback);
       },
       onUpdate: (callback) => {
-        if (this.ssg)
-          return;
         instance.updateCallbacks.push(callback);
       },
       defineProps: (propsDefinition) => {
@@ -4248,8 +4251,6 @@ class LightspeedRuntime {
         reasons.push(`${instance.models} two-way binding(s)`);
       if (instance.wantsMount)
         reasons.push("onMounted");
-      if (instance.updateCallbacks.length)
-        reasons.push("onUpdate");
       const cells = [...instance.runtimeCells].filter((key) => !this.cells.isBakedOnly(key) && (key !== "route" || options.routeIsLive));
       if (cells.length)
         reasons.push(`reads ${cells.join(", ")}`);

package/package.json

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