@domainlang/language 0.1.20 → 0.1.82

package/src/services/import-resolver.ts

@@ -1,274 +1,24 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { URI, type LangiumDocument } from 'langium';
 import { WorkspaceManager } from './workspace-manager.js';
+import { URI } from 'langium';
 import type { DomainLangServices } from '../domain-lang-module.js';
-import type { LockFile } from './types.js';
+import type { LockFile } from './git-url-resolver.js';
 
 /**
- * ImportResolver resolves import statements using manifest-centric rules (PRS-010).
- *
- * Import Types (PRS-010):
- * - Local relative: ./path, ../path → Directory-first resolution
- * - Path aliases: @/path, @alias/path → Configurable in model.yaml paths section
- * - External: owner/package → Manifest dependencies
- *
- * Directory-First Resolution:
- * - ./types → ./types/index.dlang → ./types.dlang
- * - Module entry defaults to index.dlang (no model.yaml required)
+ * ImportResolver resolves import statements using WorkspaceManager and GitUrlResolver.
  */
 export class ImportResolver {
-    private readonly workspaceManager: WorkspaceManager;
+    private workspaceManager: WorkspaceManager;
 
     constructor(services: DomainLangServices) {
         this.workspaceManager = services.imports.WorkspaceManager;
     }
 
     /**
-     * Resolve an import specifier relative to a Langium document.
+     * Resolve an import URL to a file URI using the workspace's GitUrlResolver.
      */
-    async resolveForDocument(document: LangiumDocument, specifier: string): Promise<URI> {
-        const baseDir = path.dirname(document.uri.fsPath);
-        return this.resolveFrom(baseDir, specifier);
-    }
-
-    /**
-     * Resolve an import specifier from a base directory (non-LSP contexts).
-     */
-    async resolveFrom(baseDir: string, specifier: string): Promise<URI> {
-        await this.workspaceManager.initialize(baseDir);
-
-        // Local relative paths (./path or ../path) - directory-first resolution
-        if (specifier.startsWith('./') || specifier.startsWith('../')) {
-            const resolved = path.resolve(baseDir, specifier);
-            return this.resolveLocalPath(resolved, specifier);
-        }
-
-        // Path aliases (@/path or @alias/path)
-        if (specifier.startsWith('@')) {
-            return this.resolvePathAlias(specifier);
-        }
-
-        // External dependency via manifest (owner/package format)
-        return this.resolveExternalDependency(specifier);
-    }
-
-    /**
-     * Resolves a path alias import.
-     * 
-     * @param specifier - Import specifier starting with @ (e.g., "@/lib", "@shared/types")
-     */
-    private async resolvePathAlias(specifier: string): Promise<URI> {
-        const aliases = await this.workspaceManager.getPathAliases();
-        const root = this.workspaceManager.getWorkspaceRoot();
-
-        // Find matching alias
-        const aliasMatch = this.findMatchingAlias(specifier, aliases);
-
-        if (aliasMatch) {
-            const { alias: _alias, targetPath, remainder } = aliasMatch;
-            const manifestPath = await this.workspaceManager.getManifestPath();
-            const manifestDir = manifestPath ? path.dirname(manifestPath) : root;
-            const resolvedBase = path.resolve(manifestDir, targetPath);
-            const resolved = remainder ? path.join(resolvedBase, remainder) : resolvedBase;
-            return this.resolveLocalPath(resolved, specifier);
-        }
-
-        // Default: @/ maps to workspace root (implicit)
-        if (specifier.startsWith('@/')) {
-            const relativePath = specifier.slice(2);
-            const resolved = path.join(root, relativePath);
-            return this.resolveLocalPath(resolved, specifier);
-        }
-
-        throw new Error(
-            `Unknown path alias '${specifier.split('/')[0]}' in import '${specifier}'.\n` +
-            `Hint: Define it in model.yaml paths section:\n` +
-            `  paths:\n` +
-            `    "${specifier.split('/')[0]}": "./some/path"`
-        );
-    }
-
-    /**
-     * Finds the longest matching alias for a specifier.
-     */
-    private findMatchingAlias(
-        specifier: string,
-        aliases: Record<string, string> | undefined
-    ): { alias: string; targetPath: string; remainder: string } | undefined {
-        if (!aliases) {
-            return undefined;
-        }
-
-        // Sort by length descending to match most specific alias first
-        const sortedAliases = Object.entries(aliases)
-            .sort(([a], [b]) => b.length - a.length);
-
-        for (const [alias, targetPath] of sortedAliases) {
-            // Exact match
-            if (specifier === alias) {
-                return { alias, targetPath, remainder: '' };
-            }
-            // Prefix match (alias + /)
-            if (specifier.startsWith(`${alias}/`)) {
-                return { alias, targetPath, remainder: specifier.slice(alias.length + 1) };
-            }
-        }
-
-        return undefined;
-    }
-
-    /**
-     * Resolves an external dependency via manifest.
-     * 
-     * NEW FORMAT (PRS-010): Import specifier is owner/package format.
-     */
-    private async resolveExternalDependency(specifier: string): Promise<URI> {
-        const manifest = await this.workspaceManager.getManifest();
-        if (!manifest) {
-            throw new Error(
-                `External dependency '${specifier}' requires model.yaml.\n` +
-                `Hint: Create model.yaml and add the dependency:\n` +
-                `  dependencies:\n` +
-                `    ${specifier}:\n` +
-                `      ref: v1.0.0`
-            );
-        }
-
-        const lock = await this.workspaceManager.getLockFile();
-        if (!lock) {
-            throw new Error(
-                `Dependency '${specifier}' not installed.\n` +
-                `Hint: Run 'dlang install' to fetch dependencies and generate model.lock.`
-            );
-        }
-
-        const mapped = await this.workspaceManager.resolveDependencyImport(specifier);
-        if (!mapped) {
-            throw new Error(
-                `Dependency '${specifier}' not found in model.yaml.\n` +
-                `Hint: Add it to your dependencies:\n` +
-                `  dependencies:\n` +
-                `    ${specifier}:\n` +
-                `      ref: v1.0.0`
-            );
-        }
-
-        const git = await this.workspaceManager.getGitResolver();
-        return git.resolve(mapped, { allowNetwork: false });
-    }
-
-    /**
-     * Resolves a local path using directory-first resolution.
-     * 
-     * Per PRS-010 (updated design):
-     * - If path ends with .dlang → direct file import
-     * - If no extension → directory-first:
-     *   1. Try ./path/index.dlang (module default, no model.yaml required)
-     *   2. Try ./path.dlang (file fallback)
-     */
-    private async resolveLocalPath(resolved: string, original: string): Promise<URI> {
-        const ext = path.extname(resolved);
-
-        if (ext === '.dlang') {
-            // Direct file import
-            await assertFileExists(resolved, original);
-            return URI.file(resolved);
-        }
-
-        if (ext && ext !== '.dlang') {
-            throw new Error(
-                `Invalid file extension '${ext}' in import '${original}'.\n` +
-                `Hint: DomainLang files must use the .dlang extension.`
-            );
-        }
-
-        // No extension → directory-first resolution
-        return this.resolveDirectoryFirst(resolved, original);
-    }
-
-    /**
-     * Directory-first resolution: ./types → ./types/index.dlang → ./types.dlang
-     * 
-     * Module entry defaults to index.dlang without requiring model.yaml.
-     * If the directory has model.yaml with custom entry, use that.
-     */
-    private async resolveDirectoryFirst(resolved: string, original: string): Promise<URI> {
-        // Step 1: Check if directory exists with index.dlang (or custom entry)
-        const isDirectory = await this.isDirectory(resolved);
-        if (isDirectory) {
-            // Check for model.yaml to get custom entry point
-            const moduleManifestPath = path.join(resolved, 'model.yaml');
-            const entryPoint = await this.readModuleEntry(moduleManifestPath);
-            const entryFile = path.join(resolved, entryPoint);
-            
-            if (await this.fileExists(entryFile)) {
-                return URI.file(entryFile);
-            }
-
-            // Directory exists but no entry file
-            throw new Error(
-                `Module '${original}' is missing its entry file.\n` +
-                `Expected: ${resolved}/${entryPoint}\n` +
-                `Hint: Create '${entryPoint}' in the module directory, or specify a custom entry in model.yaml:\n` +
-                `  model:\n` +
-                `    entry: main.dlang`
-            );
-        }
-
-        // Step 2: Try .dlang file fallback
-        const fileWithExt = `${resolved}.dlang`;
-        if (await this.fileExists(fileWithExt)) {
-            return URI.file(fileWithExt);
-        }
-
-        // Neither directory nor file found
-        throw new Error(
-            `Cannot resolve import '${original}'.\n` +
-            `Tried:\n` +
-            `  • ${resolved}/index.dlang (directory module)\n` +
-            `  • ${resolved}.dlang (file)\n` +
-            `Hint: Check that the path is correct and the file exists.`
-        );
-    }
-
-    /**
-     * Reads the entry point from a module's model.yaml.
-     * Defaults to index.dlang if no manifest or no entry specified.
-     */
-    private async readModuleEntry(manifestPath: string): Promise<string> {
-        try {
-            const content = await fs.readFile(manifestPath, 'utf-8');
-            const YAML = await import('yaml');
-            const manifest = YAML.parse(content) as { model?: { entry?: string } };
-            return manifest?.model?.entry ?? 'index.dlang';
-        } catch {
-            return 'index.dlang';
-        }
-    }
-
-    /**
-     * Checks if a path is a directory.
-     */
-    private async isDirectory(targetPath: string): Promise<boolean> {
-        try {
-            const stat = await fs.stat(targetPath);
-            return stat.isDirectory();
-        } catch {
-            return false;
-        }
-    }
-
-    /**
-     * Checks if a file exists.
-     */
-    private async fileExists(filePath: string): Promise<boolean> {
-        try {
-            await fs.access(filePath);
-            return true;
-        } catch {
-            return false;
-        }
+    async resolveImport(importUrl: string): Promise<URI> {
+        const gitResolver = await this.workspaceManager.getGitResolver();
+        return gitResolver.resolve(importUrl);
     }
 
     /**
@@ -278,15 +28,3 @@ export class ImportResolver {
         return this.workspaceManager.getLockFile();
     }
 }
-
-async function assertFileExists(filePath: string, original: string): Promise<void> {
-    try {
-        await fs.access(filePath);
-    } catch {
-        throw new Error(
-            `Import file not found: '${original}'.\\n` +
-            `Resolved path: ${filePath}\\n` +
-            `Hint: Check that the file exists and the path is correct.`
-        );
-    }
-}

package/src/services/performance-optimizer.ts

@@ -8,7 +8,7 @@
  * - Stale cache detection
  */
 
-import type { LockFile } from './types.js';
+import type { LockFile } from './git-url-resolver.js';
 import path from 'node:path';
 import fs from 'node:fs/promises';
 

package/src/services/workspace-manager.ts

@@ -4,15 +4,7 @@ import YAML from 'yaml';
 import { DependencyResolver } from './dependency-resolver.js';
 import { GitUrlResolver } from './git-url-resolver.js';
 import { getGlobalOptimizer } from './performance-optimizer.js';
-import type { 
-    LockFile, 
-    LockedDependency, 
-    ModelManifest, 
-    DependencySpec, 
-    ExtendedDependencySpec, 
-    PathAliases,
-    WorkspaceManagerOptions 
-} from './types.js';
+import type { LockFile, LockedDependency } from './git-url-resolver.js';
 
 const DEFAULT_MANIFEST_FILES = [
     'model.yaml'
@@ -24,6 +16,27 @@ const DEFAULT_LOCK_FILES = [
 
 const JSON_SPACE = 2;
 
+export interface WorkspaceManagerOptions {
+    readonly autoResolve?: boolean;
+    readonly manifestFiles?: readonly string[];
+    readonly lockFiles?: readonly string[];
+}
+
+interface ManifestDependency {
+    readonly source?: string;
+    readonly version?: string;
+    readonly description?: string;
+}
+
+interface ModelManifest {
+    readonly model?: {
+        readonly name?: string;
+        readonly version?: string;
+        readonly entry?: string;
+    };
+    readonly dependencies?: Record<string, ManifestDependency>;
+}
+
 interface ManifestCache {
     readonly manifest: ModelManifest;
     readonly path: string;
@@ -95,15 +108,6 @@ export class WorkspaceManager {
         return undefined;
     }
 
-    /**
-     * Returns the parsed manifest when present, otherwise undefined.
-     * Uses cached contents when unchanged on disk.
-     */
-    async getManifest(): Promise<ModelManifest | undefined> {
-        await this.ensureInitialized();
-        return this.loadManifest();
-    }
-
     /**
      * Returns the cached lock file or triggers resolution when missing.
      */
@@ -118,21 +122,12 @@ export class WorkspaceManager {
             if (cached) {
                 this.lockFile = cached;
             } else {
-                if (this.options.allowNetwork === false) {
-                    throw new Error(
-                        'Lock file (model.lock) not found and network access is disabled.\n' +
-                        'Hint: Run \'dlang install\' to generate the lock file.'
-                    );
-                }
                 await this.generateLockFile();
             }
         }
 
         if (!this.lockFile) {
-            throw new Error(
-                'Unable to resolve workspace lock file.\n' +
-                'Hint: Ensure model.yaml exists and run \'dlang install\' to generate model.lock.'
-            );
+            throw new Error('Unable to resolve workspace lock file.');
         }
 
         return this.lockFile;
@@ -156,41 +151,6 @@ export class WorkspaceManager {
         return this.lockFile;
     }
 
-    /**
-     * Invalidates all cached data (manifest and lock file).
-     * Call this when config files change externally (e.g., from CLI commands).
-     * 
-     * After invalidation, the next call to getManifest() or getLockFile()
-     * will re-read from disk.
-     */
-    invalidateCache(): void {
-        this.manifestCache = undefined;
-        this.lockFile = undefined;
-        // Re-apply undefined to git resolver to clear its lock file
-        if (this.gitResolver) {
-            this.gitResolver.setLockFile(undefined);
-        }
-    }
-
-    /**
-     * Invalidates only the manifest cache.
-     * Call this when model.yaml changes.
-     */
-    invalidateManifestCache(): void {
-        this.manifestCache = undefined;
-    }
-
-    /**
-     * Invalidates only the lock file cache.
-     * Call this when model.lock changes.
-     */
-    invalidateLockCache(): void {
-        this.lockFile = undefined;
-        if (this.gitResolver) {
-            this.gitResolver.setLockFile(undefined);
-        }
-    }
-
     /**
      * Provides the shared git URL resolver configured with the current lock file.
      */
@@ -215,44 +175,12 @@ export class WorkspaceManager {
     }
 
     /**
-     * Returns the path aliases from the manifest, if present.
+     * Resolves a manifest dependency alias to its git import string.
+     *
+     * @param aliasPath - Alias from import statement (may include subpaths)
+     * @returns Resolved git import string or undefined when alias is unknown
      */
-    async getPathAliases(): Promise<PathAliases | undefined> {
-        const manifest = await this.getManifest();
-        return manifest?.paths;
-    }
-
-    /**
-     * Normalizes a dependency entry to its extended form.
-     * Handles both short form (string version) and extended form (object).
-     * 
-     * In the new format, the key IS the owner/package, so source is derived from key
-     * ONLY for git dependencies (not for path-based local dependencies).
-     */
-    private normalizeDependency(key: string, dep: DependencySpec): ExtendedDependencySpec {
-        if (typeof dep === 'string') {
-            // Short form: "owner/package": "v1.0.0" or "main"
-            // Key is the source (owner/package format)
-            return { source: key, ref: dep };
-        }
-        // Extended form:
-        // - If has source: use as-is
-        // - If has path: it's a local dep, don't set source
-        // - If neither: derive source from key (owner/package becomes source)
-        if (dep.source || dep.path) {
-            return dep;
-        }
-        return { ...dep, source: key };
-    }
-
-    /**
-     * Resolves a manifest dependency to its git import string.
-     * 
-     * NEW FORMAT (PRS-010): Dependencies are keyed by owner/package directly
-     * @param specifier - Import specifier (owner/package format, may include subpaths)
-     * @returns Resolved git import string or undefined when not found
-     */
-    async resolveDependencyImport(specifier: string): Promise<string | undefined> {
+    async resolveDependencyImport(aliasPath: string): Promise<string | undefined> {
         await this.ensureInitialized();
         const manifest = await this.loadManifest();
         const dependencies = manifest?.dependencies;
@@ -261,28 +189,18 @@ export class WorkspaceManager {
             return undefined;
         }
 
-        // NEW: Dependencies are keyed by owner/package (e.g., "domainlang/core")
-        // Import specifier is also owner/package, potentially with subpath
-        for (const [key, dep] of Object.entries(dependencies)) {
-            const normalized = this.normalizeDependency(key, dep);
-            
-            // Skip path-based dependencies (handled by path aliases)
-            if (normalized.path) {
-                continue;
-            }
-
-            if (!normalized.source) {
+        for (const [alias, dep] of Object.entries(dependencies)) {
+            if (!dep?.source) {
                 continue;
             }
 
-            // Match if specifier equals key or starts with key/
-            if (specifier === key || specifier.startsWith(`${key}/`)) {
-                const suffix = specifier.slice(key.length);
-                const ref = normalized.ref ?? '';
-                const refSegment = ref
-                    ? (ref.startsWith('@') ? ref : `@${ref}`)
+            if (aliasPath === alias || aliasPath.startsWith(`${alias}/`)) {
+                const suffix = aliasPath.slice(alias.length);
+                const version = dep.version ?? '';
+                const versionSegment = version
+                    ? (version.startsWith('@') ? version : `@${version}`)
                     : '';
-                return `${normalized.source}${refSegment}${suffix}`;
+                return `${dep.source}${versionSegment}${suffix}`;
             }
         }
 
@@ -290,15 +208,16 @@ export class WorkspaceManager {
     }
 
     private async performInitialization(startPath: string): Promise<void> {
-        this.workspaceRoot = await this.findWorkspaceRoot(startPath) ?? path.resolve(startPath);
+        this.workspaceRoot = await this.findWorkspaceRoot(startPath);
+        if (!this.workspaceRoot) {
+            throw new Error('Workspace root (directory with model.yaml) not found.');
+        }
 
-        // Per PRS-010: Project-local cache at .dlang/packages/ (like node_modules)
-        const cacheDir = path.join(this.workspaceRoot, '.dlang', 'packages');
-        this.gitResolver = new GitUrlResolver(cacheDir);
+        this.gitResolver = new GitUrlResolver();
         const loaded = await this.loadLockFileFromDisk();
         this.applyLockFile(loaded);
 
-        if (!this.lockFile && this.options.autoResolve !== false && this.options.allowNetwork !== false) {
+        if (!this.lockFile && this.options.autoResolve !== false) {
             await this.generateLockFile();
         }
     }
@@ -336,8 +255,8 @@ export class WorkspaceManager {
         }
 
         const lockFile = await resolver.resolveDependencies();
-        this.lockFile = lockFile;
-        this.gitResolver.setLockFile(lockFile);
+    this.lockFile = lockFile;
+    this.gitResolver.setLockFile(lockFile);
 
         // Write JSON lock file
         await this.writeJsonLockFile(lockFile);
@@ -414,10 +333,6 @@ export class WorkspaceManager {
 
             const content = await fs.readFile(manifestPath, 'utf-8');
             const manifest = (YAML.parse(content) ?? {}) as ModelManifest;
-            
-            // Validate manifest structure
-            this.validateManifest(manifest, manifestPath);
-            
             this.manifestCache = {
                 manifest,
                 path: manifestPath,
@@ -433,111 +348,6 @@ export class WorkspaceManager {
         }
     }
 
-    /**
-     * Validates manifest structure and dependency configurations.
-     * Throws detailed errors for invalid manifests.
-     * 
-     * Supports both new format (owner/package: version) and extended format.
-     */
-    private validateManifest(manifest: ModelManifest, manifestPath: string): void {
-        // Validate path aliases
-        if (manifest.paths) {
-            this.validatePathAliases(manifest.paths, manifestPath);
-        }
-
-        if (!manifest.dependencies) {
-            return; // No dependencies to validate
-        }
-
-        for (const [key, dep] of Object.entries(manifest.dependencies)) {
-            const normalized = this.normalizeDependency(key, dep);
-
-            // Validate mutually exclusive source and path
-            if (normalized.source && normalized.path) {
-                throw new Error(
-                    `Invalid dependency '${key}' in ${manifestPath}:\n` +
-                    `Cannot specify both 'source' and 'path'.\n` +
-                    `Hint: Use 'source' for git dependencies or 'path' for local workspace dependencies.`
-                );
-            }
-
-            // For string format, source is always derived from key (valid)
-            // For extended format without source or path, error
-            if (typeof dep !== 'string' && !normalized.source && !normalized.path) {
-                throw new Error(
-                    `Invalid dependency '${key}' in ${manifestPath}:\n` +
-                    `Must specify either 'source' or 'path'.\n` +
-                    `Hint: Add 'source: owner/repo' for git dependencies, or 'path: ./local/path' for local packages.`
-                );
-            }
-
-            // Validate path is relative and within workspace
-            if (normalized.path) {
-                this.validateLocalPath(normalized.path, key, manifestPath);
-            }
-
-            // Validate source has ref when specified
-            if (normalized.source && !normalized.ref) {
-                throw new Error(
-                    `Invalid dependency '${key}' in ${manifestPath}:\n` +
-                    `Git dependencies must specify a 'ref' (git reference).\n` +
-                    `Hint: Add 'ref: v1.0.0' (tag), 'ref: main' (branch), or a commit SHA.`
-                );
-            }
-        }
-    }
-
-    /**
-     * Validates path aliases for security and correctness.
-     */
-    private validatePathAliases(paths: PathAliases, manifestPath: string): void {
-        for (const [alias, targetPath] of Object.entries(paths)) {
-            // Validate alias starts with @
-            if (!alias.startsWith('@')) {
-                throw new Error(
-                    `Invalid path alias '${alias}' in ${manifestPath}:\n` +
-                    `Path aliases must start with '@'.\n` +
-                    `Hint: Rename to '@${alias}' in your model.yaml paths section.`
-                );
-            }
-
-            // Validate target path doesn't escape workspace
-            this.validateLocalPath(targetPath, alias, manifestPath);
-        }
-    }
-
-    /**
-     * Validates local path dependencies for security.
-     * Ensures paths don't escape workspace boundary.
-     */
-    private validateLocalPath(localPath: string, alias: string, manifestPath: string): void {
-        // Reject absolute paths
-        if (path.isAbsolute(localPath)) {
-            throw new Error(
-                `Invalid local path '${alias}' in ${manifestPath}:\n` +
-                `Cannot use absolute path '${localPath}'.\n` +
-                `Hint: Use relative paths (e.g., './lib', '../shared') for local dependencies.`
-            );
-        }
-
-        // Resolve path relative to manifest directory
-        const manifestDir = path.dirname(manifestPath);
-        const resolvedPath = path.resolve(manifestDir, localPath);
-        const workspaceRoot = this.workspaceRoot || manifestDir;
-
-        // Check if resolved path is within workspace
-        const relativePath = path.relative(workspaceRoot, resolvedPath);
-        if (relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
-            throw new Error(
-                `Invalid local path '${alias}' in ${manifestPath}:\n` +
-                `Path '${localPath}' resolves outside workspace boundary.\n` +
-                `Resolved: ${resolvedPath}\n` +
-                `Workspace: ${workspaceRoot}\n` +
-                `Hint: Local dependencies must be within the workspace. Consider moving the dependency or using a git-based source.`
-            );
-        }
-    }
-
     private parseJsonLockFile(content: string): LockFile {
         const parsed = JSON.parse(content) as Partial<LockFile> & {
             dependencies?: Record<string, Partial<LockedDependency>>;
@@ -547,12 +357,11 @@ export class WorkspaceManager {
         const dependencies: Record<string, LockedDependency> = {};
 
         for (const [key, value] of Object.entries(parsed.dependencies ?? {})) {
-            if (!value || typeof value.ref !== 'string' || typeof value.resolved !== 'string' || typeof value.commit !== 'string') {
+            if (!value || typeof value.version !== 'string' || typeof value.resolved !== 'string' || typeof value.commit !== 'string') {
                 continue;
             }
             dependencies[key] = {
-                ref: value.ref,
-                refType: value.refType ?? 'commit', // Default to commit for backwards compatibility
+                version: value.version,
                 resolved: value.resolved,
                 commit: value.commit,
                 integrity: value.integrity,