@statorjs/language-server 0.1.33-next.0 → 0.1.33-next.2

package/dist/server.cjs

@@ -44494,6 +44494,29 @@ function scopeHash(input) {
 
 // ../stator/src/compiler/lower.ts
 var import_typescript3 = __toESM(require("typescript"), 1);
+
+// ../stator/src/template/void-elements.ts
+var VOID_ELEMENTS = /* @__PURE__ */ new Set([
+  "area",
+  "base",
+  "br",
+  "col",
+  "embed",
+  "hr",
+  "img",
+  "input",
+  "link",
+  "meta",
+  "param",
+  "source",
+  "track",
+  "wbr"
+]);
+function isVoidElement(tag) {
+  return VOID_ELEMENTS.has(tag.toLowerCase());
+}
+
+// ../stator/src/compiler/lower.ts
 function cleanJsxText(raw) {
   const lines = raw.split(/\r\n|\n|\r/);
   let lastNonEmpty = 0;
@@ -44741,7 +44764,8 @@ function lowerTemplate(template, opts = {}) {
         return `\${${lowerComponent(tag, node.attributes, void 0)}}`;
       }
       if (meta && tag.includes("-")) meta.customElements.add(tag);
-      return `<${tag}${lowerAttributes(node.attributes)}${scopeSuffix} />`;
+      const open = `<${tag}${lowerAttributes(node.attributes)}${scopeSuffix}>`;
+      return isVoidElement(tag) ? open : `${open}</${tag}>`;
     }
     if (import_typescript3.default.isJsxFragment(node)) return contentOfChildren(node.children);
     throw new CompileError(
@@ -45213,28 +45237,42 @@ function scopeSelectorList(selector, attr) {
         }
       });
       if (subjectIsGlobal) return;
-      const nodes = sel.nodes;
-      let insertAfter;
-      for (const node of nodes) {
-        if (node.type === "combinator") {
-          insertAfter = void 0;
-          continue;
-        }
-        if (node.type === "pseudo" && node.value.startsWith("::")) continue;
-        insertAfter = node;
-      }
-      const attrNode = import_postcss_selector_parser.default.attribute({
-        attribute: attr,
-        value: void 0,
-        raws: {},
-        quoteMark: null
-      });
-      if (insertAfter) sel.insertAfter(insertAfter, attrNode);
-      else sel.append(attrNode);
+      attachScopeAttr(sel, attr);
     });
   });
   return transform.processSync(selector);
 }
+function makeAttrNode(attr) {
+  return import_postcss_selector_parser.default.attribute({
+    attribute: attr,
+    value: void 0,
+    raws: {},
+    quoteMark: null
+  });
+}
+function attachScopeAttr(sel, attr) {
+  const nodes = sel.nodes;
+  let insertAfter;
+  for (const node of nodes) {
+    if (node.type === "combinator") {
+      insertAfter = void 0;
+      continue;
+    }
+    if (node.type === "pseudo" && node.value.startsWith("::")) continue;
+    insertAfter = node;
+  }
+  if (!insertAfter) {
+    sel.append(makeAttrNode(attr));
+    return;
+  }
+  if (insertAfter.type === "pseudo" && insertAfter.value === ":where") {
+    for (const inner of insertAfter.nodes) {
+      attachScopeAttr(inner, attr);
+    }
+    return;
+  }
+  sel.insertAfter(insertAfter, makeAttrNode(attr));
+}
 function isSubjectGlobal(sel) {
   const nodes = sel.nodes;
   let lastCombinator = -1;
@@ -45784,21 +45822,6 @@ function buildServerTsx(regions) {
   code += "</>);\n}\n";
   return { lang: "tsx", code, mappings };
 }
-var VOID_TAGS = /* @__PURE__ */ new Set([
-  "area",
-  "base",
-  "br",
-  "col",
-  "embed",
-  "hr",
-  "img",
-  "input",
-  "link",
-  "meta",
-  "source",
-  "track",
-  "wbr"
-]);
 function appendTemplateTsx(code, mappings, tpl, tplOffset) {
   let out = code;
   let i = 0;
@@ -45846,7 +45869,7 @@ function appendTemplateTsx(code, mappings, tpl, tplOffset) {
         if (ch === ">") break;
         j++;
       }
-      if (VOID_TAGS.has(tag.toLowerCase()) && j < tpl.length) {
+      if (VOID_ELEMENTS.has(tag.toLowerCase()) && j < tpl.length) {
         let k = j - 1;
         while (k > i && /\s/.test(tpl[k])) k--;
         if (tpl[k] !== "/") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statorjs/language-server",
-  "version": "0.1.33-next.0",
+  "version": "0.1.33-next.2",
   "description": "Volar-based language server for .stator files.",
   "license": "MIT",
   "type": "module",
@@ -33,7 +33,7 @@
     "volar-service-typescript": "0.0.71",
     "vscode-css-languageservice": "^6.3.0",
     "vscode-uri": "^3.0.8",
-    "@statorjs/stator": "2.11.0-next.0"
+    "@statorjs/stator": "2.11.0-next.2"
   },
   "peerDependencies": {
     "typescript": "^5.6.0"