@domainlang/language 0.7.0 → 0.9.0

package/out/lsp/domain-lang-scope-provider.js

@@ -1,13 +1,13 @@
 /**
  * DomainLang Scope Provider
  *
- * Implements import-based scoping for the DomainLang DSL.
+ * Implements import-based scoping with alias support and package-boundary transitive imports.
  *
- * **Key Concept:**
- * Unlike languages with global namespaces, DomainLang enforces strict import-based scoping:
- * - Elements are only visible if they are defined in the current document OR explicitly imported
- * - The global scope is restricted to imported documents only
- * - Transitive imports do NOT provide scope (only direct imports)
+ * **Key Concepts (per ADR-003):**
+ * - Elements are only visible if defined in current document OR explicitly imported
+ * - Import aliases control visibility: `import "pkg" as ddd` makes types visible as `ddd.*` only
+ * - Package-boundary transitive imports: External packages (.dlang/packages/) can re-export
+ * - Local file imports remain non-transitive (explicit dependencies only)
  *
  * **Why this matters:**
  * Without this, Langium's DefaultScopeProvider would make ALL indexed documents visible
@@ -17,8 +17,9 @@
  * 3. Create confusion about dependencies between files
  *
  * @see https://langium.org/docs/recipes/scoping/ for Langium scoping patterns
+ * @see ADR-003 for alias and package-boundary design decisions
  */
