@domainlang/language 0.1.20 → 0.1.82

package/src/syntaxes/domain-lang.monarch.ts

@@ -1,7 +1,7 @@
 // Monarch syntax highlighting for the domain-lang language.
 export default {
     keywords: [
-        'ACL','AntiCorruptionLayer','BBoM','BigBallOfMud','BoundedContext','CF','Classification','Conformist','ContextMap','CustomerSupplier','Decision','Domain','DomainMap','Import','Metadata','Namespace','OHS','OpenHostService','P','PL','Partnership','Policy','PublishedLanguage','Rule','SK','SeparateWays','SharedKernel','Team','Term','UpstreamDownstream','aka','archetype','as','bc','businessModel','by','classification','cmap','contains','decision','decisions','description','dmap','dom','evolution','examples','for','glossary','import','in','integrations','is','meta','metadata','ns','policy','relationships','rule','rules','synonyms','team','term','terminology','this','type','vision'
+        'ACL','AntiCorruptionLayer','BBoM','BigBallOfMud','BoundedContext','CF','Classification','Conformist','ContextMap','CustomerSupplier','Decision','Domain','DomainMap','Import','Metadata','Namespace','OHS','OpenHostService','P','PL','Partnership','Policy','PublishedLanguage','Rule','SK','SeparateWays','SharedKernel','Team','Term','UpstreamDownstream','aka','archetype','as','bc','businessModel','by','classification','cmap','contains','decision','decisions','description','dmap','dom','evolution','examples','for','from','glossary','import','in','integrations','integrity','is','meta','metadata','ns','policy','relationships','rule','rules','synonyms','team','term','terminology','this','type','vision'
     ],
     operators: [
         ',','->','.',':','<-','<->','=','><'

package/src/utils/import-utils.ts

@@ -1,66 +1,129 @@
+import fs from 'node:fs/promises';
 import path from 'node:path';
 import { URI, type LangiumDocument, type LangiumDocuments } from 'langium';
 import type { Model } from '../generated/ast.js';
+import { GitUrlParser } from '../services/git-url-resolver.js';
 import type { GitUrlResolver } from '../services/git-url-resolver.js';
 import { WorkspaceManager } from '../services/workspace-manager.js';
-import { ImportResolver } from '../services/import-resolver.js';
-import type { DomainLangServices } from '../domain-lang-module.js';
 
-/**
- * Lazily initialized workspace manager for standalone (non-LSP) usage.
- * Used by import graph building when services aren't available from DI.
- */
-let standaloneWorkspaceManager: WorkspaceManager | undefined;
-let standaloneImportResolver: ImportResolver | undefined;
-let lastInitializedDir: string | undefined;
+// Singleton workspace manager instance
+let workspaceManager: WorkspaceManager | undefined;
 
 /**
- * Gets or creates a standalone import resolver for non-LSP contexts.
- * Creates its own WorkspaceManager if not previously initialized for this directory.
- *
- * NOTE: In LSP contexts, prefer using services.imports.ImportResolver directly.
- * This function exists for utilities that don't have access to the service container.
- *
+ * Gets or creates the global workspace manager instance.
+ * 
  * @param startDir - Directory to start workspace search from
- * @returns Promise resolving to the import resolver
+ * @returns Promise resolving to the workspace manager
  */
-async function getStandaloneImportResolver(startDir: string): Promise<ImportResolver> {
-  // Re-initialize if directory changed (workspace boundary)
-  if (lastInitializedDir !== startDir || !standaloneImportResolver) {
-    standaloneWorkspaceManager = new WorkspaceManager({ autoResolve: false, allowNetwork: false });
+async function getWorkspaceManager(startDir: string): Promise<WorkspaceManager> {
+  if (!workspaceManager) {
+    workspaceManager = new WorkspaceManager();
+    const root = await findWorkspaceRoot(startDir);
     try {
-      await standaloneWorkspaceManager.initialize(startDir);
+      await workspaceManager.initialize(root);
     } catch (error) {
       console.warn(`Failed to initialize workspace: ${error instanceof Error ? error.message : String(error)}`);
+      // Continue without workspace - local imports will still work
     }
-    const services = {
-      imports: { WorkspaceManager: standaloneWorkspaceManager }
-    } as DomainLangServices;
-    standaloneImportResolver = new ImportResolver(services);
-    lastInitializedDir = startDir;
   }
-  return standaloneImportResolver;
+  return workspaceManager;
 }
 
 /**
- * Gets the git URL resolver from a workspace manager.
- *
+ * Gets the git URL resolver from the workspace manager.
+ * 
  * @param startDir - Directory to start workspace search from
  * @returns Promise resolving to the git URL resolver
  */
 async function getGitResolver(startDir: string): Promise<GitUrlResolver> {
-  const workspaceManager = new WorkspaceManager({ autoResolve: false, allowNetwork: false });
-  await workspaceManager.initialize(startDir);
-  return workspaceManager.getGitResolver();
+  const manager = await getWorkspaceManager(startDir);
+  return await manager.getGitResolver();
+}
+
+/**
+ * Ensures a file path has the .dlang extension.
+ * 
+ * @param filePath - The raw file path
+ * @returns Normalized path with .dlang extension
+ * @throws {Error} If path has an invalid extension
+ */
+function ensureDlangExtension(filePath: string): string {
+  const ext = path.extname(filePath);
+  
+  if (!ext) {
+    return `${filePath}.dlang`;
+  }
+  
+  if (ext !== '.dlang') {
+    throw new Error(
+      `Invalid file extension: ${ext}. Expected .dlang for file: ${filePath}`
+    );
+  }
+  
+  return filePath;
+}
+
+/**
+ * Resolves workspace-relative paths (starting with ~/).
+ * 
+ * @param importPath - Import path that may start with ~/
+ * @param workspaceRoot - The workspace root directory
+ * @returns Resolved absolute path
+ */
+function resolveWorkspacePath(importPath: string, workspaceRoot: string): string {
+  if (importPath.startsWith('~/')) {
+    return path.join(workspaceRoot, importPath.slice(2));
+  }
+  return importPath;
+}
+
+/**
+ * Finds the workspace root by looking for common workspace indicators.
+ * 
+ * Searches upward from the document's directory looking for:
+ * - dlang.toml
+ * - .git directory
+ * - package.json with dlang configuration
+ * 
+ * @param startDir - Directory to start searching from
+ * @returns Workspace root path or the start directory if not found
+ */
+async function findWorkspaceRoot(startDir: string): Promise<string> {
+  let currentDir = startDir;
+  const root = path.parse(currentDir).root;
+
+  while (currentDir !== root) {
+    // Check for workspace indicators
+    const indicators = ['dlang.toml', '.git', 'package.json'];
+    
+    for (const indicator of indicators) {
+      const indicatorPath = path.join(currentDir, indicator);
+      try {
+        await fs.access(indicatorPath);
+        return currentDir; // Found workspace root
+      } catch {
+        // Continue searching
+      }
+    }
+
+    // Move up one directory
+    const parentDir = path.dirname(currentDir);
+    if (parentDir === currentDir) break; // Reached root
+    currentDir = parentDir;
+  }
+
+  // Default to start directory if no workspace root found
+  return startDir;
 }
 
 /**
  * Resolves an import path to an absolute file URI.
  * 
- * Delegates to ImportResolver which implements PRS-010 semantics:
- * - File imports (with .dlang extension): Direct file access
- * - Module imports (no extension): Requires model.yaml in directory
- * - External dependencies: Resolved via manifest and lock file
+ * Supports:
+ * - Local relative paths: ./file.dlang, ../other/file.dlang
+ * - Workspace-relative paths: ~/contexts/sales.dlang
+ * - Git URLs: gh:owner/repo@v1.0.0/file.dlang
+ * - Full URLs: https://github.com/owner/repo/blob/v1.0.0/file.dlang
  * 
  * @param importingDoc - The document containing the import statement
  * @param rawImportPath - The raw import path from the import statement
@@ -72,8 +135,65 @@ export async function resolveImportPath(
   rawImportPath: string
 ): Promise<URI> {
   const baseDir = path.dirname(importingDoc.uri.fsPath);
-  const resolver = await getStandaloneImportResolver(baseDir);
-  return resolver.resolveFrom(baseDir, rawImportPath);
+
+  // Handle manifest dependency aliases (friendly names)
+  const manager = await getWorkspaceManager(baseDir);
+  let gitResolver: GitUrlResolver | undefined;
+
+  try {
+    const manifestImport = await manager.resolveDependencyImport(rawImportPath);
+    if (manifestImport) {
+      gitResolver = await manager.getGitResolver();
+      return await gitResolver.resolve(manifestImport);
+    }
+  } catch {
+    // Ignore manifest resolution issues; fall back to other strategies
+  }
+
+  // Handle git URLs (shorthand or full)
+  if (GitUrlParser.isGitUrl(rawImportPath)) {
+    gitResolver = gitResolver ?? await manager.getGitResolver();
+    return await gitResolver.resolve(rawImportPath);
+  }
+
+  // Handle workspace-relative paths (~/)
+  let resolvedPath = rawImportPath;
+
+  if (rawImportPath.startsWith('~/')) {
+    const workspaceRoot = await findWorkspaceRoot(baseDir);
+    resolvedPath = resolveWorkspacePath(rawImportPath, workspaceRoot);
+  } else if (!path.isAbsolute(rawImportPath)) {
+    // Handle relative paths
+    resolvedPath = path.resolve(baseDir, rawImportPath);
+  }
+
+  // Ensure .dlang extension
+  const normalized = ensureDlangExtension(resolvedPath);
+
+  // Verify file exists
+  try {
+    await fs.access(normalized);
+  } catch {
+    throw new Error(
+      `Import file not found: ${rawImportPath} (resolved to ${normalized})`
+    );
+  }
+
+  return URI.file(normalized);
+}
+
+/**
+ * Legacy function for backward compatibility.
+ * Use resolveImportPath instead.
+ * 
+ * @deprecated Use resolveImportPath which supports git URLs and workspace paths
+ */
+export async function resolveLocalImportPath(
+  importingDoc: LangiumDocument,
+  rawImportPath: string
+): Promise<string> {
+  const uri = await resolveImportPath(importingDoc, rawImportPath);
+  return uri.fsPath;
 }
 
 /**
@@ -150,3 +270,5 @@ export async function clearGitCache(startDir: string = process.cwd()): Promise<v
   const resolver = await getGitResolver(startDir);
   return await resolver.clearCache();
 }
+
+

package/src/validation/constants.ts

@@ -13,58 +13,6 @@
 
 import type { CodeDescription } from 'vscode-languageserver-types';
 
-// ============================================================================
-// Issue Codes for Code Actions
-// ============================================================================
-
-/**
- * Diagnostic codes used to identify validation issues.
- * Code actions match on these codes to provide quick fixes.
- * 
- * Naming convention: CATEGORY_SPECIFIC_ISSUE
- */
-export const IssueCodes = {
-    // Import & Dependency Issues
-    ImportMissingUri: 'import-missing-uri',
-    ImportRequiresManifest: 'import-requires-manifest',
-    ImportNotInManifest: 'import-not-in-manifest',
-    ImportNotInstalled: 'import-not-installed',
-    ImportConflictingSourcePath: 'import-conflicting-source-path',
-    ImportMissingSourceOrPath: 'import-missing-source-or-path',
-    ImportMissingRef: 'import-missing-ref',
-    ImportAbsolutePath: 'import-absolute-path',
-    ImportEscapesWorkspace: 'import-escapes-workspace',
-    
-    // Domain Issues
-    DomainNoVision: 'domain-no-vision',
-    DomainCircularHierarchy: 'domain-circular-hierarchy',
-    
-    // Bounded Context Issues
-    BoundedContextNoDescription: 'bounded-context-no-description',
-    BoundedContextNoDomain: 'bounded-context-no-domain',
-    BoundedContextClassificationConflict: 'bounded-context-classification-conflict',
-    BoundedContextTeamConflict: 'bounded-context-team-conflict',
-    
-    // Integration Pattern Issues
-    SharedKernelNotBidirectional: 'shared-kernel-not-bidirectional',
-    AclOnWrongSide: 'acl-on-wrong-side',
-    ConformistOnWrongSide: 'conformist-on-wrong-side',
-    TooManyPatterns: 'too-many-patterns',
-    
-    // Context/Domain Map Issues
-    ContextMapNoContexts: 'context-map-no-contexts',
-    ContextMapNoRelationships: 'context-map-no-relationships',
-    DomainMapNoDomains: 'domain-map-no-domains',
-    
-    // Metadata Issues
-    MetadataMissingName: 'metadata-missing-name',
-    
-    // General Issues
-    DuplicateElement: 'duplicate-element'
-} as const;
-
-export type IssueCode = typeof IssueCodes[keyof typeof IssueCodes];
-
 // ============================================================================
 // Documentation Link Utilities
 // ============================================================================
@@ -101,13 +49,6 @@ export const ValidationMessages = {
     DOMAIN_NO_VISION: (name: string) => 
         `Domain '${name}' is missing a vision statement.`,
     
-    /**
-     * Error message when a circular domain hierarchy is detected.
-     * @param cycle - Array of domain names forming the cycle
-     */
-    DOMAIN_CIRCULAR_HIERARCHY: (cycle: string[]) =>
-        `Circular domain hierarchy detected: ${cycle.join(' → ')}.`,
-    
     /**
      * Warning message when a bounded context lacks a description.
      * @param name - The name of the bounded context
@@ -179,126 +120,5 @@ export const ValidationMessages = {
      * Suggests possible syntax confusion.
      */
     TOO_MANY_PATTERNS: (count: number, side: 'left' | 'right') =>
-        `Too many integration patterns (${count}) on ${side} side. Typically use 1-2 patterns per side.`,
-
-    // ========================================================================
-    // Import & Dependency Validation (PRS-010 Phase 8)
-    // ========================================================================
-
-    /**
-     * Error when import statement has no URI.
-     */
-    IMPORT_MISSING_URI: () =>
-        `Import statement must have a URI. Use: import "package" or import "./local-path"`,
-
-    /**
-     * Error when external dependency requires model.yaml but none exists.
-     * @param specifier - The import specifier (e.g., "core", "domainlang/patterns")
-     */
-    IMPORT_REQUIRES_MANIFEST: (specifier: string) =>
-        `External dependency '${specifier}' requires model.yaml.\n` +
-        `Hint: Create model.yaml and add the dependency:\n` +
-        `  dependencies:\n` +
-        `    ${specifier}:\n` +
-        `      ref: v1.0.0`,
-
-    /**
-     * Error when import specifier not found in manifest dependencies.
-     * @param alias - The dependency alias/specifier
-     */
-    IMPORT_NOT_IN_MANIFEST: (alias: string) =>
-        `Import '${alias}' not found in model.yaml dependencies.\n` +
-        `Hint: Run 'dlang add ${alias} <source>@<ref>' to add it, or manually add to model.yaml:\n` +
-        `  dependencies:\n` +
-        `    ${alias}:\n` +
-        `      ref: v1.0.0`,
-
-    /**
-     * Error when dependency not installed (no lock file entry).
-     * @param alias - The dependency alias
-     */
-    IMPORT_NOT_INSTALLED: (alias: string) =>
-        `Dependency '${alias}' not installed.\n` +
-        `Hint: Run 'dlang install' to fetch dependencies and generate model.lock.`,
-
-    /**
-     * Error when dependency has conflicting source and path definitions.
-     * @param alias - The dependency alias
-     */
-    IMPORT_CONFLICTING_SOURCE_PATH: (alias: string) =>
-        `Dependency '${alias}' cannot define both 'source' and 'path' in model.yaml.\n` +
-        `Hint: Use 'source' for git-based packages or 'path' for local workspace packages.`,
-
-    /**
-     * Error when dependency is missing both source and path.
-     * @param alias - The dependency alias
-     */
-    IMPORT_MISSING_SOURCE_OR_PATH: (alias: string) =>
-        `Dependency '${alias}' must define either 'source' or 'path' in model.yaml.\n` +
-        `Hint: Add 'source: owner/repo' for git packages, or 'path: ./local/path' for local packages.`,
-
-    /**
-     * Error when git dependency is missing ref (tag, branch, or commit).
-     * @param alias - The dependency alias
-     */
-    IMPORT_MISSING_REF: (alias: string) =>
-        `Dependency '${alias}' must specify a git ref in model.yaml.\n` +
-        `Hint: Add a git ref: 'ref: v1.0.0' (tag), 'ref: main' (branch), or a commit SHA.`,
-
-    /**
-     * Error when local path uses absolute path.
-     * @param alias - The dependency alias
-     * @param absolutePath - The absolute path that was specified
-     */
-    IMPORT_ABSOLUTE_PATH: (alias: string, absolutePath: string) =>
-        `Local path dependency '${alias}' cannot use absolute path '${absolutePath}'.\n` +
-        `Hint: Use a relative path from the workspace root, e.g., 'path: ./packages/shared'.`,
-
-    /**
-     * Error when local path escapes workspace boundary.
-     * @param alias - The dependency alias
-     */
-    IMPORT_ESCAPES_WORKSPACE: (alias: string) =>
-        `Local path dependency '${alias}' escapes workspace boundary.\n` +
-        `Hint: Local dependencies must be within the workspace. Consider moving the dependency or using a git-based source.`,
-
-    // ========================================================================
-    // Context Map & Domain Map Validation
-    // ========================================================================
-
-    /**
-     * Warning when context map contains no bounded contexts.
-     * @param name - The context map name
-     */
-    CONTEXT_MAP_NO_CONTEXTS: (name: string) =>
-        `Context Map '${name}' contains no bounded contexts.\n` +
-        `Hint: Use 'contains ContextA, ContextB' to specify which contexts are in the map.`,
-
-    /**
-     * Info when context map has multiple contexts but no relationships.
-     * @param name - The context map name
-     * @param count - Number of contexts
-     */
-    CONTEXT_MAP_NO_RELATIONSHIPS: (name: string, count: number) =>
-        `Context Map '${name}' contains ${count} contexts but no documented relationships.\n` +
-        `Hint: Add relationships to show how contexts integrate (e.g., '[OHS] A -> [CF] B').`,
-
-    /**
-     * Warning when domain map contains no domains.
-     * @param name - The domain map name
-     */
-    DOMAIN_MAP_NO_DOMAINS: (name: string) =>
-        `Domain Map '${name}' contains no domains.\n` +
-        `Hint: Use 'contains DomainA, DomainB' to specify which domains are in the map.`,
-
-    // ========================================================================
-    // Metadata Validation
-    // ========================================================================
-
-    /**
-     * Error when metadata is missing a name.
-     */
-    METADATA_MISSING_NAME: () =>
-        `Metadata must have a name.\n` +
-        `Hint: Define metadata with: Metadata MyMetadata { ... }`
+        `Too many integration patterns (${count}) on ${side} side. Typically use 1-2 patterns per side.`
 } as const;

package/src/validation/domain.ts

@@ -21,57 +21,4 @@ function validateDomainHasVision(
     }
 }
 
-/**
- * Validates that a domain hierarchy does not contain circular references.
- * 
- * The `Domain A in B` syntax expresses subdomain containment.
- * Circular containment (A in B, B in C, C in A) is semantically invalid
- * because it violates the fundamental concept of domain decomposition.
- * 
- * @param domain - The domain to validate
- * @param accept - The validation acceptor for reporting issues
- */
-function validateNoCyclicDomainHierarchy(
-    domain: Domain,
-    accept: ValidationAcceptor
-): void {
-    // Only check if this domain has a parent
-    if (!domain.parent?.ref) {
-        return;
-    }
-    
-    const visited = new Set<Domain>();
-    const path: string[] = [domain.name];
-    let current: Domain | undefined = domain.parent.ref;
-    
-    while (current) {
-        // Check if we've encountered this domain before (cycle detected)
-        if (visited.has(current)) {
-            // We found a cycle - report it
-            path.push(current.name);
-            accept('error', ValidationMessages.DOMAIN_CIRCULAR_HIERARCHY(path), {
-                node: domain,
-                property: 'parent',
-                codeDescription: buildCodeDescription('language.md', 'domain-hierarchy')
-            });
-            return;
-        }
-        
-        // Check if we've looped back to the starting domain
-        if (current === domain) {
-            path.push(domain.name);
-            accept('error', ValidationMessages.DOMAIN_CIRCULAR_HIERARCHY(path), {
-                node: domain,
-                property: 'parent',
-                codeDescription: buildCodeDescription('language.md', 'domain-hierarchy')
-            });
-            return;
-        }
-        
-        visited.add(current);
-        path.push(current.name);
-        current = current.parent?.ref;
-    }
-}
-
-export const domainChecks = [validateDomainHasVision, validateNoCyclicDomainHierarchy]; 
+export const domainChecks = [validateDomainHasVision];