addressing PR comments

Author: ymc9

packages/language/src/index.ts

@@ -63,7 +63,10 @@ export async function loadDocument(
 
     // load imports
     const importedURIs = await loadImports(document, langiumDocuments);
-    const importedDocuments = await Promise.all(importedURIs.map((uri) => langiumDocuments.getOrCreateDocument(uri)));
+    const importedDocuments: LangiumDocument[] = [];
+    for (const uri of importedURIs) {
+        importedDocuments.push(await langiumDocuments.getOrCreateDocument(uri));
+    }
 
     // build the document together with standard library, plugin modules, and imported documents
     await services.shared.workspace.DocumentBuilder.build([stdLib, ...pluginDocs, document, ...importedDocuments], {
@@ -128,11 +131,7 @@ export async function loadDocument(
     };
 }
 
-async function loadImports(
-    document: LangiumDocument<AstNode>,
-    documents: LangiumDocuments,
-    uris: Set<string> = new Set(),
-) {
+async function loadImports(document: LangiumDocument, documents: LangiumDocuments, uris: Set<string> = new Set()) {
     const uriString = document.uri.toString();
     if (!uris.has(uriString)) {
         uris.add(uriString);
@@ -159,7 +158,7 @@ function mergeImportsDeclarations(documents: LangiumDocuments, model: Model) {
     // remove import directives
     model.imports = [];
 
-    // fix $containerIndex
+    // fix $container, $containerIndex, and $containerProperty
     linkContentToContainer(model);
 
     return importedModels;

packages/language/src/utils.ts

@@ -413,38 +413,13 @@ export function resolveImport(documents: LangiumDocuments, imp: ModelImport) {
 }
 
 export function resolveImportUri(imp: ModelImport) {
-    if (!imp.path) return undefined; // This will return true if imp.path is undefined, null, or an empty string ("").
-
-    if (!imp.path.endsWith('.zmodel')) {
-        imp.path += '.zmodel';
-    }
-
-    if (
-        !imp.path.startsWith('.') && // Respect relative paths
-        !path.isAbsolute(imp.path) // Respect Absolute paths
-    ) {
-        // use the current model's path as the search context
-        const contextPath = imp.$container.$document
-            ? path.dirname(imp.$container.$document.uri.fsPath)
-            : process.cwd();
-        imp.path = findNodeModulesFile(imp.path, contextPath) ?? imp.path;
+    if (!imp.path) {
+        return undefined;
     }
-
     const doc = AstUtils.getDocument(imp);
     const dir = path.dirname(doc.uri.fsPath);
-    return URI.file(path.resolve(dir, imp.path));
-}
-
-export function findNodeModulesFile(name: string, cwd: string = process.cwd()) {
-    if (!name) return undefined;
-    try {
-        // Use require.resolve to find the module/file. The paths option allows specifying the directory to start from.
-        const resolvedPath = require.resolve(name, { paths: [cwd] });
-        return resolvedPath;
-    } catch {
-        // If require.resolve fails to find the module/file, it will throw an error.
-        return undefined;
-    }
+    const importPath = imp.path.endsWith('.zmodel') ? imp.path : `${imp.path}.zmodel`;
+    return URI.file(path.resolve(dir, importPath));
 }
 
 /**