@statorjs/language-server 0.1.20 → 0.1.21

package/dist/server.cjs

@@ -44183,8 +44183,38 @@ var elementMarker = (i) => `b${i}`;
 var slotMarker = (i) => `s${i}`;
 var elementMarkerSelector = (marker) => `[${ISLAND_MARKER_ATTR}="${marker}"]`;
 
+// ../stator/src/compiler/emit-names.ts
+var TEMPLATE_AUTHOR_GLOBALS = [
+  "read",
+  "each",
+  "when",
+  "match",
+  "defer",
+  "on",
+  "classList",
+  "styleList"
+];
+var TEMPLATE_LOWERING_TARGETS = ["html", "itemBind", "spreadAttrs"];
+var ISLAND_SHELL_EXTRAS = ["createHtmlFragment", "clientShellAttrs"];
+var CLIENT_AUTHOR_GLOBALS = [
+  "StatorElement",
+  "use",
+  "machine",
+  "defineElement",
+  "bind",
+  "effect",
+  "dispatch"
+];
+var CLIENT_LOWERING_TARGETS = ["bindSlot", "attrValue", "setAttr"];
+function importLine(names, from) {
+  return `import { ${names.join(", ")} } from '${from}'`;
+}
+
 // ../stator/src/compiler/client-emit.ts
