@abaplint/transpiler 2.3.86 → 2.3.88

package/README.md

@@ -1,3 +1,3 @@
-# @abaplint/transpiler
-
+# @abaplint/transpiler
+
 Transpiler

package/build/src/expressions/field_chain.js

@@ -30,11 +30,11 @@ class FieldChainTranspiler {
                 const interfaceName = traversal.isInterfaceAttribute(c.getFirstToken());
                 let name = c.getFirstToken().getStr().toLowerCase();
                 if (prefix && interfaceName && name.startsWith(interfaceName) === false) {
-                    name = traversal_1.Traversal.escapeClassName(name).replace("~", "$");
-                    name = traversal_1.Traversal.escapeClassName(interfaceName) + "$" + name;
+                    name = traversal_1.Traversal.escapeNamespace(name).replace("~", "$");
+                    name = traversal_1.Traversal.escapeNamespace(interfaceName) + "$" + name;
                 }
                 else {
-                    name = traversal_1.Traversal.escapeClassName(name).replace("~", "$");
+                    name = traversal_1.Traversal.escapeNamespace(name).replace("~", "$");
                 }
                 ret.append(name, c, traversal);
             }

package/build/src/expressions/method_call.js

@@ -28,7 +28,7 @@ class MethodCallTranspiler {
             throw new Error("MethodCallTranspiler, unexpected node");
         }
         const ret = new chunk_1.Chunk();
-        ret.append(traversal_1.Traversal.escapeClassName(name.replace("~", "$")), nameToken, traversal);
+        ret.append(traversal_1.Traversal.escapeNamespace(name.replace("~", "$")), nameToken, traversal);
         ret.appendChunk(new method_call_param_1.MethodCallParamTranspiler(m === null || m === void 0 ? void 0 : m.def).transpile(step, traversal));
         ret.appendString(")");
         return ret;

package/build/src/expressions/method_call_chain.js

