feat: Datapoint output mapping

elkoDev · elkoDev · commit e1f050a47f1f · 2025-08-25T13:02:33.000+02:00
diff --git a/language/bcs-engineering-dsl-0.0.23.vsix b/language/bcs-engineering-dsl-0.0.23.vsix
diff --git a/language/example/showcase/showcase.bcsctrl b/language/example/showcase/showcase.bcsctrl
@@ -4,15 +4,20 @@ control ShowcaseController {
         Manual,
         Off
     }
-    struct RoomStatus {
-        currentMode: OpMode = OpMode.Auto,
-        temperature: REAL,
-        isOccupied: BOOL
-    }
-    unit LightingControl {
-        var currentMode: OpMode = OpMode.;
-        if (MotionSensor.) {
-        // Turn on lights...
+    functionblock HeatingLogic {
+        inputs {
+            var iTemp: REAL;
+            var iMode: OpMode;
+        }
+        outputs {
+            var oHeating: BOOL;
         }
+        logic {
+            oHeating = iMode == OpMode.Auto && iTemp < 20.5;
+        }
+    }
+    unit MorningWarmUp at TOD#06:00:00 {
+        var currentMode: OpMode = OpMode.Auto;
+        use HeatingLogic(iTemp: RoomSensor.Temperature, iMode: currentMode) -> HeatingActuator.IsActive;
     }
 }
diff --git a/language/example/showcase/showcase.bcshw b/language/example/showcase/showcase.bcshw
@@ -57,6 +57,20 @@ controller ShowcaseController {
             channel Value: BOOL link "Channel 1^Input"
         }
     } 