-var PRIMITIVES = "import { StatorElement, defineElement, use, machine, bind, bindSlot, effect, dispatch, attrValue, setAttr } from '@statorjs/stator/client'";
+var PRIMITIVES = importLine(
+  [...CLIENT_AUTHOR_GLOBALS, ...CLIENT_LOWERING_TARGETS],
+  "@statorjs/stator/client"
+);
 function emitClientModule(input) {
   const { script, element, directives, members } = input;
   const impl = `__${element.className}Impl`;
@@ -45199,7 +45229,18 @@ function isSubjectGlobal(sel) {
 }
 
 // ../stator/src/compiler/compile.ts
-var PRIMITIVES_IMPORT = "import { html, read, each, itemBind, when, match, defer, on, classList, styleList, spreadAttrs } from '@statorjs/stator/template'";
+var PRIMITIVES_IMPORT = importLine(
+  [...TEMPLATE_AUTHOR_GLOBALS, ...TEMPLATE_LOWERING_TARGETS],
+  "@statorjs/stator/template"
+);
+var SHELL_PRIMITIVES_IMPORT = importLine(
+  [
+    ...TEMPLATE_AUTHOR_GLOBALS,
+    ...TEMPLATE_LOWERING_TARGETS.filter((n) => n !== "itemBind"),
+    ...ISLAND_SHELL_EXTRAS
+  ],
+  "@statorjs/stator/template"
+);
 function compile(source, opts = {}) {
   const { frontmatter, template, styles, scripts, scriptOffsets, templateOffset } = splitStator(source);
   const kind = opts.kind ?? "component";
@@ -45209,17 +45250,14 @@ function compile(source, opts = {}) {
   const script = scripts.join("\n");
   if (script.trim()) {
     if (analyzeScriptClasses(script).length > 0) {
-      if (frontmatter.trim()) {
-        throw new CompileError(
-          `stator: an island file (a template with a StatorElement <script>) can't have frontmatter \u2014 the fence would never run: the island's shell renders from props. Move the server work into the route or component that renders this island and pass the results as props.`,
-          locAt(source, 0, opts.id)
-        );
-      }
+      const fm2 = processFrontmatter(frontmatter, "island", source, opts.id);
       return compileClient(template, script, {
         hash,
         scopeAttr,
         styles,
-        file: opts.id
+        file: opts.id,
+        fm: fm2,
+        source
       });
     }
     throw new CompileError(
@@ -45260,6 +45298,17 @@ function compileClient(template, script, ctx) {
   const tags = /* @__PURE__ */ new Set([root2.tag]);
   analyzeClient(script, tags, { file: ctx.file });
   const cls = classes.find((c) => pascalToKebab(c.name) === root2.tag);
+  if (ctx.fm && cls) {
+    const fenceNames = fenceBindingNames(ctx.fm);
+    for (const field of cls.useFields.keys()) {
+      if (fenceNames.has(field)) {
+        throw new CompileError(
+          `stator: "${field}" is both a fence binding and a use() field \u2014 the template couldn't tell the server value from the client machine. Rename one.`,
+          ctx.source ? locAt(ctx.source, 0, ctx.file) : void 0
+        );
+      }
+    }
+  }
   if (!cls) {
     throw new CompileError(
       `stator: internal \u2014 no exported class matches root <${root2.tag}> after name validation`
@@ -45282,9 +45331,13 @@ function compileClient(template, script, ctx) {
   const attrDecl = `{ ${[...cls.staticAttrs].map(([k, v]) => `${k}: ${JSON.stringify(v)}`).join(", ")} }`;
   const rootScope = ctx.scopeAttr ? ` data-s-${ctx.hash}` : "";
   const serverCode = [
-    "import { html, read, each, when, match, defer, on, classList, styleList, spreadAttrs, createHtmlFragment, clientShellAttrs } from '@statorjs/stator/template'",
+    SHELL_PRIMITIVES_IMPORT,
+    ...ctx.fm?.hoisted ? [ctx.fm.hoisted] : [],
     "",
     `export default function (props = {}) {`,
+    // The fence body runs here — per shell render, server only, ahead of
+    // the template so its bindings are in scope for the interpolations.
+    ...ctx.fm?.body ? [ctx.fm.body] : [],
     `  const __inner = ${innerExpr}`,
     `  const __attrs = clientShellAttrs(props, ${attrDecl}, ${JSON.stringify(root2.rootAttrs)})`,
     `  return createHtmlFragment(\`<${root2.tag}\${__attrs}${rootScope}>\` + __inner.html + \`</${root2.tag}>\`)`,
@@ -45382,6 +45435,12 @@ function processFrontmatter(fm, kind, source, file) {
     const repls = [];
     const visit = (n) => {
       if (import_typescript4.default.isCallExpression(n) && isStatorCall(n, "props")) {
+        if (kind === "island") {
+          throw new CompileError(
+            "stator: Stator.props() is not available in an island's fence \u2014 island props are declared by `static attrs` on the element class, and richer values arrive through the hydrate pattern (the shell renders with the props of its use site).",
+            locInFm(n)
+          );
+        }
         if (kind === "route") {
           throw new CompileError(
             "stator: Stator.props() is not available in a route page (a route has no parent props). Use Stator.reads([...]) to access machines.",
@@ -45412,6 +45471,12 @@ function processFrontmatter(fm, kind, source, file) {
         return;
       }
       if (import_typescript4.default.isCallExpression(n) && isStatorCall(n, "forwarded")) {
+        if (kind === "island") {
+          throw new CompileError(
+            "stator: Stator.forwarded() is not available in an island's fence.",
+            locInFm(n)
+          );
+        }
         if (kind === "route") {
           throw new CompileError(
             "stator: Stator.forwarded() is only available in a component \u2014 it reads a directive forwarded from a parent (`<Child on:click={h}/>`), and a route has no parent.",
@@ -45455,6 +45520,38 @@ function processFrontmatter(fm, kind, source, file) {
     pragmas
   };
 }
+function fenceBindingNames(fm) {
+  const names = /* @__PURE__ */ new Set();
+  const sf = import_typescript4.default.createSourceFile(
+    "fence.ts",
+    `${fm.hoisted}
+${fm.body}`,
+    import_typescript4.default.ScriptTarget.Latest,
+    true,
+    import_typescript4.default.ScriptKind.TS
+  );
+  const bind = (n) => {
+    if (import_typescript4.default.isIdentifier(n)) names.add(n.text);
+    else for (const el of n.elements) if (import_typescript4.default.isBindingElement(el)) bind(el.name);
+  };
+  for (const stmt of sf.statements) {
+    if (import_typescript4.default.isImportDeclaration(stmt) && stmt.importClause) {
+      const c = stmt.importClause;
+      if (c.name) names.add(c.name.text);
+      if (c.namedBindings) {
+        if (import_typescript4.default.isNamespaceImport(c.namedBindings)) names.add(c.namedBindings.name.text);
+        else for (const s of c.namedBindings.elements) names.add(s.name.text);
+      }
+    } else if (import_typescript4.default.isVariableStatement(stmt)) {
+      for (const d of stmt.declarationList.declarations) bind(d.name);
+    } else if (import_typescript4.default.isFunctionDeclaration(stmt) && stmt.name) {
+      names.add(stmt.name.text);
+    } else if (import_typescript4.default.isClassDeclaration(stmt) && stmt.name) {
+      names.add(stmt.name.text);
+    }
+  }
+  return names;
+}
 function emitComponent(fm, htmlExpr, meta) {
   let param = "";
   if (fm.propsType && meta.usesChildren) param = `props: ${fm.propsType} & { children?: any }`;
@@ -45578,16 +45675,8 @@ var import_typescript6 = __toESM(require("typescript"), 1);
 
 // ../stator/src/compiler/virtual-code.ts
 var import_typescript7 = __toESM(require("typescript"), 1);
-var TEMPLATE_GLOBALS = ["read", "each", "when", "match", "defer", "on", "classList", "styleList"];
-var CLIENT_GLOBALS = [
-  "StatorElement",
-  "use",
-  "machine",
-  "defineElement",
-  "bind",
-  "effect",
-  "dispatch"
-];
+var TEMPLATE_GLOBALS = TEMPLATE_AUTHOR_GLOBALS;
+var CLIENT_GLOBALS = CLIENT_AUTHOR_GLOBALS;
 function userImportedLocals(code, modulePath) {
   const locals = /* @__PURE__ */ new Set();
   const re = new RegExp(
@@ -45789,6 +45878,25 @@ function buildClientTsx(regions) {
   const mappings = [];
   const userScript = regions.scripts.map((s) => s.content).join("\n");
   let code = injectImports(TEMPLATE_GLOBALS, "@statorjs/stator/template", userScript) + injectImports(CLIENT_GLOBALS, "@statorjs/stator/client", userScript) + AMBIENT_TYPE_IMPORTS + STATOR_AMBIENT;
+  const fm = regions.frontmatter?.content ?? "";
+  if (fm.trim()) {
+    const fmOffset2 = regions.frontmatter?.contentOffset ?? 0;
+    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 += "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}
+`;
+    }
+    code += "}\nvoid __statorFence\n";
+  }
   for (const script of regions.scripts) {
     push(mappings, script.contentOffset, code.length, script.content.length);
     code += `${script.content}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statorjs/language-server",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "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.0.2"
+    "@statorjs/stator": "2.1.0"
   },
   "peerDependencies": {
     "typescript": "^5.6.0"