@lokascript/language-server 2.5.0 → 2.6.0

package/dist/{dist-NRPF26M4.js → dist-7HGHK5EJ.js}

@@ -3152,7 +3152,8 @@ function createTokenizerContext(tokenizer) {
     direction: tokenizer.direction,
     lookupKeyword: tokenizer.lookupKeyword.bind(tokenizer),
     isKeyword: tokenizer.isKeyword.bind(tokenizer),
-    isKeywordStart: tokenizer.isKeywordStart.bind(tokenizer)
+    isKeywordStart: tokenizer.isKeywordStart.bind(tokenizer),
+    ...tokenizer.isKeywordStartAtBoundary ? { isKeywordStartAtBoundary: tokenizer.isKeywordStartAtBoundary.bind(tokenizer) } : {}
   };
   if (tokenizer.normalizer) {
     return { ...ctx, normalizer: tokenizer.normalizer };
@@ -6068,12 +6069,73 @@ function createLatinCharClassifiers(letterPattern) {
   return { isLetter, isIdentifierChar };
 }
 var SIMPLE_TOKENIZER_OPERATOR_SET = new Set(DEFAULT_OPERATORS);
+var MARKER_CONCEPT_NORMALIZEDS = /* @__PURE__ */ new Set([
+  // Role-marker role names (profile.roleMarkers normalizeds)
+  "patient",
+  "destination",
+  "source",
+  "style",
+  "event",
+  "eventMarker",
+  "agent",
+  "goal",
+  "manner",
+  // Prepositional / positional modifier concepts matched via the role mechanism
+  // (profile.keywords "Modifiers"). `before`/`after`/`until` are intentionally
+  // NOT here — they are pattern literals (see the note above).
+  "into",
+  "from",
+  "to",
+  "with",
+  "at",
+  "of",
+  "as",
+  "by",
+  "in",
+  "on",
+  "over",
+  "under",
+  "between",
+  "through",
+  "without"
+]);
+var ENGLISH_DOM_EVENT_NAMES = [
+  "click",
+  "dblclick",
+  "input",
+  "change",
+  "submit",
+  "keydown",
+  "keyup",
+  "keypress",
+  "mousedown",
+  "mouseup",
+  "mouseover",
+  "mouseout",
+  "mouseenter",
+  "mouseleave",
+  "mousemove",
+  "pointerdown",
+  "pointerup",
+  "pointermove",
+  "focus",
+  "blur",
+  "load",
+  "resize",
+  "scroll"
+];
 var _BaseTokenizer = class _BaseTokenizer2 {
   constructor() {
     this.profileKeywords = [];
+    this.multiWordKeywords = [];
     this.profileKeywordMap = /* @__PURE__ */ new Map();
+    this.rawExtraEntries = [];
     this.extractors = [];
   }
+  /** Raw extras as passed in, pre-dedup — for consistency tests. */
+  getExtraKeywordEntries() {
+    return this.rawExtraEntries;
+  }
   /**
    * Tokenize input string to token stream.
    * Delegates to extractor-based tokenization if extractors are registered,
@@ -6142,6 +6204,12 @@ var _BaseTokenizer = class _BaseTokenizer2 {
         pos++;
       }
       if (pos >= input.length) break;
+      const multiWord = this.tryMultiWordKeyword(input, pos);
+      if (multiWord) {
+        tokens.push(multiWord);
+        pos = multiWord.position.end;
+        continue;
+      }
       let extracted = false;
       for (const extractor of this.extractors) {
         if (extractor.canExtract(input, pos)) {
@@ -6241,6 +6309,7 @@ var _BaseTokenizer = class _BaseTokenizer2 {
    */
   initializeKeywordsFromProfile(profile, extras = []) {
     const keywordMap = /* @__PURE__ */ new Map();
+    this.rawExtraEntries = extras;
     if (profile.keywords) {
       for (const [normalized2, translation] of Object.entries(profile.keywords)) {
         keywordMap.set(translation.primary, {
@@ -6284,12 +6353,20 @@ var _BaseTokenizer = class _BaseTokenizer2 {
         keywordMap.set(native, { native, normalized: normalized2 });
       }
     }
+    for (const evt of ENGLISH_DOM_EVENT_NAMES) {
+      if (!keywordMap.has(evt)) {
+        keywordMap.set(evt, { native: evt, normalized: evt });
+      }
+    }
     for (const extra of extras) {
       keywordMap.set(extra.native, extra);
     }
     this.profileKeywords = Array.from(keywordMap.values()).sort(
       (a, b) => b.native.length - a.native.length
     );
+    this.multiWordKeywords = this.profileKeywords.filter(
+      (k) => k.native.includes(" ") && !MARKER_CONCEPT_NORMALIZEDS.has(k.normalized)
+    );
     this.profileKeywordMap = /* @__PURE__ */ new Map();
     for (const keyword of this.profileKeywords) {
       this.profileKeywordMap.set(keyword.native.toLowerCase(), keyword);
@@ -6331,6 +6408,35 @@ var _BaseTokenizer = class _BaseTokenizer2 {
     }
     return null;
   }
+  /**
+   * Match the longest multi-word (space-containing) profile keyword at `pos`,
+   * requiring the match to end at a word boundary. The profile-driven
+   * counterpart of the per-language hardcoded compound lists (the hindi and
+   * vietnamese keyword extractors). Returns a keyword token (with the normalized
+   * form) or null. Case-sensitive against the stored native form, mirroring
+   * `tryProfileKeyword`/`isKeywordStart` (the i18n dicts emit a fixed surface
+   * case). No-op when `multiWordKeywords` is empty (no-space/CJK languages).
+   *
+   * @param input - Input string
+   * @param pos - Current position (must be a token-start boundary)
+   * @param isWordChar - End-boundary predicate (defaults to Unicode letter/digit/_)
+   */
+  tryMultiWordKeyword(input, pos, isWordChar = (ch) => /[\p{L}\p{N}_]/u.test(ch)) {
+    if (this.multiWordKeywords.length === 0) return null;
+    const rest = input.slice(pos);
+    for (const entry of this.multiWordKeywords) {
+      if (!rest.startsWith(entry.native)) continue;
+      const after = input[pos + entry.native.length];
+      if (after !== void 0 && isWordChar(after)) continue;
+      return createToken(
+        entry.native,
+        "keyword",
+        createPosition(pos, pos + entry.native.length),
+        entry.normalized
+      );
+    }
+    return null;
+  }
   /**
    * Check if the remaining input starts with any known keyword.
    * Useful for non-space languages to detect word boundaries.
@@ -6343,6 +6449,32 @@ var _BaseTokenizer = class _BaseTokenizer2 {
     const remaining = input.slice(pos);
     return this.profileKeywords.some((entry) => remaining.startsWith(entry.native));
   }
+  /**
+   * Check if a known keyword starts at the given position AND ends at a word
+   * boundary (end of input or a non-word character).
+   *
+   * Space-delimited languages must use this (not `isKeywordStart`) for
+   * word-walk break checks: the keyword table includes English canonical
+   * fallbacks (me, it, you, …), so a raw `startsWith` check splits any native
+   * word with an embedded fallback mid-word (e.g. Quechua ñit'iy contains
+   * "it"). CJK/no-space tokenizers rely on mid-text keyword starts and must
+   * keep using `isKeywordStart`.
+   *
+   * @param input - Input string
+   * @param pos - Current position
+   * @param isWordChar - Language-specific word-character predicate; pass the
+   *   tokenizer's letter classifier so e.g. the Quechua glottal apostrophe
+   *   counts as part of a word. Defaults to Unicode letters/digits/underscore.
+   * @returns true if a keyword starts here and is not followed by a word char
+   */
+  isKeywordStartAtBoundary(input, pos, isWordChar = (ch) => /[\p{L}\p{N}_]/u.test(ch)) {
+    const remaining = input.slice(pos);
+    return this.profileKeywords.some((entry) => {
+      if (!remaining.startsWith(entry.native)) return false;
+      const after = input[pos + entry.native.length];
+      return after === void 0 || !isWordChar(after);
+    });
+  }
   /**
    * Look up a keyword by native word (case-insensitive).
    * O(1) lookup using the keyword map.

package/dist/server.js

@@ -1137,7 +1137,7 @@ try {
 }
 var frameworkIR = null;
 try {
-  const fw = await import("./dist-NRPF26M4.js");
+  const fw = await import("./dist-7HGHK5EJ.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.5.0",
+  "version": "2.6.0",
   "description": "Language Server Protocol implementation for LokaScript/hyperscript with 21 language support",
   "type": "module",
   "main": "dist/server.js",
@@ -13,7 +13,7 @@
     "dev": "tsx src/server.ts --stdio",
     "test": "vitest",
     "typecheck": "tsc --noEmit",
-    "test:check": "vitest run --reporter=dot 2>&1 | tail -5"
+    "test:check": "VITEST_QUIET=1 bash ../../scripts/vitest-run.sh --reporter=dot"
   },
   "keywords": [
     "lsp",
@@ -31,8 +31,8 @@
     "vscode-languageserver-textdocument": "^1.0.11"
   },
   "peerDependencies": {
-    "@hyperfixi/core": "^2.5.0",
-    "@lokascript/semantic": "^2.5.0"
+    "@hyperfixi/core": "^2.6.0",
+    "@lokascript/semantic": "^2.6.0"
   },
   "peerDependenciesMeta": {
     "@lokascript/semantic": {
@@ -43,8 +43,8 @@
     }
   },
   "devDependencies": {
-    "@hyperfixi/core": "^2.5.0",
-    "@lokascript/semantic": "^2.5.0",
+    "@hyperfixi/core": "^2.6.0",
+    "@lokascript/semantic": "^2.6.0",
     "@types/node": "^20.0.0",
     "@vitest/coverage-v8": "^4.0.0",
     "tsup": "^8.0.0",