sysml-v2-lsp 0.36.0 → 0.37.0

package/dist/server/mcpServer.js

@@ -20332,6 +20332,7 @@ __export(util_exports, {
   required: () => required,
   safeExtend: () => safeExtend,
   shallowClone: () => shallowClone,
+  sizeCaps: () => sizeCaps,
   slugify: () => slugify,
   stringifyPrimitive: () => stringifyPrimitive,
   toZod: () => toZod,
@@ -20851,6 +20852,18 @@ function prefixIssues(path, issues) {
 function unwrapMessage(message) {
   return typeof message === "string" ? message : message?.message;
 }
+function sizeCaps(defChecks) {
+  const caps = [];
+  for (const ch of defChecks ?? []) {
+    const d = ch._zod.def;
+    if (!/_(length|size)$|_equals$/.test(d.check))
+      break;
+    const max = d.maximum ?? d.length ?? d.size;
+    if (max >= 0)
+      caps.push([max, ch]);
+  }
+  return caps;
+}
 function attachSchema(issues, start, inst) {
   var _a3;
   for (let i = start; i < issues.length; i++) {
@@ -22271,7 +22284,7 @@ ${content.join("\n")}
 var version = {
   major: 4,
   minor: 6,
-  patch: 5
+  patch: 6
 };
 
 // node_modules/zod/v4/core/schemas.js
@@ -23027,6 +23040,31 @@ var $ZodDate = /* @__PURE__ */ $constructor("$ZodDate", (inst, def) => {
     return payload;
   };
 });
+function capSize(inst, size) {
+  const caps = sizeCaps(inst._zod.def.checks);
+  if (!caps.length)
+    return;
+  const cap = Math.min(...caps.map((c) => c[0]));
+  const parse4 = inst._zod.parse;
+  inst._zod.parse = (payload, ctx2) => {
+    const n2 = size(payload.value);
+    if (n2 > cap && !ctx2?.skipChecks && ctx2?.direction !== "backward") {
+      for (const [max, ch] of sizeCaps(inst._zod.def.checks)) {
+        if (n2 > max && ch._zod.def.when(payload)) {
+          const start = payload.issues.length;
+          ch._zod.check(payload);
+          payload.issues[start].continue = false;
+          attachSchema(payload.issues, start, inst);
+          return payload;
+        }
+      }
+    }
+    return parse4(payload, ctx2);
+  };
+}
+var arraySize = (input2) => Array.isArray(input2) ? input2.length : -1;
+var mapSize = (input2) => input2 instanceof Map ? input2.size : -1;
+var setSize = (input2) => input2 instanceof Set ? input2.size : -1;
 function handleArrayResult(result, final, index2) {
   if (result.issues.length) {
     final.issues.push(...prefixIssues(index2, result.issues));
@@ -23070,6 +23108,7 @@ var $ZodArray = /* @__PURE__ */ $constructor("$ZodArray", (inst, def) => {
     }
     return payload;
   };
+  capSize(inst, arraySize);
 });
 function handlePropertyResult(result, final, key, input2, optin, optout) {
   const isPresent = key in input2;
@@ -24026,6 +24065,7 @@ var $ZodMap = /* @__PURE__ */ $constructor("$ZodMap", (inst, def) => {
       return Promise.all(proms).then(() => payload);
     return payload;
   };
+  capSize(inst, mapSize);
 });
 function handleMapResult(keyResult, valueResult, final, key, input2, inst, ctx2) {
   if (keyResult.issues.length) {
@@ -24092,6 +24132,7 @@ var $ZodSet = /* @__PURE__ */ $constructor("$ZodSet", (inst, def) => {
       return Promise.all(proms).then(() => payload);
     return payload;
   };
+  capSize(inst, setSize);
 });
 function handleSetResult(result, final) {
   if (result.issues.length) {
@@ -33622,9 +33663,15 @@ function generateNullableCheck(doc, ctx2, schema, accessor, buildsValue = true)
   doc.write(`}`);
   return outputVar;
 }
+function generateSizeGate(doc, schema, size) {
+  for (const [max, check2] of sizeCaps(schema._zod.def.checks)) {
+    doc.write(`if (${size} > ${numericOperand(max, check2._zod.def.check)}) return INVALID;`);
+  }
+}
 function generateArrayCheck(doc, ctx2, schema, accessor, buildsValue = true) {
   const def = schema._zod.def;
   doc.write(`if (!Array.isArray(${accessor})) return INVALID;`);
+  generateSizeGate(doc, schema, `${accessor}.length`);
   const outputVar = buildsValue ? newVar(ctx2) : null;
   const iVar = newVar(ctx2);
   const elemVar = newVar(ctx2);
@@ -34024,6 +34071,7 @@ function literalPropertyKey(ctx2, key) {
 function generateMapCheck(doc, ctx2, schema, accessor) {
   const def = schema._zod.def;
   doc.write(`if (!(${accessor} instanceof Map)) return INVALID;`);
+  generateSizeGate(doc, schema, `${accessor}.size`);
   const outputVar = newVar(ctx2);
   const kVar = newVar(ctx2);
   const valVar = newVar(ctx2);
@@ -34040,6 +34088,7 @@ function generateMapCheck(doc, ctx2, schema, accessor) {
 function generateSetCheck(doc, ctx2, schema, accessor) {
   const def = schema._zod.def;
   doc.write(`if (!(${accessor} instanceof Set)) return INVALID;`);
+  generateSizeGate(doc, schema, `${accessor}.size`);
   const outputVar = newVar(ctx2);
   const valVar = newVar(ctx2);
   doc.write(`const ${outputVar} = new Set();`);
@@ -158824,18 +158873,71 @@ var SysMLErrorListener = class extends BaseErrorListener {
   }
 };
 
+// server/src/parser/positionUtils.ts
+function normalizeUtf16Columns(text, tokens, errors) {
+  if (!/[\uD800-\uDBFF][\uDC00-\uDFFF]/.test(text)) return;
+  const columns = /* @__PURE__ */ new Map();
+  const lines = text.split("\n");
+  for (let line = 0; line < lines.length; line++) {
+    if (!/[\uD800-\uDBFF][\uDC00-\uDFFF]/.test(lines[line])) continue;
+    const offsets = [0];
+    for (const character of lines[line]) offsets.push(offsets[offsets.length - 1] + character.length);
+    columns.set(line, offsets);
+  }
+  for (const token of tokens) {
+    token.column = columns.get(token.line - 1)?.[token.column] ?? token.column;
+  }
+  for (const error62 of errors) {
+    error62.column = columns.get(error62.line)?.[error62.column] ?? error62.column;
+  }
+}
+function tokenToPosition(token) {
+  return {
+    line: (token.line ?? 1) - 1,
+    character: token.column ?? 0
+  };
+}
+function tokenToRange(token) {
+  const start = tokenToPosition(token);
+  const length = token.text?.length ?? 1;
+  return {
+    start,
+    end: { line: start.line, character: start.character + length }
+  };
+}
+function contextToRange(ctx2) {
+  const startToken = ctx2.start;
+  const stopToken = ctx2.stop ?? ctx2.start;
+  if (!startToken) {
+    return { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } };
+  }
+  const start = {
+    line: (startToken.line ?? 1) - 1,
+    character: startToken.column ?? 0
+  };
+  const end = stopToken ? {
+    line: (stopToken.line ?? 1) - 1,
+    character: (stopToken.column ?? 0) + (stopToken.text?.length ?? 1)
+  } : { line: start.line, character: start.character + 1 };
+  return { start, end };
+}
+
 // server/src/parser/parseDocument.ts
+function withUtf16Columns(text, result) {
+  normalizeUtf16Columns(text, result.tokenStream.getTokens(), result.errors);
+  return result;
+}
 function parseDocument(text) {
   const result = parseDocumentCore(text);
   if (result.errors.length > 0 && hasStaleDfaStates()) {
     markDfaNotPreSeeded();
     clearAllDFAStates();
-    return parseDocumentLL(text, result.lexer, result.tokenStream);
+    return withUtf16Columns(text, parseDocumentLL(text, result.lexer, result.tokenStream));
   }
   if (isDfaPreSeeded()) {
     markDfaNotPreSeeded();
   }
-  return result;
+  return withUtf16Columns(text, result);
 }
 function parseDocumentCore(text) {
   const inputStream = CharStream.fromString(text);
@@ -158924,10 +159026,152 @@ var _batchDefaultStrategy = new DefaultErrorStrategy();
 // server/src/providers/semanticValidator.ts
 var import_node = __toESM(require_node3());
 
+// server/src/utils/sysmlKeywords.ts
+var SYSML_KEYWORDS_ARRAY = SysMLv2Lexer.literalNames.filter((n2) => n2 != null).map((n2) => n2.replace(/^'|'$/g, "")).filter((n2) => /^[a-z]+$/.test(n2)).sort();
+var SYSML_KEYWORDS = new Set(SYSML_KEYWORDS_ARRAY);
+
 // server/src/utils/identUtils.ts
+function isIdentStart(c) {
+  return c >= 65 && c <= 90 || c >= 97 && c <= 122 || c === 95;
+}
 function isIdentPart(c) {
   return c >= 65 && c <= 90 || c >= 97 && c <= 122 || c >= 48 && c <= 57 || c === 95;
 }
+var ESCAPES = {
+  b: "\b",
+  t: "	",
+  n: "\n",
+  f: "\f",
+  r: "\r",
+  "'": "'",
+  '"': '"',
+  "\\": "\\"
+};
+function unquoteName(text) {
+  if (!text.startsWith("'") || !text.endsWith("'")) return text;
+  return text.slice(1, -1).replace(/\\([btnfr'"\\])/g, (_, ch) => ESCAPES[ch]);
+}
+function quoteName(name) {
+  if (/^[A-Za-z_][A-Za-z_0-9]*$/.test(name) && !SYSML_KEYWORDS.has(name)) return name;
+  const escaped = name.replace(/[\\'\b\t\n\f\r]/g, (ch) => {
+    const entry = Object.entries(ESCAPES).find(([, value]) => value === ch);
+    return `\\${entry[0]}`;
+  });
+  return `'${escaped}'`;
+}
+function splitQualifiedName(text) {
+  const parts = [];
+  let start = 0;
+  let quoted = false;
+  for (let i = 0; i < text.length; i++) {
+    if (quoted && text[i] === "\\") {
+      i++;
+      continue;
+    }
+    if (text[i] === "'" && (quoted || i === start)) quoted = !quoted;
+    if (!quoted && text.startsWith("::", i)) {
+      parts.push(unquoteName(text.slice(start, i).trim()));
+      start = i + 2;
+      i++;
+    }
+  }
+  parts.push(unquoteName(text.slice(start).trim()));
+  return parts;
+}
+function joinQualifiedName(parts) {
+  return parts.map((part) => /::|['\\\r\n\t\b\f]/.test(part) ? quoteName(part) : part).join("::");
+}
+function readNameAt(text, start, allowIncomplete = false) {
+  if (text[start] === "'") {
+    let end2 = start + 1;
+    while (end2 < text.length && text[end2] !== "'") {
+      if (text[end2] === "\r" || text[end2] === "\n") return void 0;
+      if (text[end2] === "\\") {
+        if (!Object.hasOwn(ESCAPES, text[end2 + 1])) return void 0;
+        end2++;
+      }
+      end2++;
+    }
+    if (end2 >= text.length) {
+      return allowIncomplete ? { name: unquoteName(`${text.slice(start)}'`), start, end: text.length } : void 0;
+    }
+    if (end2 === start + 1 && !allowIncomplete) return void 0;
+    return { name: unquoteName(text.slice(start, end2 + 1)), start, end: end2 + 1 };
+  }
+  if (!isIdentStart(text.charCodeAt(start))) return void 0;
+  let end = start + 1;
+  while (end < text.length && isIdentPart(text.charCodeAt(end))) end++;
+  return { name: text.slice(start, end), start, end };
+}
+function readQualifiedNameAt(text, start, allowIncomplete = false) {
+  const first = readNameAt(text, start, allowIncomplete);
+  if (!first) return void 0;
+  const segments = [first];
+  let end = first.end;
+  while (end < text.length) {
+    let next = end;
+    while (/\s/.test(text[next] ?? "") && next < text.length) next++;
+    if (!text.startsWith("::", next)) break;
+    next += 2;
+    while (/\s/.test(text[next] ?? "") && next < text.length) next++;
+    const segment = readNameAt(text, next, allowIncomplete);
+    if (!segment) break;
+    segments.push(segment);
+    end = segment.end;
+  }
+  return { name: joinQualifiedName(segments.map((s) => s.name)), start, end, segments };
+}
+function* scanQualifiedNames(text, allowIncomplete = false) {
+  let i = 0;
+  while (i < text.length) {
+    if (text.startsWith("//", i)) {
+      const end = text.indexOf("\n", i + 2);
+      i = end < 0 ? text.length : end + 1;
+    } else if (text.startsWith("/*", i)) {
+      const end = text.indexOf("*/", i + 2);
+      i = end < 0 ? text.length : end + 2;
+    } else if (text[i] === '"') {
+      i++;
+      while (i < text.length && text[i] !== '"') i += text[i] === "\\" ? 2 : 1;
+      i++;
+    } else if (/\d/.test(text[i]) || text[i] === "." && /\d/.test(text[i + 1] ?? "")) {
+      const number4 = text.slice(i).match(/^(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?/);
+      i += number4[0].length;
+    } else {
+      const name = readQualifiedNameAt(text, i, allowIncomplete);
+      if (name) {
+        yield name;
+        i = name.end;
+      } else if (text[i] === "'") {
+        i++;
+        while (i < text.length && text[i] !== "'" && text[i] !== "\n") {
+          i += text[i] === "\\" ? 2 : 1;
+        }
+        if (text[i] === "'") i++;
+      } else {
+        i++;
+      }
+    }
+  }
+}
+function* scanFeaturePaths(text) {
+  const names = [...scanQualifiedNames(text)];
+  for (let i = 0; i < names.length; i++) {
+    const first = names[i];
+    const parts = [first.name];
+    const qualifiedNames = [first];
+    let end = first.end;
+    while (i + 1 < names.length && /^\s*\.\s*$/.test(text.slice(end, names[i + 1].start))) {
+      parts.push(names[++i].name);
+      qualifiedNames.push(names[i]);
+      end = names[i].end;
+    }
+    yield { name: parts.join("."), start: first.start, end, qualifiedNames, parts: parts.map((part) => {
+      const segments = splitQualifiedName(part);
+      return segments.length === 1 ? segments[0] : part;
+    }) };
+  }
+}
 function stripComments(text) {
   return text.replace(/\/\*[\s\S]*?\*\//g, (m2) => m2.replace(/[^\n]/g, " ")).replace(/\/\/[^\n]*/g, (m2) => " ".repeat(m2.length));
 }
@@ -158937,10 +159181,12 @@ var index;
 var typeIndex;
 function resolveLibraryType(name) {
   if (!typeIndex) return void 0;
+  const segments = splitQualifiedName(name);
+  name = segments.length === 1 ? segments[0] : joinQualifiedName(segments);
   const exact = typeIndex.get(name);
   if (exact) return exact;
-  if (name.includes("::")) {
-    const member = name.split("::").pop();
+  if (segments.length > 1) {
+    const member = segments[segments.length - 1];
     return typeIndex.get(member);
   }
   return void 0;
@@ -159144,6 +159390,10 @@ var NamespaceResolver = class {
   resolveNameFrom(symbol2, name, indexes) {
     return this.resolveQualifiedNameFrom(ownerKeyOf(symbol2, indexes.byId), name, indexes);
   }
+  /** Resolve an editor reference within its enclosing namespace, including the root. */
+  resolveNameIn(namespace, name, indexes) {
+    return this.resolveQualifiedNameFrom(namespace ? namespaceKeyOf(namespace) : "", name, indexes);
+  }
   /**
    * Resolve a (possibly qualified) name to its symbol per §7.5.1, searching
    * outward from namespace `start` and its enclosing namespaces (its own resolved
@@ -159155,7 +159405,7 @@ var NamespaceResolver = class {
    * its own enclosing package already imported, per §7.5.1/§7.5.3).
    */
   resolveQualifiedNameFrom(start, name, indexes) {
-    const [first, ...rest] = name.split("::");
+    const [first, ...rest] = splitQualifiedName(name);
     let resolved;
     for (const ancestor of this.namespaceAncestorsOf(start, indexes)) {
       const candidates = this.getResolvedMembers(ancestor, indexes).get(first);
@@ -159322,6 +159572,9 @@ var NamespaceResolver = class {
     };
     for (const owned of indexes.byParent.get(namespace) ?? []) {
       addMember(owned.name, { symbol: owned, visibility: owned.visibility ?? "public" });
+      if (owned.shortName) {
+        addMember(owned.shortName, { symbol: owned, visibility: owned.visibility ?? "public" });
+      }
     }
     perIndexesCache.set(namespace, members2);
     const owner = typeof namespace === "string" ? indexes.byQualifiedName.get(namespace) : namespace;
@@ -159357,13 +159610,17 @@ var NamespaceResolver = class {
     switch (imp.kind) {
       case "membership": {
         const target = this.resolveQualifiedNameFrom(importingNamespace, imp.target, indexes);
-        if (target) addMember(target.name, { symbol: target, visibility: imp.visibility });
+        if (target) {
+          addMember(target.name, { symbol: target, visibility: imp.visibility });
+          if (target.shortName) addMember(target.shortName, { symbol: target, visibility: imp.visibility });
+        }
         break;
       }
       case "membership-deep": {
         const target = this.resolveQualifiedNameFrom(importingNamespace, imp.target, indexes);
         if (target) {
           addMember(target.name, { symbol: target, visibility: imp.visibility });
+          if (target.shortName) addMember(target.shortName, { symbol: target, visibility: imp.visibility });
           this.importVisibleMembers(namespaceKeyOf(target), imp.visibility, indexes, addMember, true);
         }
         break;
@@ -159419,42 +159676,6 @@ var NamespaceResolver = class {
   }
 };
 
-// server/src/parser/positionUtils.ts
-function tokenToPosition(token) {
-  return {
-    line: (token.line ?? 1) - 1,
-    character: token.column ?? 0
-  };
-}
-function tokenToRange(token) {
-  const start = tokenToPosition(token);
-  const length = token.text?.length ?? 1;
-  return {
-    start,
-    end: { line: start.line, character: start.character + length }
-  };
-}
-function contextToRange(ctx2) {
-  const startToken = ctx2.start;
-  const stopToken = ctx2.stop ?? ctx2.start;
-  if (!startToken) {
-    return { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } };
-  }
-  const start = {
-    line: (startToken.line ?? 1) - 1,
-    character: startToken.column ?? 0
-  };
-  const end = stopToken ? {
-    line: (stopToken.line ?? 1) - 1,
-    character: (stopToken.column ?? 0) + (stopToken.text?.length ?? 1)
-  } : { line: start.line, character: start.character + 1 };
-  return { start, end };
-}
-
-// server/src/utils/sysmlKeywords.ts
-var SYSML_KEYWORDS_ARRAY = SysMLv2Lexer.literalNames.filter((n2) => n2 != null).map((n2) => n2.replace(/^'|'$/g, "")).filter((n2) => /^[a-z]+$/.test(n2)).sort();
-var SYSML_KEYWORDS = new Set(SYSML_KEYWORDS_ARRAY);
-
 // server/src/utils/names.ts
 var BASIC_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
 function escapeName(name) {
@@ -160068,7 +160289,7 @@ var RE_SPEC_WITH_SUBSETS = /(?:specializes|subsets|:>|:>>)\s*('[^']+'|[A-Za-z_]\
 var RE_DEFINED_BY = /definedby\s*([A-Za-z_]\w*(?:::\w+)*(?:\s*,\s*[A-Za-z_]\w*(?:::\w+)*)*)/;
 var MAX_RULE_SEARCH_DEPTH = 6;
 var RE_TYPING = /:(?![:>])\s*('[^']+'|[A-Za-z_]\w*(?:::\w+)*)/;
-var RE_QUOTED_NAME = /'([^']+)'/;
+var RE_QUOTED_NAME = /^\s*(?:\$::)?(?:(?:[A-Za-z_]\w*|'\d+')::)*'(\d+)'/;
 var RE_IDENT_START = /^([A-Za-z_]\w*(?:::\w+)*)/;
 var SymbolTable = class {
   /** All symbols indexed by qualified name */
@@ -160135,7 +160356,12 @@ var SymbolTable = class {
    * Find a symbol by name (simple name, not qualified).
    */
   findByName(name) {
-    return this.symbolsByName.get(name) ?? [];
+    const exact = this.symbolsByName.get(name);
+    if (exact) return exact;
+    const segments = splitQualifiedName(name);
+    if (segments.length === 1) return this.symbolsByName.get(segments[0]) ?? [];
+    const qualified = this.getSymbol(joinQualifiedName(segments));
+    return qualified ? [qualified] : [];
   }
   /**
    * Find all symbols in a given URI.
@@ -160642,7 +160868,7 @@ var SymbolTable = class {
     const anonymous = !declaredName;
     const name = declaredName ?? "";
     const shortName = transition || isFlowUsage(kind) && !declaredName ? void 0 : this.extractShortName(ctx2);
-    const qualifiedName = anonymous || owner && owner.qualifiedName === void 0 ? void 0 : owner ? `${owner.qualifiedName}::${name}` : name;
+    const qualifiedName = anonymous || owner && owner.qualifiedName === void 0 ? void 0 : owner ? `${owner.qualifiedName}::${joinQualifiedName([name])}` : joinQualifiedName([name]);
     const selectionRange = anonymous ? ctx2.start ? tokenToRange(ctx2.start) : range : this.extractNameRange(ctx2) ?? range;
     const typeNames = isFlowUsage(kind) ? this.extractFlowTypeNames(ctx2) : transition ? this.extractTransitionTypeNames(ctx2) : this.extractTypeNames(ctx2);
     const specializationNames = this.extractSpecializationNames(ctx2);
@@ -160802,7 +161028,10 @@ var SymbolTable = class {
   }
   /** Remove SysML quoting while retaining qualified and dotted references. */
   cleanTransitionText(text) {
-    const cleaned = text.replace(/'([^']+)'/g, "$1").trim();
+    const cleaned = text.replace(
+      /'(?:\\.|[^'\\])*'/g,
+      (name) => joinQualifiedName([unquoteName(name)])
+    ).trim();
     return cleaned || void 0;
   }
   /** Extract explicit first/then successions owned by an action body. */
@@ -160975,8 +161204,8 @@ var SymbolTable = class {
   }
   /** The name of the feature a reference such as `a.b` or `P::a` ends at (`b`, `a`). */
   lastNameSegment(reference) {
-    const segment = reference.getText().split(/::|\./).pop();
-    return segment ? this.unquoteName(segment) : void 0;
+    const names = [...scanQualifiedNames(reference.getText())];
+    return names.at(-1)?.segments.at(-1)?.name;
   }
   declarationTokens(ctx2) {
     const tokens = [];
@@ -161112,6 +161341,16 @@ var SymbolTable = class {
    * Extract the range of just the name token.
    */
   extractNameRange(ctx2) {
+    if (ctx2.ruleIndex === SysMLv2Parser.RULE_identification || ctx2.ruleIndex === SysMLv2Parser.RULE_featureIdentification) {
+      let name;
+      for (let i = 0; i < ctx2.getChildCount(); i++) {
+        const child = ctx2.getChild(i);
+        if (child instanceof ParserRuleContext && child.ruleIndex === SysMLv2Parser.RULE_name) {
+          name = child;
+        }
+      }
+      if (name) return contextToRange(name);
+    }
     for (let i = 0; i < ctx2.getChildCount(); i++) {
       const child = ctx2.getChild(i);
       if (child instanceof TerminalNode && this.isNameTerminal(child)) {
@@ -161152,7 +161391,7 @@ var SymbolTable = class {
       for (const part of specStr.split(",")) {
         const quoted = quotedName(part);
         if (quoted !== void 0) {
-          names.push(quoted);
+          names.push(joinQualifiedName([quoted]));
           continue;
         }
         const m2 = part.trim().match(RE_IDENT_START);
@@ -161175,7 +161414,7 @@ var SymbolTable = class {
       for (const part of afterColon.split(",")) {
         const quoted = quotedName(part);
         if (quoted !== void 0) {
-          names.push(quoted);
+          names.push(joinQualifiedName([quoted]));
           continue;
         }
         const m2 = part.trim().match(RE_IDENT_START);
@@ -161186,18 +161425,20 @@ var SymbolTable = class {
     return names;
   }
   /**
-   * The declaration tokens before the body, with each lexer STRING token
+   * The declaration tokens before the value or body, with each lexer STRING token
    * replaced by a numbered placeholder (`'0'`, `'1'`, ...), and
    * `quotedName`, which turns a placeholder in a part of that text back into
-   * the name. SysML 2.0 section 7.2.2 permits punctuation in unrestricted
-   * names (the STRING lexer production), so fallback regexes must never see
-   * their `:`, `:>`, `{` or keywords. Documentation is not a name token.
+   * the name, when it ends the qualified name the part starts with. SysML
+   * 2.0 section 7.2.2 permits punctuation in unrestricted names (the STRING
+   * lexer production), so fallback regexes must never see their `:`, `:>`,
+   * `{` or keywords. Documentation is not a name token.
    */
   maskedDeclaration(ctx2) {
     const quoted = [];
-    const masked = this.declarationTokens(ctx2).map((token) => {
+    const valueStart = this.findOwnHeaderRule(ctx2, SysMLv2Parser.RULE_valuePart)?.start?.tokenIndex;
+    const masked = this.declarationTokens(ctx2).filter((token) => valueStart === void 0 || token.tokenIndex < valueStart).map((token) => {
       const text = token.text ?? "";
-      return token.type === SysMLv2Lexer.STRING ? `'${quoted.push(text.slice(1, -1)) - 1}'` : text;
+      return token.type === SysMLv2Lexer.STRING ? `'${quoted.push(unquoteName(text)) - 1}'` : text;
     }).join("");
     return {
       text: masked,
@@ -161225,7 +161466,7 @@ var SymbolTable = class {
       for (const part of specStr.split(",")) {
         const quoted = quotedName(part);
         if (quoted !== void 0) {
-          names.push(quoted);
+          names.push(joinQualifiedName([quoted]));
           continue;
         }
         const m2 = part.trim().match(RE_IDENT_START);
@@ -161254,17 +161495,7 @@ var SymbolTable = class {
       if (!(child instanceof ParserRuleContext)) continue;
       const ri = child.ruleIndex;
       if (extractionRules.has(ri)) {
-        const childText = child.getText();
-        const stripped = childText.replace(/^(specializes|:>>|:>|:|definedby|subsets|redefines|references|conjugates|disjoints)/i, "");
-        for (const part of stripped.split(",")) {
-          const qm = part.match(/'([^']+)'/);
-          if (qm) {
-            names.push(qm[1]);
-          } else {
-            const m2 = part.match(/([A-Za-z_]\w*(?:::\w+)*)/);
-            if (m2) names.push(m2[1]);
-          }
-        }
+        this.collectQualifiedTypeNames(child, names);
       } else if (
         // Recurse into declaration / part / body wrappers that may
         // contain nested typing rules (but NOT into body rules that
@@ -161277,6 +161508,17 @@ var SymbolTable = class {
       }
     }
   }
+  collectQualifiedTypeNames(ctx2, names) {
+    if (ctx2.ruleIndex === SysMLv2Parser.RULE_qualifiedName) {
+      const name = this.extractTextFromSubtree(ctx2);
+      if (name) names.push(name);
+      return;
+    }
+    for (let i = 0; i < ctx2.getChildCount(); i++) {
+      const child = ctx2.getChild(i);
+      if (child instanceof ParserRuleContext) this.collectQualifiedTypeNames(child, names);
+    }
+  }
   /**
    * Extract documentation owned by this element.
    *
@@ -161437,10 +161679,7 @@ var SymbolTable = class {
    * Returns the text unchanged if not quoted.
    */
   unquoteName(text) {
-    if (this.isQuotedName(text)) {
-      return text.slice(1, -1);
-    }
-    return text;
+    return unquoteName(text);
   }
   /**
    * Check if a text is a SysML keyword.
@@ -161728,7 +161967,7 @@ var SymbolTable = class {
       const child = ctx2.getChild(i);
       if (child instanceof TerminalNode) {
         const text = child.symbol.text;
-        if (text) parts.push(text);
+        if (text) parts.push(child.symbol.type === SysMLv2Lexer.STRING ? joinQualifiedName([unquoteName(text)]) : text);
       } else if (child instanceof ParserRuleContext) {
         this.collectExposeText(child, parts);
       }
@@ -161790,17 +162029,18 @@ var SymbolTable = class {
    * Extract all text content from a subtree (concatenate terminal nodes).
    */
   extractTextFromSubtree(ctx2) {
+    if (ctx2.ruleIndex === SysMLv2Parser.RULE_name) return unquoteName(ctx2.getText());
     const parts = [];
     for (let i = 0; i < ctx2.getChildCount(); i++) {
       const child = ctx2.getChild(i);
       if (child instanceof TerminalNode) {
         const text = child.symbol.text;
         if (text && this.isNameTerminal(child)) {
-          parts.push(this.unquoteName(text));
+          parts.push(joinQualifiedName([this.unquoteName(text)]));
         }
       } else if (child instanceof ParserRuleContext) {
         const sub = this.extractTextFromSubtree(child);
-        if (sub) parts.push(sub);
+        if (sub) parts.push(child.ruleIndex === SysMLv2Parser.RULE_name ? joinQualifiedName([sub]) : sub);
       }
     }
     return parts.length > 0 ? parts.join("::") : void 0;
@@ -161916,7 +162156,7 @@ function isISQValueType(name) {
 function resolveTypeName(typeName, symbol2, resolver, indexes, libraryNames) {
   const kwMatch = typeName.match(/^([A-Z][A-Za-z_0-9]*?)(redefines|subsets|references|connect|bind|default|via|accept|send|flow|allocate|assign|decide|merge|join|fork)([A-Z])/);
   const strippedTypeName = kwMatch ? kwMatch[1] : typeName;
-  const rootSegment = strippedTypeName.split("::")[0];
+  const rootSegment = splitQualifiedName(strippedTypeName)[0];
   const resolved = resolver.isLocallyVisible(symbol2, strippedTypeName, indexes) || STANDARD_LIBRARY_TYPES.has(strippedTypeName) || STANDARD_LIBRARY_TYPES.has(rootSegment) || libraryNames.has(rootSegment) || isISQValueType(strippedTypeName) || resolveLibraryType(strippedTypeName) !== void 0 || resolveLibraryType(rootSegment) !== void 0 || // Names starting with lowercase are feature references (subsettings
   // via :>), not type references — don't flag them as unresolved types.
   strippedTypeName.charCodeAt(0) >= 97 && strippedTypeName.charCodeAt(0) <= 122;
@@ -163637,19 +163877,19 @@ var SemanticValidator = class _SemanticValidator {
     );
     const defsInScope = targetUri ? defs.filter((def) => def.uri === targetUri) : defs;
     const referencedTypes = new Set(
-      symbols.filter((s) => s.kind !== "package" /* Package */).flatMap((s) => s.typeNames)
+      symbols.filter((s) => s.kind !== "package" /* Package */).flatMap((s) => s.typeNames.flatMap((name) => [name, splitQualifiedName(name).at(-1)]))
     );
     for (const s of symbols) {
       if (s.exposeTargets) {
         for (const target of s.exposeTargets) {
-          const simpleName = target.replace(/::\*{1,2}$/, "").split("::").pop();
+          const simpleName = splitQualifiedName(target.replace(/::\*{1,2}$/, "")).pop();
           if (simpleName) referencedTypes.add(simpleName);
         }
       }
     }
     const diagnostics = [];
     for (const def of defsInScope) {
-      const isReferenced = referencedTypes.has(def.name);
+      const isReferenced = referencedTypes.has(def.name) || def.shortName !== void 0 && referencedTypes.has(def.shortName);
       const hasBaseType = (def.typeNames?.length ?? 0) > 0;
       if (!isReferenced && !hasBaseType) {
         diagnostics.push({
@@ -164075,14 +164315,15 @@ var SemanticValidator = class _SemanticValidator {
     if (!text) return [];
     const diagnostics = [];
     const lines = text.split("\n");
-    const re = /\bconnect\s+([A-Za-z_][\w.]*)\s+to\s+([A-Za-z_][\w.]*)/g;
-    let m2;
-    while ((m2 = re.exec(text)) !== null) {
-      const leftPath = m2[1].split(".");
-      const rightPath = m2[2].split(".");
+    const paths = [...scanFeaturePaths(text)];
+    for (let i = 0; i + 3 < paths.length; i++) {
+      const [connect, leftEnd, to, rightEnd] = paths.slice(i, i + 4);
+      if (text.slice(connect.start, connect.end) !== "connect" || text.slice(to.start, to.end) !== "to" || !/^\s+$/.test(text.slice(connect.end, leftEnd.start)) || !/^\s+$/.test(text.slice(leftEnd.end, to.start)) || !/^\s+$/.test(text.slice(to.end, rightEnd.start))) continue;
+      const leftPath = [...leftEnd.parts];
+      const rightPath = [...rightEnd.parts];
       const left = leftPath[leftPath.length - 1];
       const right = rightPath[rightPath.length - 1];
-      const scope = this.connectorScope(symbolsInUri, this.indexToRange(text, m2.index, 0).start, indexes);
+      const scope = this.connectorScope(symbolsInUri, this.indexToRange(text, connect.start, 0).start, indexes);
       const lSym = this.resolveConnectorEnd(leftPath, scope, indexes);
       const rSym = this.resolveConnectorEnd(rightPath, scope, indexes);
       if (!lSym || !rSym) continue;
@@ -164092,10 +164333,10 @@ var SemanticValidator = class _SemanticValidator {
       if (lType === "~" + rType || rType === "~" + lType) continue;
       if (lType.startsWith("~") && lType.slice(1) === rType) continue;
       if (rType.startsWith("~") && rType.slice(1) === lType) continue;
-      const matchLine = text.substring(0, m2.index).split("\n").length - 1;
+      const matchLine = text.substring(0, connect.start).split("\n").length - 1;
       let insideInterfaceDef = false;
-      for (let i = matchLine; i >= 0 && i >= matchLine - 30; i--) {
-        const line = (lines[i] || "").trim();
+      for (let i2 = matchLine; i2 >= 0 && i2 >= matchLine - 30; i2--) {
+        const line = (lines[i2] || "").trim();
         if (/\binterface\s+def\b/.test(line)) {
           insideInterfaceDef = true;
           break;
@@ -164103,7 +164344,7 @@ var SemanticValidator = class _SemanticValidator {
         if (/^\s*package\b/.test(line)) break;
       }
       if (insideInterfaceDef) continue;
-      const precedingText = text.substring(Math.max(0, m2.index - 300), m2.index);
+      const precedingText = text.substring(Math.max(0, connect.start - 300), connect.start);
       if (/\binterface\s+\w[\w']*(:\w[\w']*)?\s*$/m.test(precedingText)) continue;
       const lDefSyms = indexes.byName.get(lType) ?? [];
       const rDefSyms = indexes.byName.get(rType) ?? [];
@@ -164122,14 +164363,14 @@ var SemanticValidator = class _SemanticValidator {
         const hasSharedFeature = rChildren.some((c) => lChildNames.has(c.name));
         if (hasSharedFeature) continue;
       }
-      const range = this.indexToRange(text, m2.index, m2[0].length);
+      const range = this.indexToRange(text, connect.start, rightEnd.end - connect.start);
       diagnostics.push({
         severity: import_node.DiagnosticSeverity.Warning,
         range,
         message: `Port compatibility issue: '${left}' (${lType}) is connected to '${right}' (${rType})`,
         source: "sysml",
         code: "incompatible-port-types",
-        data: { uri }
+        data: { uri, left, right, leftType: lType }
       });
     }
     return diagnostics;
@@ -164232,15 +164473,11 @@ var SemanticValidator = class _SemanticValidator {
       if (!parent) continue;
       const parentMembers = this.getConstraintScopeMembers(parent, indexes);
       if (parentMembers.length === 0) continue;
-      const ignoredRanges = this.getIgnoredBodyRanges(b.body);
-      const idRe = /\b([A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*)*)\b/g;
-      let im;
-      while ((im = idRe.exec(b.body)) !== null) {
-        if (this.isIndexInRanges(im.index, ignoredRanges)) continue;
-        const expr = im[1];
+      for (const reference of scanFeaturePaths(b.body)) {
+        const expr = reference.name;
         if (this.isConstraintKeyword(expr)) continue;
         if (/^\d/.test(expr)) continue;
-        const path = expr.split(".");
+        const path = [...reference.parts];
         const ok = this.resolvePathFromParent(path, parentMembers, indexes);
         if (ok) continue;
         if (path.length === 1) {
@@ -164249,14 +164486,14 @@ var SemanticValidator = class _SemanticValidator {
             continue;
           }
         }
-        const absoluteStart = b.bodyOffset + im.index;
+        const absoluteStart = b.bodyOffset + reference.start;
         diagnostics.push({
           severity: import_node.DiagnosticSeverity.Warning,
-          range: this.indexToRange(text, absoluteStart, expr.length),
+          range: this.indexToRange(text, absoluteStart, reference.end - reference.start),
           message: `Unresolved constraint reference '${expr}' in scope '${displayName(parent)}'`,
           source: "sysml",
           code: "unresolved-constraint-reference",
-          data: { uri }
+          data: { uri, scopeName: parent.name }
         });
       }
     }
@@ -164450,25 +164687,6 @@ var SemanticValidator = class _SemanticValidator {
   isConstraintKeyword(value) {
     return CONSTRAINT_KEYWORDS.has(value);
   }
-  getIgnoredBodyRanges(body) {
-    const ranges = [];
-    const blockRe = /\/\*[\s\S]*?\*\//g;
-    let m2;
-    while ((m2 = blockRe.exec(body)) !== null) {
-      ranges.push({ start: m2.index, end: m2.index + m2[0].length });
-    }
-    const lineRe = /\/\/[^\n\r]*/g;
-    while ((m2 = lineRe.exec(body)) !== null) {
-      ranges.push({ start: m2.index, end: m2.index + m2[0].length });
-    }
-    return ranges;
-  }
-  isIndexInRanges(index2, ranges) {
-    for (const r of ranges) {
-      if (index2 >= r.start && index2 < r.end) return true;
-    }
-    return false;
-  }
   hasDocumentationOnlyConstraintBody(body) {
     const trimmed = body.trim();
     if (!trimmed) return false;