@torpor/view 0.0.12 → 0.0.14

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @torpor/view
 
+## 0.0.14
+
+### Patch Changes
+
+- fb896c6: Fix: make sure we've got $props on the server
+- 85bccf6: Fix: apply scope to elements without a class
+
+## 0.0.13
+
+### Patch Changes
+
+- ed4a6db: Fix: include quoted content in styles
+
 ## 0.0.12
 
 ### Patch Changes

package/dist/compile.cjs

@@ -203,6 +203,7 @@ function buildComponentFragmentText(node, status, fragments, currentFragment) {
   }
 }
 function buildElementFragmentText(node, status, fragments, currentFragment) {
+  let needsClass = node.scopeStyles;
   currentFragment.text += `<${node.tagName}`;
   let attributesText = node.attributes.filter((a) => !a.name.startsWith("on") && !a.name.includes(":")).map((a) => {
     if (a.value && isReactive(a.value) && !a.name.includes(":")) {
@@ -210,6 +211,7 @@ function buildElementFragmentText(node, status, fragments, currentFragment) {
         return `${a.name}=""`;
       }
     } else if (a.name === "class" && node.scopeStyles) {
+      needsClass = false;
       let value = a.value ? `"${trimQuotes(a.value)} torp-${status.styleHash}"` : `"torp-${status.styleHash}"`;
       return `${a.name}=${value}`;
     } else {
@@ -219,6 +221,9 @@ function buildElementFragmentText(node, status, fragments, currentFragment) {
   if (attributesText) {
     currentFragment.text += " " + attributesText;
   }
+  if (needsClass) {
+    currentFragment.text += ` class="torp-${status.styleHash}"`;
+  }
   currentFragment.text += ">";
   for (let child of node.children) {
     buildNodeFragmentText(child, status, fragments, currentFragment);
@@ -2412,6 +2417,7 @@ function buildServerElementNode(node, status, b) {
   }
 }
 function buildElementAttributes2(node, status) {
+  let needsClass = node.scopeStyles;
   let attributes = [];
   for (let { name, value } of node.attributes) {
     if (name === "self" && node.tagName === ":element") {
@@ -2460,6 +2466,7 @@ function buildElementAttributes2(node, status) {
         status.imports.add("t_class");
         if (node.scopeStyles) {
           value += `, "torp-${status.styleHash}"`;
+          needsClass = false;
         }
         attributes.push(`class="\${t_class(${value})}"`);
       } else if (name === ":style") {
@@ -2477,12 +2484,16 @@ function buildElementAttributes2(node, status) {
     } else if (name === "class" && node.scopeStyles) {
       value = value ? `"${trimQuotes(value)} torp-${status.styleHash}"` : `"torp-${status.styleHash}"`;
       attributes.push(`${name}="${trimQuotes(value).replaceAll('"', "&quot;")}"`);
+      needsClass = false;
     } else if (value != null) {
       attributes.push(`${name}="${trimQuotes(value).replaceAll('"', "&quot;")}"`);
     } else {
       attributes.push(`${name}`);
     }
   }
+  if (needsClass) {
+    attributes.push(`class="torp-${status.styleHash}"`);
+  }
   return attributes.join(" ");
 }
 
@@ -2719,6 +2730,9 @@ function buildServerTemplate(template, imports, b, options) {
       marker = i + "/* @params */".length;
     } else if (script.substring(i, i + "/* @start */".length) === "/* @start */") {
       b.append(script.substring(marker, i));
+      if (current.props?.length) {
+        b.append(`$props ??= {};`);
+      }
       if (current.contextProps?.length) {
         b.append(`$context = Object.assign({}, $context);`);
       }
@@ -3805,15 +3819,19 @@ function parseComponentStyle(status) {
     } else if (char === "/" && nextChar === "*") {
       status.i = status.source.indexOf("*/", status.i) + 1;
     } else if (char === '"' || char === "'") {
+      styleSource += char;
       for (let j = status.i + 1; j < status.source.length; j++) {
+        styleSource += status.source[j];
         if (status.source[j] === char && status.source[j - 1] !== "\\") {
           status.i = j;
           break;
         }
       }
     } else if (char === "`") {
+      styleSource += char;
       let level2 = 0;
       for (let j = status.i + 1; j < status.source.length; j++) {
+        styleSource += status.source[j];
         if (status.source[j] === char && status.source[j - 1] !== "\\" && level2 === 0) {
           status.i = j;
           break;