@abaplint/transpiler 1.7.12 → 1.7.16

package/build/src/expressions/constant.js

@@ -10,8 +10,9 @@ class ConstantTranspiler {
     transpile(node, traversal) {
         const int = node.findFirstExpression(core_1.Expressions.Integer);
         if (int) {
-            const val = parseInt(int.concatTokens(), 10);
-            let ret = "constant_" + (val < 0 ? "minus_" : "") + Math.abs(val);
+            const concat = int.concatTokens().trim();
+            const post = concat.startsWith("-") ? "minus_" : "";
+            let ret = "constant_" + post + int.getLastToken().getStr();
             if (this.addGet === true) {
                 ret += ".get()";
             }

package/build/src/index.d.ts

@@ -55,7 +55,7 @@ export declare class Transpiler {
     runRaw(files: IFile[]): Promise<IOutput>;
     run(reg: abaplint.IRegistry, progress?: IProgress): Promise<IOutput>;
     protected handleConstants(obj: abaplint.ABAPObject, file: abaplint.ABAPFile, reg: abaplint.IRegistry): string;
-    protected findConstants(obj: abaplint.ABAPObject, file: abaplint.ABAPFile, reg: abaplint.IRegistry): Set<number>;
+    protected findConstants(obj: abaplint.ABAPObject, file: abaplint.ABAPFile, reg: abaplint.IRegistry): Set<string>;
     protected runObject(obj: abaplint.ABAPObject, reg: abaplint.IRegistry): IOutputFile[];
     /** merges the locals def and imp into one mjs file */
     private rearrangeClassLocals;

package/build/src/index.js

@@ -62,9 +62,9 @@ class Transpiler {
         let result = "";
         const constants = this.findConstants(obj, file, reg);
         if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.skipConstants) === false || ((_b = this.options) === null || _b === void 0 ? void 0 : _b.skipConstants) === undefined) {
-            for (const c of Array.from(constants).sort()) {
-                const post = c < 0 ? "minus_" : "";
-                result += `const constant_${post}${Math.abs(c)} = new abap.types.Integer().set(${c});\n`;
+            for (const concat of Array.from(constants).sort()) {
+                const post = concat.startsWith("-") ? "minus_" : "";
+                result += `const constant_${post}${concat.replace("-", "")} = new abap.types.Integer().set(${concat});\n`;
             }
         }
         return result;
@@ -73,8 +73,7 @@ class Transpiler {
         var _a, _b;
         let constants = new Set();
         for (const i of ((_a = file.getStructure()) === null || _a === void 0 ? void 0 : _a.findAllExpressions(abaplint.Expressions.Integer)) || []) {
-            const j = parseInt(i.concatTokens(), 10);
-            constants.add(j);
+            constants.add(i.concatTokens().replace(" ", ""));
         }
         // extra constants from interfaces, used for default values
         if (obj.getType() === "CLAS") {

package/build/src/statements/create_object.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateObjectTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const expressions_1 = require("../expressions");
 class CreateObjectTranspiler {
     transpile(node, traversal) {
-        var _a;
+        var _a, _b;
         const target = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Target)).getCode();
         let para = "";
         const parameters = node.findFirstExpression(abaplint.Expressions.ParameterListS);
@@ -13,16 +14,24 @@ class CreateObjectTranspiler {
             para = traversal.traverse(parameters).getCode();
         }
         let name = "";
-        const dynamic = (_a = node.findDirectExpression(abaplint.Expressions.Dynamic)) === null || _a === void 0 ? void 0 : _a.findFirstExpression(abaplint.Expressions.ConstantString);
+        let directGlobal = false;
+        let dynamic = (_a = node.findDirectExpression(abaplint.Expressions.Dynamic)) === null || _a === void 0 ? void 0 : _a.findFirstExpression(abaplint.Expressions.ConstantString);
         if (dynamic) {
             name = dynamic.getFirstToken().getStr();
             name = name.substring(1, name.length - 1);
         }
         else {
+            dynamic = (_b = node.findDirectExpression(abaplint.Expressions.Dynamic)) === null || _b === void 0 ? void 0 : _b.findFirstExpression(abaplint.Expressions.FieldChain);
+            if (dynamic) {
+                name = new expressions_1.FieldChainTranspiler(true).transpile(dynamic, traversal).getCode();
+                directGlobal = true;
+            }
+        }
+        if (name === "") {
             name = this.findClassName(node, traversal);
         }
         let ret = "";
-        const clas = traversal.lookupClassOrInterface(name, node.getFirstToken());
+        const clas = traversal.lookupClassOrInterface(name, node.getFirstToken(), directGlobal);
         const cx = traversal.lookupClassOrInterface("CX_SY_CREATE_OBJECT_ERROR", node.getFirstToken());
         if (dynamic) {
             ret += `if (${clas} === undefined) { throw new ${cx}; }\n`;

package/build/src/statements/select.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const expressions_1 = require("../expressions");
 class SelectTranspiler {
     transpile(node, traversal) {
         var _a, _b;
@@ -10,6 +11,14 @@ class SelectTranspiler {
         let select = "SELECT ";
         select += ((_a = node.findFirstExpression(abaplint.Expressions.SQLFieldList)) === null || _a === void 0 ? void 0 : _a.concatTokens()) + " ";
         select += ((_b = node.findFirstExpression(abaplint.Expressions.SQLFrom)) === null || _b === void 0 ? void 0 : _b.concatTokens()) + " ";
+        for (const d of node.findAllExpressionsRecursive(abaplint.Expressions.Dynamic)) {
+            const chain = d.findFirstExpression(abaplint.Expressions.FieldChain);
+            if (chain) {
+                const code = new expressions_1.FieldChainTranspiler(true).transpile(chain, traversal).getCode();
+                const search = d.concatTokens();
+                select = select.replace(search, `" + ${code} + "`);
+            }
+        }
         if (node.concatTokens().toUpperCase().startsWith("SELECT SINGLE ")) {
             select += "LIMIT 1";
         }

package/build/src/traversal.d.ts

@@ -36,7 +36,7 @@ export declare class Traversal {
     private dataFromInterfaces;
     determineType(node: abaplint.Nodes.ExpressionNode | abaplint.Nodes.StatementNode, scope: abaplint.ISpaghettiScopeNode | undefined): abaplint.AbstractType | undefined;
     registerClassOrInterface(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;
-    lookupClassOrInterface(name: string | undefined, token: abaplint.Token | undefined): string;
+    lookupClassOrInterface(name: string | undefined, token: abaplint.Token | undefined, directGlobal?: boolean): string;
     private buildPrefix;
     protected traverseStructure(node: abaplint.Nodes.StructureNode): Chunk;
     protected traverseStatement(node: abaplint.Nodes.StatementNode): Chunk;

package/build/src/traversal.js

@@ -347,11 +347,14 @@ class Traversal {
             return `abap.Classes['${name.toUpperCase()}'] = ${name.toLowerCase()};`;
         }
     }
-    lookupClassOrInterface(name, token) {
+    lookupClassOrInterface(name, token, directGlobal = false) {
         var _a, _b;
         if (name === undefined || token === undefined) {
             return "abap.Classes['undefined']";
         }
+        if (directGlobal === true) {
+            return "abap.Classes[" + name + "]";
+        }
         const scope = this.findCurrentScopeByToken(token);
         // todo, add explicit type,
         let def = scope === null || scope === void 0 ? void 0 : scope.findClassDefinition(name);

package/build/src/types.js

@@ -96,6 +96,9 @@ class TranspileTypes {
         else if (type instanceof abaplint.BasicTypes.FloatType) {
             resolved = "Float";
         }
+        else if (type instanceof abaplint.BasicTypes.DecFloat34Type) {
+            resolved = "DecFloat34";
+        }
         else if (type instanceof abaplint.BasicTypes.UnknownType) {
             return `(() => { throw "Unknown type: ${type.getError()}" })()`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "1.7.12",
+  "version": "1.7.16",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -34,7 +34,7 @@
     "@types/chai": "^4.3.0",
     "@types/mocha": "^9.0.0",
     "chai": "^4.3.4",
-    "mocha": "^9.1.3",
+    "mocha": "^9.1.4",
     "source-map-support": "^0.5.21",
     "typescript": "^4.5.4"
   }