@abaplint/transpiler 2.3.72 → 2.3.74

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

@@ -19,8 +19,6 @@ export * from "./field_length";
 export * from "./field_offset";
 export * from "./field_symbol";
 export * from "./function_exporting";
-export * from "./sql_from";
-export * from "./sql_join";
 export * from "./function_parameters";
 export * from "./message_number";
 export * from "./method_call_body";
@@ -41,8 +39,11 @@ export * from "./simple_source4";
 export * from "./source_field_symbol";
 export * from "./source";
 export * from "./sql_cond";
+export * from "./sql_from";
+export * from "./sql_join";
 export * from "./sql_source_simple";
 export * from "./sql_source";
+export * from "./sql_target";
 export * from "./string_template_source";
 export * from "./string_template";
 export * from "./target";

package/build/src/expressions/index.js

@@ -35,8 +35,6 @@ __exportStar(require("./field_length"), exports);
 __exportStar(require("./field_offset"), exports);
 __exportStar(require("./field_symbol"), exports);
 __exportStar(require("./function_exporting"), exports);
-__exportStar(require("./sql_from"), exports);
-__exportStar(require("./sql_join"), exports);
 __exportStar(require("./function_parameters"), exports);
 __exportStar(require("./message_number"), exports);
 __exportStar(require("./method_call_body"), exports);
@@ -57,8 +55,11 @@ __exportStar(require("./simple_source4"), exports);
 __exportStar(require("./source_field_symbol"), exports);
 __exportStar(require("./source"), exports);
 __exportStar(require("./sql_cond"), exports);
+__exportStar(require("./sql_from"), exports);
+__exportStar(require("./sql_join"), exports);
 __exportStar(require("./sql_source_simple"), exports);
 __exportStar(require("./sql_source"), exports);
+__exportStar(require("./sql_target"), exports);
 __exportStar(require("./string_template_source"), exports);
 __exportStar(require("./string_template"), exports);
 __exportStar(require("./target"), exports);

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

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

package/build/src/expressions/sql_target.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLTargetTranspiler = void 0;
+const abaplint = require("@abaplint/core");
+class SQLTargetTranspiler {
+    transpile(node, traversal) {
+        const s = node.findDirectExpression(abaplint.Expressions.Target);
+        return traversal.traverse(s);
+    }
+}
+exports.SQLTargetTranspiler = SQLTargetTranspiler;
+//# sourceMappingURL=sql_target.js.map

package/build/src/index.js

@@ -30,17 +30,17 @@ class Transpiler {
         return new Transpiler().run(reg);
     }
     async run(reg, progress) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         reg.parse();
-        new keywords_1.Keywords().handle(reg);
+        new keywords_1.Keywords((_a = this.options) === null || _a === void 0 ? void 0 : _a.keywords).handle(reg);
         this.validate(reg);
         const dbSetup = new db_1.DatabaseSetup(reg).run();
         const output = {
             objects: [],
-            unitTestScript: new unit_test_1.UnitTest().unitTestScript(reg, (_a = this.options) === null || _a === void 0 ? void 0 : _a.skip, (_b = this.options) === null || _b === void 0 ? void 0 : _b.only),
-            unitTestScriptOpen: new unit_test_1.UnitTest().unitTestScriptOpen(reg, (_c = this.options) === null || _c === void 0 ? void 0 : _c.skip, (_d = this.options) === null || _d === void 0 ? void 0 : _d.only),
-            initializationScript: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, (_e = this.options) === null || _e === void 0 ? void 0 : _e.extraSetup),
-            initializationScript2: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, (_f = this.options) === null || _f === void 0 ? void 0 : _f.extraSetup, true),
+            unitTestScript: new unit_test_1.UnitTest().unitTestScript(reg, (_b = this.options) === null || _b === void 0 ? void 0 : _b.skip, (_c = this.options) === null || _c === void 0 ? void 0 : _c.only),
+            unitTestScriptOpen: new unit_test_1.UnitTest().unitTestScriptOpen(reg, (_d = this.options) === null || _d === void 0 ? void 0 : _d.skip, (_e = this.options) === null || _e === void 0 ? void 0 : _e.only),
+            initializationScript: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, (_f = this.options) === null || _f === void 0 ? void 0 : _f.extraSetup),
+            initializationScript2: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, (_g = this.options) === null || _g === void 0 ? void 0 : _g.extraSetup, true),
             databaseSetup: dbSetup,
             reg: reg,
         };

