tw-framework 1.0.1 → 1.0.2

package/dist/tw.mjs

@@ -7596,6 +7596,7 @@ function parseTWSelector(cursor, errors, state, parseBody) {
     if (token.type === "DOT") {
       cursor.advance();
       let classVal = "";
+      let prevWasMinus = false;
       const classStart = cursor.peek()?.pos;
       while (!cursor.done) {
         const ct = cursor.peek();
@@ -7604,8 +7605,12 @@ function parseTWSelector(cursor, errors, state, parseBody) {
           const after = cursor.peek(1);
           if (after && after.type === "COLON") break;
         }
+        if (ct.type === "IDENT" && !prevWasMinus && classVal.length > 0 && (CLASS_BOUNDARY_BOOLEAN_ATTRS.has(ct.value) || inlineAttrStartsAt(cursor))) {
+          break;
+        }
         if (ct.type === "IDENT" || ct.type === "TEXT" || ct.type === "KEYWORD") {
           classVal += ct.value;
+          prevWasMinus = false;
           cursor.advance();
         } else if (ct.type === "NUMBER") {
           classVal += ct.value;
@@ -7615,6 +7620,7 @@ function parseTWSelector(cursor, errors, state, parseBody) {
           cursor.advance();
         } else if (ct.type === "MINUS") {
           classVal += "-";
+          prevWasMinus = true;
           cursor.advance();
         } else {
           break;
@@ -7623,11 +7629,16 @@ function parseTWSelector(cursor, errors, state, parseBody) {
       while (!cursor.done && cursor.peek()?.type === "DOT") {
         cursor.advance();
         let nextClass = "";
+        let nextPrevMinus = false;
         while (!cursor.done) {
           const ct = cursor.peek();
           if (!ct) break;
+          if (ct.type === "IDENT" && !nextPrevMinus && nextClass.length > 0 && (CLASS_BOUNDARY_BOOLEAN_ATTRS.has(ct.value) || inlineAttrStartsAt(cursor))) {
+            break;
+          }
           if (ct.type === "IDENT" || ct.type === "TEXT" || ct.type === "KEYWORD") {
             nextClass += ct.value;
+            nextPrevMinus = false;
             cursor.advance();
           } else if (ct.type === "NUMBER") {
             nextClass += ct.value;
@@ -7665,7 +7676,7 @@ function parseTWSelector(cursor, errors, state, parseBody) {
     const t2 = cursor.peek();
     if (!t2) break;
     if (t2.type === "LBRACE" || t2.type === "STRING") break;
-    if (t2.type === "IDENT" && VOID_HEAD_TAGS_ATTR.has(t2.value)) {
+    if (t2.type === "IDENT" && VOID_HEAD_TAGS_ATTR.has(t2.value) && (el.voidElement || VOID_HEAD_TAGS_ATTR.has(tag.toLowerCase()))) {
       const after = cursor.peek(1);
       if (after && (after.type === "IDENT" || after.type === "STRING")) break;
     }
@@ -7734,13 +7745,21 @@ function parseTWSelector(cursor, errors, state, parseBody) {
     }
     if (t2.type === "IDENT" || t2.type === "KEYWORD") {
       if (t2.pos.line > tagToken.pos.line) break;
-      const attrName = t2.value;
+      let attrName = t2.value;
       cursor.advance();
+      while (cursor.peek() && cursor.peek().type === "MINUS") {
+        const hyphNext = cursor.peek(1);
+        if (hyphNext && (hyphNext.type === "IDENT" || hyphNext.type === "TEXT" || hyphNext.type === "KEYWORD")) {
+          cursor.advance();
+          cursor.advance();
+          attrName += "-" + hyphNext.value;
+        } else break;
+      }
       const vToken = cursor.peek();
       if (vToken && (vToken.type === "STRING" || vToken.type === "NUMBER")) {
         cursor.advance();
         el.attrs.push(createAttribute(attrName, vToken.value, t2.pos.line, t2.pos.col));
-      } else if (vToken && (vToken.type === "IDENT" || vToken.type === "KEYWORD")) {
+      } else if (vToken && (vToken.type === "IDENT" || vToken.type === "KEYWORD") && vToken.pos.line === t2.pos.line) {
         cursor.advance();
         el.attrs.push(createAttribute(attrName, vToken.value, t2.pos.line, t2.pos.col));
       } else {
@@ -7931,6 +7950,19 @@ function parseTextFromString(cursor) {
   if (!token) return null;
   return createText(token.value, token.pos.line, token.pos.col, false);
 }
+function inlineAttrStartsAt(cursor) {
+  let k = 1;
+  for (; ; ) {
+    const a = cursor.peek(k);
+    if (!a) return false;
+    if (a.type === "STRING") return true;
+    if (a.type === "MINUS") {
+      k += 2;
+      continue;
+    }
+    return false;
+  }
+}
 function parseElement(cursor, errors, state, parseBody) {
   const tagToken = cursor.advance();
   if (!tagToken) return null;
@@ -8607,12 +8639,37 @@ function parseBlockBody2(cursor, parseBody) {
   }
   return parseBody(["KEYWORD", "RBRACE"]);
 }
+var CLASS_BOUNDARY_BOOLEAN_ATTRS;
 var init_statements = __esm({
   "../../packages/compiler/tw/parser/statements/index.ts"() {
     init_nodes();
     init_recovery();
     init_directives();
     init_tw();
+    CLASS_BOUNDARY_BOOLEAN_ATTRS = /* @__PURE__ */ new Set([
+      "disabled",
+      "required",
+      "readonly",
+      "checked",
+      "selected",
+      "autofocus",
+      "hidden",
+      "multiple",
+      "muted",
+      "loop",
+      "controls",
+      "defer",
+      "async",
+      "autoplay",
+      "reversed",
+      "open",
+      "inert",
+      "itemscope",
+      "novalidate",
+      "allowfullscreen",
+      "formnovalidate",
+      "playsinline"
+    ]);
   }
 });
 
@@ -54439,7 +54496,9 @@ var helpText = `
 
     ship [target]          Deploy to platform
     adapter [name]         Generate deployment adapter files (node, bun, docker, vercel)
-      targets: vercel, netlify, cloudflare, docker, static
+      targets: node, bun, docker, vercel, netlify, cloudflare,
+                          aws, digitalocean, render, railway, fly,
+                          github-pages, firebase, nginx, caddy
       (default: auto-detect)
 
     plugin <action>        Manage plugins

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tw-framework",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Full-stack web framework \u2014 own template language (.tw), styling (.tss), compiler and VDOM; runs on Bun and Node",
   "type": "module",
   "main": "./dist/tw.mjs",