Fixes #435.

Author: simonbrowndotje

changelog.md

@@ -8,6 +8,8 @@
 - structurizr-dsl: Adds a `Shell` shape.
 - structurizr-dsl: Adds a `Terminal` shape.
 - structurizr-dsl: Adds an 'instanceOf' keyword (an alternative for `softwareSystemInstance` and `containerInstance`).
+- structurizr-dsl: Relationships to/from software system/container instances can be now defined by using the software system/container identifier.
+- structurizr-dsl: Fixes https://github.com/structurizr/java/issues/435 (Relationship archetype not applied to implicit-source relationships).
 
 ## v4.1.0 (28th May 2025)
 

structurizr-dsl/src/main/java/com/structurizr/dsl/StructurizrDslParser.java

@@ -345,7 +345,7 @@ void parse(List<String> lines, File dslFile, boolean fragment, boolean includeIn
                     } else if (tokens.size() >= 2 && isRelationshipKeywordOrArchetype(tokens.get(0)) && inContext(ElementDslContext.class)) {
                         // implicit without archetype: -> this
                         // implicit with archetype: --https-> this
-                        Archetype archetype = getArchetype(RELATIONSHIP_TOKEN, tokens.get(1));
+                        Archetype archetype = getArchetype(RELATIONSHIP_TOKEN, tokens.get(0));
                         Set<Relationship> relationships = new ImplicitRelationshipParser().parse(getContext(ElementDslContext.class), tokens.withoutContextStartToken(), archetype);
 
                         if (relationships.size() == 1) {

structurizr-dsl/src/test/java/com/structurizr/dsl/DslTests.java

@@ -1563,6 +1563,22 @@ void test_archetypesForExtension() throws Exception {
         assertTrue(r.hasTag("HTTPS"));
     }
 
+    @Test
+    void test_archetypesForImplicitRelationships() throws Exception {
+        File parentDslFile = new File("src/test/resources/dsl/archetypes-for-implicit-relationships.dsl");
+        StructurizrDslParser parser = new StructurizrDslParser();
+        parser.parse(parentDslFile);
+        Workspace workspace = parser.getWorkspace();
+
+        SoftwareSystem a = workspace.getModel().getSoftwareSystemWithName("A");
+        SoftwareSystem b = workspace.getModel().getSoftwareSystemWithName("B");
+
+        Relationship r = b.getEfferentRelationshipWith(a);
+        assertEquals("Makes API calls to", r.getDescription());
+        assertEquals("HTTPS", r.getTechnology());
+        assertTrue(r.hasTag("HTTPS"));
+    }
+
     @Test
     void test_textBlock() throws Exception {
         StructurizrDslParser parser = new StructurizrDslParser();

structurizr-dsl/src/test/resources/dsl/archetypes-for-implicit-relationships.dsl

@@ -0,0 +1,15 @@
+workspace {
+    model {
+        archetypes {
+            https = -> {
+                technology "HTTPS"
+                tag "HTTPS"
+            }
+        }
+
+        a = softwareSystem "A"
+        b = softwareSystem "B" {
+            --https-> a "Makes API calls to"
+        }
+    }
+}