@domainlang/language 0.7.0 → 0.9.0

package/out/domain-lang-module.d.ts

@@ -7,6 +7,7 @@ import { DomainLangCompletionProvider } from './lsp/domain-lang-completion.js';
 import { DomainLangCodeActionProvider } from './lsp/domain-lang-code-actions.js';
 import { ImportResolver } from './services/import-resolver.js';
 import { WorkspaceManager } from './services/workspace-manager.js';
+import { PackageBoundaryDetector } from './services/package-boundary-detector.js';
 /**
  * Declaration of custom services - add your own service classes here.
  */
@@ -14,6 +15,7 @@ export type DomainLangAddedServices = {
     imports: {
         ImportResolver: ImportResolver;
         WorkspaceManager: WorkspaceManager;
+        PackageBoundaryDetector: PackageBoundaryDetector;
     };
     references: {
         QualifiedNameProvider: QualifiedNameProvider;

package/out/domain-lang-module.js

@@ -9,11 +9,17 @@ import { DomainLangFormatter } from './lsp/domain-lang-formatter.js';
 import { DomainLangHoverProvider } from './lsp/hover/domain-lang-hover.js';
 import { DomainLangCompletionProvider } from './lsp/domain-lang-completion.js';
 import { DomainLangCodeActionProvider } from './lsp/domain-lang-code-actions.js';
+import { DomainLangNodeKindProvider } from './lsp/domain-lang-node-kind-provider.js';
+import { DomainLangDocumentSymbolProvider } from './lsp/domain-lang-document-symbol-provider.js';
 import { ImportResolver } from './services/import-resolver.js';
 import { WorkspaceManager } from './services/workspace-manager.js';
+import { PackageBoundaryDetector } from './services/package-boundary-detector.js';
 import { DomainLangWorkspaceManager } from './lsp/domain-lang-workspace-manager.js';
 import { DomainLangIndexManager } from './lsp/domain-lang-index-manager.js';
 const DomainLangSharedModule = {
+    lsp: {
+        NodeKindProvider: () => new DomainLangNodeKindProvider()
+    },
     workspace: {
         WorkspaceManager: (services) => new DomainLangWorkspaceManager(services),
         IndexManager: (services) => new DomainLangIndexManager(services)
@@ -27,7 +33,8 @@ const DomainLangSharedModule = {
 export const DomainLangModule = {
     imports: {
         ImportResolver: (services) => new ImportResolver(services),
-        WorkspaceManager: () => new WorkspaceManager({ autoResolve: false, allowNetwork: false })
+        WorkspaceManager: () => new WorkspaceManager({ autoResolve: false, allowNetwork: false }),
+        PackageBoundaryDetector: () => new PackageBoundaryDetector()
     },
     references: {
         ScopeComputation: (services) => new DomainLangScopeComputation(services),
@@ -38,7 +45,8 @@ export const DomainLangModule = {
         Formatter: () => new DomainLangFormatter(),
         HoverProvider: (services) => new DomainLangHoverProvider(services),
         CompletionProvider: (services) => new DomainLangCompletionProvider(services),
-        CodeActionProvider: () => new DomainLangCodeActionProvider()
+        CodeActionProvider: () => new DomainLangCodeActionProvider(),
+        DocumentSymbolProvider: (services) => new DomainLangDocumentSymbolProvider(services)
     },
 };
 /**
@@ -61,6 +69,17 @@ export function createDomainLangServices(context) {
     const DomainLang = inject(createDefaultModule({ shared }), DomainLangGeneratedModule, DomainLangModule);
     shared.ServiceRegistry.register(DomainLang);
     registerValidationChecks(DomainLang);
+    // Late-bind language services into shared module services.
+    // IndexManager and WorkspaceManager are in the shared module (created first),
+    // but need access to ImportResolver from the language module (created second).
+    const indexManager = shared.workspace.IndexManager;
+    if (indexManager instanceof DomainLangIndexManager) {
+        indexManager.setLanguageServices(DomainLang);
+    }
+    const workspaceManager = shared.workspace.WorkspaceManager;
+    if (workspaceManager instanceof DomainLangWorkspaceManager) {
+        workspaceManager.setLanguageServices(DomainLang);
+    }
     if (!context.connection) {
         // We don't run inside a language server
         // Therefore, initialize the configuration provider instantly

package/out/domain-lang-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"domain-lang-module.js","sourceRoot":"","sources":["../src/domain-lang-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAE,MAAM,SAAS,CAAC;AAQ9C,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAE,yBAAyB,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AACnG,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AA2B5E,MAAM,sBAAsB,GAAgE;IACxF,SAAS,EAAE;QACP,gBAAgB,EAAE,CAAC,QAA+B,EAAE,EAAE,CAAC,IAAI,0BAA0B,CAAC,QAAQ,CAAC;QAC/F,YAAY,EAAE,CAAC,QAA+B,EAAE,EAAE,CAAC,IAAI,sBAAsB,CAAC,QAAQ,CAAC;KAC1F;CACJ,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAiF;IAC1G,OAAO,EAAE;QACL,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,QAAQ,CAAC;QAC1D,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI,gBAAgB,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;KAC5F;IACD,UAAU,EAAE;QACR,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,0BAA0B,CAAC,QAAQ,CAAC;QACxE,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAC,QAAQ,CAAC;QAClE,qBAAqB,EAAE,GAAG,EAAE,CAAC,IAAI,qBAAqB,EAAE;KAC3D;IACD,GAAG,EAAE;QACD,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,mBAAmB,EAAE;QAC1C,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAC,QAAQ,CAAC;QAClE,kBAAkB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,4BAA4B,CAAC,QAAQ,CAAC;QAC5E,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAI,4BAA4B,EAAE;KAC/D;CACJ,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,wBAAwB,CAAC,OAAmC;IAIxE,MAAM,MAAM,GAAG,MAAM,CACjB,yBAAyB,CAAC,OAAO,CAAC,EAClC,+BAA+B,EAC/B,sBAAsB,CACzB,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,CACrB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,EAC/B,yBAAyB,EACzB,gBAAgB,CACnB,CAAC;IACF,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC5C,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAErC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACtB,wCAAwC;QACxC,6DAA6D;QAC7D,MAAM,CAAC,SAAS,CAAC,qBAAqB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;AAClC,CAAC"}
+{"version":3,"file":"domain-lang-module.js","sourceRoot":"","sources":["../src/domain-lang-module.ts"],"names":[],"mappings":"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"}

package/out/lsp/domain-lang-completion.d.ts

@@ -6,12 +6,153 @@
  * - Grammar-aligned: Completions match grammar structure exactly
  * - Simple: Uses parent node to determine context
  * - Maintainable: Clear mapping from grammar to completions
+ * - Import-aware: Provides completions for local paths, aliases, and dependencies
  */
+import type { LangiumDocument } from 'langium';
+import { GrammarAST } from 'langium';
 import { CompletionAcceptor, CompletionContext, DefaultCompletionProvider, NextFeature } from 'langium/lsp';
+import { CompletionList } from 'vscode-languageserver';
+import type { CancellationToken, CompletionParams } from 'vscode-languageserver-protocol';
+import type { DomainLangServices } from '../domain-lang-module.js';
 export declare class DomainLangCompletionProvider extends DefaultCompletionProvider {
-    protected completionFor(context: CompletionContext, next: NextFeature, acceptor: CompletionAcceptor): void;
+    private readonly workspaceManager;
+    readonly completionOptions: {
+        triggerCharacters: string[];
+    };
+    constructor(services: DomainLangServices);
+    /**
+     * Override getCompletion to handle import string completions for incomplete strings.
+     *
+     * **Why this override is necessary:**
+     * When the cursor sits inside an incomplete string token (e.g. `import "partial`)
+     * Langium's lexer cannot produce a valid STRING token, so `completionFor()` never
+     * fires for the `uri` property.  This override detects the incomplete-string case
+     * via regex and returns completions directly.  For all other positions the parent
+     * implementation (which routes through `completionFor`) is used.
+     */
+    getCompletion(document: LangiumDocument, params: CompletionParams, cancelToken?: CancellationToken): Promise<CompletionList | undefined>;
+    /**
+     * Post-process completion results to replace full-FQN items with segmented items
+     * when the cursor is at a dotted path.
+     *
+     * **Why this is necessary:**
+     * Langium's `buildContexts` creates a "data type rule" context that triggers our
+     * `completionForCrossReference` override, which correctly produces segmented items.
+     * However, when the CST is broken (e.g., partial `Core.B` doesn't fully parse as
+     * a QualifiedName), `findDataTypeRuleStart` returns `undefined` and only token-based
+     * contexts fire. These contexts have features that are ID terminals (not cross-references),
+     * so `completionForCrossReference` is never called. Langium's default pipeline then
+     * produces full-FQN items like `Core.Baunwalls.Jannie`.
+     *
+     * This post-processing step catches those FQN items and segments them,
+     * ensuring consistent behavior regardless of parse state.
+     */
+    private segmentDottedCompletions;
+    /** Check if any items are already segmented by our completionForCrossReference. */
+    private hasSegmentedItems;
+    /** Remove full-FQN items that leaked alongside segmented items. */
+    private removeLeakedFqnItems;
+    /** Calculate line/character positions from text offsets. */
+    private calculateTextPositions;
+    /** Transform FQN completion items into segmented (next-segment-only) items. */
+    private transformToSegmentedItems;
+    /** Transform a single FQN item into a segmented item, or keep non-matching items. */
+    private segmentSingleItem;
+    /**
+     * Check if two dotted names share a common prefix up to the first differing segment.
+     */
+    private sharesDottedPrefix;
+    /**
+     * Scan backwards from cursor to find a dotted identifier path.
+     * Returns the full typed text and start position, or undefined if no dots found.
+     *
+     * This is intentionally cursor-based (not tokenOffset-based) to be robust
+     * across all Langium completion contexts.
+     */
+    private extractDottedPathAtCursor;
+    /** Walk backwards through `.ID` pairs from the given position. */
+    private walkBackThroughDotIdPairs;
+    /**
+     * Collect import completion items for a given partial input string.
+     *
+     * Shared by both the `getCompletion` override (incomplete string case)
+     * and the `completionFor` path (normal Langium feature-based routing).
+     */
+    private collectImportItems;
+    protected completionFor(context: CompletionContext, next: NextFeature, acceptor: CompletionAcceptor): Promise<void>;
+    /**
+     * Override cross-reference completion to provide dot-segmented completions.
+     *
+     * When the user types a dotted prefix (e.g., `Core.`), only the next
+     * namespace segment is shown instead of the full qualified name —
+     * matching how modern IDEs handle hierarchical completions.
+     *
+     * Example: Scope contains `Core.CoreDomain`, `Core.BaunWalls.Jannie`, `Core.BaunWalls.Anna`
+     * - No dots typed → default FQN labels: `Core.CoreDomain`, `Core.BaunWalls.Jannie`, ...
+     * - `Core.` typed → segmented: `CoreDomain`, `BaunWalls`
+     * - `Core.BaunWalls.` typed → segmented: `Jannie`, `Anna`
+     */
+    protected completionForCrossReference(context: CompletionContext, next: NextFeature<GrammarAST.CrossReference>, acceptor: CompletionAcceptor): void | Promise<void>;
+    /**
+     * Walk backwards from `tokenOffset` through preceding `.ID` pairs
+     * to find the start of the full dotted path.
+     * QualifiedName = ID ('.' ID)* — Langium tokenises each ID separately.
+     */
+    private findDottedPathStart;
+    /**
+     * Iterate scope candidates and emit segmented completion items.
+     * Splits FQN candidates by the typed prefix, extracting only the next segment.
+     */
+    private acceptSegmentedCandidates;
     private safeCompletionFor;
+    /**
+     * Detect if we're completing inside an import statement's uri property.
+     *
+     * This checks:
+     * 1. The NextFeature's type and property (when completing STRING for uri)
+     * 2. The current AST node (when inside an ImportStatement)
+     * 3. Text-based pattern matching (fallback for edge cases)
+     */
+    private isImportUriCompletion;
+    /** Check if the node or any ancestor is an ImportStatement. */
+    private isInImportStatementHierarchy;
+    /** Check if text before cursor matches an import string pattern. */
+    private isImportTextPattern;
+    /**
+     * Add import completions asynchronously.
+     * This method ensures the manifest is loaded before providing completions.
+     */
+    private addImportCompletions;
+    /**
+     * Extract the current input inside the import string.
+     */
+    private extractImportInput;
+    /**
+     * Add local path starters.
+     */
+    private addLocalPathStarters;
+    /**
+     * Add all starter options when input is empty.
+     */
+    private addAllStarterOptions;
+    /**
+     * Add alias completions that match the current input.
+     */
+    private addAliasCompletions;
+    /**
+     * Add dependency completions that match the current input.
+     */
+    private addDependencyCompletions;
+    /**
+     * Add filtered options for partial input that doesn't start with special characters.
+     * Shows aliases and dependencies that match the user's partial input.
+     */
+    private addFilteredOptions;
     private handleNodeCompletions;
+    /**
+     * Add import statement snippet at top level.
+     */
+    private addImportSnippet;
     private handleContainerCompletions;
     private addTopLevelSnippets;
     /**