+
+    datapoint RoomSensor {
+        portgroup: Room1DigitalInputs
+        channels: {
+            channel Temperature: REAL link "Channel 2^Input"
+        }
+    } 
+
+    datapoint HeatingActuator {
+        portgroup: TwoDigitalOutputs
+        channels: {
+            channel IsActive: BOOL link "Channel 1^Output"
+        }
+    } 
 }   
 
 network {
diff --git a/language/package.json b/language/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.0.22",
+  "version": "0.0.23",
   "name": "bcs-engineering-dsl",
   "displayName": "BCS Engineering DSL",
   "icon": "icon.png",
diff --git a/language/puml/bcs-control-metamodel.puml b/language/puml/bcs-control-metamodel.puml
@@ -154,9 +154,9 @@ package "Literals" {
 
 ' Abstract element for what can be referenced by name
 abstract class NamedElement
-NamedElement <|--- VarDecl
-NamedElement <|--- EnumDecl
-NamedElement <|--- Datapoint
+NamedElement <|-- VarDecl
+NamedElement <|-- EnumDecl
+NamedElement <|-- Datapoint
 
 ' ===== RELATIONSHIPS =====
 
@@ -213,9 +213,9 @@ UseStmt "1" *-- "1" UseOutput : useOutput
 InputMapping "1" ..> "1" VarDecl : inputVar
 UseOutput "1" *-- "0..1" SimpleUseResult : singleOutput
 UseOutput "1" *-- "0..*" MappingUseResult : mappingOutputs
-SimpleUseResult "1" ..> "1" VarDecl : targetOutputVar
+SimpleUseResult "1" ..> "1" Ref : target
 MappingUseResult "1" ..> "1" VarDecl : fbOutputVar
-MappingUseResult "1" ..> "1" VarDecl : targetOutputVar
+MappingUseResult "1" ..> "1" Ref : target
 EdgeStmt "1" *-- "1" Ref : signal
 
 ' --- Expressions ---
diff --git a/language/railroad/svg/bcs-control/MappingUseResult.svg b/language/railroad/svg/bcs-control/MappingUseResult.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" xmlns="http://www.w3.org/2000/svg" width="241" height="62" viewBox="0 0 241 62">
+<svg class="railroad-diagram" xmlns="http://www.w3.org/2000/svg" width="249" height="62" viewBox="0 0 249 62">
 <style>
     svg.railroad-diagram {
         background-color: hsl(30,20%,95%);
@@ -28,7 +28,7 @@
 <path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
 <g>
 <path d="M40 31h0"></path>
-<path d="M200 31h0"></path>
+<path d="M208 31h0"></path>
 <path d="M40 31h10"></path>
 <g>
 <path d="M50 31h0"></path>
@@ -48,12 +48,12 @@
 <path d="M144 31h10"></path>
 <g>
 <path d="M154 31h0"></path>
-<path d="M190 31h0"></path>
-<rect x="154" y="20" width="36" height="22"></rect>
-<text x="172" y="35">ID</text>
+<path d="M198 31h0"></path>
+<rect x="154" y="20" width="44" height="22"></rect>
+<text x="176" y="35">Ref</text>
 </g>
-<path d="M190 31h10"></path>
+<path d="M198 31h10"></path>
 </g>
-<path d="M 200 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
+<path d="M 208 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
 </g>
 </svg>
diff --git a/language/railroad/svg/bcs-control/SimpleUseResult.svg b/language/railroad/svg/bcs-control/SimpleUseResult.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" xmlns="http://www.w3.org/2000/svg" width="137" height="62" viewBox="0 0 137 62">
+<svg class="railroad-diagram" xmlns="http://www.w3.org/2000/svg" width="145" height="62" viewBox="0 0 145 62">
 <style>
     svg.railroad-diagram {
         background-color: hsl(30,20%,95%);
@@ -29,11 +29,11 @@
 <path d="M40 31h10"></path>
 <g>
 <path d="M50 31h0"></path>
-<path d="M86 31h0"></path>
-<rect x="50" y="20" width="36" height="22"></rect>
-<text x="68" y="35">ID</text>
+<path d="M94 31h0"></path>
+<rect x="50" y="20" width="44" height="22"></rect>
+<text x="72" y="35">Ref</text>
 </g>
-<path d="M86 31h10"></path>
-<path d="M 96 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
+<path d="M94 31h10"></path>
+<path d="M 104 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
 </g>
 </svg>
diff --git a/language/src/cli/platform/beckhoff/application/statement-converter.ts b/language/src/cli/platform/beckhoff/application/statement-converter.ts
@@ -25,7 +25,6 @@ import {
 } from "../../../../language/generated/ast.js";
 import { ExpressionConverter } from "./expression-converter.js";
 import { GlobalInstanceManager } from "./global-instance-manager.js";
-import { getQualifiedReferenceName } from "./qualified_reference_name.js";
 
 /**
  * Converts DSL statements to IEC 61131-3 Structured Text and analyzes statement structures.
@@ -120,14 +119,12 @@ export class StatementConverter {
       const fb = stmt.functionBlockRef.ref;
       const outs = fb ? getOutputs(fb) : [];
       const fbOut = outs.length === 1 ? outs[0].name : "output";
-      const target = getQualifiedReferenceName(
-        stmt.useOutput.singleOutput.targetOutputVar
-      );
-      return out + `${p}${target} := ${instanceName}.${fbOut};\n`;
+      const target = this.expr.emit(stmt.useOutput.singleOutput.target);
+      return out + `${p}${target} := ${instanceName}.${fbOut};\n`.trimEnd();
     }
 
     for (const m of stmt.useOutput.mappingOutputs) {
-      const target = getQualifiedReferenceName(m.targetOutputVar);
+      const target = this.expr.emit(m.target);
       const fbOut = m.fbOutputVar.ref?.name ?? "output";
       out += `${p}${target} := ${instanceName}.${fbOut};\n`;
     }
diff --git a/language/src/language/bcs-control.langium b/language/src/language/bcs-control.langium
@@ -227,11 +227,11 @@ UseOutput:
 ;
 
 SimpleUseResult:
-    targetOutputVar=[VarDecl]
+    target=Ref
 ;
 
 MappingUseResult:
-    fbOutputVar=[VarDecl] ':' targetOutputVar=[VarDecl]
+    fbOutputVar=[VarDecl] ':' target=Ref
 ;
 
 
diff --git a/language/src/language/control/bcs-control-lang-semantic-token-provider.ts b/language/src/language/control/bcs-control-lang-semantic-token-provider.ts
@@ -21,7 +21,6 @@ import {
   isStructFieldDecl,
   isUseStmt,
   isMappingUseResult,
-  isSimpleUseResult,
   isInputMapping,
   isEnumMemberLiteral,
   isCaseLiteral,
@@ -213,18 +212,6 @@ export class BCSControlLangSemanticTokenProvider extends AbstractSemanticTokenPr
         property: "fbOutputVar",
         type: SemanticTokenTypes.parameter,
       });
-      acceptor({
-        node,
-        property: "targetOutputVar",
-        type: SemanticTokenTypes.variable,
-      });
-    }
-    if (isSimpleUseResult(node)) {
-      acceptor({
-        node,
-        property: "targetOutputVar",
-        type: SemanticTokenTypes.variable,
-      });
     }
     if (isInputMapping(node)) {
       acceptor({
diff --git a/language/src/language/control/utils/usestmt-validation-utils.ts b/language/src/language/control/utils/usestmt-validation-utils.ts
@@ -1,8 +1,16 @@
 import { ValidationAcceptor } from "langium";
-import { UseStmt, FunctionBlockDecl, UseOutput } from "../../generated/ast.js";
+import {
+  UseStmt,
+  FunctionBlockDecl,
+  UseOutput,
+  isDatapoint,
+  isEnumDecl,
+  Ref,
+} from "../../generated/ast.js";
 import { getInputs, getOutputs } from "./function-block-utils.js";
 import { DuplicationValidationUtils } from "./duplication-validation-utils.js";
 import { TypeInferenceUtils } from "./type-inference-utils.js";
+import { ExpressionUtils } from "./expression-utils.js";
 
 /**
  * Utility class for validating UseStmt (function block usage) operations.
@@ -130,11 +138,11 @@ export class UseStmtValidationUtils {
     }
 
     const expected = getOutputs(fb)[0];
-    const actual = output.singleOutput!.targetOutputVar?.ref;
+    const actualTarget = output.singleOutput!.target;
 
-    if (actual) {
+    if (UseStmtValidationUtils.checkTargetIsAssignable(actualTarget, accept)) {
       const expectedType = TypeInferenceUtils.inferVarDeclType(expected);
-      const actualType = TypeInferenceUtils.inferVarDeclType(actual);
+      const actualType = TypeInferenceUtils.inferType(actualTarget, accept);
 
       if (
         expectedType &&
@@ -143,8 +151,12 @@ export class UseStmtValidationUtils {
       ) {
         accept(
           "error",
-          `Type mismatch for output '${expected.name}': cannot assign to '${actual.name}' of type '${actualType}', expected '${expectedType}'.`,
-          { node: output.singleOutput!, property: "targetOutputVar" }
+          `Type mismatch for output '${
+            expected.name
+          }': cannot assign to '${ExpressionUtils.stringifyExpression(
+            actualTarget
+          )}' of type '${actualType}', expected '${expectedType}'.`,
+          { node: output.singleOutput!, property: "target" }
         );
       }
     }
@@ -180,25 +192,63 @@ export class UseStmtValidationUtils {
     // Perform type checking for mappings
     for (const map of output.mappingOutputs) {
       const fbOutputVar = map.fbOutputVar?.ref;
-      const targetOutputVar = map.targetOutputVar?.ref;
+      const targetRef = map.target;
 
-      if (!targetOutputVar || !fbOutputVar) continue;
+      if (!targetRef || !fbOutputVar) continue;
 
-      const expected = getOutputs(fb).find((o) => o.name === fbOutputVar.name);
-      const expectedType = expected ? TypeInferenceUtils.inferVarDeclType(expected) : undefined;
-      const actualType = TypeInferenceUtils.inferVarDeclType(targetOutputVar);
+      if (UseStmtValidationUtils.checkTargetIsAssignable(targetRef, accept)) {
+        const expected = getOutputs(fb).find(
+          (o) => o.name === fbOutputVar.name
+        );
+        const expectedType = expected
+          ? TypeInferenceUtils.inferVarDeclType(expected)
+          : undefined;
+        const actualType = TypeInferenceUtils.inferType(targetRef, accept);
+
+        if (
+          expectedType &&
+          actualType &&
+          !TypeInferenceUtils.isTypeAssignable(expectedType, actualType)
+        ) {
+          accept(
+            "error",
+            `Type mismatch: cannot assign output '${
+              fbOutputVar.name
+            }' to '${ExpressionUtils.stringifyExpression(
+              targetRef
+            )}'. Expected assignable type for '${expectedType}', but got '${actualType}'.`,
+            { node: map, property: "target" }
+          );
+        }
+      }
+    }
+  }
 
-      if (
-        expectedType &&
-        actualType &&
-        !TypeInferenceUtils.isTypeAssignable(expectedType, actualType)
-      ) {
+  private static checkTargetIsAssignable(
+    target: Ref,
+    accept: ValidationAcceptor
+  ): boolean {
+    const targetRef = target.ref?.ref;
+    if (!targetRef) return true; // Let other validators handle unresolved refs
+
+    if (isEnumDecl(targetRef)) {
+      accept("error", "Cannot assign a 'use' output to an enum type.", {
+        node: target,
+      });
+      return false;
+    }
+
+    if (isDatapoint(targetRef)) {
+      const portGroup = targetRef.portgroup?.ref;
+      if (portGroup?.ioType.includes("INPUT")) {
         accept(
           "error",
-          `Type mismatch for mapped output '${fbOutputVar.name}': expected '${expectedType}', got '${actualType}'.`,
-          { node: map, property: "fbOutputVar" }
+          `Cannot assign a 'use' output to a read-only input channel.`,
+          { node: target }
         );
+        return false;
       }
     }
+    return true;
   }
 }
diff --git a/language/test/validating/validating.test.ts b/language/test/validating/validating.test.ts
@@ -132,7 +132,7 @@ describe("BCS Control Validation Tests", () => {
       // 6. Output type mismatch (single)
       "Type mismatch for output 'oHeating': cannot assign to 'isHeating_should_fail_type_matching' of type 'INT', expected 'BOOL'.",
       // 7. Output type mismatch (mapping)
-      "Type mismatch for mapped output 'oHeating': expected 'BOOL', got 'INT'.",
+      "Type mismatch: cannot assign output 'oHeating' to 'isHeating_should_fail_type_matching'. Expected assignable type for 'BOOL', but got 'INT'.",
       // 8. Output mapping could not resolve
       "Could not resolve reference to VarDecl named 'oExtra'.",
       "Could not resolve reference to VarDecl named 'oWrong'.",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "0.0.22",`
	`2`	`+ "version": "0.0.23",`
`3`	`3`	`"name": "bcs-engineering-dsl",`
`4`	`4`	`"displayName": "BCS Engineering DSL",`
`5`	`5`	`"icon": "icon.png",`
Original file line number	Diff line number	Diff line change
`@@ -227,11 +227,11 @@ UseOutput:`
`227`	`227`	`;`
`228`	`228`
`229`	`229`	`SimpleUseResult:`
`230`		`- targetOutputVar=[VarDecl]`
	`230`	`+ target=Ref`
`231`	`231`	`;`
`232`	`232`
`233`	`233`	`MappingUseResult:`
`234`		`- fbOutputVar=[VarDecl] ':' targetOutputVar=[VarDecl]`
	`234`	`+ fbOutputVar=[VarDecl] ':' target=Ref`
`235`	`235`	`;`
`236`	`236`
`237`	`237`