@abaplint/transpiler 2.11.61 → 2.11.63

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

@@ -1,9 +1,9 @@
-import { Nodes } from "@abaplint/core";
+import { AbstractType, Nodes } from "@abaplint/core";
 import { IExpressionTranspiler } from "./_expression_transpiler";
 import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class SourceTranspiler implements IExpressionTranspiler {
     private readonly addGet;
     constructor(addGet?: boolean);
-    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal, context?: AbstractType): Chunk;
 }

package/build/src/expressions/source.js

@@ -13,7 +13,7 @@ class SourceTranspiler {
     constructor(addGet = false) {
         this.addGet = addGet;
     }
-    transpile(node, traversal) {
+    transpile(node, traversal, context) {
         let ret = new chunk_1.Chunk();
         const post = new chunk_1.Chunk();
         const children = node.getChildren();
@@ -28,7 +28,7 @@ class SourceTranspiler {
                     ret.appendChunk(new constant_1.ConstantTranspiler(this.addGet).transpile(c, traversal));
                 }
                 else if (c.get() instanceof core_1.Expressions.StringTemplate) {
-                    ret.appendChunk(traversal.traverse(c));
+                    ret.appendChunk(new _1.StringTemplateTranspiler().transpile(c, traversal, context));
                 }
                 else if (c.get() instanceof core_1.Expressions.Cond) {
                     ret.appendChunk(traversal.traverse(c));
@@ -83,7 +83,8 @@ class SourceTranspiler {
                     ret = new chunk_1.Chunk().appendString(new _1.TypeNameOrInfer().transpile(typ, traversal).getCode());
                     ret.appendString(".set(");
                     // todo: handle LET
-                    ret.appendString(traversal.traverse(c.getFirstChild()).getCode());
+                    const context = new _1.TypeNameOrInfer().findType(typ, traversal);
+                    ret.appendString(new SourceTranspiler().transpile(c.getFirstChild(), traversal, context).getCode());
                     ret.appendString(")");
                 }
                 else if (c.get() instanceof core_1.Expressions.ValueBody) {

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

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

package/build/src/expressions/string_template.js

@@ -5,7 +5,7 @@ const core_1 = require("@abaplint/core");
 const _1 = require(".");
 const chunk_1 = require("../chunk");
 class StringTemplateTranspiler {
-    transpile(node, traversal) {
+    transpile(node, traversal, context) {
         let ret = "";
         const children = node.getChildren();
         // eslint-disable-next-line @typescript-eslint/prefer-for-of
@@ -30,7 +30,7 @@ class StringTemplateTranspiler {
                 }
             }
             else if (c instanceof core_1.Nodes.ExpressionNode) {
-                ret += new _1.StringTemplateSourceTranspiler().transpile(c, traversal).getCode();
+                ret += new _1.StringTemplateSourceTranspiler().transpile(c, traversal, context).getCode();
             }
         }
         return new chunk_1.Chunk("new abap.types.String().set(" + ret + ")");

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

@@ -1,8 +1,7 @@
-import { Nodes } from "@abaplint/core";
-import { IExpressionTranspiler } from "./_expression_transpiler";
+import { Nodes, AbstractType } from "@abaplint/core";
 import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
-export declare class StringTemplateSourceTranspiler implements IExpressionTranspiler {
-    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+export declare class StringTemplateSourceTranspiler {
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal, context?: AbstractType): Chunk;
     private build;
 }

package/build/src/expressions/string_template_source.js

@@ -4,14 +4,15 @@ exports.StringTemplateSourceTranspiler = void 0;
 const core_1 = require("@abaplint/core");
 const _1 = require(".");
 const chunk_1 = require("../chunk");
+const transpile_types_1 = require("../transpile_types");
 class StringTemplateSourceTranspiler {
-    transpile(node, traversal) {
+    transpile(node, traversal, context) {
         let ret = "";
         const pre = "abap.templateFormatting(";
         let post = ")";
         const formatting = node.findDirectExpression(core_1.Expressions.StringTemplateFormatting);
         if (formatting) {
-            const options = this.build(formatting, traversal);
+            const options = this.build(formatting, traversal, context);
             if (options) {
                 post = "," + options + ")";
             }
@@ -23,7 +24,7 @@ class StringTemplateSourceTranspiler {
         ret += pre + new _1.SourceTranspiler().transpile(c, traversal).getCode() + post;
         return new chunk_1.Chunk(ret);
     }
-    build(node, traversal) {
+    build(node, traversal, context) {
         let option = "";
         let count = 0;
         for (const c of node.getChildren()) {
@@ -43,6 +44,12 @@ class StringTemplateSourceTranspiler {
                 option += new _1.SourceTranspiler(true).transpile(c, traversal).getCode();
             }
         }
+        if (option.startsWith(`"alpha":"in"`)) {
+            if (context === undefined) {
+                throw new Error("ALPHA = IN, context undefined");
+            }
+            option += `, "alphaInContext": ` + transpile_types_1.TranspileTypes.toType(context);
+        }
         if (option !== "") {
             return "{" + option + "}";
         }

package/build/src/initialization.js

@@ -106,8 +106,18 @@ export async function initializeABAP() {\n`;
     // class constructors might make early use of eg. constants from interfaces
     // sub classes will import() super classes and trigger a class constructor of the super
     hasClassConstructor(reg, clas) {
+        /*
         if (clas.getDefinition()?.getMethodDefinitions().getByName("CLASS_CONSTRUCTOR") !== undefined) {
-            return true;
+          return true;
+        }
+        */
+        // also take local class definitions into account
+        for (const file of clas.getABAPFiles()) {
+            for (const cdef of file.getInfo().listClassDefinitions()) {
+                if (cdef.methods.some((m) => m.name.toUpperCase() === "CLASS_CONSTRUCTOR")) {
+                    return true;
+                }
+            }
         }
         const sup = clas.getDefinition()?.getSuperClass();
         if (sup !== undefined) {

package/build/src/statements/move.js

@@ -5,12 +5,23 @@ const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 class MoveTranspiler {
     transpile(node, traversal) {
-        let source = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Source));
+        const sourceExpression = node.findDirectExpression(abaplint.Expressions.Source);
         const targets = [];
-        for (const t of node.findDirectExpressions(abaplint.Expressions.Target)) {
+        const targetExpressions = node.findDirectExpressions(abaplint.Expressions.Target);
+        for (const t of targetExpressions) {
             targets.push(traversal.traverse(t));
         }
         const ret = new chunk_1.Chunk();
+        if (targetExpressions.length === 1
+            && sourceExpression?.getChildren().length === 1
+            && sourceExpression.findDirectExpression(abaplint.Expressions.StringTemplate)
+            && sourceExpression.concatTokens().toUpperCase().endsWith(" ALPHA = IN }|")) {
+            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}));`);
+            return ret;
+        }
+        let source = traversal.traverse(sourceExpression);
         const second = node.getChildren()[1]?.concatTokens();
         switch (second) {
             case "?=":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.11.61",
+  "version": "2.11.63",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,14 +29,14 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.113.188",
+    "@abaplint/core": "^2.113.189",
     "source-map": "^0.7.6"
   },
   "devDependencies": {
     "@types/chai": "^4.3.20",
     "@types/mocha": "^10.0.10",
     "chai": "^4.5.0",
-    "mocha": "^11.7.1",
+    "mocha": "^11.7.2",
     "source-map-support": "^0.5.21",
     "typescript": "^5.9.2"
   }