structurizr-dsl: Constants and variables are inherited when extending a DSL workspace.

Author: simonbrowndotje

changelog.md

@@ -14,6 +14,7 @@
 - structurizr-dsl: Adds support for removing relationships between software system instance/container instances, with a view to redefining them via infrastructure nodes.
 - structurizr-dsl: Adds support for a `jump` property on relationship styles.
 - structurizr-dsl: PlantUML, Mermaid, and Kroki image views can now be defined by an inline source block.
+- structurizr-dsl: Constants and variables are inherited when extending a DSL workspace.
 - structurizr-import: Adds support for `plantuml.inline`, `mermaid.inline`, and `kroki.inline` properties to inline the resulting PNG/SVG file into the workspace.
 - structurizr-inspection: Adds a way to disable inspections via a workspace property named `structurizr.inspection` (`false` to disable).
 - structurizr-inspection: Default inspector adds a summary of error/warning/info/ignore counts as workspace properties.

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

@@ -45,7 +45,7 @@ public final class StructurizrDslParser extends StructurizrDslTokens {
     private final Stack<DslContext> contextStack;
     private final Set<String> parsedTokens = new HashSet<>();
     private final IdentifiersRegister identifiersRegister;
-    private final Map<String, NameValuePair> constantsAndVariables;
+    private Map<String, NameValuePair> constantsAndVariables;
     private final Features features = new Features();
 
     private Map<String,Map<String,Archetype>> archetypes = Map.of(
@@ -78,6 +78,7 @@ public StructurizrDslParser() {
     void configureFrom(StructurizrDslParser parser) {
         setIdentifierScope(parser.getIdentifierScope());
         archetypes = parser.archetypes;
+        constantsAndVariables = parser.constantsAndVariables;
     }
 
     /**

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

@@ -1269,6 +1269,18 @@ void test_Constant() {
         }
     }
 
+    @Test
+    void test_ConstantsAndVariablesFromWorkspaceExtension() throws Exception {
+        File dslFile = new File("src/test/resources/dsl/constants-and-variables-from-workspace-extension-child.dsl");
+
+        StructurizrDslParser parser = new StructurizrDslParser();
+        parser.parse(dslFile);
+
+        SoftwareSystem softwareSystem = parser.getWorkspace().getModel().getSoftwareSystemWithName("Name");
+        assertNotNull(softwareSystem);
+        assertEquals("Description", softwareSystem.getDescription());
+    }
+
     @Test
     void test_UnbalancedCurlyBraces() {
         try {

structurizr-dsl/src/test/resources/dsl/constants-and-variables-from-workspace-extension-child.dsl

@@ -0,0 +1,7 @@
+workspace extends constants-and-variables-from-workspace-extension-parent.dsl {
+
+    model {
+        softwareSystem "${NAME}" "${DESCRIPTION}"
+    }
+
+}

structurizr-dsl/src/test/resources/dsl/constants-and-variables-from-workspace-extension-parent.dsl

@@ -0,0 +1,6 @@
+workspace {
+
+    !const "NAME" "Name"
+    !var "DESCRIPTION" "Description"
+
+}