@domainlang/language 0.1.82 → 0.4.0

package/src/generated/grammar.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 4.1.0.
+ * This file was generated by langium-cli 4.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
@@ -2160,133 +2160,38 @@ export const DomainLangGrammar = (): Grammar => loadedDomainLangGrammar ?? (load
             "$comment": "/** Imports types or namespaces from another file or module, enabling reuse and modularity. */"
           },
           {
-            "$type": "Alternatives",
+            "$type": "Assignment",
+            "feature": "uri",
+            "operator": "=",
+            "terminal": {
+              "$type": "RuleCall",
+              "rule": {
+                "$ref": "#/rules@28"
+              },
+              "arguments": []
+            }
+          },
+          {
+            "$type": "Group",
             "elements": [
               {
-                "$type": "Group",
-                "elements": [
-                  {
-                    "$type": "Keyword",
-                    "value": "{"
-                  },
-                  {
-                    "$type": "Assignment",
-                    "feature": "symbols",
-                    "operator": "+=",
-                    "terminal": {
-                      "$type": "RuleCall",
-                      "rule": {
-                        "$ref": "#/rules@27"
-                      },
-                      "arguments": []
-                    }
-                  },
-                  {
-                    "$type": "Group",
-                    "elements": [
-                      {
-                        "$type": "Keyword",
-                        "value": ","
-                      },
-                      {
-                        "$type": "Assignment",
-                        "feature": "symbols",
-                        "operator": "+=",
-                        "terminal": {
-                          "$type": "RuleCall",
-                          "rule": {
-                            "$ref": "#/rules@27"
-                          },
-                          "arguments": []
-                        }
-                      }
-                    ],
-                    "cardinality": "*"
-                  },
-                  {
-                    "$type": "Keyword",
-                    "value": "}"
-                  },
-                  {
-                    "$type": "Keyword",
-                    "value": "from"
-                  },
-                  {
-                    "$type": "Assignment",
-                    "feature": "uri",
-                    "operator": "=",
-                    "terminal": {
-                      "$type": "RuleCall",
-                      "rule": {
-                        "$ref": "#/rules@28"
-                      },
-                      "arguments": []
-                    }
-                  }
-                ]
+                "$type": "Keyword",
+                "value": "as"
               },
               {
-                "$type": "Group",
-                "elements": [
-                  {
-                    "$type": "Assignment",
-                    "feature": "uri",
-                    "operator": "=",
-                    "terminal": {
-                      "$type": "RuleCall",
-                      "rule": {
-                        "$ref": "#/rules@28"
-                      },
-                      "arguments": []
-                    }
-                  },
-                  {
-                    "$type": "Group",
-                    "elements": [
-                      {
-                        "$type": "Keyword",
-                        "value": "integrity"
-                      },
-                      {
-                        "$type": "Assignment",
-                        "feature": "integrity",
-                        "operator": "=",
-                        "terminal": {
-                          "$type": "RuleCall",
-                          "rule": {
-                            "$ref": "#/rules@28"
-                          },
-                          "arguments": []
-                        }
-                      }
-                    ],
-                    "cardinality": "?"
+                "$type": "Assignment",
+                "feature": "alias",
+                "operator": "=",
+                "terminal": {
+                  "$type": "RuleCall",
+                  "rule": {
+                    "$ref": "#/rules@27"
                   },
-                  {
-                    "$type": "Group",
-                    "elements": [
-                      {
-                        "$type": "Keyword",
-                        "value": "as"
-                      },
-                      {
-                        "$type": "Assignment",
-                        "feature": "alias",
-                        "operator": "=",
-                        "terminal": {
-                          "$type": "RuleCall",
-                          "rule": {
-                            "$ref": "#/rules@27"
-                          },
-                          "arguments": []
-                        }
-                      }
-                    ],
-                    "cardinality": "?"
-                  }
-                ]
+                  "arguments": []
+                }
               }
-            ]
+            ],
+            "cardinality": "?"
           }
         ],
         "$comment": "/** Imports types or namespaces from another file or module, enabling reuse and modularity. */"
