@lokascript/language-server 2.7.1 → 2.8.0

package/dist/{dist-MRVDB2YM.js → dist-6KATWM5A.js}

@@ -212,7 +212,14 @@ var DEFAULT_REFERENCES = /* @__PURE__ */ new Set([
   "result",
   "event",
   "target",
-  "body"
+  "body",
+  // DOM context globals — as reference-typed as `body`, and already advertised as
+  // references by core's REFERENCE_KEYWORDS and the parser's PROPERTY_ACCESS_BASES.
+  // Without them here, a foreign surface (ja ドキュメント, es documento) lexes as a
+  // keyword but fails isValidReference, degrades to a literal, and leaks verbatim.
+  "document",
+  "window",
+  "detail"
 ]);
 function isValidReference(value, referenceSet = DEFAULT_REFERENCES) {
   return referenceSet.has(value);
@@ -227,16 +234,6 @@ var STRUCTURAL_ROLES = /* @__PURE__ */ new Set([
   "catch",
   "finally"
 ]);
-function isNestedCommand(value) {
-  const inner = value.slice(1, -1);
-  let depth = 0;
-  for (const ch of inner) {
-    if (ch === "[") depth++;
-    else if (ch === "]") depth--;
-    else if (depth === 0 && (ch === " " || ch === ":")) return true;
-  }
-  return false;
-}
 function parseExplicit(input, options = {}) {
   const trimmed = input.trim();
   const collect = options.collectDiagnostics === true;
@@ -324,7 +321,7 @@ function parseExplicit(input, options = {}) {
     }
     const role = roleName;
     const valueStr = token.slice(colonIndex + 1);
-    if (STRUCTURAL_ROLES.has(roleName) && valueStr.startsWith("[") && isNestedCommand(valueStr)) {
+    if (STRUCTURAL_ROLES.has(roleName) && valueStr.startsWith("[")) {
       const nestedEnd = findMatchingBracket(token, colonIndex + 1);
       const nestedSyntax = token.slice(colonIndex + 1, nestedEnd + 1);
       roles.set(role, { type: "expression", raw: nestedSyntax });
@@ -576,26 +573,63 @@ function extractStructuralBody(roles, roleName, options) {
   if (value.type === "expression") return [parseExplicit(value.raw, options)];
   return [];
 }
+function hasUnquotedCombinator(value) {
+  let quote = "";
+  for (const ch of value) {
+    if (quote) {
+      if (ch === quote) quote = "";
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      continue;
+    }
+    if (ch === " " || ch === ">" || ch === "+" || ch === "~" || ch === ",") return true;
+  }
+  return false;
+}
 function inferSelectorKind(value) {
   if (!value) return void 0;
+  if (hasUnquotedCombinator(value)) return "complex";
   if (value.startsWith("#")) return "id";
   if (value.startsWith(".")) return "class";
   if (value.startsWith("[")) return "attribute";
-  if (value.startsWith("<") || value.startsWith("*")) return "element";
-  if (/[>+~ ]/.test(value) && value.length > 1) return "complex";
+  if (value.startsWith("*")) return "element";
   return void 0;
 }
+function unescapeString(s) {
+  if (!s.includes("\\")) return s;
+  let out = "";
+  for (let i = 0; i < s.length; i++) {
+    if (s[i] === "\\" && i + 1 < s.length) {
+      const next = s[i + 1];
+      const mapped = next === "\\" ? "\\" : next === '"' ? '"' : next === "'" ? "'" : next === "n" ? "\n" : next === "r" ? "\r" : next === "t" ? "	" : "";
+      if (mapped) {
+        out += mapped;
+        i++;
+        continue;
+      }
+    }
+    out += s[i];
+  }
+  return out;
+}
 function tokenizeExplicit(content) {
   const tokens = [];
   let current = "";
   let inString = false;
   let stringChar = "";
+  let inSelector = false;
   let bracketDepth = 0;
   for (let i = 0; i < content.length; i++) {
     const char = content[i];
     if (inString) {
       current += char;
-      if (char === stringChar && content[i - 1] !== "\\") inString = false;
+      if (char === stringChar) {
+        let backslashes = 0;
+        for (let j = i - 1; j >= 0 && content[j] === "\\"; j--) backslashes++;
+        if (backslashes % 2 === 0) inString = false;
+      }
       continue;
     }
     if (char === '"' || char === "'") {
@@ -604,6 +638,16 @@ function tokenizeExplicit(content) {
       current += char;
       continue;
     }
+    if (inSelector) {
+      current += char;
+      if (char === ">" && current.endsWith("/>")) inSelector = false;
+      continue;
+    }
+    if (char === "<" && (current === "" || current.endsWith(":"))) {
+      inSelector = true;
+      current += char;
+      continue;
+    }
     if (char === "[") {
       bracketDepth++;
       current += char;
@@ -627,11 +671,19 @@ function tokenizeExplicit(content) {
   return tokens;
 }
 function parseExplicitValue(valueStr, referenceSet) {
+  if (valueStr.startsWith("<")) {
+    if (!valueStr.endsWith("/>")) {
+      throw new Error(`Unterminated selector literal: "${valueStr}". Expected a closing "/>"`);
+    }
+    const inner = valueStr.slice(1, -2);
+    if (!inner) throw new Error(`Empty selector literal: "${valueStr}"`);
+    return createSelector(inner, inferSelectorKind(inner));
+  }
   if (valueStr.startsWith("#") || valueStr.startsWith(".") || valueStr.startsWith("[") || valueStr.startsWith("@") || valueStr.startsWith("*")) {
     return createSelector(valueStr, inferSelectorKind(valueStr));
   }
   if (valueStr.startsWith('"') || valueStr.startsWith("'")) {
-    return createLiteral(valueStr.slice(1, -1), "string");
+    return createLiteral(unescapeString(valueStr.slice(1, -1)), "string");
   }
   if (valueStr === "true") return createLiteral(true, "boolean");
   if (valueStr === "false") return createLiteral(false, "boolean");
@@ -730,16 +782,23 @@ function renderBracketCommand(node) {
   }
   return `[${parts.join(" ")}]`;
 }
+function needsSelectorWrap(value) {
+  if (value.includes(" ")) return true;
+  const first = value[0];
+  return !(first === "#" || first === "." || first === "@" || first === "*");
+}
 function valueToString(value) {
   switch (value.type) {
     case "literal":
       if (typeof value.value === "string") {
-        if (value.dataType === "string" || /\s/.test(value.value)) return `"${value.value}"`;
+        if (value.dataType === "string" || /\s/.test(value.value))
+          return JSON.stringify(value.value);
         return value.value;
       }
       return String(value.value);
     case "selector":
-      return value.value;
+      if (!value.value) return value.value;
+      return needsSelectorWrap(value.value) ? `<${value.value}/>` : value.value;
     case "reference":
       return value.value;
     case "property-path":
@@ -837,6 +896,7 @@ function toProtocolJSON(node) {
   if (node.diagnostics && node.diagnostics.length > 0) {
     result.diagnostics = node.diagnostics.map((d) => {
       const json = { level: d.severity, message: d.message };
+      if (d.role) json.role = d.role;
       if (d.code) json.code = d.code;
       if (d.source) json.source = d.source;
       if (d.suggestions && d.suggestions.length > 0) json.suggestions = [...d.suggestions];
@@ -921,6 +981,7 @@ function fromProtocolJSON(json) {
   const diagnostics = json.diagnostics?.map((d) => ({
     severity: d.level,
     message: d.message,
+    ...d.role ? { role: d.role } : {},
     ...d.code ? { code: d.code } : {},
     ...d.source ? { source: d.source } : {},
     ...d.suggestions && d.suggestions.length > 0 ? { suggestions: d.suggestions } : {}
@@ -2674,7 +2735,8 @@ function buildFormatString(schema, profile, keyword) {
   if (profile.wordOrder === "SVO" || profile.wordOrder === "VSO") {
     parts.push(keyword);
   }
-  for (const role of schema.roles) {
+  const sortedRoles = sortRolesByWordOrder(schema.roles, profile.wordOrder);
+  for (const role of sortedRoles) {
     const marker = getMarkerForRole(role, profile);
     const roleName = `{${role.role}}`;
     if (marker) {
@@ -4085,7 +4147,9 @@ function buildProtocolSection() {
 3. No spaces around the colon in role:value pairs
 4. Strings with spaces must be quoted: \`patient:"hello world"\`
 5. Selectors start with \`#\`, \`.\`, \`[\`, \`@\`, or \`*\`
-6. Output must be valid bracket syntax: \`[action role:value ...]\``;
+6. A selector containing a space, a combinator (\`>\` \`+\` \`~\`), or a comma must use a selector literal: \`patient:<ul > li/>\`, \`patient:<.a, .b/>\`
+7. Inside a structural role (\`body\`, \`then\`, \`else\`, \`condition\`, \`loop-body\`, \`variable\`, \`catch\`, \`finally\`) a \`[...]\` value is always a nested command. Write an attribute selector there as \`condition:<[data-active]/>\`
+8. Output must be valid bracket syntax: \`[action role:value ...]\``;
   return {
     id: "protocol",
     title: "LSE Protocol",
@@ -4098,6 +4162,7 @@ function buildValueTypeSection() {
 
 | Type | Syntax | Example |
 |------|--------|---------|
+| Selector literal | Delimited by \`<\` and \`/>\` | \`<ul > li/>\`, \`<.a, .b/>\`, \`<[data-id]/>\` |
 | Selector | Starts with \`#\` \`.\` \`[\` \`@\` \`*\` | \`#button\`, \`.active\`, \`[data-id]\` |
 | String | Quoted with \`"\` or \`'\` | \`"hello world"\`, \`'json'\` |
 | Boolean | Exact: \`true\` / \`false\` | \`visible:true\` |
@@ -6238,7 +6303,39 @@ var _BaseTokenizer = class _BaseTokenizer2 {
         pos++;
       }
     }
-    return new TokenStreamImpl(tokens, this.language);
+    return new TokenStreamImpl(this.mergeColonQualifiedNames(tokens), this.language);
+  }
+  /**
+   * Fuse `name` + `:qualifier` into ONE identifier (`draggable:start`).
+   *
+   * `:name` is hyperscript's local-variable sigil, but a colon IMMEDIATELY
+   * preceded by an identifier is a qualifier (custom event namespace), not a
+   * sigil. The English tokenizer already merges these inside
+   * EnglishKeywordExtractor; this post-pass gives the other 23 languages the
+   * same stream. Strict position adjacency is the discriminator: whitespace
+   * between the tokens (`trigger :start`) breaks `end === start`, so a spaced
+   * local-variable reference survives untouched.
+   *
+   * Self-gating for non-hyperscript tokenizers (domain DSLs): their extractor
+   * sets tokenize `:` as bare punctuation (length 1), which never matches
+   * COLON_QUALIFIER, so this pass is a no-op for them.
+   */
+  mergeColonQualifiedNames(tokens) {
+    const out = [];
+    for (const tok of tokens) {
+      const prev = out[out.length - 1];
+      if (prev && _BaseTokenizer2.ASCII_WORD.test(prev.value) && _BaseTokenizer2.COLON_QUALIFIER.test(tok.value) && prev.position.end === tok.position.start) {
+        const merged = prev.value + tok.value;
+        out[out.length - 1] = createToken(
+          merged,
+          this.classifyToken(merged),
+          createPosition(prev.position.start, tok.position.end)
+        );
+        continue;
+      }
+      out.push(tok);
+    }
+    return out;
   }
   /**
    * Classify an unknown character when no extractor matches.
@@ -6744,6 +6841,8 @@ var _BaseTokenizer = class _BaseTokenizer2 {
     return null;
   }
 };
+_BaseTokenizer.ASCII_WORD = /^[A-Za-z_][A-Za-z0-9_]*$/;
+_BaseTokenizer.COLON_QUALIFIER = /^:[A-Za-z_][A-Za-z0-9_]*$/;
 _BaseTokenizer.STANDARD_TIME_UNITS = [
   { pattern: "ms", suffix: "ms", length: 2 },
   { pattern: "s", suffix: "s", length: 1, checkBoundary: true },

package/dist/server.js

@@ -1134,7 +1134,7 @@ try {
 }
 var frameworkIR = null;
 try {
-  const fw = await import("./dist-MRVDB2YM.js");
+  const fw = await import("./dist-6KATWM5A.js");
   frameworkIR = { fromInterchangeNode: fw.fromInterchangeNode, renderExplicit: fw.renderExplicit };
   console.error(
     "[lokascript-ls] @lokascript/framework loaded \u2014 LSE bracket notation in hover enabled"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lokascript/language-server",
-  "version": "2.7.1",
+  "version": "2.8.0",
   "description": "Language Server Protocol implementation for LokaScript/hyperscript with 21 language support",
   "type": "module",
   "main": "dist/server.js",
@@ -31,8 +31,8 @@
     "vscode-languageserver-textdocument": "^1.0.11"
   },
   "peerDependencies": {
-    "@hyperfixi/core": "^2.7.1",
-    "@lokascript/semantic": "^2.7.1"
+    "@hyperfixi/core": "^2.8.0",
+    "@lokascript/semantic": "^2.8.0"
   },
   "peerDependenciesMeta": {
     "@lokascript/semantic": {
@@ -43,12 +43,12 @@
     }
   },
   "devDependencies": {
-    "@hyperfixi/core": "^2.7.1",
-    "@lokascript/semantic": "^2.7.1",
+    "@hyperfixi/core": "^2.8.0",
+    "@lokascript/semantic": "^2.8.0",
     "@types/node": "^20.0.0",
     "@vitest/coverage-v8": "^4.0.0",
     "tsup": "^8.0.0",
-    "tsx": "^4.0.0",
+    "tsx": "^4.23.1",
     "typescript": "^5.0.0",
     "vitest": "^4.1.5"
   },