@abaplint/transpiler 2.0.28 → 2.0.29

package/build/src/statements/select.d.ts

@@ -6,4 +6,5 @@ export declare class SelectTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
     private findKeys;
     private concatCond;
+    private isWhereExpression;
 }

package/build/src/statements/select.js

@@ -11,18 +11,23 @@ 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()) + " ";
-        const where = node.findFirstExpression(abaplint.Expressions.SQLCond);
+        let where;
+        for (const sqlCond of node.findAllExpressions(abaplint.Expressions.SQLCond)) {
+            if (this.isWhereExpression(node, sqlCond)) {
+                where = sqlCond;
+            }
+        }
         if (where) {
             select += "WHERE " + this.concatCond(where, traversal) + " ";
         }
-        const orderBy = node.findFirstExpression(abaplint.Expressions.SQLOrderBy);
-        if (orderBy) {
-            select += orderBy.concatTokens() + " ";
-        }
         const upTo = node.findFirstExpression(abaplint.Expressions.SQLUpTo);
         if (upTo) {
             select += upTo.concatTokens() + " ";
         }
+        const orderBy = node.findFirstExpression(abaplint.Expressions.SQLOrderBy);
+        if (orderBy) {
+            select += orderBy.concatTokens() + " ";
+        }
         for (const d of node.findAllExpressionsRecursive(abaplint.Expressions.Dynamic)) {
             const chain = d.findFirstExpression(abaplint.Expressions.FieldChain);
             if (chain) {
@@ -69,6 +74,23 @@ class SelectTranspiler {
         }
         return ret.trim();
     }
+    isWhereExpression(node, expression) {
+        // check if previous token before sqlCond is "WHERE". It could also be "ON" in case of join condition
+        let prevToken;
+        const sqlCondToken = expression.getFirstToken();
+        for (const token of node.getTokens()) {
+            if (token.getStart() === sqlCondToken.getStart()) {
+                break;
+            }
+            prevToken = token;
+        }
+        if (prevToken && prevToken.getStr() === "WHERE") {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
 }
 exports.SelectTranspiler = SelectTranspiler;
 //# sourceMappingURL=select.js.map

package/build/src/structures/class_implementation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClassImplementationTranspiler = void 0;
 const abaplint = require("@abaplint/core");
+const traversal_1 = require("../traversal");
 const transpile_types_1 = require("../transpile_types");
 const expressions_1 = require("../expressions");
 const chunk_1 = require("../chunk");
@@ -69,7 +70,7 @@ class ClassImplementationTranspiler {
         const clasName = node.getFirstToken().getStr().toLowerCase();
         const staticAttributes = this.findStaticAttributes(cdef, scope);
         for (const attr of staticAttributes) {
-            const name = clasName + "." + attr.prefix + attr.identifier.getName().toLowerCase();
+            const name = traversal_1.Traversal.escapeClassName(clasName) + "." + attr.prefix + attr.identifier.getName().toLowerCase();
             ret += name + " = " + new transpile_types_1.TranspileTypes().toType(attr.identifier.getType()) + ";\n";
             const val = attr.identifier.getValue();
             if (typeof val === "string") {

package/build/src/traversal.js

@@ -124,17 +124,17 @@ class Traversal {
                 const found = this.reg.findObjectForFile(file);
                 if (found) {
                     if (found instanceof abaplint.Objects.Interface) {
-                        return this.lookupClassOrInterface(found.getName(), t) + "." + found.getName().toLowerCase() + "$" + name;
+                        return Traversal.escapeClassName(this.lookupClassOrInterface(found.getName(), t)) + "." + found.getName().toLowerCase() + "$" + name;
                     }
                     else {
-                        return this.lookupClassOrInterface(found.getName(), t) + "." + name;
+                        return Traversal.escapeClassName(this.lookupClassOrInterface(found.getName(), t)) + "." + name;
                     }
                 }
             }
         }
         const className = this.isStaticClassAttribute(t);
         if (className) {
-            name = className + "." + name;
+            name = Traversal.escapeClassName(className) + "." + name;
         }
         else if (name === "super") {
             return name;

package/package.json

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