@abaplint/transpiler 2.6.25 → 2.6.27

package/build/src/statements/class_implementation.js

@@ -21,6 +21,7 @@ class ClassImplementationTranspiler {
         const scope = traversal.findCurrentScopeByToken(token);
         return new chunk_1.Chunk().append(ret + ` {
 static INTERNAL_TYPE = 'CLAS';
+static INTERNAL_NAME = '${traversal.buildInternalName(token.getStr(), def)}';
 static IMPLEMENTED_INTERFACES = [${this.findImplementedClass(traversal, def, scope).map(e => `"` + e.toUpperCase() + `"`).join(",")}];
 static ATTRIBUTES = {${traversal.buildAttributes(def)}};`, node, traversal);
     }

package/build/src/structures/class_definition.js

@@ -23,6 +23,8 @@ class ClassDefinitionTranspiler {
             return new chunk_1.Chunk(`
 class ${className === null || className === void 0 ? void 0 : className.toLowerCase()} {
   static INTERNAL_TYPE = 'CLAS';
+  static IMPLEMENTED_INTERFACES = [];
+  static INTERNAL_NAME = 'ABSTRACT_CLASS_INTERNAL_NAME';
   static ATTRIBUTES = {};
   async constructor_() {
     this.me = new abap.types.ABAPObject();

package/build/src/transpile_types.js

@@ -17,15 +17,14 @@ class TranspileTypes {
         return pre + t.getName().toLowerCase() + " = " + code + ";\n";
     }
     toType(type) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let resolved = "";
         let extra = "";
         if (type instanceof abaplint.BasicTypes.ObjectReferenceType
             || type instanceof abaplint.BasicTypes.GenericObjectReferenceType) {
             resolved = "ABAPObject";
-            if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_a = type.getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()) + "\"}";
-            }
+            extra = "{qualifiedName: " + JSON.stringify((_a = type.getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()) +
+                ", RTTIName: " + JSON.stringify((_b = type.getRTTIName()) === null || _b === void 0 ? void 0 : _b.toUpperCase()) + "}";
         }
         else if (type instanceof abaplint.BasicTypes.TableType) {
             resolved = "Table";
@@ -39,31 +38,31 @@ class TranspileTypes {
         else if (type instanceof abaplint.BasicTypes.IntegerType) {
             resolved = "Integer";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_b = type.getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_c = type.getQualifiedName()) === null || _c === void 0 ? void 0 : _c.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.StringType) {
             resolved = "String";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_c = type.getQualifiedName()) === null || _c === void 0 ? void 0 : _c.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_d = type.getQualifiedName()) === null || _d === void 0 ? void 0 : _d.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.UTCLongType) {
             resolved = "UTCLong";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_d = type.getQualifiedName()) === null || _d === void 0 ? void 0 : _d.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_e = type.getQualifiedName()) === null || _e === void 0 ? void 0 : _e.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.DateType) {
             resolved = "Date";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_e = type.getQualifiedName()) === null || _e === void 0 ? void 0 : _e.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_f = type.getQualifiedName()) === null || _f === void 0 ? void 0 : _f.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.TimeType) {
             resolved = "Time";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_f = type.getQualifiedName()) === null || _f === void 0 ? void 0 : _f.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_g = type.getQualifiedName()) === null || _g === void 0 ? void 0 : _g.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.DataReference) {
@@ -134,7 +133,7 @@ class TranspileTypes {
         else if (type instanceof abaplint.BasicTypes.XStringType) {
             resolved = "XString";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_g = type.getQualifiedName()) === null || _g === void 0 ? void 0 : _g.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_h = type.getQualifiedName()) === null || _h === void 0 ? void 0 : _h.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.XSequenceType) {
@@ -150,13 +149,13 @@ class TranspileTypes {
         else if (type instanceof abaplint.BasicTypes.FloatType) {
             resolved = "Float";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_h = type.getQualifiedName()) === null || _h === void 0 ? void 0 : _h.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_j = type.getQualifiedName()) === null || _j === void 0 ? void 0 : _j.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.FloatingPointType) {
             resolved = "Float";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_j = type.getQualifiedName()) === null || _j === void 0 ? void 0 : _j.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_k = type.getQualifiedName()) === null || _k === void 0 ? void 0 : _k.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.DecFloat34Type) {

package/build/src/traversal.d.ts

@@ -45,6 +45,7 @@ export declare class Traversal {
     registerClassOrInterface(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;
     setValues(identifier: abaplint.TypedIdentifier, name: string): string;
     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;
     protected traverseStructure(node: abaplint.Nodes.StructureNode): Chunk;

package/build/src/traversal.js

@@ -479,14 +479,8 @@ class Traversal {
         if (def === undefined) {
             return "";
         }
-        const name = def.getName();
-        if (def.isGlobal() === false) {
-            const prefix = this.buildPrefix();
-            return `abap.Classes['${prefix}-${name.toUpperCase()}'] = ${Traversal.escapeNamespace(name.toLowerCase())};`;
-        }
-        else {
-            return `abap.Classes['${name.toUpperCase()}'] = ${Traversal.escapeNamespace(name.toLowerCase())};`;
-        }
+        const name = this.buildInternalName(def.getName(), def);
+        return `abap.Classes['${name}'] = ${Traversal.escapeNamespace(def.getName().toLowerCase())};`;
     }
     setValues(identifier, name) {
         return Traversal.setValues(identifier, name);
@@ -511,8 +505,21 @@ class Traversal {
         }
         return ret;
     }
-    lookupClassOrInterface(name, token, directGlobal = false) {
+    buildInternalName(name, def) {
         var _a, _b;
+        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()}`;
+            }
+            else {
+                return (_b = def === null || def === void 0 ? void 0 : def.getName()) === null || _b === void 0 ? void 0 : _b.toUpperCase();
+            }
+        }
+        // assume global
+        return name.toUpperCase();
+    }
+    lookupClassOrInterface(name, token, directGlobal = false) {
         if (name === undefined || token === undefined) {
             return "abap.Classes['undefined']";
         }
@@ -520,24 +527,12 @@ class Traversal {
             return "abap.Classes[" + name + ".trimEnd()]";
         }
         const scope = this.findCurrentScopeByToken(token);
-        // todo, add explicit type,
         let def = scope === null || scope === void 0 ? void 0 : scope.findClassDefinition(name);
         if (def === undefined) {
             def = scope === null || scope === void 0 ? void 0 : scope.findInterfaceDefinition(name);
         }
-        if (def) {
-            if (def.isGlobal() === false) {
-                const prefix = this.buildPrefix();
-                return `abap.Classes['${prefix}-${(_a = def === null || def === void 0 ? void 0 : def.getName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()}']`;
-            }
-            else {
-                return `abap.Classes['${(_b = def === null || def === void 0 ? void 0 : def.getName()) === null || _b === void 0 ? void 0 : _b.toUpperCase()}']`;
-            }
-        }
-        else {
-            // assume global
-            return "abap.Classes['" + name.toUpperCase() + "']";
-        }
+        const internalName = this.buildInternalName(name, def);
+        return "abap.Classes['" + internalName + "']";
     }
     buildPrefix() {
         return this.obj.getType() + "-" + this.obj.getName();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.6.25",
+  "version": "2.6.27",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.97.15",
+    "@abaplint/core": "^2.97.16",
     "source-map": "^0.7.4"
   },
   "devDependencies": {