-import { AstUtils, DefaultScopeProvider, EMPTY_SCOPE, MapScope } from 'langium';
+import { AstUtils, DefaultScopeProvider, EMPTY_SCOPE, MapScope, stream } from 'langium';
 /**
  * Custom scope provider that restricts cross-file references to imported documents only.
  *
@@ -28,68 +29,142 @@ export class DomainLangScopeProvider extends DefaultScopeProvider {
     constructor(services) {
         super(services);
         this.domainLangIndexManager = services.shared.workspace.IndexManager;
+        this.packageBoundaryDetector = services.imports.PackageBoundaryDetector;
     }
     /**
-     * Override getGlobalScope to restrict it to imported documents only.
+     * Override getGlobalScope to implement alias-scoped and package-boundary transitive imports.
      *
      * The default Langium behavior includes ALL documents in the workspace.
-     * We restrict this to:
+     * We restrict and transform scope to:
      * 1. The current document's own exported symbols
-     * 2. Exported symbols from directly imported documents
+     * 2. Symbols from directly imported documents (with alias prefixing)
+     * 3. Symbols from package-boundary transitive imports (external packages only)
      *
      * @param referenceType - The AST type being referenced
      * @param context - Information about the reference
      * @returns A scope containing only visible elements
      */
     getGlobalScope(referenceType, context) {
-        const document = AstUtils.getDocument(context.container);
-        if (!document) {
+        try {
+            const document = AstUtils.getDocument(context.container);
+            if (!document) {
+                return EMPTY_SCOPE;
+            }
+            const descriptions = this.computeVisibleDescriptions(referenceType, document);
+            return new MapScope(descriptions);
+        }
+        catch (error) {
+            console.error('Error in getGlobalScope:', error);
             return EMPTY_SCOPE;
         }
-        // Get the set of URIs that are in scope for this document
-        const importedUris = this.getImportedDocumentUris(document);
-        // Filter the global index to only include descriptions from imported documents
-        const filteredDescriptions = this.filterDescriptionsByImports(referenceType, document, importedUris);
-        // Create a scope from the filtered descriptions
-        return new MapScope(filteredDescriptions);
     }
     /**
-     * Gets the set of document URIs that are directly imported by the given document.
-     *
-     * Uses the resolved imports tracked by DomainLangIndexManager during indexing.
-     * This ensures accurate resolution including path aliases.
+     * Computes all visible descriptions for a document, including:
+     * - Current document's own symbols
+     * - Direct imports (with alias prefixing)
+     * - Package-boundary transitive imports
      *
-     * @param document - The document to get imports for
-     * @returns Set of imported document URIs (as strings)
+     * @param referenceType - The AST type being referenced
+     * @param document - The document making the reference
+     * @returns Stream of visible descriptions
      */
-    getImportedDocumentUris(document) {
+    computeVisibleDescriptions(referenceType, document) {
         const docUri = document.uri.toString();
-        // Get resolved imports from the index manager (tracked during indexing)
-        const resolvedImports = this.domainLangIndexManager.getResolvedImports(docUri);
-        // Always include the current document itself
-        const importedUris = new Set([docUri]);
-        // Add all resolved import URIs
-        for (const resolvedUri of resolvedImports) {
-            importedUris.add(resolvedUri);
+        const allVisibleDescriptions = [];
+        // 1. Always include current document's own symbols
+        const ownDescriptions = this.indexManager.allElements(referenceType)
+            .filter(desc => desc.documentUri.toString() === docUri);
+        allVisibleDescriptions.push(...ownDescriptions.toArray());
+        // 2. Get import info (with aliases)
+        const importInfo = this.domainLangIndexManager.getImportInfo(docUri);
+        // Track which documents we've already included to avoid duplicates
+        const processedUris = new Set([docUri]);
+        // 3. Process each direct import
+        for (const imp of importInfo) {
+            if (!imp.resolvedUri || processedUris.has(imp.resolvedUri)) {
+                continue;
+            }
+            // Add descriptions from the directly imported document
+            this.addDescriptionsFromImport(imp, referenceType, processedUris, allVisibleDescriptions);
+            // 4. Check for package-boundary transitive imports
+            this.addPackageBoundaryTransitiveImports(imp, referenceType, document, processedUris, allVisibleDescriptions);
+        }
+        return stream(allVisibleDescriptions);
+    }
+    /**
+     * Adds descriptions from a single import, applying alias prefixing if needed.
+     *
+     * @param imp - Import information (specifier, alias, resolved URI)
+     * @param referenceType - The AST type being referenced
+     * @param processedUris - Set of already-processed URIs to avoid duplicates
+     * @param output - Array to append visible descriptions to
+     */
+    addDescriptionsFromImport(imp, referenceType, processedUris, output) {
+        const descriptions = this.indexManager.allElements(referenceType)
+            .filter(desc => desc.documentUri.toString() === imp.resolvedUri);
+        if (imp.alias) {
+            // With alias: prefix all names with alias
+            // Example: CoreDomain → ddd.CoreDomain
+            for (const desc of descriptions) {
+                output.push(this.createAliasedDescription(desc, imp.alias));
+            }
         }
-        return importedUris;
+        else {
+            // Without alias: use original names
+            output.push(...descriptions.toArray());
+        }
+        processedUris.add(imp.resolvedUri);
     }
     /**
-     * Filters the global index to only include descriptions from imported documents.
+     * Adds package-boundary transitive imports for external packages.
+     *
+     * When document A imports package document B (e.g., index.dlang),
+     * and B imports internal package files C, D, etc. (same package root),
+     * then A can see types from C, D, etc. (package re-exports).
+     *
+     * Local file imports remain non-transitive.
      *
+     * @param imp - Import information for the direct import
      * @param referenceType - The AST type being referenced
      * @param currentDocument - The document making the reference
-     * @param importedUris - Set of URIs that are in scope
-     * @returns Stream of filtered descriptions
+     * @param processedUris - Set of already-processed URIs to avoid duplicates
+     * @param output - Array to append visible descriptions to
+     */
+    addPackageBoundaryTransitiveImports(imp, referenceType, currentDocument, processedUris, output) {
+        // Get the imports of the imported document (B's imports)
+        const transitiveImports = this.domainLangIndexManager.getImportInfo(imp.resolvedUri);
+        for (const transitiveImp of transitiveImports) {
+            if (!transitiveImp.resolvedUri || processedUris.has(transitiveImp.resolvedUri)) {
+                continue;
+            }
+            // Check if both documents are in the same external package
+            // (package boundary = same commit directory within .dlang/packages/)
+            const samePackage = this.packageBoundaryDetector.areInSamePackageSync(imp.resolvedUri, transitiveImp.resolvedUri);
+            if (samePackage) {
+                // Within package boundary: include transitive imports
+                // Apply the top-level import's alias (if any)
+                this.addDescriptionsFromImport({
+                    specifier: transitiveImp.specifier,
+                    alias: imp.alias, // Use the top-level import's alias
+                    resolvedUri: transitiveImp.resolvedUri
+                }, referenceType, processedUris, output);
+            }
+        }
+    }
+    /**
+     * Creates an alias-prefixed version of a description.
+     *
+     * Example: CoreDomain with alias "ddd" → ddd.CoreDomain
+     *
+     * @param original - Original description
+     * @param alias - Import alias to prefix with
+     * @returns New description with prefixed name
      */
-    filterDescriptionsByImports(referenceType, currentDocument, importedUris) {
-        // Get all descriptions of the reference type from the index
-        const allDescriptions = this.indexManager.allElements(referenceType);
-        // Filter to only those from imported documents
-        return allDescriptions.filter(desc => {
-            const descDocUri = desc.documentUri.toString();
-            return importedUris.has(descDocUri);
-        });
+    createAliasedDescription(original, alias) {
+        return {
+            ...original,
+            name: `${alias}.${original.name}`
+        };
     }
 }
 //# sourceMappingURL=domain-lang-scope-provider.js.map

package/out/lsp/domain-lang-scope-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"domain-lang-scope-provider.js","sourceRoot":"","sources":["../../src/lsp/domain-lang-scope-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AASH,OAAO,EACH,QAAQ,EACR,oBAAoB,EACpB,WAAW,EACX,QAAQ,EACX,MAAM,SAAS,CAAC;AAIjB;;;;GAIG;AACH,MAAM,OAAO,uBAAwB,SAAQ,oBAAoB;IAM7D,YAAY,QAA4B;QACpC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,sBAAsB,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,YAAsC,CAAC;IACnG,CAAC;IAED;;;;;;;;;;;OAWG;IACgB,cAAc,CAAC,aAAqB,EAAE,OAAsB;QAC3E,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,WAAW,CAAC;QACvB,CAAC;QAED,0DAA0D;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAE5D,+EAA+E;QAC/E,MAAM,oBAAoB,GAAG,IAAI,CAAC,2BAA2B,CACzD,aAAa,EACb,QAAQ,EACR,YAAY,CACf,CAAC;QAEF,gDAAgD;QAChD,OAAO,IAAI,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;;;;OAQG;IACK,uBAAuB,CAAC,QAAyB;QACrD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAEvC,wEAAwE;QACxE,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAE/E,6CAA6C;QAC7C,MAAM,YAAY,GAAG,IAAI,GAAG,CAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAE/C,+BAA+B;QAC/B,KAAK,MAAM,WAAW,IAAI,eAAe,EAAE,CAAC;YACxC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,YAAY,CAAC;IACxB,CAAC;IAED;;;;;;;OAOG;IACK,2BAA2B,CAC/B,aAAqB,EACrB,eAAgC,EAChC,YAAyB;QAEzB,4DAA4D;QAC5D,MAAM,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QAErE,+CAA+C;QAC/C,OAAO,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;YAC/C,OAAO,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACP,CAAC;CACJ"}
+{"version":3,"file":"domain-lang-scope-provider.js","sourceRoot":"","sources":["../../src/lsp/domain-lang-scope-provider.ts"],"names":[],"mappings":"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"}

package/out/lsp/domain-lang-workspace-manager.d.ts

@@ -1,5 +1,6 @@
 import { DefaultWorkspaceManager, type FileSystemNode, type LangiumDocument, type LangiumSharedCoreServices, type WorkspaceFolder } from 'langium';
 import type { CancellationToken } from 'vscode-languageserver-protocol';
+import type { DomainLangServices } from '../domain-lang-module.js';
 /**
  * Langium WorkspaceManager override implementing manifest-centric import loading per PRS-010.
  *
@@ -48,7 +49,18 @@ import type { CancellationToken } from 'vscode-languageserver-protocol';
  */
 export declare class DomainLangWorkspaceManager extends DefaultWorkspaceManager {
     private readonly sharedServices;
+    /**
+     * DI-injected import resolver. Set via late-binding because
+     * WorkspaceManager (shared module) is created before ImportResolver (language module).
+     * Falls back to standalone ensureImportGraphFromDocument when not set.
+     */
+    private importResolver;
     constructor(services: LangiumSharedCoreServices);
+    /**
+     * Late-binds the language-specific services after DI initialization.
+     * Called from `createDomainLangServices()` after the language module is created.
+     */
+    setLanguageServices(services: DomainLangServices): void;
     shouldIncludeEntry(entry: FileSystemNode): boolean;
     initializeWorkspace(folders: WorkspaceFolder[], cancelToken?: CancellationToken): Promise<void>;
     protected loadAdditionalDocuments(folders: WorkspaceFolder[], collector: (document: LangiumDocument) => void): Promise<void>;
@@ -57,7 +69,7 @@ export declare class DomainLangWorkspaceManager extends DefaultWorkspaceManager
      *
      * Skips:
      * - Module directories (directories with model.yaml) - loaded via import graph
-     * - `.dlang/cache` directory - package cache managed by CLI
+     * - `.dlang/packages` directory - package cache managed by CLI
      *
      * @param folders - Workspace folders to scan
      * @param moduleDirectories - Set of directories containing model.yaml (to skip)
@@ -66,7 +78,7 @@ export declare class DomainLangWorkspaceManager extends DefaultWorkspaceManager
     private loadStandaloneFiles;
     /**
      * Recursively loads .dlang files from a directory.
-     * Skips module directories and the .dlang/cache package cache.
+     * Skips module directories and the .dlang/packages cache.
      */
     private loadDlangFilesRecursively;
     /**
@@ -85,4 +97,13 @@ export declare class DomainLangWorkspaceManager extends DefaultWorkspaceManager
      * @returns Array of manifest info (one per model.yaml found)
      */
     private findAllManifestsInFolders;
+    /**
+     * Recursively builds the import graph from a document.
+     * Uses the DI-injected ImportResolver when available,
+     * falling back to the standalone utility.
+     *
+     * @param document - The starting document
+     * @returns Set of URIs (as strings) for all documents in the import graph
+     */
+    private loadImportGraph;
 }

package/out/lsp/domain-lang-workspace-manager.js

@@ -54,6 +54,13 @@ export class DomainLangWorkspaceManager extends DefaultWorkspaceManager {
         super(services);
         this.sharedServices = services;
     }
+    /**
+     * Late-binds the language-specific services after DI initialization.
+     * Called from `createDomainLangServices()` after the language module is created.
+     */
+    setLanguageServices(services) {
+        this.importResolver = services.imports.ImportResolver;
+    }
     shouldIncludeEntry(entry) {
         // Prevent auto-including .dlang files; we'll load via entry/import graph
         const name = UriUtils.basename(entry.uri);
@@ -80,7 +87,7 @@ export class DomainLangWorkspaceManager extends DefaultWorkspaceManager {
                 await this.sharedServices.workspace.DocumentBuilder.build([entryDoc], {
                     validation: true
                 });
-                const uris = await ensureImportGraphFromDocument(entryDoc, this.langiumDocuments);
+                const uris = await this.loadImportGraph(entryDoc);
                 const importedDocs = [];
                 for (const uriString of uris) {
                     const uri = URI.parse(uriString);
@@ -110,7 +117,7 @@ export class DomainLangWorkspaceManager extends DefaultWorkspaceManager {
      *
      * Skips:
      * - Module directories (directories with model.yaml) - loaded via import graph
-     * - `.dlang/cache` directory - package cache managed by CLI
+     * - `.dlang/packages` directory - package cache managed by CLI
      *
      * @param folders - Workspace folders to scan
      * @param moduleDirectories - Set of directories containing model.yaml (to skip)
@@ -132,20 +139,20 @@ export class DomainLangWorkspaceManager extends DefaultWorkspaceManager {
     }
     /**
      * Recursively loads .dlang files from a directory.
-     * Skips module directories and the .dlang/cache package cache.
+     * Skips module directories and the .dlang/packages cache.
      */
     async loadDlangFilesRecursively(dirPath, moduleDirectories, collector) {
         // Skip module directories - they're loaded via import graph
         if (moduleDirectories.has(dirPath)) {
             return [];
         }
-        // Skip .dlang/cache - package cache managed by CLI
+        // Skip .dlang/packages - package cache managed by CLI
         const baseName = path.basename(dirPath);
         const parentName = path.basename(path.dirname(dirPath));
-        if (baseName === 'cache' && parentName === '.dlang') {
+        if (baseName === 'packages' && parentName === '.dlang') {
             return [];
         }
-        // Also skip the .dlang directory itself if it contains cache
+        // Also skip the .dlang directory itself (contains packages cache)
         if (baseName === '.dlang') {
             return [];
         }
@@ -211,5 +218,43 @@ export class DomainLangWorkspaceManager extends DefaultWorkspaceManager {
         const directories = folders.map(f => URI.parse(f.uri).fsPath);
         return findManifestsInDirectories(directories);
     }
+    /**
+     * Recursively builds the import graph from a document.
+     * Uses the DI-injected ImportResolver when available,
+     * falling back to the standalone utility.
+     *
+     * @param document - The starting document
+     * @returns Set of URIs (as strings) for all documents in the import graph
+     */
+    async loadImportGraph(document) {
+        if (!this.importResolver) {
+            // Fallback to standalone utility when DI isn't wired
+            return ensureImportGraphFromDocument(document, this.langiumDocuments);
+        }
+        const resolver = this.importResolver;
+        const langiumDocuments = this.langiumDocuments;
+        const visited = new Set();
+        async function visit(doc) {
+            const uriString = doc.uri.toString();
+            if (visited.has(uriString))
+                return;
+            visited.add(uriString);
+            const model = doc.parseResult.value;
+            for (const imp of model.imports ?? []) {
+                if (!imp.uri)
+                    continue;
+                try {
+                    const resolvedUri = await resolver.resolveForDocument(doc, imp.uri);
+                    const childDoc = await langiumDocuments.getOrCreateDocument(resolvedUri);
+                    await visit(childDoc);
+                }
+                catch {
+                    // Import resolution failed — validation will report the error
+                }
+            }
+        }
+        await visit(document);
+        return visited;
+    }
 }
 //# sourceMappingURL=domain-lang-workspace-manager.js.map

package/out/lsp/domain-lang-workspace-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"domain-lang-workspace-manager.js","sourceRoot":"","sources":["../../src/lsp/domain-lang-workspace-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"domain-lang-workspace-manager.js","sourceRoot":"","sources":["../../src/lsp/domain-lang-workspace-manager.ts"],"names":[],"mappings":"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"}

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

@@ -3,6 +3,7 @@ import type { LangiumServices } from 'langium/lsp';
 import { AstNodeHoverProvider } from 'langium/lsp';
 import type { Hover, HoverParams } from 'vscode-languageserver';
 import { QualifiedNameProvider } from '../domain-lang-naming.js';
+import type { DomainLangIndexManager } from '../domain-lang-index-manager.js';
 /**
  * Provides hover information for DomainLang elements.
  *
@@ -13,6 +14,7 @@ export declare class DomainLangHoverProvider extends AstNodeHoverProvider {
     protected readonly documentationProvider: DocumentationProvider;
     protected readonly commentProvider: CommentProvider;
     protected readonly qualifiedNameProvider: QualifiedNameProvider;
+    protected readonly indexManager: DomainLangIndexManager;
     /**
      * Registry of type-specific hover content generators.
      * Each generator returns content for its node type, or undefined to skip.
@@ -22,6 +24,8 @@ export declare class DomainLangHoverProvider extends AstNodeHoverProvider {
     getHoverContent(document: LangiumDocument, params: HoverParams): Promise<Hover | undefined>;
     /**
      * Try to get hover for a declaration node (AST node).
+     * For qualified name references, only shows hover when hovering over the last segment.
+     * For qualified name declarations (like namespace names), shows hover on any segment.
      */
     private tryGetDeclarationHover;
     /**
@@ -29,7 +33,12 @@ export declare class DomainLangHoverProvider extends AstNodeHoverProvider {
      * Uses the keyword dictionary for all keywords.
      */
     private tryGetKeywordHover;
-    protected getAstNodeHoverContent(node: AstNode): MaybePromise<string | undefined>;
+    protected getAstNodeHoverContent(node: AstNode, currentDocument?: LangiumDocument): MaybePromise<string | undefined>;
+    /**
+     * Gets the import alias for a node if it's from an imported document.
+     * Returns undefined if the node is in the same document or not imported with an alias.
+     */
+    private getImportAliasForNode;
     private getDomainHover;
     private getThisRefHover;
     private getBoundedContextHover;
@@ -47,17 +56,18 @@ export declare class DomainLangHoverProvider extends AstNodeHoverProvider {
     private getImportHover;
     private getDefaultHover;
     /**
-     * Formats a relationship line for hover display.
+     * Computes the display name for a node in hover, considering import aliases.
+     * If node is imported with an alias, shows `alias.name`, otherwise shows full qualified name.
      */
-    private formatRelationshipLine;
+    private getDisplayNameForHover;
     /**
-     * Wraps text in a domain-lang code block.
+     * Formats a relationship line for hover display.
      */
-    private codeBlock;
+    private formatRelationshipLine;
     /**
      * Formats the final hover content with consistent structure.
+     * Delegates to the shared hover-builders utility.
      */
     private formatHover;
-    private getRefName;
     private refLink;
 }