@domainlang/language 0.1.20 → 0.1.82

package/src/domain-lang-module.ts

@@ -2,9 +2,8 @@ import { type Module, inject } from 'langium';
 import type { 
     DefaultSharedModuleContext, 
     LangiumServices, 
-    LangiumSharedServices,
-    PartialLangiumServices,
-    PartialLangiumSharedServices 
+    LangiumSharedServices, 
+    PartialLangiumServices 
 } from 'langium/lsp';
 import { createDefaultModule, createDefaultSharedModule } from 'langium/lsp';
 import { DomainLangGeneratedModule, DomainLangGeneratedSharedModule } from './generated/module.js';
@@ -14,10 +13,8 @@ import { DomainLangScopeComputation } from './lsp/domain-lang-scope.js';
 import { DomainLangFormatter } from './lsp/domain-lang-formatter.js';
 import { DomainLangHoverProvider } from './lsp/hover/domain-lang-hover.js';
 import { DomainLangCompletionProvider } from './lsp/domain-lang-completion.js';
-import { DomainLangCodeActionProvider } from './lsp/domain-lang-code-actions.js';
 import { ImportResolver } from './services/import-resolver.js';
 import { WorkspaceManager } from './services/workspace-manager.js';
-import { DomainLangWorkspaceManager } from './lsp/domain-lang-workspace-manager.js';
 
 /**
  * Declaration of custom services - add your own service classes here.
@@ -33,8 +30,7 @@ export type DomainLangAddedServices = {
     lsp: {
         Formatter: DomainLangFormatter,
         HoverProvider: DomainLangHoverProvider,
-        CompletionProvider: DomainLangCompletionProvider,
-        CodeActionProvider: DomainLangCodeActionProvider
+        CompletionProvider: DomainLangCompletionProvider
     }
 }
 
@@ -44,12 +40,6 @@ export type DomainLangAddedServices = {
  */
 export type DomainLangServices = LangiumServices & DomainLangAddedServices
 
-const DomainLangSharedModule: Module<LangiumSharedServices, PartialLangiumSharedServices> = {
-    workspace: {
-        WorkspaceManager: (services: LangiumSharedServices) => new DomainLangWorkspaceManager(services)
-    }
-};
-
 /**
  * Dependency injection module that overrides Langium default services and contributes the
  * declared custom services. The Langium defaults can be partially specified to override only
@@ -58,7 +48,7 @@ const DomainLangSharedModule: Module<LangiumSharedServices, PartialLangiumShared
 export const DomainLangModule: Module<DomainLangServices, PartialLangiumServices & DomainLangAddedServices> = {
     imports: {
         ImportResolver: (services) => new ImportResolver(services),
-        WorkspaceManager: () => new WorkspaceManager({ autoResolve: false, allowNetwork: false })
+        WorkspaceManager: () => new WorkspaceManager()
     },
     references: {
         ScopeComputation: (services) => new DomainLangScopeComputation(services),
@@ -67,8 +57,7 @@ export const DomainLangModule: Module<DomainLangServices, PartialLangiumServices
     lsp: {
         Formatter: () => new DomainLangFormatter(),
         HoverProvider: (services) => new DomainLangHoverProvider(services),
-        CompletionProvider: (services) => new DomainLangCompletionProvider(services),
-        CodeActionProvider: () => new DomainLangCodeActionProvider()
+        CompletionProvider: (services) => new DomainLangCompletionProvider(services)
     },
 };
 
@@ -93,8 +82,7 @@ export function createDomainLangServices(context: DefaultSharedModuleContext): {
 } {
     const shared = inject(
         createDefaultSharedModule(context),
-        DomainLangGeneratedSharedModule,
-        DomainLangSharedModule
+        DomainLangGeneratedSharedModule
     );
     const DomainLang = inject(
         createDefaultModule({ shared }),

package/src/domain-lang.langium

@@ -292,18 +292,23 @@ BusinessRule:
 // ============================================================================
 
 /**
- * Import Statement - Manifest-centric import system per PRS-010.
+ * Import Statement - Git-native import system inspired by Go modules and Deno.
  * 
- * Simplified syntax where import statements use short specifiers:
- *   - External dependencies (from manifest): import "core" as Core
+ * Supported formats:
  *   - Local files: import "./shared/types.dlang"
  *   - Workspace-relative: import "~/contexts/sales.dlang"
- * 
- * All resolution details (source, version, integrity) live in model.yaml manifest.
- * Named imports and inline integrity checks have been removed per PRS-010.
+ *   - GitHub packages: import "owner/repo@v1.0.0"
+ *   - GitLab/Git URLs: import "https://gitlab.com/owner/repo@v1.0.0"
+ *   - With aliases: import "ddd-patterns/core@v2.1.0" as DDD
+ *   - Named imports: import { OrderContext } from "./contexts.dlang"
  */
 ImportStatement:
