@abaplint/transpiler 2.0.26 → 2.0.29

package/README.md

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

package/build/src/expressions/source.js

@@ -12,7 +12,10 @@ class SourceTranspiler {
     transpile(node, traversal) {
         let ret = new chunk_1.Chunk();
         const post = new chunk_1.Chunk();
-        for (const c of node.getChildren()) {
+        const children = node.getChildren();
+        for (let i = 0; i < children.length; i++) {
+            const c = children[i];
+            const last = i === children.length - 1;
             if (c instanceof core_1.Nodes.ExpressionNode) {
                 if (c.get() instanceof core_1.Expressions.FieldChain) {
                     ret.appendChunk(new _1.FieldChainTranspiler(this.addGet).transpile(c, traversal));
@@ -35,14 +38,12 @@ class SourceTranspiler {
                 }
                 else if (c.get() instanceof core_1.Expressions.MethodCallChain) {
                     ret.appendChunk(traversal.traverse(c));
-                    if (this.addGet) {
-                        const code = ret.getCode();
-                        if (code.includes("await")) {
-                            ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(").get()");
-                        }
-                        else {
-                            ret.append(".get()", c, traversal);
-                        }
+                    const code = ret.getCode();
+                    if (code.includes("await")) {
+                        ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(")");
+                    }
+                    if (this.addGet && last === true) {
+                        ret.append(".get()", c, traversal);
                     }
                 }
                 else if (c.get() instanceof core_1.Expressions.Source) {
@@ -57,6 +58,9 @@ class SourceTranspiler {
                 else if (c.get() instanceof core_1.Expressions.ComponentChain) {
                     ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(").get().");
                     ret.appendChunk(new _1.ComponentChainTranspiler().transpile(c, traversal));
+                    if (this.addGet && last === true) {
+                        ret.append(".get()", c, traversal);
+                    }
                 }
                 else if (c.get() instanceof core_1.Expressions.Dereference) {
                     ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(").getPointer()");
@@ -82,6 +86,7 @@ class SourceTranspiler {
             }
         }
         ret.appendChunk(post);
+        //    console.dir(ret.getCode());
         return ret;
     }
 }

package/build/src/handle_abap.js

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

package/build/src/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/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())},
+        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())},
 };`);
         const output = {
             object: {

package/build/src/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/requires.js

@@ -28,7 +28,7 @@ class Requires {
         if (obj.getType() === "CLAS") {
             // add the superclass
             const clas = obj;
-            const sup = (_b = (_a = clas.getDefinition()) === null || _a === void 0 ? void 0 : _a.getSuperClass()) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+            const sup = (_b = (_a = clas.getDefinition()) === null || _a === void 0 ? void 0 : _a.getSuperClass()) === null || _b === void 0 ? void 0 : _b.toLowerCase().replace(/\//g, "%23");
             if (sup) {
                 add({ filename: sup + ".clas.abap", name: sup });
             }

package/build/src/statements/class_implementation.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClassImplementationTranspiler = void 0;
 const abaplint = require("@abaplint/core");
+const traversal_1 = require("../traversal");
 const chunk_1 = require("../chunk");
 class ClassImplementationTranspiler {
     transpile(node, traversal) {
         var _a;
         const token = node.findFirstExpression(abaplint.Expressions.ClassName).getFirstToken();
         const def = traversal.getClassDefinition(token);
-        let ret = "class " + token.getStr().toLowerCase();
+        let ret = "class " + traversal_1.Traversal.escapeClassName(token.getStr().toLowerCase());
         if (token.getStr().toLowerCase() === "cx_root") {
             // special case for exceptions
             ret += " extends Error";

package/build/src/statements/do.js

@@ -12,14 +12,14 @@ 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 ${idSource} = ${source};
-for (let ${id} = 0; ${id} < ${idSource}; ${id}++) {
+            return new chunk_1.Chunk(`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(`let ${unique} = 1;
-while (true) {
+            return new chunk_1.Chunk(`let ${unique} = 1;
+while (true) {
 abap.builtin.sy.get().index.set(${unique}++);`);
         }
     }

package/build/src/statements/end_method.js

@@ -15,7 +15,7 @@ class EndMethodTranspiler {
         const vars = scope.getData().vars;
         for (const n in vars) {
             const identifier = vars[n];
-            if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
+            if (identifier.getMeta().includes("returning" /* abaplint.IdentifierMeta.MethodReturning */)) {
                 returning += "return " + n.toLowerCase() + ";\n";
             }
         }

package/build/src/statements/method_implementation.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MethodImplementationTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const transpile_types_1 = require("../transpile_types");
+const traversal_1 = require("../traversal");
 const expressions_1 = require("../expressions");
 const chunk_1 = require("../chunk");
 class MethodImplementationTranspiler {
@@ -31,14 +32,14 @@ class MethodImplementationTranspiler {
         for (const n in vars) {
             const identifier = vars[n];
             const varName = n.toLowerCase();
-            if (identifier.getMeta().includes("importing" /* MethodImporting */)
-                || identifier.getMeta().includes("changing" /* MethodChanging */)
-                || identifier.getMeta().includes("exporting" /* MethodExporting */)) {
+            if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
+                || identifier.getMeta().includes("changing" /* abaplint.IdentifierMeta.MethodChanging */)
+                || identifier.getMeta().includes("exporting" /* abaplint.IdentifierMeta.MethodExporting */)) {
                 if (unique === "") {
                     unique = "INPUT";
                 }
                 after = after + new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
-                if (identifier.getMeta().includes("importing" /* MethodImporting */) && identifier.getType().isGeneric() === false) {
+                if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */) && identifier.getType().isGeneric() === false) {
                     after += "if (" + unique + " && " + unique + "." + varName + ") {" + varName + ".set(" + unique + "." + varName + ");}\n";
                 }
                 else {
@@ -71,7 +72,7 @@ class MethodImplementationTranspiler {
                     after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varName + " = " + val + ";}\n";
                 }
             }
-            else if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
+            else if (identifier.getMeta().includes("returning" /* abaplint.IdentifierMeta.MethodReturning */)) {
                 after = after + new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
             }
         }
@@ -86,7 +87,7 @@ class MethodImplementationTranspiler {
             // 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 " + methodName + "(" + unique + ") {\n" +
-                "return " + className + "." + methodName + "(" + unique + ");\n" +
+                "return " + traversal_1.Traversal.escapeClassName(className) + "." + methodName + "(" + unique + ");\n" +
                 "}\n" + "static ";
         }
         const str = staticMethod + "async " + methodName + "(" + unique + ") {" + after;

package/build/src/statements/return.js

@@ -9,7 +9,7 @@ class ReturnTranspiler {
         const vars = scope === null || scope === void 0 ? void 0 : scope.getData().vars;
         for (const n in vars) {
             const identifier = vars[n];
-            if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
+            if (identifier.getMeta().includes("returning" /* abaplint.IdentifierMeta.MethodReturning */)) {
                 extra = " " + n.toLowerCase();
             }
         }

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/structures/interface.js

@@ -36,8 +36,8 @@ class InterfaceTranspiler {
         let ret = "\n";
         for (const n in vars) {
             const identifier = vars[n];
-            if (identifier.getMeta().includes("static" /* Static */) === false
-                || identifier.getMeta().includes("read_only" /* ReadOnly */) === false) {
+            if (identifier.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === false
+                || identifier.getMeta().includes("read_only" /* abaplint.IdentifierMeta.ReadOnly */) === false) {
                 continue;
             }
             const interfaceName = node.getFirstToken().getStr().toLowerCase();

package/build/src/traversal.d.ts

@@ -8,6 +8,7 @@ export declare class Traversal {
     private readonly reg;
     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;
     getCurrentObject(): abaplint.ABAPObject;
     traverse(node: abaplint.INode | undefined): Chunk;
     getFilename(): string;

package/build/src/traversal.js

@@ -16,6 +16,9 @@ class Traversal {
         this.reg = reg;
         this.runtimeTypeError = runtimeTypeError;
     }
+    static escapeClassName(name) {
+        return name === null || name === void 0 ? void 0 : name.replace(/\//g, "$");
+    }
     getCurrentObject() {
         return this.obj;
     }
@@ -121,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;
@@ -154,7 +157,7 @@ class Traversal {
         const found = scope.findScopeForVariable(name);
         const id = scope.findVariable(name);
         if (found && id
-            && id.getMeta().includes("static" /* Static */)
+            && id.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */)
             && found.stype === abaplint.ScopeType.ClassImplementation) {
             //      console.dir(found.sname);
             return found.sname.toLowerCase();
@@ -261,7 +264,7 @@ class Traversal {
         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" /* Static */) === true) {
+            if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
                 continue;
             }
             const name = a.getName().toLowerCase();
@@ -305,7 +308,7 @@ class Traversal {
         let ret = "";
         const intf = this.findInterfaceDefinition(name, scope);
         for (const a of (intf === null || intf === void 0 ? void 0 : intf.getAttributes().getAll()) || []) {
-            if (a.getMeta().includes("static" /* Static */) === true) {
+            if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
                 continue;
             }
             const n = name.toLowerCase() + "$" + a.getName().toLowerCase();
@@ -345,10 +348,10 @@ class Traversal {
         const name = def.getName();
         if (def.isGlobal() === false) {
             const prefix = this.buildPrefix(def);
-            return `abap.Classes['${prefix}-${name.toUpperCase()}'] = ${name.toLowerCase()};`;
+            return `abap.Classes['${prefix}-${name.toUpperCase()}'] = ${Traversal.escapeClassName(name.toLowerCase())};`;
         }
         else {
-            return `abap.Classes['${name.toUpperCase()}'] = ${name.toLowerCase()};`;
+            return `abap.Classes['${name.toUpperCase()}'] = ${Traversal.escapeClassName(name.toLowerCase())};`;
         }
     }
     lookupClassOrInterface(name, token, directGlobal = false) {

package/build/src/unit_test.d.ts

@@ -7,6 +7,7 @@ export declare type TestMethodList = {
 }[];
 export declare class UnitTest {
     initializationScript(reg: abaplint.IRegistry, dbSetup: DatabaseSetupResult, extraSetup?: string): string;
+    private escapeNamespace;
     unitTestScriptOpen(reg: abaplint.IRegistry, _skip?: TestMethodList, _only?: TestMethodList): string;
     unitTestScript(reg: abaplint.IRegistry, skip?: TestMethodList, _only?: TestMethodList): string;
     private buildImports;

package/build/src/unit_test.js

@@ -6,11 +6,11 @@ const abaplint = require("@abaplint/core");
 class UnitTest {
     // todo, move this method somewhere else, its much more than just unit test relevant
     initializationScript(reg, dbSetup, extraSetup) {
-        let ret = `/* eslint-disable import/newline-after-import */
-import runtime from "@abaplint/runtime";
-global.abap = new runtime.ABAP();
-${this.buildImports(reg)}
-
+        let ret = `/* eslint-disable import/newline-after-import */
+import runtime from "@abaplint/runtime";
+global.abap = new runtime.ABAP();
+${this.buildImports(reg)}
+
 export async function initializeABAP() {\n`;
         ret += `  const sqlite = \`${dbSetup.schemas.sqlite}\`;\n`;
         ret += `  const hdb = \`${dbSetup.schemas.hdb}\`;\n`;
@@ -27,20 +27,24 @@ export async function initializeABAP() {\n`;
         ret += `}`;
         return ret;
     }
+    escapeNamespace(filename) {
+        // ES modules are resolved and cached as URLs. This means that special characters must be percent-encoded, such as # with %23 and ? with %3F.
+        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({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]});
-  let ls_input = new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})});
-  let ls_result = new abap.types.Structure({list: new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 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()}), {"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({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]});
+  let ls_input = new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})});
+  let ls_result = new abap.types.Structure({list: new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 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()}), {"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)) {
@@ -48,7 +52,7 @@ async function run() {
             }
             const hasTestFile = obj.getFiles().some(f => { return f.getFilename().includes(".testclasses."); });
             if (hasTestFile === true) {
-                ret += `  await import("./${obj.getName().toLowerCase()}.${obj.getType().toLowerCase()}.testclasses.mjs");\n`;
+                ret += `  await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs");\n`;
             }
             for (const file of obj.getABAPFiles()) {
                 for (const def of file.getInfo().listClassDefinitions()) {
@@ -60,44 +64,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});`;
                     }
                 }
             }
         }
-        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)) {
@@ -111,9 +115,9 @@ async function run() {
                         // todo, fix, there might be global test methods
                         continue;
                     }
-                    ret += `    {
-      const {${def.name}} = await import("./${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) {
@@ -140,24 +144,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;
     }
@@ -168,26 +172,26 @@ run().then(() => {
         const list = [];
         for (const obj of reg.getObjects()) {
             if (obj instanceof abaplint.Objects.Table) {
-                list.push(`await import("./${obj.getName().toLowerCase()}.tabl.mjs");`);
+                list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.tabl.mjs");`);
             }
             else if (obj instanceof abaplint.Objects.DataElement) {
-                list.push(`await import("./${obj.getName().toLowerCase()}.dtel.mjs");`);
+                list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.dtel.mjs");`);
             }
             else if (obj instanceof abaplint.Objects.TableType) {
-                list.push(`await import("./${obj.getName().toLowerCase()}.ttyp.mjs");`);
+                list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.ttyp.mjs");`);
             }
         }
         for (const obj of reg.getObjects()) {
             if (obj instanceof abaplint.Objects.FunctionGroup) {
                 for (const m of obj.getModules()) {
-                    list.push(`await import("./${obj.getName().toLowerCase()}.fugr.${m.getName().toLowerCase()}.mjs");`);
+                    list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.fugr.${m.getName().toLowerCase()}.mjs");`);
                 }
             }
             else if (obj instanceof abaplint.Objects.Class) {
-                list.push(`await import("./${obj.getName().toLowerCase()}.clas.mjs");`);
+                list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.clas.mjs");`);
             }
             else if (obj instanceof abaplint.Objects.Interface) {
-                list.push(`await import("./${obj.getName().toLowerCase()}.intf.mjs");`);
+                list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.intf.mjs");`);
             }
         }
         list.sort();

package/package.json

@@ -1,42 +1,42 @@
-{
-  "name": "@abaplint/transpiler",
-  "version": "2.0.26",
-  "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.90.6",
-    "source-map": "^0.7.3"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.3.1",
-    "@types/mocha": "^9.1.1",
-    "chai": "^4.3.6",
-    "mocha": "^10.0.0",
-    "source-map-support": "^0.5.21",
-    "typescript": "^4.6.4"
-  }
-}
+{
+  "name": "@abaplint/transpiler",
+  "version": "2.0.29",
+  "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.90.9",
+    "source-map": "^0.7.3"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.1",
+    "@types/mocha": "^9.1.1",
+    "chai": "^4.3.6",
+    "mocha": "^10.0.0",
+    "source-map-support": "^0.5.21",
+    "typescript": "^4.7.2"
+  }
+}