@domainlang/language 0.7.0 → 0.9.0

package/src/sdk/validator.ts

@@ -0,0 +1,358 @@
+/**
+ * Model validation utilities for Node.js environments.
+ * 
+ * **WARNING: This module is NOT browser-compatible.**
+ * 
+ * Provides validation capabilities that leverage the LSP infrastructure
+ * for workspace initialization, import resolution, and document building.
+ * 
+ * @module sdk/validator
+ */
+
+import { NodeFileSystem } from 'langium/node';
+import { URI } from 'langium';
+import { createDomainLangServices } from '../domain-lang-module.js';
+import { ensureImportGraphFromDocument } from '../utils/import-utils.js';
+import { isModel } from '../generated/ast.js';
+import { dirname, resolve, join } from 'node:path';
+import { existsSync } from 'node:fs';
+
+/**
+ * Validation diagnostic with file context.
+ */
+export interface ValidationDiagnostic {
+    /** Diagnostic severity (1=error, 2=warning, 3=info, 4=hint) */
+    severity: number;
+    /** Diagnostic message */
+    message: string;
+    /** File path where diagnostic occurred */
+    file: string;
+    /** Line number (1-based) */
+    line: number;
+    /** Column number (1-based) */
+    column: number;
+}
+
+/**
+ * Result of model validation.
+ */
+export interface ValidationResult {
+    /** Whether the model is valid (no errors) */
+    valid: boolean;
+    /** Number of files validated */
+    fileCount: number;
+    /** Number of domains in the model */
+    domainCount: number;
+    /** Number of bounded contexts in the model */
+    bcCount: number;
+    /** Validation errors */
+    errors: ValidationDiagnostic[];
+    /** Validation warnings */
+    warnings: ValidationDiagnostic[];
+}
+
+/**
+ * Options for validation.
+ */
+export interface ValidationOptions {
+    /** Workspace directory (defaults to file's directory) */
+    workspaceDir?: string;
+}
+
+/**
+ * Convert Langium diagnostic to ValidationDiagnostic.
+ */
+function toValidationDiagnostic(
+    diagnostic: { severity?: number; message: string; range: { start: { line: number; character: number } } },
+    file: string
+): ValidationDiagnostic {
+    return {
+        severity: diagnostic.severity ?? 1,
+        message: diagnostic.message,
+        file,
+        line: diagnostic.range.start.line + 1,
+        column: diagnostic.range.start.character + 1,
+    };
+}
+
+/**
+ * Validates a DomainLang model file and all its imports.
+ * 
+ * Uses the LSP infrastructure to:
+ * - Initialize the workspace
+ * - Resolve and load imports
+ * - Build and validate all documents
+ * 
+ * @param filePath - Path to the entry .dlang file
+ * @param options - Validation options
+ * @returns Validation result with errors, warnings, and model statistics
+ * @throws Error if file doesn't exist or has invalid extension
+ * 
+ * @example
+ * ```typescript
+ * import { validateFile } from '@domainlang/language/sdk';
+ * 
+ * const result = await validateFile('./index.dlang');
+ * 
+ * if (!result.valid) {
+ *   for (const err of result.errors) {
+ *     console.error(`${err.file}:${err.line}:${err.column}: ${err.message}`);
+ *   }
+ *   process.exit(1);
+ * }
+ * 
+ * console.log(`✓ Validated ${result.fileCount} files`);
+ * console.log(`  ${result.domainCount} domains, ${result.bcCount} bounded contexts`);
+ * ```
+ */
+export async function validateFile(
+    filePath: string,
+    options: ValidationOptions = {}
+): Promise<ValidationResult> {
+    // Resolve absolute path
+    const absolutePath = resolve(filePath);
+    
+    // Check file exists
+    if (!existsSync(absolutePath)) {
+        throw new Error(`File not found: ${filePath}`);
+    }
+
+    // Create services with workspace support
+    const servicesObj = createDomainLangServices(NodeFileSystem);
+    const shared = servicesObj.shared;
+    const services = servicesObj.DomainLang;
+    
+    // Check file extension
+    const extensions = services.LanguageMetaData.fileExtensions;
+    if (!extensions.some(ext => absolutePath.endsWith(ext))) {
+        throw new Error(`Invalid file extension. Expected: ${extensions.join(', ')}`);
+    }
+
+    // Initialize workspace with the specified directory or file's directory
+    const workspaceDir = options.workspaceDir ?? dirname(absolutePath);
+    const workspaceManager = services.imports.WorkspaceManager;
+    await workspaceManager.initialize(workspaceDir);
+
+    // Load and parse the document
+    const uri = URI.file(absolutePath);
+    const document = await shared.workspace.LangiumDocuments.getOrCreateDocument(uri);
+    
+    // Build document initially without validation to load imports
+    await shared.workspace.DocumentBuilder.build([document], { validation: false });
+    
+    // Load all imported documents via the import graph
+    const importResolver = services.imports.ImportResolver;
+    await ensureImportGraphFromDocument(
+        document,
+        shared.workspace.LangiumDocuments,
+        importResolver
+    );
+    
+    // Build all documents with validation enabled
+    const allDocuments = Array.from(shared.workspace.LangiumDocuments.all);
+    await shared.workspace.DocumentBuilder.build(allDocuments, { validation: true });
+
+    // Collect diagnostics from the entry document
+    const diagnostics = document.diagnostics ?? [];
+    const errors: ValidationDiagnostic[] = [];
+    const warnings: ValidationDiagnostic[] = [];
+
+    for (const diagnostic of diagnostics) {
+        const validationDiag = toValidationDiagnostic(diagnostic, absolutePath);
+        if (diagnostic.severity === 1) {
+            errors.push(validationDiag);
+        } else if (diagnostic.severity === 2) {
+            warnings.push(validationDiag);
+        }
+    }
+
+    // Count model elements across all documents
+    let domainCount = 0;
+    let bcCount = 0;
+
+    for (const doc of allDocuments) {
+        const model = doc.parseResult?.value;
+        if (isModel(model)) {
+            for (const element of model.children ?? []) {
+                if (element.$type === 'Domain') {
+                    domainCount++;
+                } else if (element.$type === 'BoundedContext') {
+                    bcCount++;
+                }
+            }
+        }
+    }
+
+    return {
+        valid: errors.length === 0,
+        fileCount: allDocuments.length,
+        domainCount,
+        bcCount,
+        errors,
+        warnings,
+    };
+}
+
+/**
+ * Workspace validation result with diagnostics grouped by file.
+ */
+export interface WorkspaceValidationResult {
+    /** Whether the workspace is valid (no errors in any file) */
+    valid: boolean;
+    /** Number of files validated */
+    fileCount: number;
+    /** Number of domains across all files */
+    domainCount: number;
+    /** Number of bounded contexts across all files */
+    bcCount: number;
+    /** Validation errors grouped by file path */
+    errors: ValidationDiagnostic[];
+    /** Validation warnings grouped by file path */
+    warnings: ValidationDiagnostic[];
+    /** Total number of diagnostics across all files */
+    totalDiagnostics: number;
+}
+
+/**
+ * Validates an entire DomainLang workspace.
+ * 
+ * Uses the LSP infrastructure to:
+ * - Initialize the workspace from a directory containing model.yaml
+ * - Load the entry file (from manifest or default index.dlang)
+ * - Resolve and load all imports
+ * - Build and validate all documents in the workspace
+ * - Collect diagnostics from ALL documents (like VS Code Problems pane)
+ * 
+ * @param workspaceDir - Path to the workspace directory (containing model.yaml)
+ * @returns Validation result with diagnostics from all files
+ * @throws Error if workspace directory doesn't exist or cannot be loaded
+ * 
+ * @example
+ * ```typescript
+ * import { validateWorkspace } from '@domainlang/language/sdk';
+ * 
+ * const result = await validateWorkspace('./my-workspace');
+ * 
+ * if (!result.valid) {
+ *   console.error(`Found ${result.errors.length} errors in ${result.fileCount} files`);
+ *   
+ *   for (const err of result.errors) {
+ *     console.error(`${err.file}:${err.line}:${err.column}: ${err.message}`);
+ *   }
+ *   process.exit(1);
+ * }
+ * 
+ * console.log(`✓ Validated ${result.fileCount} files`);
+ * console.log(`  ${result.domainCount} domains, ${result.bcCount} bounded contexts`);
+ * console.log(`  0 errors, ${result.warnings.length} warnings`);
+ * ```
+ */
+export async function validateWorkspace(
+    workspaceDir: string
+): Promise<WorkspaceValidationResult> {
+    // Resolve absolute path
+    const absolutePath = resolve(workspaceDir);
+    
+    // Check directory exists
+    if (!existsSync(absolutePath)) {
+        throw new Error(`Workspace directory not found: ${workspaceDir}`);
+    }
+
+    // Create services with workspace support
+    const servicesObj = createDomainLangServices(NodeFileSystem);
+    const shared = servicesObj.shared;
+    const services = servicesObj.DomainLang;
+    const workspaceManager = services.imports.WorkspaceManager;
+
+    try {
+        // Initialize workspace - this will find and load model.yaml
+        await workspaceManager.initialize(absolutePath);
+    } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`Failed to initialize workspace at ${workspaceDir}: ${message}`);
+    }
+
+    // Get the manifest to find the entry file
+    const manifest = await workspaceManager.getManifest();
+    let entryFile = 'index.dlang';
+    
+    if (manifest?.model?.entry) {
+        entryFile = manifest.model.entry;
+    }
+
+    const entryPath = join(absolutePath, entryFile);
+    
+    // Check if entry file exists
+    if (!existsSync(entryPath)) {
+        throw new Error(
+            `Entry file not found: ${entryFile}\n` +
+            `Expected at: ${entryPath}\n` +
+            (manifest ? `Specified in manifest` : `Using default entry file`)
+        );
+    }
+
+    // Load and parse the entry document
+    const uri = URI.file(entryPath);
+    const document = await shared.workspace.LangiumDocuments.getOrCreateDocument(uri);
+    
+    // Build document initially without validation to load imports
+    await shared.workspace.DocumentBuilder.build([document], { validation: false });
+    
+    // Load all imported documents via the import graph
+    const importResolver = services.imports.ImportResolver;
+    await ensureImportGraphFromDocument(
+        document,
+        shared.workspace.LangiumDocuments,
+        importResolver
+    );
+    
+    // Build all documents with validation enabled
+    const allDocuments = Array.from(shared.workspace.LangiumDocuments.all);
+    await shared.workspace.DocumentBuilder.build(allDocuments, { validation: true });
+
+    // Collect diagnostics from ALL documents (not just entry)
+    const errors: ValidationDiagnostic[] = [];
+    const warnings: ValidationDiagnostic[] = [];
+
+    for (const doc of allDocuments) {
+        const diagnostics = doc.diagnostics ?? [];
+        const docPath = doc.uri.fsPath;
+        
+        for (const diagnostic of diagnostics) {
+            const validationDiag = toValidationDiagnostic(diagnostic, docPath);
+            
+            if (diagnostic.severity === 1) {
+                errors.push(validationDiag);
+            } else if (diagnostic.severity === 2) {
+                warnings.push(validationDiag);
+            }
+        }
+    }
+
+    // Count model elements across all documents
+    let domainCount = 0;
+    let bcCount = 0;
+
+    for (const doc of allDocuments) {
+        const model = doc.parseResult?.value;
+        if (isModel(model)) {
+            for (const element of model.children ?? []) {
+                if (element.$type === 'Domain') {
+                    domainCount++;
+                } else if (element.$type === 'BoundedContext') {
+                    bcCount++;
+                }
+            }
+        }
+    }
+
+    return {
+        valid: errors.length === 0,
+        fileCount: allDocuments.length,
+        domainCount,
+        bcCount,
+        errors,
+        warnings,
+        totalDiagnostics: errors.length + warnings.length,
+    };
+}