-    /** Imports types or namespaces from another file or module, enabling reuse and modularity. */ ('Import' | 'import') uri=STRING ('as' alias=ID)?
+    /** Imports types or namespaces from another file or module, enabling reuse and modularity. */ ('Import' | 'import') (
+        '{' symbols+=ID (',' symbols+=ID)* '}' 'from' uri=STRING
+        | uri=STRING
+        ('integrity' integrity=STRING)?
+        ('as' alias=ID)?
+    )
 ;
 
 /**

package/src/generated/ast.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 4.2.0.
+ * This file was generated by langium-cli 4.1.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
@@ -74,10 +74,12 @@ export type DomainLangKeywordNames =
     | "evolution"
     | "examples"
     | "for"
+    | "from"
     | "glossary"
     | "import"
     | "in"
     | "integrations"
+    | "integrity"
     | "is"
     | "meta"
     | "metadata"
@@ -350,26 +352,30 @@ export function isDomainTerm(item: unknown): item is DomainTerm {
 }
 
 /**
- * Import Statement - Manifest-centric import system per PRS-010.
+ * Import Statement - Git-native import system inspired by Go modules and Deno.
  * 
- * Simplified syntax where import statements use short specifiers:
- *   - External dependencies (from manifest): import "core" as Core
+ * Supported formats:
  *   - Local files: import "./shared/types.dlang"
  *   - Workspace-relative: import "~/contexts/sales.dlang"
- * 
- * All resolution details (source, version, integrity) live in model.yaml manifest.
- * Named imports and inline integrity checks have been removed per PRS-010.
+ *   - GitHub packages: import "owner/repo@v1.0.0"
+ *   - GitLab/Git URLs: import "https://gitlab.com/owner/repo@v1.0.0"
+ *   - With aliases: import "ddd-patterns/core@v2.1.0" as DDD
+ *   - Named imports: import { OrderContext } from "./contexts.dlang"
  */
 export interface ImportStatement extends langium.AstNode {
     readonly $container: Model;
     readonly $type: 'ImportStatement';
     alias?: string;
+    integrity?: string;
+    symbols: Array<string>;
     uri: string;
 }
 
 export const ImportStatement = {
     $type: 'ImportStatement',
     alias: 'alias',
+    integrity: 'integrity',
+    symbols: 'symbols',
     uri: 'uri'
 } as const;
 
@@ -846,6 +852,13 @@ export class DomainLangAstReflection extends langium.AbstractAstReflection {
                 alias: {
                     name: ImportStatement.alias
                 },
+                integrity: {
+                    name: ImportStatement.integrity
+                },
+                symbols: {
+                    name: ImportStatement.symbols,
+                    defaultValue: []
+                },
                 uri: {
                     name: ImportStatement.uri
                 }

package/src/generated/grammar.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 4.2.0.
+ * This file was generated by langium-cli 4.1.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
@@ -2160,38 +2160,133 @@ export const DomainLangGrammar = (): Grammar => loadedDomainLangGrammar ?? (load
             "$comment": "/** Imports types or namespaces from another file or module, enabling reuse and modularity. */"
           },
           {
-            "$type": "Assignment",
-            "feature": "uri",
-            "operator": "=",
-            "terminal": {
-              "$type": "RuleCall",
-              "rule": {
-                "$ref": "#/rules@28"
-              },
-              "arguments": []
-            }
-          },
-          {
-            "$type": "Group",
+            "$type": "Alternatives",
             "elements": [
               {
-                "$type": "Keyword",
-                "value": "as"
+                "$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": "Assignment",
-                "feature": "alias",
-                "operator": "=",
-                "terminal": {
-                  "$type": "RuleCall",
-                  "rule": {
-                    "$ref": "#/rules@27"
+                "$type": "Group",
+                "elements": [
+                  {
+                    "$type": "Assignment",
+                    "feature": "uri",
+                    "operator": "=",
+                    "terminal": {
+                      "$type": "RuleCall",
+                      "rule": {
+                        "$ref": "#/rules@28"
+                      },
+                      "arguments": []
+                    }
                   },
-                  "arguments": []
-                }
+                  {
+                    "$type": "Group",
+                    "elements": [
+                      {
+                        "$type": "Keyword",
+                        "value": "integrity"
+                      },
+                      {
+                        "$type": "Assignment",
+                        "feature": "integrity",
+                        "operator": "=",
+                        "terminal": {
+                          "$type": "RuleCall",
+                          "rule": {
+                            "$ref": "#/rules@28"
+                          },
+                          "arguments": []
+                        }
+                      }
+                    ],
+                    "cardinality": "?"
+                  },
+                  {
+                    "$type": "Group",
+                    "elements": [
+                      {
+                        "$type": "Keyword",
+                        "value": "as"
+                      },
+                      {
+                        "$type": "Assignment",
+                        "feature": "alias",
+                        "operator": "=",
+                        "terminal": {
+                          "$type": "RuleCall",
+                          "rule": {
+                            "$ref": "#/rules@27"
+                          },
+                          "arguments": []
+                        }
+                      }
+                    ],
+                    "cardinality": "?"
+                  }
+                ]
               }
-            ],
-            "cardinality": "?"
+            ]
           }
         ],
         "$comment": "/** Imports types or namespaces from another file or module, enabling reuse and modularity. */"
