@domainlang/language 0.6.0 → 0.8.0

package/out/services/package-boundary-detector.js

@@ -0,0 +1,211 @@
+/**
+ * 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 {
+    constructor() {
+        /**
+         * Cache mapping document URI to its package root path.
+         * - External packages: path to directory containing model.yaml
+         * - Local files: null (no package boundary)
+         */
+        this.packageRootCache = new Map();
+    }
+    /**
+     * 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) {
+        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) {
+        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, doc2Uri) {
+        // 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
+     */
+    getPackageCommitDirectory(fsPath) {
+        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, doc2Uri) {
+        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
+     */
+    async findPackageRootForExternal(fsPath) {
+        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.
+     */
+    toFsPath(uri) {
+        if (typeof uri === 'string') {
+            uri = URI.parse(uri);
+        }
+        return uri.fsPath;
+    }
+    /**
+     * Clears the package root cache.
+     * Call this when packages are installed/removed.
+     */
+    clearCache() {
+        this.packageRootCache.clear();
+    }
+}
+//# sourceMappingURL=package-boundary-detector.js.map

package/out/services/package-boundary-detector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"package-boundary-detector.js","sourceRoot":"","sources":["../../src/services/package-boundary-detector.ts"],"names":[],"mappings":"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"}

package/out/services/performance-optimizer.js

@@ -56,7 +56,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 = parse(content);
             this.manifestCache.set(cacheKey, {
                 value: manifest,
                 timestamp: Date.now(),
@@ -100,7 +101,10 @@ export class PerformanceOptimizer {
             try {
                 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);
                 }
             }

package/out/services/performance-optimizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"performance-optimizer.js","sourceRoot":"","sources":["../../src/services/performance-optimizer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"performance-optimizer.js","sourceRoot":"","sources":["../../src/services/performance-optimizer.ts"],"names":[],"mappings":"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"}

package/out/services/types.d.ts

@@ -37,6 +37,30 @@
  *
  * @module services/types
  */
+/**
+ * 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.
  *

package/out/services/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/services/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AA+GH;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAC,GAAmB;IACxD,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,CAAC;AACnD,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/services/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAwIH;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAC,GAAmB;IACxD,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,CAAC;AACnD,CAAC"}

package/out/services/workspace-manager.d.ts

@@ -2,6 +2,11 @@ import type { LockFile, ModelManifest, DependencySpec, ExtendedDependencySpec, P
 /**
  * Coordinates workspace discovery and manifest/lock file reading.
  *
+ * **Multi-Root Support:**
+ * Maintains separate contexts for each workspace root (directory with model.yaml).
+ * This enables correct resolution in multi-project setups where sub-projects
+ * have their own model.yaml files.
+ *
  * This is a read-only service for the LSP - it does NOT:
  * - Generate lock files (use CLI: `dlang install`)
  * - Download packages (use CLI: `dlang install`)
@@ -15,16 +20,41 @@ import type { LockFile, ModelManifest, DependencySpec, ExtendedDependencySpec, P
 export declare class WorkspaceManager {
     private readonly manifestFiles;
     private readonly lockFiles;
-    private workspaceRoot;
-    private lockFile;
-    private initializePromise;
-    private manifestCache;
+    /**
+     * Cache of workspace contexts by resolved workspace root path.
+     * Supports multiple independent workspaces in a single session.
+     */
+    private readonly workspaceContexts;
+    /**
+     * Cache mapping start paths to their resolved workspace roots.
+     * Avoids repeated directory tree walking for the same paths.
+     */
+    private readonly pathToRootCache;
+    /**
+     * The currently active workspace root (set by last initialize() call).
+     * Used by methods like getWorkspaceRoot(), getManifest(), etc.
+     */
+    private activeRoot;
     constructor(options?: WorkspaceManagerOptions);
+    /**
+     * Returns the active workspace context, or undefined if not initialized.
+     * All methods that need context should call this after ensureInitialized().
+     */
+    private getActiveContext;
     /**
      * Finds the workspace root and loads any existing lock file.
-     * Repeated calls await the same initialization work.
+     *
+     * **Multi-Root Support:**
+     * Each call may switch to a different workspace context based on the startPath.
+     * The workspace root is the nearest ancestor directory containing model.yaml.
+     *
+     * @param startPath - Directory to start searching from (usually document directory)
      */
     initialize(startPath: string): Promise<void>;
+    /**
+     * Initializes a workspace context by loading its lock file.
+     */
+    private initializeContext;
     /**
      * Returns the absolute path of the workspace root.
      * @throws Error if {@link initialize} has not completed successfully.
@@ -33,8 +63,19 @@ export declare class WorkspaceManager {
     /**
      * Returns the project-local package cache directory.
      * Per PRS-010: .dlang/packages/
+     *
+     * If the current workspace root is inside a cached package,
+     * walks up to find the actual project root's cache directory.
      */
     getCacheDir(): string;
+    /**
+     * Finds the actual project root when inside a cached package.
+     *
+     * Cached packages are stored in: <project>/.dlang/packages/<owner>/<repo>/<commit>/
+     * If workspaceRoot is inside this structure, returns <project>
+     * Otherwise returns workspaceRoot unchanged.
+     */
+    private findProjectRootFromCache;
     /**
      * Resolves the manifest file path within the workspace, if present.
      */
@@ -44,6 +85,20 @@ export declare class WorkspaceManager {
      * Uses cached contents when unchanged on disk.
      */
     getManifest(): Promise<ModelManifest | undefined>;
+    /**
+     * Returns the cached manifest synchronously (if available).
+     * Used by LSP features that need synchronous access (like completion).
+     * Returns undefined if manifest hasn't been loaded yet.
+     */
+    getCachedManifest(): ModelManifest | undefined;
+    /**
+     * Ensures the manifest is loaded and returns it.
+     * Use this over getCachedManifest() when you need to guarantee the manifest
+     * is available (e.g., in async LSP operations like completions).
+     *
+     * @returns The manifest or undefined if no model.yaml exists
+     */
+    ensureManifestLoaded(): Promise<ModelManifest | undefined>;
     /**
      * Gets the currently cached lock file.
      * Returns undefined if no lock file exists (run `dlang install` to create one).
@@ -94,11 +149,23 @@ export declare class WorkspaceManager {
      * Reads the entry point from a cached package's model.yaml.
      */
     private readPackageEntry;
-    private performInitialization;
     private ensureInitialized;
     private loadLockFileFromDisk;
     private tryReadLockFile;
     private loadManifest;
+    /**
+     * Reads, validates, and caches a manifest file.
+     */
+    private readAndCacheManifest;
+    /**
+     * Handles errors from manifest loading, distinguishing recoverable
+     * errors (missing file, parse errors) from unexpected ones.
+     */
+    private handleManifestError;
+    /**
+     * Clears the manifest cache on the given context, if available.
+     */
+    private clearManifestCache;
     /**
      * Validates manifest structure and dependency configurations.
      * Throws detailed errors for invalid manifests.