@abaplint/transpiler 2.10.35 → 2.10.37

package/build/src/handlers/handle_type_pool.js

@@ -5,19 +5,35 @@ const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 const transpile_types_1 = require("../transpile_types");
 const traversal_1 = require("../traversal");
+const structures_1 = require("../structures");
 class HandleTypePool {
     runObject(obj, reg) {
-        const spaghetti = new abaplint.SyntaxLogic(reg, obj).run().spaghetti.getFirstChild()?.getFirstChild();
+        const spaghetti = new abaplint.SyntaxLogic(reg, obj).run().spaghetti;
+        const spaghettiNode = spaghetti.getFirstChild()?.getFirstChild();
+        if (spaghettiNode === undefined) {
+            throw new Error("HandleTypePool: no spaghetti found");
+        }
+        const abapFile = obj.getABAPFiles()[0];
+        if (abapFile === undefined) {
+            throw new Error("HandleTypePool: no ABAP file found");
+        }
         const chunk = new chunk_1.Chunk();
         chunk.appendString(`const pool = {};\n`);
-        for (const v in spaghetti?.getData().vars) {
-            const abs = spaghetti.getData().vars[v];
+        for (const v in spaghettiNode?.getData().vars) {
+            const abs = spaghettiNode.getData().vars[v];
             const name = `pool['${v.toLowerCase()}']`;
             chunk.appendString(`${name} = ${new transpile_types_1.TranspileTypes().toType(abs.getType())};\n`);
             chunk.appendString(traversal_1.Traversal.setValues(abs, name));
+            // yea, this is a mess
+            for (const cons of abapFile.getStructure()?.findAllStructures(abaplint.Structures.Constants) || []) {
+                const cName = cons.findFirstExpression(abaplint.Expressions.DefinitionName)?.getFirstToken().getStr().toLowerCase();
+                if (cName === v.toLocaleLowerCase()) {
+                    chunk.appendString(structures_1.ConstantsTranspiler.handleValues(name, cons, new traversal_1.Traversal(spaghetti, abapFile, obj, reg)));
+                }
+            }
         }
-        for (const t in spaghetti?.getData().types) {
-            const abs = spaghetti.getData().types[t];
+        for (const t in spaghettiNode?.getData().types) {
+            const abs = spaghettiNode.getData().types[t];
             chunk.appendString(`pool['${t.toLowerCase()}'] = ${new transpile_types_1.TranspileTypes().toType(abs.getType())};\n`);
         }
         chunk.appendString(`abap.TypePools['${obj.getName()}'] = pool;`);

package/build/src/structures/constants.d.ts

@@ -4,4 +4,5 @@ import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class ConstantsTranspiler implements IStructureTranspiler {
     transpile(node: abaplint.Nodes.StructureNode, traversal: Traversal): Chunk;
+    static handleValues(prefix: string, node: abaplint.Nodes.StructureNode, traversal: Traversal): string;
 }

package/build/src/structures/constants.js

@@ -15,6 +15,11 @@ class ConstantsTranspiler {
             throw "ConstantsTranspilerName";
         }
         let ret = new statements_1.DataTranspiler().transpile(begin, traversal).getCode() + "\n";
+        ret += ConstantsTranspiler.handleValues(name, node, traversal);
+        return new chunk_1.Chunk(ret);
+    }
+    static handleValues(prefix, node, traversal) {
+        let ret = "";
         // todo: CONSTANTS BEGIN inside CONSTANTS BEGIN
         for (const c of node.findDirectStatements(abaplint.Statements.Constant)) {
             const field = c.findDirectExpression(abaplint.Expressions.DefinitionName)?.getFirstToken().getStr();
@@ -23,10 +28,10 @@ class ConstantsTranspiler {
             }
             const value = c.findFirstExpression(abaplint.Expressions.Constant);
             if (value) {
-                ret += `${name}.get().${field}.set(${traversal.traverse(value).getCode()});\n`;
+                ret += `${prefix}.get().${field}.set(${traversal.traverse(value).getCode()});\n`;
             }
         }
-        return new chunk_1.Chunk(ret);
+        return ret;
     }
 }
 exports.ConstantsTranspiler = ConstantsTranspiler;

package/build/src/unit_test.js

@@ -39,7 +39,7 @@ export async function initializeABAP() {\n`;
             ret += `  insert.push(\`${i}\`);\n`;
         }
         ret += `\n`;
-        if (extraSetup === undefined) {
+        if (extraSetup === undefined || extraSetup === "") {
             ret += `// no setup logic specified in config\n`;
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.10.35",
+  "version": "2.10.37",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",