package/src/services/package-boundary-detector.ts

@@ -0,0 +1,238 @@
+/**
+ * Package Boundary Detector
+ * 
+ * Determines package boundaries for import scoping.
+ * Per ADR-003, package boundaries are defined by:
+ * - External packages: Files within .dlang/packages/ sharing the same model.yaml
+ * - Local files: Each file is its own boundary (non-transitive)
+ * 
+ * Used by DomainLangScopeProvider to enable transitive imports within
+ * package boundaries while keeping local file imports non-transitive.
+ */
+
+import * as path from 'node:path';
+import * as fs from 'node:fs/promises';
+import { URI } from 'langium';
+
+/**
+ * Detects and caches package boundaries for efficient scope resolution.
+ */
+export class PackageBoundaryDetector {
+    /**
+     * Cache mapping document URI to its package root path.
+     * - External packages: path to directory containing model.yaml
+     * - Local files: null (no package boundary)
+     */
+    private readonly packageRootCache = new Map<string, string | null>();
+
+    /**
+     * Determines if a document is part of an external package.
+     * 
+     * External packages are stored in .dlang/packages/owner/repo/commit/
+     * 
+     * @param documentUri - The URI of the document to check
+     * @returns true if document is in an external package
+     */
+    isExternalPackage(documentUri: URI | string): boolean {
+        const fsPath = this.toFsPath(documentUri);
+        const normalized = fsPath.split(path.sep);
+        
+        // Check if path contains .dlang/packages/
+        const dlangIndex = normalized.indexOf('.dlang');
+        if (dlangIndex === -1) {
+            return false;
+        }
+        
+        return dlangIndex + 1 < normalized.length && 
+               normalized[dlangIndex + 1] === 'packages';
+    }
+
+    /**
+     * Gets the package root for a document.
+     * 
+     * For external packages (.dlang/packages/), walks up from the document
+     * to find the nearest model.yaml file within the package structure.
+     * 
+     * For local files, returns null (no package boundary).
+     * 
+     * @param documentUri - The URI of the document
+     * @returns Absolute path to package root, or null if not in a package
+     */
+    async getPackageRoot(documentUri: URI | string): Promise<string | null> {
+        const uriString = documentUri.toString();
+        
+        // Check cache first
+        if (this.packageRootCache.has(uriString)) {
+            return this.packageRootCache.get(uriString) ?? null;
+        }
+        
+        // If not an external package, it has no package boundary
+        if (!this.isExternalPackage(documentUri)) {
+            this.packageRootCache.set(uriString, null);
+            return null;
+        }
+        
+        const fsPath = this.toFsPath(documentUri);
+        const packageRoot = await this.findPackageRootForExternal(fsPath);
+        this.packageRootCache.set(uriString, packageRoot);
+        return packageRoot;
+    }
+
+    /**
+     * Checks if two documents are in the same package (synchronous heuristic).
+     * 
+     * This is a fast, synchronous check that compares package commit directories
+     * without filesystem access. Documents are in the same package if:
+     * - Both are in .dlang/packages/ AND
+     * - They share the same owner/repo/commit path
+     * 
+     * This is used by the scope provider which needs synchronous access.
+     * 
+     * Structure: .dlang/packages/owner/repo/commit/...
+     * 
+     * @param doc1Uri - URI of first document
+     * @param doc2Uri - URI of second document
+     * @returns true if both are in the same package commit directory
+     */
+    areInSamePackageSync(doc1Uri: URI | string, doc2Uri: URI | string): boolean {
+        // Both must be external packages
+        if (!this.isExternalPackage(doc1Uri) || !this.isExternalPackage(doc2Uri)) {
+            return false;
+        }
+        
+        const path1 = this.toFsPath(doc1Uri);
+        const path2 = this.toFsPath(doc2Uri);
+        
+        const root1 = this.getPackageCommitDirectory(path1);
+        const root2 = this.getPackageCommitDirectory(path2);
+        
+        return root1 !== null && root1 === root2;
+    }
+
+    /**
+     * Gets the package commit directory (owner/repo/commit) from a path.
+     * 
+     * @param fsPath - Filesystem path
+     * @returns Commit directory path or null
+     */
+    private getPackageCommitDirectory(fsPath: string): string | null {
+        const normalized = fsPath.split(path.sep);
+        const dlangIndex = normalized.indexOf('.dlang');
+        
+        if (dlangIndex === -1) {
+            return null;
+        }
+        
+        const packagesIndex = dlangIndex + 1;
+        if (packagesIndex >= normalized.length || normalized[packagesIndex] !== 'packages') {
+            return null;
+        }
+        
+        // Commit directory is at: .dlang/packages/owner/repo/commit
+        const commitIndex = packagesIndex + 3;
+        if (commitIndex >= normalized.length) {
+            return null;
+        }
+        
+        // Return the path up to and including the commit directory
+        return normalized.slice(0, commitIndex + 1).join(path.sep);
+    }
+
+    /**
+     * Checks if two documents are in the same package.
+     * 
+     * Documents are in the same package if:
+     * - Both are external packages AND
+     * - They share the same package root (model.yaml location)
+     * 
+     * Local files are never in the same package (each is isolated).
+     * 
+     * @param doc1Uri - URI of first document
+     * @param doc2Uri - URI of second document
+     * @returns true if both documents are in the same package
+     */
+    async areInSamePackage(doc1Uri: URI | string, doc2Uri: URI | string): Promise<boolean> {
+        const root1 = await this.getPackageRoot(doc1Uri);
+        const root2 = await this.getPackageRoot(doc2Uri);
+        
+        // If either is not in a package, they can't be in the same package
+        if (!root1 || !root2) {
+            return false;
+        }
+        
+        return root1 === root2;
+    }
+
+    /**
+     * Finds the package root for an external package by walking up to find model.yaml.
+     * 
+     * External packages have structure: .dlang/packages/owner/repo/commit/...
+     * The model.yaml should be at the commit level or just below it.
+     * 
+     * @param fsPath - Filesystem path of the document
+     * @returns Path to directory containing model.yaml, or null
+     */
+    private async findPackageRootForExternal(fsPath: string): Promise<string | null> {
+        const normalized = fsPath.split(path.sep);
+        const dlangIndex = normalized.indexOf('.dlang');
+        
+        if (dlangIndex === -1) {
+            return null;
+        }
+        
+        // Find the packages directory
+        const packagesIndex = dlangIndex + 1;
+        if (packagesIndex >= normalized.length || normalized[packagesIndex] !== 'packages') {
+            return null;
+        }
+        
+        // Start from the commit directory level
+        // Structure: .dlang/packages/owner/repo/commit/
+        const commitIndex = packagesIndex + 3;
+        if (commitIndex >= normalized.length) {
+            return null;
+        }
+        
+        // Walk up from the document path to the commit directory
+        let currentPath = path.dirname(fsPath);
+        const commitPath = normalized.slice(0, commitIndex + 1).join(path.sep);
+        
+        // Search upward for model.yaml, but don't go above the commit directory
+        while (currentPath.length >= commitPath.length) {
+            const manifestPath = path.join(currentPath, 'model.yaml');
+            try {
+                await fs.access(manifestPath);
+                return currentPath;
+            } catch {
+                // model.yaml not found at this level, continue upward
+            }
+            
+            const parent = path.dirname(currentPath);
+            if (parent === currentPath) {
+                // Reached filesystem root without finding model.yaml
+                break;
+            }
+            currentPath = parent;
+        }
+        
+        return null;
+    }
+
+    /**
+     * Converts a URI to a filesystem path.
+     */
+    private toFsPath(uri: URI | string): string {
+        if (typeof uri === 'string') {
+            uri = URI.parse(uri);
+        }
+        return uri.fsPath;
+    }
+
+    /**
+     * Clears the package root cache.
+     * Call this when packages are installed/removed.
+     */
+    clearCache(): void {
+        this.packageRootCache.clear();
+    }
+}

