@abaplint/transpiler 2.6.32 → 2.6.34

package/build/src/statements/call_function.js

@@ -15,6 +15,7 @@ class CallFunctionTranspiler {
         if (fmchild instanceof abaplint.Nodes.ExpressionNode
             && fmchild.get() instanceof abaplint.Expressions.FieldChain) {
             fmname = new expressions_1.FieldChainTranspiler(true).transpile(fmchild, traversal).getCode();
+            fmname = fmname + ".trimEnd()";
         }
         else {
             fmname = fmchild.concatTokens().toUpperCase();

package/build/src/statements/create_object.js

@@ -4,6 +4,7 @@ exports.CreateObjectTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 const expressions_1 = require("../expressions");
+const unique_identifier_1 = require("../unique_identifier");
 class CreateObjectTranspiler {
     transpile(node, traversal) {
         var _a, _b;
@@ -18,7 +19,7 @@ class CreateObjectTranspiler {
         let dynamic = (_a = node.findDirectExpression(abaplint.Expressions.Dynamic)) === null || _a === void 0 ? void 0 : _a.findFirstExpression(abaplint.Expressions.ConstantString);
         if (dynamic) {
             name = dynamic.getFirstToken().getStr();
-            name = name.substring(1, name.length - 1);
+            //      name = name.substring(1, name.length - 1);
         }
         else {
             dynamic = (_b = node.findDirectExpression(abaplint.Expressions.Dynamic)) === null || _b === void 0 ? void 0 : _b.findFirstExpression(abaplint.Expressions.FieldChain);
@@ -31,10 +32,14 @@ class CreateObjectTranspiler {
             name = this.findClassName(node, traversal);
         }
         let ret = "";
-        const clas = traversal.lookupClassOrInterface(name, node.getFirstToken(), directGlobal);
+        let clas = traversal.lookupClassOrInterface(name, node.getFirstToken(), directGlobal);
         const cx = traversal.lookupClassOrInterface("CX_SY_CREATE_OBJECT_ERROR", node.getFirstToken());
         if (dynamic) {
-            ret += `if (${clas} === undefined) { throw new ${cx}; }\n`;
+            const id = unique_identifier_1.UniqueIdentifier.get();
+            ret += `let ${id} = abap.Classes["${traversal.buildPrefix()}"+${name}.trimEnd()];\n`;
+            ret += `if (${id} === undefined) { ${id} = abap.Classes[${name}.trimEnd()]; }\n`;
+            ret += `if (${id} === undefined) { throw new ${cx}; }\n`;
+            clas = id;
         }
         ret += target + ".set(await (new " + clas + "()).constructor_(" + para + "));";
         return new chunk_1.Chunk(ret);

package/build/src/traversal.d.ts

@@ -47,7 +47,7 @@ export declare class Traversal {
     static setValues(identifier: abaplint.TypedIdentifier, name: string): string;
     buildInternalName(name: string, def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;
     lookupClassOrInterface(name: string | undefined, token: abaplint.Token | undefined, directGlobal?: boolean): string;
-    private buildPrefix;
+    buildPrefix(): string;
     protected traverseStructure(node: abaplint.Nodes.StructureNode): Chunk;
     protected traverseStatement(node: abaplint.Nodes.StatementNode): Chunk;
     protected traverseExpression(node: abaplint.Nodes.ExpressionNode): Chunk;

package/build/src/traversal.js

@@ -522,7 +522,7 @@ class Traversal {
         if (def) {
             if (def.isGlobal() === false) {
                 const prefix = this.buildPrefix();
-                return `${prefix}-${(_a = def === null || def === void 0 ? void 0 : def.getName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()}`;
+                return `${prefix}${(_a = def === null || def === void 0 ? void 0 : def.getName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()}`;
             }
             else {
                 return (_b = def === null || def === void 0 ? void 0 : def.getName()) === null || _b === void 0 ? void 0 : _b.toUpperCase();
@@ -547,7 +547,7 @@ class Traversal {
         return "abap.Classes['" + internalName + "']";
     }
     buildPrefix() {
-        return this.obj.getType() + "-" + this.obj.getName();
+        return this.obj.getType() + "-" + this.obj.getName() + "-";
     }
     ////////////////////////////
     traverseStructure(node) {

package/package.json

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