@abaplint/transpiler 2.11.63 → 2.11.64

package/build/src/expressions/field_assignment.d.ts

@@ -1,6 +1,6 @@
-import { Nodes } from "@abaplint/core";
+import { AbstractType, Nodes } from "@abaplint/core";
 import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class FieldAssignmentTranspiler {
-    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal, context?: AbstractType): Chunk;
 }

package/build/src/expressions/field_assignment.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldAssignmentTranspiler = void 0;
 const core_1 = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const abaplint = require("@abaplint/core");
+const source_1 = require("./source");
 class FieldAssignmentTranspiler {
-    transpile(node, traversal) {
+    transpile(node, traversal, context) {
         const ret = new chunk_1.Chunk();
         const field = node.findDirectExpression(core_1.Expressions.FieldSub);
         if (field === undefined) {
@@ -14,7 +16,11 @@ class FieldAssignmentTranspiler {
         if (source === undefined) {
             throw new Error("FieldAssignmentTranspiler, Expected Source");
         }
-        ret.appendString(`.setField("${field.concatTokens().toLowerCase()}", ${traversal.traverse(source).getCode()})`);
+        if (context instanceof abaplint.BasicTypes.StructureType) {
+            context = context.getComponentByName(field.concatTokens());
+        }
+        const sourc = new source_1.SourceTranspiler().transpile(source, traversal, context).getCode();
+        ret.appendString(`.setField("${field.concatTokens().toLowerCase()}", ${sourc})`);
         return ret;
     }
 }

package/build/src/expressions/string_template_source.js

@@ -12,7 +12,7 @@ class StringTemplateSourceTranspiler {
         let post = ")";
         const formatting = node.findDirectExpression(core_1.Expressions.StringTemplateFormatting);
         if (formatting) {
-            const options = this.build(formatting, traversal, context);
+            const options = this.build(formatting, traversal, context, node);
             if (options) {
                 post = "," + options + ")";
             }
@@ -24,7 +24,7 @@ class StringTemplateSourceTranspiler {
         ret += pre + new _1.SourceTranspiler().transpile(c, traversal).getCode() + post;
         return new chunk_1.Chunk(ret);
     }
-    build(node, traversal, context) {
+    build(node, traversal, context, _top) {
         let option = "";
         let count = 0;
         for (const c of node.getChildren()) {
@@ -45,10 +45,9 @@ class StringTemplateSourceTranspiler {
             }
         }
         if (option.startsWith(`"alpha":"in"`)) {
-            if (context === undefined) {
-                throw new Error("ALPHA = IN, context undefined");
+            if (context !== undefined) {
+                option += `, "alphaInContext": ` + transpile_types_1.TranspileTypes.toType(context);
             }
-            option += `, "alphaInContext": ` + transpile_types_1.TranspileTypes.toType(context);
         }
         if (option !== "") {
             return "{" + option + "}";

package/build/src/expressions/value_body.js

@@ -26,7 +26,7 @@ class ValueBodyTranspiler {
         const hasLines = body.findDirectExpression(core_1.Expressions.ValueBodyLine) !== undefined;
         for (const child of body.getChildren()) {
             if (child.get() instanceof core_1.Expressions.FieldAssignment && child instanceof core_1.Nodes.ExpressionNode) {
-                const transpiled = new field_assignment_1.FieldAssignmentTranspiler().transpile(child, traversal).getCode();
+                const transpiled = new field_assignment_1.FieldAssignmentTranspiler().transpile(child, traversal, context).getCode();
                 if (hasLines === false) {
                     ret.appendString(transpiled);
                 }

package/build/src/statements/move.js

@@ -15,7 +15,8 @@ class MoveTranspiler {
         if (targetExpressions.length === 1
             && sourceExpression?.getChildren().length === 1
             && sourceExpression.findDirectExpression(abaplint.Expressions.StringTemplate)
-            && sourceExpression.concatTokens().toUpperCase().endsWith(" ALPHA = IN }|")) {
+            && sourceExpression.concatTokens().toUpperCase().endsWith(" ALPHA = IN }|")
+            && sourceExpression.concatTokens().toUpperCase().startsWith("|{")) {
             const target = targets[0].getCode();
             const tSource = traversal.traverse(sourceExpression.findFirstExpression(abaplint.Expressions.StringTemplateSource)?.findDirectExpression(abaplint.Expressions.Source));
             ret.appendString(target + `.set(abap.alphaIn(${tSource.getCode()}, ${target}, ${target}));`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.11.63",
+  "version": "2.11.64",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.113.189",
+    "@abaplint/core": "^2.113.191",
     "source-map": "^0.7.6"
   },
   "devDependencies": {