@@ -2294,7 +2199,7 @@ export const DomainLangGrammar = (): Grammar => loadedDomainLangGrammar ?? (load
       "entry": false,
       "fragment": false,
       "parameters": [],
-      "$comment": "/**\\n * Import Statement - Git-native import system inspired by Go modules and Deno.\\n * \\n * Supported formats:\\n *   - Local files: import \\"./shared/types.dlang\\"\\n *   - Workspace-relative: import \\"~/contexts/sales.dlang\\"\\n *   - GitHub packages: import \\"owner/repo@v1.0.0\\"\\n *   - GitLab/Git URLs: import \\"https://gitlab.com/owner/repo@v1.0.0\\"\\n *   - With aliases: import \\"ddd-patterns/core@v2.1.0\\" as DDD\\n *   - Named imports: import { OrderContext } from \\"./contexts.dlang\\"\\n */"
+      "$comment": "/**\\n * Import Statement - Manifest-centric import system per PRS-010.\\n * \\n * Simplified syntax where import statements use short specifiers:\\n *   - External dependencies (from manifest): import \\"core\\" as Core\\n *   - Local files: import \\"./shared/types.dlang\\"\\n *   - Workspace-relative: import \\"~/contexts/sales.dlang\\"\\n * \\n * All resolution details (source, version, integrity) live in model.yaml manifest.\\n * Named imports and inline integrity checks have been removed per PRS-010.\\n */"
     },
     {
       "$type": "ParserRule",

package/src/generated/module.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 4.1.0.
+ * This file was generated by langium-cli 4.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

package/src/index.ts

@@ -6,6 +6,9 @@ export * from './generated/module.js';
 // and creates a connection when imported, which breaks CLI/SDK standalone usage
 export * from './ast-augmentation.js';
 
+// Export centralized types (canonical source for all service types)
+export * from './services/types.js';
+
 // Export services
 export * from './services/workspace-manager.js';
 export * from './services/dependency-resolver.js';
@@ -15,3 +18,7 @@ export * from './services/import-resolver.js';
 export * from './services/relationship-inference.js';
 export * from './services/git-url-resolver.js';
 export * from './services/performance-optimizer.js';
+export * from './services/semver.js';
+
+// Export LSP services
+export * from './lsp/manifest-diagnostics.js';

package/src/lsp/domain-lang-code-actions.ts

@@ -0,0 +1,189 @@
+/**
+ * Code Action Provider for DomainLang.
+ * 
+ * Provides quick-fix code actions for validation diagnostics.
+ * 
+ * Key Features:
+ * - "Add dependency to model.yaml" for unknown import aliases
+ * - "Run dlang install" for uninstalled dependencies
+ * 
+ * @module
+ */
+
+import type { CodeAction, CodeActionParams, Command, Diagnostic } from 'vscode-languageserver';
+import { CodeActionKind } from 'vscode-languageserver';
+import type { MaybePromise, LangiumDocument } from 'langium';
+import type { CodeActionProvider } from 'langium/lsp';
+import { IssueCodes } from '../validation/constants.js';
+
+/**
+ * Shape of diagnostic data used for code action matching.
+ * Must match the data structure used in validators.
+ */
+interface ImportDiagnosticData {
+    code: string;
+    alias?: string;
+    specifier?: string;
+    path?: string;
+}
+
+/**
+ * Code action provider for DomainLang LSP features.
+ * 
+ * Implements quick fixes for:
+ * - Import validation errors (add to model.yaml, run install)
+ */
+export class DomainLangCodeActionProvider implements CodeActionProvider {
+
+    /**
+     * Generates code actions for the given diagnostics.
+     * 
+     * @param document - The document containing the diagnostics
+     * @param params - Code action request parameters including diagnostics
+     * @returns Array of code actions, or undefined if none applicable
+     */
+    getCodeActions(
+        document: LangiumDocument, 
+        params: CodeActionParams
+    ): MaybePromise<Array<Command | CodeAction> | undefined> {
+        const result: CodeAction[] = [];
+        const acceptor = (ca: CodeAction | undefined): void => {
+            if (ca) result.push(ca);
+        };
+
+        for (const diagnostic of params.context.diagnostics) {
+            this.createCodeActions(diagnostic, document, acceptor);
+        }
+
+        return result.length > 0 ? result : undefined;
+    }
+
+    /**
+     * Creates code actions for a specific diagnostic.
+     * 
+     * Matches on diagnostic.data.code to determine which quick fix to offer.
+     */
+    private createCodeActions(
+        diagnostic: Diagnostic, 
+        document: LangiumDocument, 
+        accept: (ca: CodeAction | undefined) => void
+    ): void {
+        const data = diagnostic.data as ImportDiagnosticData | undefined;
+        if (!data?.code) return;
+
+        switch (data.code) {
+            case IssueCodes.ImportNotInManifest:
+                if (data.alias) {
+                    accept(this.createAddToManifestAction(diagnostic, document, data.alias));
+                }
+                break;
+
+            case IssueCodes.ImportRequiresManifest:
+                if (data.specifier) {
+                    accept(this.createCreateManifestAction(diagnostic, document, data.specifier));
+                }
+                break;
+
+            case IssueCodes.ImportNotInstalled:
+                if (data.alias) {
+                    accept(this.createRunInstallAction(diagnostic, data.alias));
+                }
+                break;
+
+            case IssueCodes.ImportMissingRef:
+                if (data.alias) {
+                    accept(this.createAddRefAction(diagnostic, data.alias));
+                }
+                break;
+        }
+    }
+
+    /**
+     * Creates a code action to add a dependency to model.yaml.
+     * 
+     * This generates a WorkspaceEdit that modifies model.yaml to add
+     * the missing dependency with a placeholder version.
+     */
+    private createAddToManifestAction(
+        diagnostic: Diagnostic,
+        _document: LangiumDocument,
+        alias: string
+    ): CodeAction {
+        // Create a command that will be executed to add the dependency
+        // Since we can't directly edit model.yaml from here (it's not the current document),
+        // we provide a command that the extension can handle
+        return {
+            title: `Add '${alias}' to model.yaml`,
+            kind: CodeActionKind.QuickFix,
+            diagnostics: [diagnostic],
+            isPreferred: true,
+            command: {
+                title: `Add '${alias}' to model.yaml`,
+                command: 'domainlang.addDependency',
+                arguments: [alias]
+            }
+        };
+    }
+
+    /**
+     * Creates a code action to create model.yaml with the dependency.
+     */
+    private createCreateManifestAction(
+        diagnostic: Diagnostic,
+        _document: LangiumDocument,
+        specifier: string
+    ): CodeAction {
+        const alias = specifier.split('/')[0];
+        return {
+            title: `Create model.yaml with '${alias}' dependency`,
+            kind: CodeActionKind.QuickFix,
+            diagnostics: [diagnostic],
+            isPreferred: true,
+            command: {
+                title: `Create model.yaml`,
+                command: 'domainlang.createManifest',
+                arguments: [alias, specifier]
+            }
+        };
+    }
+
+    /**
+     * Creates a code action to run dlang install.
+     */
+    private createRunInstallAction(
+        diagnostic: Diagnostic,
+        alias: string
+    ): CodeAction {
+        return {
+            title: `Run 'dlang install' to fetch '${alias}'`,
+            kind: CodeActionKind.QuickFix,
+            diagnostics: [diagnostic],
+            isPreferred: true,
+            command: {
+                title: 'Install dependencies',
+                command: 'domainlang.install',
+                arguments: []
+            }
+        };
+    }
+
+    /**
+     * Creates a code action to add ref to dependency.
+     */
+    private createAddRefAction(
+        diagnostic: Diagnostic,
+        alias: string
+    ): CodeAction {
+        return {
+            title: `Add git ref to '${alias}' in model.yaml`,
+            kind: CodeActionKind.QuickFix,
+            diagnostics: [diagnostic],
+            isPreferred: false,
+            command: {
+                title: 'Add ref',
+                command: 'domainlang.addRef',
+                arguments: [alias]
+            }
+        };
+    }
+}

package/src/lsp/domain-lang-workspace-manager.ts

@@ -0,0 +1,104 @@
+import path from 'node:path';
+import YAML from 'yaml';
+import { DefaultWorkspaceManager, URI, UriUtils, type FileSystemNode, type LangiumDocument, type LangiumSharedCoreServices, type WorkspaceFolder } from 'langium';
+import type { CancellationToken } from 'vscode-languageserver-protocol';
+import { ensureImportGraphFromDocument } from '../utils/import-utils.js';
+
+/**
+ * Langium WorkspaceManager override implementing manifest-centric import loading per PRS-010.
+ *
+ * Behavior:
+ * - Skips pre-loading *.dlang during workspace scan (only entry graph is loaded when manifest exists).
+ * - Mode A (with manifest): find nearest model.yaml in folder, load entry (default index.dlang) and its import graph.
+ * - Mode B (no manifest): no pre-loading; imports resolved on-demand when a document is opened.
+ * - Never performs network fetches; relies on cached dependencies/lock files. Missing cache produces diagnostics upstream.
+ */
+export class DomainLangWorkspaceManager extends DefaultWorkspaceManager {
+    constructor(services: LangiumSharedCoreServices) {
+        super(services);
+    }
+
+    override shouldIncludeEntry(entry: FileSystemNode): boolean {
+        // Prevent auto-including .dlang files; we'll load via entry/import graph
+        const name = UriUtils.basename(entry.uri);
+        if (name.toLowerCase().endsWith('.dlang')) {
+            return false;
+        }
+        return super.shouldIncludeEntry(entry);
+    }
+
+    override async initializeWorkspace(folders: WorkspaceFolder[], cancelToken?: CancellationToken): Promise<void> {
+        await super.initializeWorkspace(folders, cancelToken);
+    }
+
+    protected override async loadAdditionalDocuments(folders: WorkspaceFolder[], collector: (document: LangiumDocument) => void): Promise<void> {
+        const manifestInfo = await this.findManifestInFolders(folders);
+        if (!manifestInfo) {
+            return; // Mode B: no manifest
+        }
+
+        const entryUri = URI.file(manifestInfo.entryPath);
+        const entryDoc = await this.langiumDocuments.getOrCreateDocument(entryUri);
+        collector(entryDoc);
+
+        const uris = await ensureImportGraphFromDocument(entryDoc, this.langiumDocuments);
+        for (const uriString of uris) {
+            const uri = URI.parse(uriString);
+            const doc = await this.langiumDocuments.getOrCreateDocument(uri);
+            collector(doc);
+        }
+    }
+
+    private async findManifestInFolders(folders: WorkspaceFolder[]): Promise<{ manifestPath: string; entryPath: string } | undefined> {
+        for (const folder of folders) {
+            const manifestPath = await this.findNearestManifest(folder.uri);
+            if (manifestPath) {
+                const entry = await this.readEntryFromManifest(manifestPath) ?? 'index.dlang';
+                const entryPath = path.resolve(path.dirname(manifestPath), entry);
+                return { manifestPath, entryPath };
+            }
+        }
+        return undefined;
+    }
+
+    private async findNearestManifest(startUri: string): Promise<string | undefined> {
+        let current = path.resolve(URI.parse(startUri).fsPath);
+        const { root } = path.parse(current);
+
+        while (true) {
+            const candidate = path.join(current, 'model.yaml');
+            if (await this.pathExists(candidate)) {
+                return candidate;
+            }
+
+            if (current === root) {
+                return undefined;
+            }
+
+            const parent = path.dirname(current);
+            if (parent === current) {
+                return undefined;
+            }
+            current = parent;
+        }
+    }
+
+    private async readEntryFromManifest(manifestPath: string): Promise<string | undefined> {
+        try {
+            const content = await this.fileSystemProvider.readFile(URI.file(manifestPath));
+            const manifest = (YAML.parse(content) ?? {}) as { model?: { entry?: string } };
+            return manifest.model?.entry;
+        } catch {
+            return undefined;
+        }
+    }
+
+    private async pathExists(target: string): Promise<boolean> {
+        try {
+            await this.fileSystemProvider.stat(URI.file(target));
+            return true;
+        } catch {
+            return false;
+        }
+    }
+}

package/src/lsp/hover/domain-lang-hover.ts

@@ -276,9 +276,7 @@ export class DomainLangHoverProvider extends AstNodeHoverProvider {
             if (ast.isImportStatement && ast.isImportStatement(node)) {
                 const fields: string[] = [];
                 fields.push(`**URI:** \`${node.uri}\``);
-                if (node.symbols.length) fields.push(`**Imports:** ${node.symbols.map(s => `\`${s}\``).join(', ')}`);
                 if (node.alias) fields.push(`**Alias:** \`${node.alias}\``);
-                if (node.integrity) fields.push(`**Integrity:** \`${node.integrity}\``);
                 return (commentBlock ? `${commentBlock}\n\n---\n\n` : '') +
                     `📦 **\`(import)\`**\n\n` +
                     fields.join('\n\n');