package/build/src/keywords.d.ts

@@ -1,6 +1,8 @@
 import * as abaplint from "@abaplint/core";
 /** Replaces javascript keywords in ABAP source code, in-memory only */
 export declare class Keywords {
+    private readonly keywords;
+    constructor(keywords?: string[]);
     handle(reg: abaplint.IRegistry): void;
     private traverse;
 }

package/build/src/keywords.js

@@ -2,8 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Keywords = void 0;
 const abaplint = require("@abaplint/core");
+// https://www.w3schools.com/js/js_reserved.asp
+const defaultKeywords = [
+    "abstract", "arguments", "await",
+    "break", "byte", "catch",
+    "char", "class", "const", "continue",
+    "debugger", "default", "do",
+    "double", "else", "enum", "eval",
+    "export", "extends", "false", "final",
+    "finally", "for", "function",
+    "goto", "if", "implements", "import",
+    "in", "instanceof", "interface",
+    "let", "long", "native", "new",
+    "null", "package", "private",
+    "public", "return", "short", "static",
+    "switch", "synchronized", "this",
+    "throw", "throws", "transient", "true",
+    "try", "typeof", "var", "void",
+    "volatile", "while", "yield"
+];
+// "with"
+// "delete"
 /** Replaces javascript keywords in ABAP source code, in-memory only */
 class Keywords {
+    constructor(keywords) {
+        this.keywords = [];
+        if (keywords !== undefined) {
+            this.keywords = keywords;
+        }
+        else {
+            this.keywords = defaultKeywords;
+        }
+    }
     handle(reg) {
         reg.parse();
         for (const o of reg.getObjects()) {
@@ -30,27 +60,6 @@ class Keywords {
         reg.parse();
     }
     traverse(node, file) {
-        // https://www.w3schools.com/js/js_reserved.asp
-        const keywords = [
-            "abstract", "arguments", "await",
-            "break", "byte", "catch",
-            "char", "class", "const", "continue",
-            "debugger", "default", "do",
-            "double", "else", "enum", "eval",
-            "export", "extends", "false", "final",
-            "finally", "for", "function",
-            "goto", "if", "implements", "import",
-            "in", "instanceof", "interface",
-            "let", "long", "native", "new",
-            "null", "package", "private",
-            "public", "return", "short", "static",
-            "switch", "synchronized", "this",
-            "throw", "throws", "transient", "true",
-            "try", "typeof", "var", "void",
-            "volatile", "while", "yield"
-        ];
-        // "with"
-        // "delete"
         const ret = [];
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.TokenNodeRegex) {
@@ -59,7 +68,7 @@ class Keywords {
                 if (start instanceof abaplint.VirtualPosition) {
                     continue;
                 }
-                for (const k of keywords) {
+                for (const k of this.keywords) {
                     const lower = token.getStr().toLowerCase();
                     if (k === lower
                         || "!" + k === lower

package/build/src/statements/method_implementation.js

@@ -66,6 +66,9 @@ class MethodImplementationTranspiler {
                         else if (parameterDefault.getFirstToken().getStr().toLowerCase() === "space") {
                             val = "abap.builtin.space";
                         }
+                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-langu") {
+                            val = "abap.builtin.sy.get().langu";
+                        }
                         else if (parameterDefault.concatTokens().toLowerCase() === "sy-uname") {
                             val = "abap.builtin.sy.get().uname";
                         }

package/build/src/statements/select.js

@@ -8,7 +8,7 @@ const unique_identifier_1 = require("../unique_identifier");
 const sql_from_1 = require("../expressions/sql_from");
 class SelectTranspiler {
     transpile(node, traversal, targetOverride) {
-        var _a, _b, _c;
+        var _a;
         let target = "undefined";
         if (targetOverride) {
             target = targetOverride;
@@ -76,14 +76,15 @@ class SelectTranspiler {
         }
         if (node.findFirstExpression(abaplint.Expressions.SQLForAllEntries)) {
             const unique = unique_identifier_1.UniqueIdentifier.get();
-            const faeName = (_c = (_b = (_a = node.findFirstExpression(abaplint.Expressions.SQLForAllEntries)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(abaplint.Expressions.SQLSource)) === null || _b === void 0 ? void 0 : _b.concatTokens()) === null || _c === void 0 ? void 0 : _c.toLowerCase();
-            select = select.replace(new RegExp(" " + faeName, "g"), " " + unique);
+            const fn = (_a = node.findFirstExpression(abaplint.Expressions.SQLForAllEntries)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(abaplint.Expressions.SQLSource);
+            const faeTranspiled = new expressions_1.SQLSourceTranspiler().transpile(fn, traversal).getCode();
+            select = select.replace(new RegExp(" " + faeTranspiled, "g"), " " + unique);
             select = select.replace(unique + ".get().table_line.get()", unique + ".get()"); // there can be only one?
-            const code = `if (${faeName}.array().length === 0) {
+            const code = `if (${faeTranspiled}.array().length === 0) {
   throw "FAE, todo, empty table";
 } else {
   abap.statements.clear(${target});
-  for await (const ${unique} of abap.statements.loop(${faeName})) {
+  for await (const ${unique} of abap.statements.loop(${faeTranspiled})) {
     await abap.statements.select(${target}, {select: "${select.trim()}"${extra}}, {appending: true});
   }
   abap.builtin.sy.get().dbcnt.set(${target}.array().length);

package/build/src/structures/select.js

@@ -5,23 +5,24 @@ const abaplint = require("@abaplint/core");
 const select_1 = require("../statements/select");
 const chunk_1 = require("../chunk");
 const unique_identifier_1 = require("../unique_identifier");
+const expressions_1 = require("../expressions");
 class SelectTranspiler {
     transpile(node, traversal) {
-        var _a, _b;
+        var _a;
         const ret = new chunk_1.Chunk();
         const selectStatement = node.findFirstStatement(abaplint.Statements.SelectLoop);
         if (selectStatement === undefined) {
             throw "Structure, select loop not found";
         }
         const from = (_a = selectStatement.findFirstExpression(abaplint.Expressions.SQLFromSource)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
-        const intoName = (_b = selectStatement.findFirstExpression(abaplint.Expressions.SQLTarget)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+        const intoName = new expressions_1.SQLTargetTranspiler().transpile(selectStatement.findFirstExpression(abaplint.Expressions.SQLTarget), traversal).getCode();
         // note: this implementation SELECTs everything into memory, which might be bad, and sometimes not correct
         const targetName = unique_identifier_1.UniqueIdentifier.get();
         const loopName = unique_identifier_1.UniqueIdentifier.get();
         ret.appendString(`let ${targetName} = new abap.types.Table(abap.DDIC["${from}"].type);\n`);
         ret.appendChunk(new select_1.SelectTranspiler().transpile(selectStatement, traversal, targetName));
         ret.appendString(`\nfor (const ${loopName} of ${targetName}.array()) {\n`);
-        ret.appendString(`${intoName === null || intoName === void 0 ? void 0 : intoName.replace("-", ".get().")}.set(${loopName});\n`);
+        ret.appendString(`${intoName}.set(${loopName});\n`);
         const body = node.findDirectStructure(abaplint.Structures.Body);
         if (body) {
             ret.appendChunk(traversal.traverse(body));

package/build/src/types.d.ts

@@ -51,4 +51,6 @@ export interface ITranspilerOptions {
     only?: TestMethodList;
     /** extra setup script to be executed during initialization */
     extraSetup?: string;
+    /** list of keywords to rename, if not supplied default will be used */
+    keywords?: string[];
 }

package/build/src/validation.js

@@ -27,7 +27,33 @@ exports.config = {
         },
         "parser_error": true,
         "allowed_object_types": {
-            "allowed": ["INTF", "CLAS", "PROG", "DEVC", "TABL", "SHLP", "VIEW", "XSLT", "ENQU", "SHMA", "SICF", "NROB", "TYPE", "DTEL", "DOMA", "TTYP", "MSAG", "FUGR"],
+            "allowed": [
+                "AUTH",
+                "CLAS",
+                "DEVC",
+                "DOMA",
+                "DTEL",
+                "ENQU",
+                "FUGR",
+                "INTF",
+                "MSAG",
+                "NROB",
+                "PARA",
+                "PROG",
+                "SHLP",
+                "SHMA",
+                "SICF",
+                "SMIM",
+                "SRFC",
+                "SUSO",
+                "TABL",
+                "TOBJ",
+                "TRAN",
+                "TTYP",
+                "TYPE",
+                "VIEW",
+                "XSLT",
+            ],
         },
         "unknown_types": true,
         "ambiguous_statement": true,

package/package.json

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