@statorjs/language-server 0.1.17 → 0.1.18

package/dist/server.cjs

@@ -44177,50 +44177,14 @@ var import_volar_service_typescript = __toESM(require_volar_service_typescript()
 // ../stator/src/compiler/client-emit.ts
 var import_typescript = __toESM(require("typescript"), 1);
 
-// ../stator/src/compiler/diagnostics.ts
-var CompileError = class extends Error {
-  loc;
-  constructor(message, loc2) {
-    super(message);
-    this.name = "CompileError";
-    this.loc = loc2;
-  }
-};
-function offsetToLineCol(source, offset) {
-  const clamped = Math.max(0, Math.min(offset, source.length));
-  let line = 1;
-  let lastNewline = -1;
-  for (let i = 0; i < clamped; i++) {
-    if (source.charCodeAt(i) === 10) {
-      line++;
-      lastNewline = i;
-    }
-  }
-  return { line, column: clamped - lastNewline };
-}
-function codeFrame(source, line, column) {
-  const lines = source.split("\n");
-  const start = Math.max(1, line - 1);
-  const end = Math.min(lines.length, line + 1);
-  const gutterWidth = String(end).length;
-  const out = [];
-  for (let n = start; n <= end; n++) {
-    const gutter = String(n).padStart(gutterWidth);
-    const marker = n === line ? ">" : " ";
-    out.push(`${marker} ${gutter} | ${lines[n - 1] ?? ""}`);
-    if (n === line) {
-      out.push(`  ${" ".repeat(gutterWidth)} | ${" ".repeat(Math.max(0, column - 1))}^`);
-    }
-  }
-  return out.join("\n");
-}
-function locAt(source, offset, file) {
-  const { line, column } = offsetToLineCol(source, offset);
-  return { file, line, column, frame: codeFrame(source, line, column) };
-}
+// ../stator/src/wire/island-markers.ts
+var ISLAND_MARKER_ATTR = "data-b";
+var elementMarker = (i) => `b${i}`;
+var slotMarker = (i) => `s${i}`;
+var elementMarkerSelector = (marker) => `[${ISLAND_MARKER_ATTR}="${marker}"]`;
 
 // ../stator/src/compiler/client-emit.ts
-var PRIMITIVES = "import { StatorElement, defineElement, use, machine, bind, bindSlot, effect, dispatch } from '@statorjs/stator/client'";
+var PRIMITIVES = "import { StatorElement, defineElement, use, machine, bind, bindSlot, effect, dispatch, attrValue, setAttr } from '@statorjs/stator/client'";
 function emitClientModule(input) {
   const { script, element, directives, members } = input;
   const impl = `__${element.className}Impl`;
@@ -44242,7 +44206,9 @@ function emitClientModule(input) {
       continue;
     }
     const node = `n${i++}`;
-    lines.push(`    for (const ${node} of this.querySelectorAll('[data-b="${marker}"]')) {`);
+    lines.push(
+      `    for (const ${node} of this.querySelectorAll(${JSON.stringify(elementMarkerSelector(marker))})) {`
+    );
     for (const d of group) lines.push(`      ${wireDirective(node, d, members)}`);
     lines.push("    }");
   }
@@ -44268,27 +44234,9 @@ function wireDirective(node, d, members) {
   const target = d.target ?? "text";
   const thunk = `() => (${rewriteMembers(d.expr, members)})`;
   const deps = `[${d.deps.map((dep) => `this.${dep}`).join(", ")}]`;
-  if (target === "value" || target === "checked") {
-    const path = parseTwoWayPath(d.expr);
-    if (!path) {
-      throw new CompileError(
-        `stator: bind:${target}={${d.expr}} must bind to a settable context path like \`actor.key\` (a derived value can't be two-way bound).`
-      );
-    }
-    const writer2 = emitWriter(node, target);
-    const read = target === "checked" ? `${node}.checked` : `${node}.value`;
-    const guard = target === "value" ? `if (e.isComposing) return; ` : "";
-    const setter = `${node}.addEventListener(${JSON.stringify(target === "value" ? "input" : "change")}, (e) => { ${guard}this.${path.actor}.send({ type: '@set', key: ${JSON.stringify(path.key)}, value: ${read} }) })`;
-    return `this.track(bind(${deps}, ${thunk}, ${writer2}));
-      ${setter}`;
-  }
   const writer = emitWriter(node, target);
   return `this.track(bind(${deps}, ${thunk}, ${writer}))`;
 }
-function parseTwoWayPath(expr) {
-  const m = expr.trim().match(/^([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)$/);
-  return m ? { actor: m[1], key: m[2] } : null;
-}
 function emitHandler(expr, members) {
   const t = expr.trim();
   if (/^[A-Za-z_$][\w$]*$/.test(t) && members.has(t)) {
@@ -44298,18 +44246,11 @@ function emitHandler(expr, members) {
 }
 function emitWriter(node, target) {
   switch (target) {
-    case "text":
-      return `(v) => { ${node}.textContent = v == null ? '' : String(v) }`;
-    case "html":
-      return `(v) => { ${node}.innerHTML = v == null ? '' : String(v) }`;
-    case "value":
-      return `(v) => { const s = v == null ? '' : String(v); if (${node}.value !== s) ${node}.value = s }`;
     case "disabled":
     case "hidden":
-    case "checked":
       return `(v) => { if (${node}.${target} !== !!v) ${node}.${target} = !!v }`;
     default:
-      return `(v) => { if (v == null || v === false) ${node}.removeAttribute(${JSON.stringify(target)}); else ${node}.setAttribute(${JSON.stringify(target)}, v === true ? '' : String(v)) }`;
+      return `(v) => setAttr(${node}, ${JSON.stringify(target)}, attrValue(v))`;
   }
 }
 function stripClientPrimitiveImports(script) {
@@ -44348,6 +44289,50 @@ function rewriteMembers(expr, members) {
 
 // ../stator/src/compiler/client-script.ts
 var import_typescript2 = __toESM(require("typescript"), 1);
+
+// ../stator/src/compiler/diagnostics.ts
+var CompileError = class extends Error {
+  loc;
+  constructor(message, loc2) {
+    super(message);
+    this.name = "CompileError";
+    this.loc = loc2;
+  }
+};
+function offsetToLineCol(source, offset) {
+  const clamped = Math.max(0, Math.min(offset, source.length));
+  let line = 1;
+  let lastNewline = -1;
+  for (let i = 0; i < clamped; i++) {
+    if (source.charCodeAt(i) === 10) {
+      line++;
+      lastNewline = i;
+    }
+  }
+  return { line, column: clamped - lastNewline };
+}
+function codeFrame(source, line, column) {
+  const lines = source.split("\n");
+  const start = Math.max(1, line - 1);
+  const end = Math.min(lines.length, line + 1);
+  const gutterWidth = String(end).length;
+  const out = [];
+  for (let n = start; n <= end; n++) {
+    const gutter = String(n).padStart(gutterWidth);
+    const marker = n === line ? ">" : " ";
+    out.push(`${marker} ${gutter} | ${lines[n - 1] ?? ""}`);
+    if (n === line) {
+      out.push(`  ${" ".repeat(gutterWidth)} | ${" ".repeat(Math.max(0, column - 1))}^`);
+    }
+  }
+  return out.join("\n");
+}
+function locAt(source, offset, file) {
+  const { line, column } = offsetToLineCol(source, offset);
+  return { file, line, column, frame: codeFrame(source, line, column) };
+}
+
+// ../stator/src/compiler/client-script.ts
 function kebabToPascal(tag) {
   return tag.split("-").map((p) => p.charAt(0).toUpperCase() + p.slice(1)).join("");
 }
@@ -44542,11 +44527,15 @@ function lowerTemplate(template, opts = {}) {
   const enableItemBind = !opts.client;
   const isItemRead = (n) => enableItemBind && eachParams !== null && import_typescript3.default.isCallExpression(n) && import_typescript3.default.isIdentifier(n.expression) && n.expression.text === "read" && n.arguments.length >= 2 && n.arguments[0] !== void 0 && import_typescript3.default.isIdentifier(n.arguments[0]) && n.arguments[0].text === eachParams.item;
   const isClientRead = (n) => opts.client !== void 0 && import_typescript3.default.isCallExpression(n) && import_typescript3.default.isIdentifier(n.expression) && n.expression.text === "read" && n.arguments.length >= 2 && n.arguments[0] !== void 0 && import_typescript3.default.isIdentifier(n.arguments[0]) && opts.client.useFields.has(n.arguments[0].text);
+  const bindRemoved = (name, at) => new CompileError(
+    `stator: bind:${name} was removed in 2.0. Display state with read() \u2014 \`{read(m, (s) => s.value)}\` in text position, \`attr={read(m, \u2026)}\` on an attribute \u2014 and capture input at a commit boundary with a typed event (ref:/FormData + send/dispatch). See the forms guide.`,
+    at
+  );
   const clientReadExpr = (call) => `(${call.arguments[1].getText(sf)})(${call.arguments[0].text})`;
   const allocSlotMarker = () => {
     const client = opts.client;
     if (!client) throw new CompileError("stator: internal \u2014 slot marker outside client mode");
-    return `s${client.directives.filter((d) => d.kind === "slot").length}`;
+    return slotMarker(client.directives.filter((d) => d.kind === "slot").length);
   };
   const assertNoClientRead = (n) => {
     if (!opts.client) return;
@@ -44771,7 +44760,7 @@ function lowerTemplate(template, opts = {}) {
       const lowered = lowerAttribute(attr);
       if (lowered) out += ` ${lowered}`;
     }
-    if (collected?.marker) out += ` data-b="${collected.marker}"`;
+    if (collected?.marker) out += ` ${ISLAND_MARKER_ATTR}="${collected.marker}"`;
     return out;
   };
   const collectClientDirectives = (attrs) => {
@@ -44784,22 +44773,13 @@ function lowerTemplate(template, opts = {}) {
       if (import_typescript3.default.isJsxNamespacedName(attr.name)) {
         const ns = attr.name.namespace.text;
         const name = attr.name.name.text;
-        if (ns !== "on" && ns !== "bind") continue;
+        if (ns === "bind") throw bindRemoved(name, loc2(attr));
+        if (ns !== "on") continue;
         const expr = attrExpr(attr);
         if (!expr) {
-          throw new CompileError(`stator: ${ns}:${name} requires a value ({...})`, loc2(attr));
-        }
-        if (ns === "on") {
-          pending.push({ marker: "", kind: "on", event: name, expr, deps: [] });
-        } else {
-          pending.push({
-            marker: "",
-            kind: "bind",
-            target: name,
-            expr,
-            deps: inferDeps(expr, client.useFields)
-          });
+          throw new CompileError(`stator: on:${name} requires a handler ({...})`, loc2(attr));
         }
+        pending.push({ marker: "", kind: "on", event: name, expr, deps: [] });
         consumed.add(attr);
         continue;
       }
@@ -44824,7 +44804,9 @@ function lowerTemplate(template, opts = {}) {
       }
     }
     if (pending.length === 0) return { consumed };
-    const marker = `b${new Set(client.directives.filter((d) => d.kind !== "slot").map((d) => d.marker)).size}`;
+    const marker = elementMarker(
+      new Set(client.directives.filter((d) => d.kind !== "slot").map((d) => d.marker)).size
+    );
     for (const d of pending) {
       d.marker = marker;
       client.directives.push(d);
@@ -44883,10 +44865,8 @@ function lowerTemplate(template, opts = {}) {
         if (meta) meta.refs.add(name2);
         return `data-ref=${JSON.stringify(name2)}`;
       }
-      throw new CompileError(
-        `stator: directive "${ns}:${name2}" is not supported yet (Phase 3b)`,
-        loc2(attr)
-      );
+      if (ns === "bind") throw bindRemoved(name2, loc2(attr));
+      throw new CompileError(`stator: directive "${ns}:${name2}" is not supported`, loc2(attr));
     }
     const name = attr.name.getText(sf);
     if (!attr.initializer) return name;
@@ -44913,9 +44893,10 @@ function lowerTemplate(template, opts = {}) {
       if (import_typescript3.default.isJsxNamespacedName(attr.name)) {
         const ns = attr.name.namespace.text;
         const dirName = attr.name.name.text;
+        if (ns === "bind") throw bindRemoved(dirName, loc2(attr));
         if (ns !== "on") {
           throw new CompileError(
-            `stator: forwarding "${ns}:${dirName}" to a component isn't supported yet \u2014 only on:* event directives forward. Apply bind:/ref: on an element directly.`,
+            `stator: forwarding "${ns}:${dirName}" to a component isn't supported yet \u2014 only on:* event directives forward. Apply ref: on an element directly.`,
             loc2(attr)
           );
         }
@@ -45539,6 +45520,26 @@ function isStatorMember(e, member) {
 
 // ../stator/src/compiler/dts.ts
 var import_typescript5 = __toESM(require("typescript"), 1);
+function statorPropsType(frontmatter, template, scripts) {
+  const { propsType } = extractFrontmatterTypes(frontmatter);
+  let propsT = componentPropsType(propsType, template);
+  let needsReadResult = false;
+  const classes = scripts.length > 0 ? analyzeScriptClasses(scripts.join("\n")) : [];
+  if (!propsType && classes.length > 0) {
+    const attrs = /* @__PURE__ */ new Map();
+    for (const cls of classes) {
+      for (const [key, kind] of cls.staticAttrs) attrs.set(key, kind);
+    }
+    if (attrs.size > 0) {
+      needsReadResult = true;
+      const fields = [...attrs].map(([key, kind]) => `${key}?: ${kind} | __SReadResult<${kind}>`).join("; ");
+      propsT = `{ ${fields} } & { [prop: string]: unknown }`;
+    } else {
+      propsT = "{ [prop: string]: unknown }";
+    }
+  }
+  return { propsT, needsReadResult };
+}
 function componentPropsType(propsType, template) {
   const usesChildren = /<children[\s/>]/.test(template);
   if (propsType) return usesChildren ? `${propsType} & { children?: any }` : propsType;
@@ -45644,7 +45645,14 @@ function buildServerTsx(regions) {
     tplOffset += doctype[0].length;
     tpl = tpl.slice(doctype[0].length);
   }
-  const propsT = componentPropsType(extractFrontmatterTypes(fm).propsType, regions.template.content);
+  const { propsT, needsReadResult } = statorPropsType(
+    fm,
+    regions.template.content,
+    regions.scripts.map((s) => s.content)
+  );
+  if (needsReadResult) {
+    code += "type __SReadResult<T> = import('@statorjs/stator/template').ReadResult<T>\n";
+  }
   code += `export default function (_props: ${propsT}) {
 `;
   for (const seg of body) {

package/package.json

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