package/src/services/performance-optimizer.ts

@@ -76,7 +76,8 @@ export class PerformanceOptimizer {
 
         try {
             const content = await fs.readFile(manifestPath, 'utf-8');
-            const manifest = JSON.parse(content);
+            const { parse } = await import('yaml');
+            const manifest: unknown = parse(content);
 
             this.manifestCache.set(cacheKey, {
                 value: manifest,
@@ -127,7 +128,10 @@ export class PerformanceOptimizer {
                 const stat = await fs.stat(lockPath);
                 const cached = this.lockFileCache.get(workspaceRoot);
                 
-                if (cached && stat.mtimeMs > cached.timestamp) {
+                // Floor mtimeMs to integer precision to match Date.now() —
+                // some filesystems (e.g. APFS) report sub-millisecond mtime,
+                // which can exceed the integer timestamp from Date.now().
+                if (cached && Math.floor(stat.mtimeMs) > cached.timestamp) {
                     stale.push(workspaceRoot);
                 }
             } catch {

package/src/services/types.ts

@@ -42,6 +42,31 @@
 // Core Building Blocks
 // ============================================================================
 
+/**
+ * Information about an import statement tracked during indexing.
+ * 
+ * Used by IndexManager to track both the import's resolved location
+ * and its alias (if any) for scope resolution.
+ * 
+ * @example
+ * ```typescript
+ * // import "larsbaunwall/ddd-types" as ddd
+ * const info: ImportInfo = {
+ *   specifier: "larsbaunwall/ddd-types",
+ *   alias: "ddd",
+ *   resolvedUri: "file:///.dlang/packages/larsbaunwall/ddd-types/abc123/index.dlang"
+ * };
+ * ```
+ */
+export interface ImportInfo {
+    /** The import specifier as written in source (e.g., "./file.dlang", "owner/repo") */
+    readonly specifier: string;
+    /** Optional alias from 'as' clause (e.g., "ddd" in 'import "pkg" as ddd') */
+    readonly alias?: string;
+    /** Resolved absolute URI of the imported document */
+    readonly resolvedUri: string;
+}
+
 /**
  * Type of git reference for version pinning.
  *