@@ -2199,7 +2294,7 @@ export const DomainLangGrammar = (): Grammar => loadedDomainLangGrammar ?? (load
       "entry": false,
       "fragment": false,
       "parameters": [],
-      "$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 */"
+      "$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 */"
     },
     {
       "$type": "ParserRule",

package/src/generated/module.ts

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

package/src/index.ts

@@ -6,9 +6,6 @@ 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';
@@ -18,7 +15,3 @@ 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/hover/domain-lang-hover.ts

@@ -276,7 +276,9 @@ 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');

package/src/sdk/index.ts

@@ -123,4 +123,6 @@ export type {
     LoadOptions,
     BcQueryBuilder,
     RelationshipView,
+    AugmentedBoundedContext,
+    AugmentedDomain,
 } from './types.js';

package/src/sdk/loader-node.ts

@@ -25,16 +25,14 @@ import { isModel } from '../generated/ast.js';
 import { createDomainLangServices } from '../domain-lang-module.js';
 import type { LoadOptions, QueryContext } from './types.js';
 import { fromModel, augmentModel } from './query.js';
-import { ensureImportGraphFromDocument } from '../utils/import-utils.js';
 
 /**
  * Loads a DomainLang model from a file on disk.
  * 
  * **Node.js only** - uses file system APIs.
  * 
- * Supports multi-file models with imports: all imported files are
- * automatically loaded and linked. Use `documents` in the result
- * to see all loaded files.
+ * Note: This loads a single file. For multi-file models with imports,
+ * consider using the WorkspaceManager or hosting an LSP server.
  * 
  * @param entryFile - Path to the entry .dlang file
  * @param options - Optional load configuration
@@ -45,16 +43,13 @@ import { ensureImportGraphFromDocument } from '../utils/import-utils.js';
  * ```typescript
  * import { loadModel } from '@domainlang/language/sdk/loader-node';
  * 
- * const { query, model, documents } = await loadModel('./domains.dlang', {
+ * const { query, model } = await loadModel('./domains.dlang', {
  *   workspaceDir: process.cwd()
  * });
  * 
- * // Query spans all imported files
  * for (const bc of query.boundedContexts()) {
  *   console.log(bc.name);
  * }
- * 
- * console.log(`Loaded ${documents.length} files`);
  * ```
  */
 export async function loadModel(
@@ -94,19 +89,9 @@ export async function loadModel(
     
     // Register document and build it
     shared.workspace.LangiumDocuments.addDocument(document);
-    await shared.workspace.DocumentBuilder.build([document], { validation: false });
-    
-    // Traverse import graph to load all imported files
-    const importedUris = await ensureImportGraphFromDocument(
-        document, 
-        shared.workspace.LangiumDocuments
-    );
+    await shared.workspace.DocumentBuilder.build([document], { validation: true });
     
-    // Build all imported documents with validation
-    const allDocuments = Array.from(shared.workspace.LangiumDocuments.all);
-    await shared.workspace.DocumentBuilder.build(allDocuments, { validation: true });
-    
-    // Wait for entry document to be fully processed
+    // Wait for document to be fully processed
     if (document.state < DocumentState.Validated) {
         throw new Error(`Document not fully processed: ${absolutePath}`);
     }
@@ -127,16 +112,11 @@ export async function loadModel(
         throw new Error(`Document root is not a Model: ${entryFile}`);
     }
     
-    // Augment AST nodes with SDK properties for all loaded models
-    for (const doc of allDocuments) {
-        const docModel = doc.parseResult.value;
-        if (isModel(docModel)) {
-            augmentModel(docModel);
-        }
-    }
+    // Augment AST nodes with SDK properties
+    augmentModel(model);
     
-    // Collect all document URIs from the import graph
-    const documentUris: URI[] = Array.from(importedUris).map(uriStr => URI.parse(uriStr));
+    // Collect all document URIs
+    const documentUris: URI[] = Array.from(shared.workspace.LangiumDocuments.all).map(doc => doc.uri);
     
     return {
         model,

package/src/sdk/types.ts

@@ -305,6 +305,29 @@ export interface RelationshipView {
     readonly astNode: Relationship;
 }
 
+/**
+ * Augmented BoundedContext with SDK-resolved properties.
+ * These properties are computed during model loading using precedence rules.
+ * 
+ * Property names follow the PRS design: natural names that "just work" with
+ * IDE autocomplete. Use `resolved*` prefix to avoid conflicts with existing
+ * AST properties while maintaining discoverability.
+ * 
+ * @deprecated Since SDK now uses module augmentation in ast-augmentation.ts,
+ * this type alias is only kept for backwards compatibility. Use BoundedContext
+ * directly after importing the SDK.
+ */
+export type AugmentedBoundedContext = BoundedContext;
+
+/**
+ * Augmented Domain with SDK-resolved properties.
+ * 
+ * @deprecated Since SDK now uses module augmentation in ast-augmentation.ts,
+ * this type alias is only kept for backwards compatibility. Use Domain
+ * directly after importing the SDK.
+ */
+export type AugmentedDomain = Domain;
+
 /**
  * Internal index structure for O(1) lookups.
  * Not exported from public API.