@abaplint/transpiler-cli 2.10.11 → 2.10.13

package/build/bundle.js

@@ -76550,7 +76550,7 @@ class FieldChainTranspiler {
             if (c.get() instanceof core_1.Expressions.SourceField
                 || c.get() instanceof core_1.Expressions.Field) {
                 const name = traversal.prefixAndName(c.getFirstToken(), filename).replace("~", "$");
-                ret.append(traversal_1.Traversal.escapeNamespace(name), c, traversal);
+                ret.append(traversal_1.Traversal.prefixVariable(traversal_1.Traversal.escapeNamespace(name)), c, traversal);
             }
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.SourceFieldSymbol) {
                 ret.appendChunk(new field_symbol_1.FieldSymbolTranspiler().transpile(c, traversal));
@@ -78488,7 +78488,7 @@ class TargetTranspiler {
             const next = children[i + 1];
             if (c.get() instanceof core_1.Expressions.TargetField) {
                 const prefix = traversal.prefixAndName(c.getFirstToken()).replace("~", "$");
-                ret.append(traversal_1.Traversal.escapeNamespace(prefix), c, traversal);
+                ret.append(traversal_1.Traversal.prefixVariable(traversal_1.Traversal.escapeNamespace(prefix)), c, traversal);
             }
             else if (c.get() instanceof core_1.Expressions.ClassName) {
                 const name = traversal.lookupClassOrInterface(c.getFirstToken().getStr(), c.getFirstToken());
@@ -79351,13 +79351,14 @@ exports.Transpiler = Transpiler;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Keywords = exports.defaultKeywords = void 0;
+exports.Keywords = exports.DEFAULT_KEYWORDS = void 0;
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 // https://www.w3schools.com/js/js_reserved.asp
-exports.defaultKeywords = [
+exports.DEFAULT_KEYWORDS = [
     "abstract", "arguments", "await",
     "break", "byte", "catch",
-    "char", "class", "const", "continue",
+    //  "char",
+    "class", "const", "continue",
     "debugger", "default", "do",
     "double", "else", "enum", "eval",
     "export", "extends", "false", "final",
@@ -79382,10 +79383,13 @@ class Keywords {
             this.keywords = keywords;
         }
         else {
-            this.keywords = exports.defaultKeywords;
+            this.keywords = exports.DEFAULT_KEYWORDS;
         }
     }
     handle(reg) {
+        if (this.keywords.length === 0) {
+            return;
+        }
         reg.parse();
         for (const o of reg.getObjects()) {
             if (!(o instanceof abaplint.ABAPObject)) {
@@ -81066,6 +81070,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DataTranspiler = void 0;
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
+const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 const constant_1 = __webpack_require__(/*! ../expressions/constant */ "./node_modules/@abaplint/transpiler/build/src/expressions/constant.js");
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
@@ -81092,7 +81097,7 @@ class DataTranspiler {
         }
         const ret = new chunk_1.Chunk()
             .appendString("let ")
-            .append(found.getName().toLowerCase(), token, traversal)
+            .append(traversal_1.Traversal.prefixVariable(traversal_1.Traversal.escapeNamespace(found.getName().toLowerCase())), token, traversal)
             .appendString(" = " + new transpile_types_1.TranspileTypes().toType(found.getType()))
             .append(";", node.getLastToken(), traversal)
             .append(value, node.getLastToken(), traversal);
@@ -81646,6 +81651,7 @@ exports.EndLoopTranspiler = EndLoopTranspiler;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.EndMethodTranspiler = void 0;
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 class EndMethodTranspiler {
     transpile(node, traversal) {
@@ -81660,7 +81666,7 @@ class EndMethodTranspiler {
         for (const n in vars) {
             const identifier = vars[n];
             if (identifier.getMeta().includes("returning" /* abaplint.IdentifierMeta.MethodReturning */)) {
-                returning += "return " + n.toLowerCase() + ";\n";
+                returning += "return " + traversal_1.Traversal.prefixVariable(n.toLowerCase()) + ";\n";
             }
         }
         const data = scope.getIdentifier();
@@ -81991,6 +81997,7 @@ exports.FormTranspiler = void 0;
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
+const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 class FormTranspiler {
     transpile(node, traversal) {
         unique_identifier_1.UniqueIdentifier.resetIndexBackup();
@@ -82000,13 +82007,13 @@ class FormTranspiler {
         const ret = new chunk_1.Chunk("async function " + name + "(INPUT) {");
         const params = [];
         for (const p of def?.getChangingParameters() || []) {
-            params.push(`let ${p.getName()} = INPUT.${p.getName()};`);
+            params.push(`let ${traversal_1.Traversal.prefixVariable(p.getName())} = INPUT.${p.getName()};`);
         }
         for (const p of def?.getTablesParameters() || []) {
-            params.push(`let ${p.getName()} = INPUT.${p.getName()};`);
+            params.push(`let ${traversal_1.Traversal.prefixVariable(p.getName())} = INPUT.${p.getName()};`);
         }
         for (const p of def?.getUsingParameters() || []) {
-            params.push(`let ${p.getName()} = INPUT.${p.getName()};`);
+            params.push(`let ${traversal_1.Traversal.prefixVariable(p.getName())} = INPUT.${p.getName()};`);
         }
         if (params.length > 0) {
             ret.appendString("\n" + params.join("\n"));
@@ -83069,6 +83076,7 @@ class MethodImplementationTranspiler {
         for (const n in vars) {
             const identifier = vars[n];
             const varName = n.toLowerCase();
+            const varPrefixed = traversal_1.Traversal.prefixVariable(varName);
             if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
                 || identifier.getMeta().includes("changing" /* abaplint.IdentifierMeta.MethodChanging */)
                 || identifier.getMeta().includes("event_parameter" /* abaplint.IdentifierMeta.EventParameter */)
@@ -83081,31 +83089,31 @@ class MethodImplementationTranspiler {
                 const passByValue = identifier.getMeta().includes("pass_by_value" /* abaplint.IdentifierMeta.PassByValue */);
                 const type = identifier.getType();
                 if (identifier.getMeta().includes("exporting" /* abaplint.IdentifierMeta.MethodExporting */)) {
-                    after += `let ${varName} = ${unique}?.${varName} || ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};\n`;
+                    after += `let ${varPrefixed} = ${unique}?.${varName} || ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};\n`;
                 }
                 else if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
                     && parameterDefault === undefined
                     && passByValue === false
                     && isOptional === false
                     && type.isGeneric() === false) {
-                    after += `let ${varName} = ${unique}?.${varName};\n`;
+                    after += `let ${varPrefixed} = ${unique}?.${varName};\n`;
                     if (identifier.getType().getQualifiedName() !== undefined && identifier.getType().getQualifiedName() !== "") {
-                        after += `if (${varName}?.getQualifiedName === undefined || ${varName}.getQualifiedName() !== "${identifier.getType().getQualifiedName()?.toUpperCase()}") { ${varName} = undefined; }\n`;
+                        after += `if (${varPrefixed}?.getQualifiedName === undefined || ${varPrefixed}.getQualifiedName() !== "${identifier.getType().getQualifiedName()?.toUpperCase()}") { ${varPrefixed} = undefined; }\n`;
                     }
-                    after += `if (${varName} === undefined) { ${varName} = ${new transpile_types_1.TranspileTypes().toType(identifier.getType())}.set(${unique}.${varName}); }\n`;
+                    after += `if (${varPrefixed} === undefined) { ${varPrefixed} = ${new transpile_types_1.TranspileTypes().toType(identifier.getType())}.set(${unique}.${varName}); }\n`;
                 }
                 else if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
                     && type.isGeneric() === true) {
                     if (isOptional === true) {
-                        after += `let ${varName} = ${unique}?.${varName} || ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};\n`;
+                        after += `let ${varPrefixed} = ${unique}?.${varName} || ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};\n`;
                     }
                     else {
-                        after += `let ${varName} = ${unique}?.${varName};\n`;
+                        after += `let ${varPrefixed} = ${unique}?.${varName};\n`;
                     }
                     if (type instanceof abaplint.BasicTypes.NumericGenericType) {
-                        after += `if (${varName}.constructor.name === "Character") {
-  ${varName} = ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};
-  ${varName}.set(${unique}?.${varName});
+                        after += `if (${varPrefixed}.constructor.name === "Character") {
+  ${varPrefixed} = ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};
+  ${varPrefixed}.set(${unique}?.${varName});
 }\n`;
                     }
                 }
@@ -83113,19 +83121,19 @@ class MethodImplementationTranspiler {
                     && type.isGeneric() === false) {
                     after += new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
                     // note: it might be nessesary to do a type conversion, eg char is passed to xstring parameter
-                    after += "if (" + unique + " && " + unique + "." + varName + ") {" + varName + ".set(" + unique + "." + varName + ");}\n";
+                    after += "if (" + unique + " && " + unique + "." + varName + ") {" + varPrefixed + ".set(" + unique + "." + varName + ");}\n";
                 }
                 else {
                     after += new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
-                    after += "if (" + unique + " && " + unique + "." + varName + ") {" + varName + " = " + unique + "." + varName + ";}\n";
+                    after += "if (" + unique + " && " + unique + "." + varName + ") {" + varPrefixed + " = " + unique + "." + varName + ";}\n";
                 }
                 if (parameterDefault) {
                     const val = this.buildDefault(parameterDefault, traversal, methodDef?.getFilename());
                     if (passByValue === true || identifier.getMeta().includes("changing" /* abaplint.IdentifierMeta.MethodChanging */)) {
-                        after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varName + ".set(" + val + ");}\n";
+                        after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varPrefixed + ".set(" + val + ");}\n";
                     }
                     else {
-                        after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varName + " = " + val + ";}\n";
+                        after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varPrefixed + " = " + val + ";}\n";
                     }
                 }
             }
@@ -84102,6 +84110,7 @@ exports.RetryTranspiler = RetryTranspiler;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ReturnTranspiler = void 0;
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
 class ReturnTranspiler {
@@ -84112,7 +84121,7 @@ class ReturnTranspiler {
         for (const n in vars) {
             const identifier = vars[n];
             if (identifier.getMeta().includes("returning" /* abaplint.IdentifierMeta.MethodReturning */)) {
-                extra = " " + n.toLowerCase();
+                extra = " " + traversal_1.Traversal.prefixVariable(n.toLowerCase());
             }
         }
         let pre = "";
@@ -86531,12 +86540,13 @@ exports.WhileTranspiler = WhileTranspiler;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TranspileTypes = void 0;
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const traversal_1 = __webpack_require__(/*! ./traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 const featureHexUInt8 = false;
 // todo: change this class to static for performance?
 class TranspileTypes {
     declare(t) {
         const type = t.getType();
-        return "let " + t.getName().toLowerCase() + " = " + this.toType(type) + ";";
+        return "let " + traversal_1.Traversal.prefixVariable(t.getName().toLowerCase()) + " = " + this.toType(type) + ";";
     }
     declareStaticSkipVoid(pre, t) {
         const type = t.getType();
@@ -86746,6 +86756,7 @@ const StructureTranspilers = __webpack_require__(/*! ./structures */ "./node_mod
 const transpile_types_1 = __webpack_require__(/*! ./transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
 const chunk_1 = __webpack_require__(/*! ./chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const expressions_1 = __webpack_require__(/*! ./expressions */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
+const keywords_1 = __webpack_require__(/*! ./keywords */ "./node_modules/@abaplint/transpiler/build/src/keywords.js");
 class Traversal {
     constructor(spaghetti, file, obj, reg, options) {
         this.scopeCache = undefined;
@@ -86758,6 +86769,13 @@ class Traversal {
     static escapeNamespace(name) {
         return name?.replace(/\//g, "$");
     }
+    static prefixVariable(name) {
+        // TODO: performace, make this a hash lookup?,
+        if (keywords_1.DEFAULT_KEYWORDS.some(k => k === name)) {
+            return "$" + name;
+        }
+        return name + "";
+    }
     getCurrentObject() {
         return this.obj;
     }
@@ -87968,7 +87986,7 @@ class Validation {
         }
         exports.config.rules.forbidden_identifier.check = ["^unique\\d+$"];
         if (this.options?.keywords === undefined) {
-            for (const d of keywords_1.defaultKeywords) {
+            for (const d of keywords_1.DEFAULT_KEYWORDS) {
                 const add = "^" + d + "$";
                 exports.config.rules["forbidden_identifier"]["check"].push(add);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.10.11",
+  "version": "2.10.13",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -26,7 +26,7 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.10.11",
+    "@abaplint/transpiler": "^2.10.13",
     "@types/glob": "^8.1.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.7",