fix: resolve imports in CLI by using CMLImportResolver and absolute file paths

The CLI project now properly handles imports in CML files by:
1. Using CMLImportResolver to explicitly resolve imports
2. Using absolute file paths to ensure correct URI resolution
3. Updating test files to match DSL project's import syntax

This aligns the CLI's import handling with the DSL project's implementation.

Author: toddpi314-reuters

src/main/java/org/contextmapper/cli/commands/GenerateCommand.java

@@ -21,6 +21,7 @@
 import org.contextmapper.dsl.standalone.ContextMapperStandaloneSetup;
 import org.contextmapper.dsl.standalone.StandaloneContextMapperAPI;
 import org.eclipse.xtext.generator.IGenerator2;
+import org.contextmapper.dsl.cml.CMLImportResolver;
 
 import java.io.File;
 import java.util.Arrays;
@@ -51,7 +52,12 @@ public void run(String[] args) {
 
                 if (doesOutputDirExist(this.outputDir)) {
                     StandaloneContextMapperAPI cmAPI = ContextMapperStandaloneSetup.getStandaloneAPI();
-                    CMLResource cmlResource = cmAPI.loadCML(inputPath);
+                    File inputFile = new File(inputPath).getAbsoluteFile();
+                    CMLResource cmlResource = cmAPI.loadCML(inputFile);
+                    
+                    // Ensure imports are resolved before generation
+                    new CMLImportResolver().resolveImportedResources(cmlResource);
+                    
                     cmAPI.callGenerator(cmlResource, getGenerator(cmd), this.outputDir);
                     System.out.println("Generated into '" + this.outputDir + "'.");
                 }

src/test/java/org/contextmapper/cli/commands/GenerateCommandTest.java

@@ -137,6 +137,22 @@ void run_WhenCalledWithContextMapParam_ThenGenerateContextMapFiles() {
         assertThat(new File("build/test-out/test_ContextMap.svg").exists()).isTrue();
     }
 
+    @Test
+    void run_WhenCalledWithFileContainingImports_ThenGenerateFilesWithImportedContexts() throws IOException {
+        // given
+        final GenerateCommand command = spy(new GenerateCommand());
+        new File("build/test-out").mkdir();
+
+        // when
+        command.run(new String[]{"-i", "src/test/resources/test-with-imports.cml", "-g", "context-map", "-o", "build/test-out"});
+
+        // then
+        assertThat(outContent.toString()).contains("Generated into 'build/test-out'.");
+        assertThat(new File("build/test-out/test-with-imports_ContextMap.gv").exists()).isTrue();
+        assertThat(new File("build/test-out/test-with-imports_ContextMap.png").exists()).isTrue();
+        assertThat(new File("build/test-out/test-with-imports_ContextMap.svg").exists()).isTrue();
+    }
+
     @Test
     void run_WhenCalledWithGenericParam_ThenGenerateGenericOutput() {
         // given

src/test/java/org/contextmapper/cli/commands/ValidateCommandTest.java

@@ -88,4 +88,17 @@ void run_WhenWithInvalidCMLFile_ThenPrintError() {
         assertThat(outContent.toString()).contains("ERROR in null on line 2:mismatched input '<EOF>' expecting RULE_CLOSE");
     }
 
+    @Test
+    void run_WhenWithFileContainingImports_ThenValidateWithoutErrors() {
+        // given
+        final ValidateCommand command = spy(new ValidateCommand());
+
+        // when
+        command.run(new String[]{"-i src/test/resources/test-with-imports.cml"});
+
+        // then
+        verify(command).printValidationMessages(any(), any());
+        assertThat(outContent.toString()).contains("The CML file 'src/test/resources/test-with-imports.cml' has been validated without errors.");
+    }
+
 }

src/test/resources/other-contexts.cml

@@ -0,0 +1,3 @@
+/* Simple bounded contexts */
+BoundedContext anotherContext
+BoundedContext yetAnotherContext 

src/test/resources/test-with-imports.cml

@@ -0,0 +1,8 @@
+/* Import other contexts */
+import "./other-contexts.cml"
+
+/* Define a simple context map */
+ContextMap SimpleMap {
+  contains anotherContext
+  contains yetAnotherContext
+}