@@ -30,7 +30,7 @@ class MethodCallChainTranspiler {
                 ret = new chunk_1.Chunk().append(traversal.lookupClassOrInterface(c.getFirstToken().getStr(), c.getFirstToken()), c, traversal);
             }
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.MethodName) {
-                const name = traversal_1.Traversal.escapeClassName(c.getFirstToken().getStr().toLowerCase().replace("~", "$"));
+                const name = traversal_1.Traversal.escapeNamespace(c.getFirstToken().getStr().toLowerCase().replace("~", "$"));
                 ret.append(name, c, traversal);
             }
             else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr() === "->") {

package/build/src/expressions/method_source.js

@@ -71,10 +71,10 @@ class MethodSourceTranspiler {
                 const nameToken = child.getFirstToken();
                 const m = traversal.findMethodReference(nameToken, traversal.findCurrentScopeByToken(nameToken));
                 if (m) {
-                    call += traversal_1.Traversal.escapeClassName(m.name.toLowerCase().replace("~", "$"));
+                    call += traversal_1.Traversal.escapeNamespace(m.name.toLowerCase().replace("~", "$"));
                 }
                 else {
-                    const methodName = traversal_1.Traversal.escapeClassName(child.concatTokens().toLowerCase().replace("~", "$"));
+                    const methodName = traversal_1.Traversal.escapeNamespace(child.concatTokens().toLowerCase().replace("~", "$"));
                     call += methodName;
                 }
             }

package/build/src/expressions/target.js

@@ -32,9 +32,9 @@ class TargetTranspiler {
             }
             else if (c.get() instanceof core_1.Expressions.AttributeName) {
                 const intf = traversal.isInterfaceAttribute(c.getFirstToken());
-                let name = traversal_1.Traversal.escapeClassName(c.getFirstToken().getStr()).replace("~", "$").toLowerCase();
+                let name = traversal_1.Traversal.escapeNamespace(c.getFirstToken().getStr()).replace("~", "$").toLowerCase();
                 if (intf && name.startsWith(intf) === false) {
-                    name = traversal_1.Traversal.escapeClassName(intf) + "$" + name;
+                    name = traversal_1.Traversal.escapeNamespace(intf) + "$" + name;
                 }
                 ret.append(name, c, traversal);
             }

package/build/src/handlers/handle_abap.js

@@ -108,7 +108,7 @@ class HandleABAP {
                 continue;
             }
             if (name) {
-                contents.appendString("const {" + traversal_1.Traversal.escapeClassName(name) + "} = await import(\"./" + filename.replace(/#/g, "%23") + "\");\n");
+                contents.appendString("const {" + traversal_1.Traversal.escapeNamespace(name) + "} = await import(\"./" + filename.replace(/#/g, "%23") + "\");\n");
             }
             else {
                 contents.appendString("await import(\"./" + filename.replace(/#/g, "%23") + "\");\n");
@@ -116,7 +116,7 @@ class HandleABAP {
         }
         contents.appendChunk(output.chunk);
         if (output.exports.length > 0) {
-            contents.appendString("\nexport {" + output.exports.map(traversal_1.Traversal.escapeClassName).join(", ") + "};");
+            contents.appendString("\nexport {" + output.exports.map(traversal_1.Traversal.escapeNamespace).join(", ") + "};");
         }
         return contents;
     }

package/build/src/handlers/handle_data_element.js

@@ -18,11 +18,11 @@ class HandleDataElement {
                 fixedValues = doma.getFixedValues();
             }
         }
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "DTEL",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
-  "domain": ${JSON.stringify(obj.getDomainName())},
-  "fixedValues": ${JSON.stringify(fixedValues)},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "DTEL",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+  "domain": ${JSON.stringify(obj.getDomainName())},
+  "fixedValues": ${JSON.stringify(fixedValues)},
 };`);
         const output = {
             object: {

package/build/src/handlers/handle_enqu.js

@@ -10,20 +10,20 @@ class HandleEnqu {
         if (filename === undefined) {
             return [];
         }
-        const chunk = new chunk_1.Chunk().appendString(`// enqueue object
-abap.FunctionModules["ENQUEUE_${obj.getName().toUpperCase()}"] = async (INPUT) => {
-  const lookup = abap.Classes["KERNEL_LOCK"];
-  if (lookup === undefined) {
-    throw new Error("Lock, kernel class missing");
-  }
-  await lookup.enqueue(INPUT);
-};
-abap.FunctionModules["DEQUEUE_${obj.getName().toUpperCase()}"] = async (INPUT) => {
-  const lookup = abap.Classes["KERNEL_LOCK"];
-  if (lookup === undefined) {
-    throw new Error("Lock, kernel class missing");
-  }
-  await lookup.dequeue(INPUT);
+        const chunk = new chunk_1.Chunk().appendString(`// enqueue object
+abap.FunctionModules["ENQUEUE_${obj.getName().toUpperCase()}"] = async (INPUT) => {
+  const lookup = abap.Classes["KERNEL_LOCK"];
+  if (lookup === undefined) {
+    throw new Error("Lock, kernel class missing");
+  }
+  await lookup.enqueue(INPUT);
+};
+abap.FunctionModules["DEQUEUE_${obj.getName().toUpperCase()}"] = async (INPUT) => {
+  const lookup = abap.Classes["KERNEL_LOCK"];
+  if (lookup === undefined) {
+    throw new Error("Lock, kernel class missing");
+  }
+  await lookup.dequeue(INPUT);
 };`);
         const output = {
             object: {

package/build/src/handlers/handle_table.js

@@ -12,10 +12,10 @@ class HandleTable {
             return [];
         }
         const type = obj.parseType(reg);
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "TABL",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
-  "keyFields": ${JSON.stringify(obj.listKeys(reg))},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "TABL",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+  "keyFields": ${JSON.stringify(obj.listKeys(reg))},
 };`);
         const output = {
             object: {

package/build/src/handlers/handle_table_type.js

@@ -11,9 +11,9 @@ class HandleTableType {
             return [];
         }
         const type = obj.parseType(reg);
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "TTYP",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "TTYP",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
 };`);
         const output = {
             object: {

package/build/src/handlers/handle_view.js

@@ -12,9 +12,9 @@ class HandleView {
             return [];
         }
         const type = obj.parseType(reg);
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "VIEW",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "VIEW",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
 };`);
         // todo, "keyFields": ${JSON.stringify(obj.listKeys())},
         const output = {

package/build/src/statements/call.js

@@ -22,9 +22,9 @@ class CallTranspiler {
             }
             post += ";";
             if (exceptions) {
-                post += `\nabap.builtin.sy.get().subrc.set(0);
-} catch (e) {
-if (e.classic) {
+                post += `\nabap.builtin.sy.get().subrc.set(0);
+} catch (e) {
+if (e.classic) {
   switch (e.classic.toUpperCase()) {\n`;
                 for (const e of exceptions.findAllExpressions(abaplint.Expressions.ParameterException)) {
                     const name = e.getFirstToken().getStr().toUpperCase();
@@ -39,10 +39,10 @@ if (e.classic) {
                         post += `case "${name}": abap.builtin.sy.get().subrc.set(${value}); break;\n`;
                     }
                 }
-                post += `  }
-} else {
-  throw e;
-}
+                post += `  }
+} else {
+  throw e;
+}
 }`;
             }
             const chainChunk = traversal.traverse(chain);

package/build/src/statements/class_implementation.js

@@ -9,16 +9,16 @@ class ClassImplementationTranspiler {
         var _a;
         const token = node.findFirstExpression(abaplint.Expressions.ClassName).getFirstToken();
         const def = traversal.getClassDefinition(token);
-        let ret = "class " + traversal_1.Traversal.escapeClassName(token.getStr().toLowerCase());
+        let ret = "class " + traversal_1.Traversal.escapeNamespace(token.getStr().toLowerCase());
         if (token.getStr().toLowerCase() === "cx_root") {
             // special case for exceptions
             ret += " extends Error";
         }
         else if (def === null || def === void 0 ? void 0 : def.getSuperClass()) {
-            ret += " extends " + traversal_1.Traversal.escapeClassName((_a = def === null || def === void 0 ? void 0 : def.getSuperClass()) === null || _a === void 0 ? void 0 : _a.toLowerCase());
+            ret += " extends " + traversal_1.Traversal.escapeNamespace((_a = def === null || def === void 0 ? void 0 : def.getSuperClass()) === null || _a === void 0 ? void 0 : _a.toLowerCase());
         }
-        return new chunk_1.Chunk().append(ret + ` {
-static INTERNAL_TYPE = 'CLAS';
+        return new chunk_1.Chunk().append(ret + ` {
+static INTERNAL_TYPE = 'CLAS';
 static IMPLEMENTED_INTERFACES = [${def === null || def === void 0 ? void 0 : def.getImplementing().map(e => `"` + e.name.toUpperCase() + `"`).join(",")}];`, node, traversal);
     }
 }

package/build/src/statements/do.js

@@ -15,16 +15,16 @@ class DoTranspiler {
             const source = new expressions_1.SourceTranspiler(true).transpile(found, traversal).getCode();
             const idSource = unique_identifier_1.UniqueIdentifier.get();
             const id = unique_identifier_1.UniqueIdentifier.get();
-            return new chunk_1.Chunk(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
-const ${idSource} = ${source};
-for (let ${id} = 0; ${id} < ${idSource}; ${id}++) {
+            return new chunk_1.Chunk(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
+const ${idSource} = ${source};
+for (let ${id} = 0; ${id} < ${idSource}; ${id}++) {
 abap.builtin.sy.get().index.set(${id} + 1);`);
         }
         else {
             const unique = unique_identifier_1.UniqueIdentifier.get();
-            return new chunk_1.Chunk(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
-let ${unique} = 1;
-while (true) {
+            return new chunk_1.Chunk(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
+let ${unique} = 1;
+while (true) {
 abap.builtin.sy.get().index.set(${unique}++);`);
         }
     }

package/build/src/statements/end_do.js

@@ -7,7 +7,7 @@ class EndDoTranspiler {
         this.syIndexBackup = syIndexBackup;
     }
     transpile(node, traversal) {
-        return new chunk_1.Chunk().append(`}
+        return new chunk_1.Chunk().append(`}
 abap.builtin.sy.get().index.set(${this.syIndexBackup});\n`, node, traversal);
     }
 }

package/build/src/statements/end_while.js

@@ -7,7 +7,7 @@ class EndWhileTranspiler {
         this.syIndexBackup = syIndexBackup;
     }
     transpile(node, traversal) {
-        return new chunk_1.Chunk().append(`}
+        return new chunk_1.Chunk().append(`}
 abap.builtin.sy.get().index.set(${this.syIndexBackup});\n`, node, traversal);
     }
 }

package/build/src/statements/method_implementation.js

@@ -133,12 +133,12 @@ class MethodImplementationTranspiler {
         if (method && method.isStatic()) {
             // in ABAP static methods can be called with instance arrows, "->"
             const className = (_b = (_a = scope.getParent()) === null || _a === void 0 ? void 0 : _a.getIdentifier().sname) === null || _b === void 0 ? void 0 : _b.toLowerCase();
-            staticMethod = "async " + traversal_1.Traversal.escapeClassName(methodName) + "(" + unique + ") {\n" +
-                "return " + traversal_1.Traversal.escapeClassName(className) + "." + traversal_1.Traversal.escapeClassName(methodName) + "(" + unique + ");\n" +
+            staticMethod = "async " + traversal_1.Traversal.escapeNamespace(methodName) + "(" + unique + ") {\n" +
+                "return " + traversal_1.Traversal.escapeNamespace(className) + "." + traversal_1.Traversal.escapeNamespace(methodName) + "(" + unique + ");\n" +
                 "}\n" + "static ";
         }
         unique_identifier_1.UniqueIdentifier.resetIndexBackup();
-        const str = staticMethod + "async " + traversal_1.Traversal.escapeClassName(methodName) + "(" + unique + ") {" + after;
+        const str = staticMethod + "async " + traversal_1.Traversal.escapeNamespace(methodName) + "(" + unique + ") {" + after;
         return new chunk_1.Chunk().append(str, node, traversal);
     }
     /////////////////////////////

package/build/src/statements/read_table.js

@@ -53,7 +53,7 @@ class ReadTableTranspiler {
                 while (field.includes("-")) {
                     field = field.replace("-", ".get().");
                 }
-                field = traversal_1.Traversal.escapeClassName(field).replace("~", "$");
+                field = traversal_1.Traversal.escapeNamespace(field).replace("~", "$");
                 if (left.get() instanceof abaplint.Expressions.Dynamic
                     && left instanceof abaplint.Nodes.ExpressionNode) {
                     const concat = left.concatTokens().toLowerCase();

package/build/src/statements/select.js

@@ -80,14 +80,14 @@ class SelectTranspiler {
             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 (${faeTranspiled}.array().length === 0) {
-  throw "FAE, todo, empty table";
-} else {
-  abap.statements.clear(${target});
-  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);
+            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(${faeTranspiled})) {
+    await abap.statements.select(${target}, {select: "${select.trim()}"${extra}}, {appending: true});
+  }
+  abap.builtin.sy.get().dbcnt.set(${target}.array().length);
 }`;
             return new chunk_1.Chunk().append(code, node, traversal);
         }

package/build/src/statements/while.js

@@ -13,11 +13,11 @@ class WhileTranspiler {
         const cond = new expressions_1.CondTranspiler().transpile(node.findFirstExpression(abaplint.Expressions.Cond), traversal);
         const unique = unique_identifier_1.UniqueIdentifier.get();
         return new chunk_1.Chunk()
-            .append(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
-let ${unique} = 1;
+            .append(`const ${this.syIndexBackup} = abap.builtin.sy.get().index.get();
+let ${unique} = 1;
 while (`, node, traversal)
             .appendChunk(cond)
-            .appendString(`) {
+            .appendString(`) {
 abap.builtin.sy.get().index.set(${unique}++);`);
     }
 }

package/build/src/structures/class_definition.js

@@ -20,14 +20,14 @@ class ClassDefinitionTranspiler {
         }
         else {
             // its an abstract class with only abstract methods
-            return new chunk_1.Chunk(`
-class ${className === null || className === void 0 ? void 0 : className.toLowerCase()} {
-  static INTERNAL_TYPE = 'CLAS';
-  async constructor_() {
-    this.me = new abap.types.ABAPObject();
-    this.me.set(this);
-    return this;
-  }
+            return new chunk_1.Chunk(`
+class ${className === null || className === void 0 ? void 0 : className.toLowerCase()} {
+  static INTERNAL_TYPE = 'CLAS';
+  async constructor_() {
+    this.me = new abap.types.ABAPObject();
+    this.me.set(this);
+    return this;
+  }
 }`);
         }
     }

package/build/src/structures/class_implementation.js

@@ -61,7 +61,7 @@ class ClassImplementationTranspiler {
         if (cdef === undefined) {
             return "ERROR_CDEF_NOT_FOUND";
         }
-        const prefix = traversal_1.Traversal.escapeClassName(cdef.getName().toLowerCase()) + ".";
+        const prefix = traversal_1.Traversal.escapeNamespace(cdef.getName().toLowerCase()) + ".";
         let ret = "";
         for (const ty of cdef.getTypeDefinitions().getAll()) {
             ret += new transpile_types_1.TranspileTypes().declareStaticSkipVoid(prefix, ty.type);
@@ -85,7 +85,7 @@ class ClassImplementationTranspiler {
         const clasName = node.getFirstToken().getStr().toLowerCase();
         const staticAttributes = this.findStaticAttributes(cdef, scope);
         for (const attr of staticAttributes) {
-            const name = traversal_1.Traversal.escapeClassName(clasName) + "." + attr.prefix + attr.identifier.getName().toLowerCase();
+            const name = traversal_1.Traversal.escapeNamespace(clasName) + "." + attr.prefix + traversal_1.Traversal.escapeNamespace(attr.identifier.getName().toLowerCase());
             ret += name + " = " + new transpile_types_1.TranspileTypes().toType(attr.identifier.getType()) + ";\n";
             ret += traversal.setValues(attr.identifier, name);
         }
@@ -99,7 +99,7 @@ class ClassImplementationTranspiler {
         // this is not correct, ABAP does not invocate the class constructor at require time,
         // but this will probably work
         if (cdef.getMethodDefinitions().getByName("class_constructor")) {
-            ret += "await " + traversal_1.Traversal.escapeClassName(node.getFirstToken().getStr().toLowerCase()) + ".class_constructor();\n";
+            ret += "await " + traversal_1.Traversal.escapeNamespace(node.getFirstToken().getStr().toLowerCase()) + ".class_constructor();\n";
         }
         return ret;
     }

package/build/src/structures/function_module.js

@@ -17,12 +17,12 @@ class FunctionModuleTranspiler {
                 if (name === undefined) {
                     name = "FunctionModuleTranspilerNameNotFound";
                 }
-                r += `async function ${traversal_1.Traversal.escapeClassName(name)}(INPUT) {\n`;
+                r += `async function ${traversal_1.Traversal.escapeNamespace(name)}(INPUT) {\n`;
                 r += this.findSignature(traversal, name, c);
             }
             else if (c.get() instanceof abaplint.Statements.EndFunction) {
                 r += "}\n";
-                r += `abap.FunctionModules['${name.toUpperCase()}'] = ${traversal_1.Traversal.escapeClassName(name)};\n`;
+                r += `abap.FunctionModules['${name.toUpperCase()}'] = ${traversal_1.Traversal.escapeNamespace(name)};\n`;
             }
             else {
                 r += traversal.traverse(c).getCode();
@@ -61,8 +61,8 @@ class FunctionModuleTranspiler {
                 if (type !== undefined) {
                     // todo, set DEFAULT value
                     // todo, check for OPTIONALness and raise exceptions and stuff
-                    ret += `if (${name} === undefined) {
-            ${name} = ${new transpile_types_1.TranspileTypes().toType(type)};
+                    ret += `if (${name} === undefined) {
+            ${name} = ${new transpile_types_1.TranspileTypes().toType(type)};
           }\n`;
                 }
             }

package/build/src/structures/interface.js

@@ -15,7 +15,7 @@ class InterfaceTranspiler {
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.Interface) {
                 name = (_a = c.findDirectExpression(abaplint.Expressions.InterfaceName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr().toLowerCase();
-                name = traversal_1.Traversal.escapeClassName(name);
+                name = traversal_1.Traversal.escapeNamespace(name);
                 ret += `class ${name} {\n`;
                 ret += `static INTERNAL_TYPE = 'INTF';\n`;
                 ret += `static IMPLEMENTED_INTERFACES = [${def === null || def === void 0 ? void 0 : def.getImplementing().map(e => `"` + e.name.toUpperCase() + `"`).join(",")}];\n`;
@@ -33,7 +33,7 @@ class InterfaceTranspiler {
         if (idef === undefined) {
             return "";
         }
-        const prefix = traversal_1.Traversal.escapeClassName(idef.getName().toLowerCase()) + ".";
+        const prefix = traversal_1.Traversal.escapeNamespace(idef.getName().toLowerCase()) + ".";
         let ret = "";
         for (const ty of idef.getTypeDefinitions().getAll()) {
             ret += new transpile_types_1.TranspileTypes().declareStaticSkipVoid(prefix, ty.type);
@@ -56,7 +56,7 @@ class InterfaceTranspiler {
                 || identifier.getMeta().includes("read_only" /* abaplint.IdentifierMeta.ReadOnly */) === false) {
                 continue;
             }
-            const interfaceName = traversal_1.Traversal.escapeClassName(node.getFirstToken().getStr().toLowerCase());
+            const interfaceName = traversal_1.Traversal.escapeNamespace(node.getFirstToken().getStr().toLowerCase());
             const name = interfaceName + "." + interfaceName + "$" + n.toLowerCase();
             ret += name + " = " + new transpile_types_1.TranspileTypes().toType(identifier.getType()) + ";\n";
             const constantStatement = traversal.findStatementInFile(identifier.getStart());

package/build/src/traversal.d.ts

@@ -8,7 +8,7 @@ export declare class Traversal {
     readonly reg: abaplint.IRegistry;
     readonly runtimeTypeError: boolean;
     constructor(spaghetti: abaplint.ISpaghettiScope, file: abaplint.ABAPFile, obj: abaplint.ABAPObject, reg: abaplint.IRegistry, runtimeTypeError?: boolean);
-    static escapeClassName(name: string | undefined): string | undefined;
+    static escapeNamespace(name: string | undefined): string | undefined;
     getCurrentObject(): abaplint.ABAPObject;
     traverse(node: abaplint.INode | undefined): Chunk;
     getFilename(): string;

package/build/src/traversal.js

@@ -17,7 +17,7 @@ class Traversal {
         this.reg = reg;
         this.runtimeTypeError = runtimeTypeError;
     }
-    static escapeClassName(name) {
+    static escapeNamespace(name) {
         return name === null || name === void 0 ? void 0 : name.replace(/\//g, "$");
     }
     getCurrentObject() {
@@ -125,23 +125,23 @@ class Traversal {
                 const found = this.reg.findObjectForFile(file);
                 if (found) {
                     if (found instanceof abaplint.Objects.Interface) {
-                        return Traversal.escapeClassName(this.lookupClassOrInterface(found.getName(), t)) + "." + found.getName().toLowerCase() + "$" + name;
+                        return Traversal.escapeNamespace(this.lookupClassOrInterface(found.getName(), t)) + "." + found.getName().toLowerCase() + "$" + name;
                     }
                     else {
-                        return Traversal.escapeClassName(this.lookupClassOrInterface(found.getName(), t)) + "." + name;
+                        return Traversal.escapeNamespace(this.lookupClassOrInterface(found.getName(), t)) + "." + name;
                     }
                 }
             }
         }
         const className = this.isStaticClassAttribute(t);
         if (className) {
-            name = Traversal.escapeClassName(className) + "." + name;
+            name = Traversal.escapeNamespace(className) + "." + name;
         }
         else if (name === "super") {
             return name;
         }
         else if (this.isClassAttribute(t)) {
-            name = "this." + Traversal.escapeClassName(name);
+            name = "this." + Traversal.escapeNamespace(name);
         }
         else if (this.isBuiltinVariable(t)) {
             name = "abap.builtin." + name;
@@ -257,14 +257,14 @@ class Traversal {
             && def.getMethodDefinitions().getByName("CONSTRUCTOR") === undefined) {
             ret += `await super.constructor_(INPUT);\n`;
         }
-        const cName = Traversal.escapeClassName(def.getName().toLowerCase());
+        const cName = Traversal.escapeNamespace(def.getName().toLowerCase());
         ret += "this.me = new abap.types.ABAPObject();\n";
         ret += "this.me.set(this);\n";
         for (const a of def.getAttributes().getAll()) {
             if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
                 continue;
             }
-            const name = "this." + a.getName().toLowerCase();
+            const name = "this." + Traversal.escapeNamespace(a.getName().toLowerCase());
             ret += name + " = " + new transpile_types_1.TranspileTypes().toType(a.getType()) + ";\n";
             ret += this.setValues(a, name);
         }
@@ -274,11 +274,11 @@ class Traversal {
         }
         // handle aliases after initialization of carrier variables
         for (const a of def.getAliases().getAll()) {
-            ret += "this." + a.getName().toLowerCase() + " = this." + Traversal.escapeClassName(a.getComponent().replace("~", "$").toLowerCase()) + ";\n";
+            ret += "this." + a.getName().toLowerCase() + " = this." + Traversal.escapeNamespace(a.getComponent().replace("~", "$").toLowerCase()) + ";\n";
         }
         // constants can be accessed both statically and via reference
         for (const c of def.getAttributes().getConstants()) {
-            ret += "this." + c.getName().toLowerCase() + " = " + cName + "." + c.getName().toLowerCase() + ";\n";
+            ret += "this." + Traversal.escapeNamespace(c.getName().toLowerCase()) + " = " + cName + "." + Traversal.escapeNamespace(c.getName().toLowerCase()) + ";\n";
         }
         return ret;
     }
@@ -312,7 +312,7 @@ class Traversal {
             if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
                 continue;
             }
-            const n = Traversal.escapeClassName(name.toLowerCase()) + "$" + a.getName().toLowerCase();
+            const n = Traversal.escapeNamespace(name.toLowerCase()) + "$" + a.getName().toLowerCase();
             ret += "this." + n + " = " + new transpile_types_1.TranspileTypes().toType(a.getType()) + ";\n";
         }
         for (const i of (intf === null || intf === void 0 ? void 0 : intf.getImplementing()) || []) {
@@ -403,10 +403,10 @@ class Traversal {
         const name = def.getName();
         if (def.isGlobal() === false) {
             const prefix = this.buildPrefix(def);
-            return `abap.Classes['${prefix}-${name.toUpperCase()}'] = ${Traversal.escapeClassName(name.toLowerCase())};`;
+            return `abap.Classes['${prefix}-${name.toUpperCase()}'] = ${Traversal.escapeNamespace(name.toLowerCase())};`;
         }
         else {
-            return `abap.Classes['${name.toUpperCase()}'] = ${Traversal.escapeClassName(name.toLowerCase())};`;
+            return `abap.Classes['${name.toUpperCase()}'] = ${Traversal.escapeNamespace(name.toLowerCase())};`;
         }
     }
     setValues(identifier, name) {

package/build/src/unit_test.js

@@ -8,16 +8,16 @@ class UnitTest {
     initializationScript(reg, dbSetup, extraSetup, useImport) {
         let ret = "";
         if (useImport === true) {
-            ret = `/* eslint-disable import/newline-after-import */
+            ret = `/* eslint-disable import/newline-after-import */
 import "./_top.mjs";\n`;
         }
         else {
-            ret = `/* eslint-disable import/newline-after-import */
-import runtime from "@abaplint/runtime";
+            ret = `/* eslint-disable import/newline-after-import */
+import runtime from "@abaplint/runtime";
 globalThis.abap = new runtime.ABAP();\n`;
         }
-        ret += `${this.buildImports(reg, useImport)}
-
+        ret += `${this.buildImports(reg, useImport)}
+
 export async function initializeABAP() {\n`;
         ret += `  const sqlite = [];\n`;
         for (const i of dbSetup.schemas.sqlite) {
@@ -45,19 +45,19 @@ export async function initializeABAP() {\n`;
         return filename.replace(/\//g, "%23");
     }
     unitTestScriptOpen(reg, _skip, _only) {
-        let ret = `/* eslint-disable curly */
-import fs from "fs";
-import path from "path";
-import {fileURLToPath} from "url";
-import {initializeABAP} from "./init.mjs";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-async function run() {
-  await initializeABAP();
-  let lt_input = new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30)}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]});
-  let ls_input = new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30)});
-  let ls_result = new abap.types.Structure({list: new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30), expected: new abap.types.String(), actual: new abap.types.String(), status: new abap.types.String(), runtime: new abap.types.Integer(), message: new abap.types.String(), js_location: new abap.types.String(), console: new abap.types.String()}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]}), json: new abap.types.String()});
+        let ret = `/* eslint-disable curly */
+import fs from "fs";
+import path from "path";
+import {fileURLToPath} from "url";
+import {initializeABAP} from "./init.mjs";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+async function run() {
+  await initializeABAP();
+  let lt_input = new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30)}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]});
+  let ls_input = new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30)});
+  let ls_result = new abap.types.Structure({list: new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character(30), testclass_name: new abap.types.Character(30), method_name: new abap.types.Character(30), expected: new abap.types.String(), actual: new abap.types.String(), status: new abap.types.String(), runtime: new abap.types.Integer(), message: new abap.types.String(), js_location: new abap.types.String(), console: new abap.types.String()}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]}), json: new abap.types.String()});
 `;
         for (const obj of reg.getObjects()) {
             if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
@@ -77,44 +77,44 @@ async function run() {
                         if (m.isForTesting === false) {
                             continue;
                         }
-                        ret += `  ls_input.get().class_name.set("${obj.getName()}");
-  ls_input.get().testclass_name.set("${def.name.toUpperCase()}");
-  ls_input.get().method_name.set("${m.name.toUpperCase()}");
+                        ret += `  ls_input.get().class_name.set("${obj.getName()}");
+  ls_input.get().testclass_name.set("${def.name.toUpperCase()}");
+  ls_input.get().method_name.set("${m.name.toUpperCase()}");
   abap.statements.append({source: ls_input, target: lt_input});\n`;
                     }
                 }
             }
         }
-        ret += `
-
-  ls_result.set(await abap.Classes["KERNEL_UNIT_RUNNER"].run({it_input: lt_input}));
-  fs.writeFileSync(__dirname + path.sep + "output.json", ls_result.get().json.get());
-}
-
-run().then(() => {
-  process.exit(0);
-}).catch((err) => {
-  console.log(err);
-  process.exit(1);
+        ret += `
+
+  ls_result.set(await abap.Classes["KERNEL_UNIT_RUNNER"].run({it_input: lt_input}));
+  fs.writeFileSync(__dirname + path.sep + "output.json", ls_result.get().json.get());
+}
+
+run().then(() => {
+  process.exit(0);
+}).catch((err) => {
+  console.log(err);
+  process.exit(1);
 });`;
         return ret;
     }
     unitTestScript(reg, skip, _only) {
-        let ret = `/* eslint-disable curly */
-import fs from "fs";
-import path from "path";
-import {fileURLToPath} from "url";
-import {initializeABAP} from "./init.mjs";
-import runtime from "@abaplint/runtime";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-async function run() {
-  await initializeABAP();
-  const unit = new runtime.UnitTestResult();
-  let clas;
-  let locl;
-  let meth;
+        let ret = `/* eslint-disable curly */
+import fs from "fs";
+import path from "path";
+import {fileURLToPath} from "url";
+import {initializeABAP} from "./init.mjs";
+import runtime from "@abaplint/runtime";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+async function run() {
+  await initializeABAP();
+  const unit = new runtime.UnitTestResult();
+  let clas;
+  let locl;
+  let meth;
   try {\n`;
         for (const obj of reg.getObjects()) {
             if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
@@ -128,9 +128,9 @@ async function run() {
                         // todo, fix, there might be global test methods
                         continue;
                     }
-                    ret += `    {
-      const {${def.name}} = await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs");
-      locl = clas.addTestClass("${def.name}");
+                    ret += `    {
+      const {${def.name}} = await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs");
+      locl = clas.addTestClass("${def.name}");
       if (${def.name}.class_setup) await ${def.name}.class_setup();\n`;
                     for (const m of def.methods) {
                         if (m.isForTesting === false) {
@@ -157,24 +157,24 @@ async function run() {
                 }
             }
         }
-        ret += `// -------------------END-------------------
-    console.log(abap.console.get());
-    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
-  } catch (e) {
-    if (meth) {
-      meth.fail();
-    }
-    console.log(abap.console.get());
-    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
-    throw e;
-  }
-}
-
-run().then(() => {
-  process.exit(0);
-}).catch((err) => {
-  console.log(err);
-  process.exit(1);
+        ret += `// -------------------END-------------------
+    console.log(abap.console.get());
+    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
+  } catch (e) {
+    if (meth) {
+      meth.fail();
+    }
+    console.log(abap.console.get());
+    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
+    throw e;
+  }
+}
+
+run().then(() => {
+  process.exit(0);
+}).catch((err) => {
+  console.log(err);
+  process.exit(1);
 });`;
         return ret;
     }

package/package.json

@@ -1,42 +1,42 @@
-{
-  "name": "@abaplint/transpiler",
-  "version": "2.3.86",
-  "description": "Transpiler",
-  "main": "build/src/index.js",
-  "typings": "build/src/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/abaplint/transpiler.git"
-  },
-  "scripts": {
-    "compile": "tsc",
-    "publish:major": "npm --no-git-tag-version version major && rm -rf build && npm install && npm run test && npm publish --access public",
-    "publish:minor": "npm --no-git-tag-version version minor && rm -rf build && npm install && npm run test && npm publish --access public",
-    "publish:patch": "npm --no-git-tag-version version patch && rm -rf build && npm install && npm run test && npm publish --access public",
-    "test": "npm run compile && mocha"
-  },
-  "mocha": {
-    "recursive": true,
-    "reporter": "progress",
-    "spec": "build/test/**/*.js",
-    "require": "source-map-support/register"
-  },
-  "keywords": [
-    "ABAP",
-    "abaplint"
-  ],
-  "author": "abaplint",
-  "license": "MIT",
-  "dependencies": {
-    "@abaplint/core": "^2.94.5",
-    "source-map": "^0.7.4"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.3.4",
-    "@types/mocha": "^10.0.1",
-    "chai": "^4.3.7",
-    "mocha": "^10.2.0",
-    "source-map-support": "^0.5.21",
-    "typescript": "^4.8.4"
-  }
-}
+{
+  "name": "@abaplint/transpiler",
+  "version": "2.3.88",
+  "description": "Transpiler",
+  "main": "build/src/index.js",
+  "typings": "build/src/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/abaplint/transpiler.git"
+  },
+  "scripts": {
+    "compile": "tsc",
+    "publish:major": "npm --no-git-tag-version version major && rm -rf build && npm install && npm run test && npm publish --access public",
+    "publish:minor": "npm --no-git-tag-version version minor && rm -rf build && npm install && npm run test && npm publish --access public",
+    "publish:patch": "npm --no-git-tag-version version patch && rm -rf build && npm install && npm run test && npm publish --access public",
+    "test": "npm run compile && mocha"
+  },
+  "mocha": {
+    "recursive": true,
+    "reporter": "progress",
+    "spec": "build/test/**/*.js",
+    "require": "source-map-support/register"
+  },
+  "keywords": [
+    "ABAP",
+    "abaplint"
+  ],
+  "author": "abaplint",
+  "license": "MIT",
+  "dependencies": {
+    "@abaplint/core": "^2.94.7",
+    "source-map": "^0.7.4"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.4",
+    "@types/mocha": "^10.0.1",
+    "chai": "^4.3.7",
+    "mocha": "^10.2.0",
+    "source-map-support": "^0.5.21",
+    "typescript": "^4.8.4"
+  }
+}