@statorjs/language-server 0.1.33 → 0.1.34

package/dist/server.cjs

@@ -44814,6 +44814,10 @@ function codeFrame(source, line, column) {
   }
   return out.join("\n");
 }
+function parseDiagnosticsOf(sf) {
+  const { parseDiagnostics } = sf;
+  return parseDiagnostics ?? [];
+}
 function locAt(source, offset, file) {
   const { line, column } = offsetToLineCol(source, offset);
   return { file, line, column, frame: codeFrame(source, line, column) };
@@ -45112,6 +45116,39 @@ function lowerTemplate(template, opts = {}) {
     import_typescript3.default.forEachChild(node, (child) => checkNoBindingInRcdata(child, rcdataTag));
   };
   checkNoBindingInRcdata(fragment, null);
+  const childMarkerOf = (attrs) => attrs.properties.find(
+    (a) => import_typescript3.default.isJsxAttribute(a) && !import_typescript3.default.isJsxNamespacedName(a.name) && a.name.getText(sf) === "child"
+  );
+  const checkChildMarkers = (node, underComponent) => {
+    if (import_typescript3.default.isJsxElement(node) || import_typescript3.default.isJsxSelfClosingElement(node)) {
+      const opening = import_typescript3.default.isJsxElement(node) ? node.openingElement : node;
+      const tag = opening.tagName.getText(sf);
+      const marker = childMarkerOf(opening.attributes);
+      if (marker) {
+        const region = marker.initializer && import_typescript3.default.isStringLiteral(marker.initializer) ? marker.initializer.text : "x";
+        if (isComponentTag(tag)) {
+          throw new CompileError(
+            `stator: child="${region}" on <${tag}/> has no effect \u2014 a child="x" marker is only read on a direct element child of a component tag; on a component it is an ignored prop. Wrap it: <div child="${region}"><${tag}/></div>`,
+            loc2(marker)
+          );
+        }
+        if (!underComponent) {
+          throw new CompileError(
+            `stator: child="${region}" has no effect here \u2014 a child="x" marker is only read on a direct element child of a component tag. Move the condition inside the slotted element: <div child="${region}">{cond ? \u2026 : null}</div>`,
+            loc2(marker)
+          );
+        }
+      }
+      checkChildMarkers(opening.attributes, false);
+      if (import_typescript3.default.isJsxElement(node)) {
+        const inner = isComponentTag(tag);
+        for (const child of node.children) checkChildMarkers(child, inner);
+      }
+      return;
+    }
+    import_typescript3.default.forEachChild(node, (child) => checkChildMarkers(child, false));
+  };
+  checkChildMarkers(fragment, false);
   const checkItemReadPlacement = (node, frames) => {
     if (import_typescript3.default.isCallExpression(node) && import_typescript3.default.isIdentifier(node.expression)) {
       const callee = node.expression.text;
@@ -45775,7 +45812,8 @@ function compile(source, opts = {}) {
         styles,
         file: opts.id,
         fm: fm2,
-        source
+        source,
+        templateOffset
       });
     }
     throw new CompileError(
@@ -45812,7 +45850,7 @@ function compile(source, opts = {}) {
 }
 function compileClient(template, script, ctx) {
   const classes = analyzeScriptClasses(script);
-  const root2 = extractClientRoot(template, ctx.file);
+  const root2 = extractClientRoot(template, ctx);
   const tags = /* @__PURE__ */ new Set([root2.tag]);
   analyzeClient(script, tags, { file: ctx.file });
   const cls = classes.find((c) => pascalToKebab(c.name) === root2.tag);
@@ -45878,23 +45916,27 @@ function compileClient(template, script, ctx) {
     clientTag: root2.tag
   };
 }
-function staticRootAttrs(attrs, sf) {
+function staticRootAttrs(tag, attrs, sf, at) {
   const out = {};
   for (const attr of attrs.properties) {
-    if (!import_typescript4.default.isJsxAttribute(attr) || import_typescript4.default.isJsxNamespacedName(attr.name)) continue;
-    const name = attr.name.getText(sf);
-    const init = attr.initializer;
-    if (init === void 0) {
-      out[name] = true;
-    } else if (import_typescript4.default.isStringLiteral(init)) {
-      out[name] = init.text;
+    const isStatic = import_typescript4.default.isJsxAttribute(attr) && !import_typescript4.default.isJsxNamespacedName(attr.name) && (attr.initializer === void 0 || import_typescript4.default.isStringLiteral(attr.initializer));
+    if (!isStatic) {
+      throw new CompileError(
+        `stator: <${tag} ${attr.getText(sf)}> \u2014 attributes on an island's root must be static (a string literal or a bare boolean). The root is rendered by the shell from the use site's props; a dynamic value belongs on an inner element, or declare it with \`static attrs\` and pass it from the use site.`,
+        at(attr)
+      );
     }
+    const name = attr.name.getText(sf);
+    out[name] = attr.initializer === void 0 ? true : attr.initializer.text;
   }
   return out;
 }
-function extractClientRoot(template, file) {
-  const wrapped = `const __t = (<>${template}</>);`;
+function extractClientRoot(template, ctx) {
+  const { file } = ctx;
+  const prefix = "const __t = (<>";
+  const wrapped = `${prefix}${template}</>);`;
   const sf = import_typescript4.default.createSourceFile("t.tsx", wrapped, import_typescript4.default.ScriptTarget.Latest, true, import_typescript4.default.ScriptKind.TSX);
+  const at = (node) => ctx.source != null && ctx.templateOffset != null ? locAt(ctx.source, ctx.templateOffset + (node.getStart(sf) - prefix.length), file) : void 0;
   let fragment;
   const find = (n) => {
     if (import_typescript4.default.isJsxFragment(n)) {
@@ -45917,13 +45959,13 @@ function extractClientRoot(template, file) {
   if (import_typescript4.default.isJsxSelfClosingElement(rootEl)) {
     const tag2 = rootEl.tagName.getText(sf);
     requireCustomRoot(tag2, file);
-    return { tag: tag2, inner: "", rootAttrs: staticRootAttrs(rootEl.attributes, sf) };
+    return { tag: tag2, inner: "", rootAttrs: staticRootAttrs(tag2, rootEl.attributes, sf, at) };
   }
   const el = rootEl;
   const tag = el.openingElement.tagName.getText(sf);
   requireCustomRoot(tag, file);
   const inner = wrapped.slice(el.openingElement.getEnd(), el.closingElement.getStart());
-  return { tag, inner, rootAttrs: staticRootAttrs(el.openingElement.attributes, sf) };
+  return { tag, inner, rootAttrs: staticRootAttrs(tag, el.openingElement.attributes, sf, at) };
 }
 function requireCustomRoot(tag, file) {
   if (!isCustomElementTag(tag)) {
@@ -45943,6 +45985,21 @@ function processFrontmatter(fm, kind, source, file) {
   let propsType;
   const reads = [];
   const locInFm = (node) => locAt(source, fmOffset(source) + node.getStart(sf), file);
+  const syntax = parseDiagnosticsOf(sf);
+  if (syntax.length > 0) {
+    const jsx = findJsxLikeAssertion(sf);
+    if (jsx) {
+      throw new CompileError(
+        "stator: JSX isn't allowed in frontmatter \u2014 it's plain TypeScript. Markup belongs in the template (use when()/match() for conditional content); a different page for a not-found case cascades to routes/404.stator.",
+        locInFm(jsx)
+      );
+    }
+    const d = syntax[0];
+    throw new CompileError(
+      `stator: frontmatter syntax error \u2014 ${import_typescript4.default.flattenDiagnosticMessageText(d.messageText, "\n")}`,
+      locAt(source, fmOffset(source) + d.start, file)
+    );
+  }
   for (const stmt of sf.statements) {
     if (import_typescript4.default.isImportDeclaration(stmt) || import_typescript4.default.isTypeAliasDeclaration(stmt) || import_typescript4.default.isInterfaceDeclaration(stmt)) {
       hoisted.push(stmt.getText(sf));
@@ -46129,6 +46186,19 @@ function requireRoute(what, kind, loc2) {
     );
   }
 }
+function findJsxLikeAssertion(sf) {
+  let found;
+  const visit = (n) => {
+    if (found) return;
+    if (import_typescript4.default.isTypeAssertionExpression(n) && import_typescript4.default.isTypeReferenceNode(n.type) && import_typescript4.default.isIdentifier(n.type.typeName) && !n.type.typeArguments) {
+      found = n;
+      return;
+    }
+    import_typescript4.default.forEachChild(n, visit);
+  };
+  visit(sf);
+  return found;
+}
 function fmOffset(source) {
   return source.startsWith("---") ? source.indexOf("\n") + 1 : 0;
 }
@@ -46246,11 +46316,7 @@ function buildServerTsx(regions) {
   const userCode = fm + regions.template.content;
   let code = injectImports(TEMPLATE_GLOBALS, "@statorjs/stator/template", userCode) + AMBIENT_TYPE_IMPORTS + STATOR_AMBIENT;
   const { hoisted, body } = splitFrontmatter(fm, fmOffset2);
-  for (const seg of hoisted) {
-    push(mappings, seg.sourceOffset, code.length, seg.text.length);
-    code += `${seg.text}
-`;
-  }
+  for (const seg of hoisted) code = emitSegment(mappings, code, seg);
   let tplOffset = regions.template.contentOffset;
   let tpl = regions.template.content;
   const doctype = DOCTYPE_RE.exec(tpl);
@@ -46268,12 +46334,7 @@ function buildServerTsx(regions) {
   }
   code += `export default function (_props: ${propsT}) {
 `;
-  for (const seg of body) {
-    code += "  ";
-    push(mappings, seg.sourceOffset, code.length, seg.text.length);
-    code += `${seg.text}
-`;
-  }
+  for (const seg of body) code = emitSegment(mappings, `${code}  `, seg);
   code += "  return (<>";
   code = appendTemplateTsx(code, mappings, tpl, tplOffset);
   code += "</>);\n}\n";
@@ -46362,13 +46423,29 @@ function expressionEnd(tpl, start) {
   }
   return tpl.length;
 }
+function emitSegment(mappings, code, seg) {
+  if (seg.opaque) return `${code}${JSON.stringify(seg.text)};
+`;
+  push(mappings, seg.sourceOffset, code.length, seg.text.length);
+  return `${code}${seg.text}
+`;
+}
 function splitFrontmatter(fm, fmOffset2) {
   const hoisted = [];
   const body = [];
   if (!fm.trim()) return { hoisted, body };
   const sf = import_typescript7.default.createSourceFile("fm.ts", fm, import_typescript7.default.ScriptTarget.Latest, true, import_typescript7.default.ScriptKind.TS);
+  const brokenLines = new Set(
+    parseDiagnosticsOf(sf).map((d) => sf.getLineAndCharacterOfPosition(d.start).line)
+  );
   for (const stmt of sf.statements) {
-    const seg = { sourceOffset: fmOffset2 + stmt.getStart(sf), text: stmt.getText(sf) };
+    const start = stmt.getStart(sf);
+    const seg = { sourceOffset: fmOffset2 + start, text: stmt.getText(sf) };
+    const first = sf.getLineAndCharacterOfPosition(start).line;
+    const last = sf.getLineAndCharacterOfPosition(stmt.getEnd()).line;
+    for (let line = first; line <= last; line++) {
+      if (brokenLines.has(line)) seg.opaque = true;
+    }
     if (import_typescript7.default.isImportDeclaration(stmt) || import_typescript7.default.isTypeAliasDeclaration(stmt) || import_typescript7.default.isInterfaceDeclaration(stmt)) {
       hoisted.push(seg);
     } else {
@@ -46387,17 +46464,10 @@ function buildClientTsx(regions) {
     const { hoisted, body } = splitFrontmatter(fm, fmOffset2);
     for (const seg of hoisted) {
       if (userScript.includes(seg.text.trim())) continue;
-      push(mappings, seg.sourceOffset, code.length, seg.text.length);
-      code += `${seg.text}
-`;
+      code = emitSegment(mappings, code, seg);
     }
     code += "function __statorFence(props: Record<string, unknown>) {\n";
-    for (const seg of body) {
-      code += "  ";
-      push(mappings, seg.sourceOffset, code.length, seg.text.length);
-      code += `${seg.text}
-`;
-    }
+    for (const seg of body) code = emitSegment(mappings, `${code}  `, seg);
     code += "}\nvoid __statorFence\n";
   }
   for (const script of regions.scripts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statorjs/language-server",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "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"
+    "@statorjs/stator": "2.12.0"
   },
   "peerDependencies": {
     "typescript": "^5.6.0"