@abaplint/runtime 2.10.76 → 2.10.78

package/build/src/expand_dynamic.js

@@ -7,13 +7,32 @@ function expandDynamic(code, ev) {
         return "1 = 1";
     }
     else {
+        // yea, this is also wrong,
+        code = code.replace(/ EQ /g, " = ");
         // todo more here, this is just one simple case,
-        const match = code.match(/ <(\w+)>/);
+        let regex = / <(\w+)>-(\w+)/;
+        let match = code.match(regex);
+        if (match && match[1] && match[2]) {
+            let name = "fs_" + match[1] + "_";
+            name = name.toLowerCase();
+            let found = ev(name);
+            if (found instanceof types_1.FieldSymbol) {
+                found = found.get()[match[2].toLowerCase()];
+                if (found === undefined) {
+                    throw new Error(`expandDynamic: Field symbol ${name} does not have field ${match[2]}`);
+                }
+                code = code.replace(regex, " '" + found.get() + "'");
+            }
+        }
+        // todo more here, this is just one simple case,
+        regex = / <(\w+)>/;
+        match = code.match(regex);
         if (match && match[1]) {
-            const name = "fs_" + match[1] + "_";
+            let name = "fs_" + match[1] + "_";
+            name = name.toLowerCase();
             const found = ev(name);
             if (found instanceof types_1.FieldSymbol) {
-                code = code.replace(/ <(\w+)>/, "'" + found.get() + "'");
+                code = code.replace(regex, " '" + found.get() + "'");
             }
         }
         return code;

package/build/src/types/structure.d.ts

@@ -13,6 +13,7 @@ export declare class Structure {
     constructor(fields: {
         [key: string]: any;
     }, qualifiedName?: string, ddicName?: string, suffix?: any, asInclude?: any);
+    private linkGroupFields;
     clone(): Structure;
     clear(): this;
     getDDICName(): string | undefined;

package/build/src/types/structure.js

@@ -13,6 +13,15 @@ class Structure {
         this.ddicName = ddicName?.toUpperCase();
         this.suffix = suffix;
         this.asInclude = asInclude;
+        this.linkGroupFields();
+    }
+    linkGroupFields() {
+        for (const as of Object.keys(this.asInclude || {})) {
+            const suffix = this.suffix?.[as] || "";
+            for (const fieldName of Object.keys(this.value[as].get())) {
+                this.value[fieldName + suffix] = this.value[as].get()[fieldName];
+            }
+        }
     }
     clone() {
         const newValues = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.10.76",
+  "version": "2.10.78",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",