@abaplint/transpiler-cli 2.6.26 → 2.6.27

package/build/bundle.js

@@ -19568,21 +19568,28 @@ class CurrentScope {
         if (name === undefined) {
             return { found: false };
         }
+        let RTTIPrefix = "";
+        if (this.parentObj.getType() === "PROG") {
+            RTTIPrefix = "\\PROGRAM=" + this.parentObj.getName();
+        }
+        else if (this.parentObj.getType() === "CLAS") {
+            RTTIPrefix = "\\CLASS-POOL=" + this.parentObj.getName();
+        }
         const findLocalClass = (_a = this.current) === null || _a === void 0 ? void 0 : _a.findClassDefinition(name);
         if (findLocalClass) {
-            return { found: true, id: findLocalClass, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "CLAS" };
+            return { found: true, id: findLocalClass, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "CLAS", RTTIName: RTTIPrefix + "\\CLASS=" + findLocalClass.getName() };
         }
         const globalClas = this.reg.getObject("CLAS", name);
         if (globalClas) {
-            return { found: true, id: globalClas.getIdentifier(), type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "CLAS" };
+            return { found: true, id: globalClas.getIdentifier(), type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "CLAS", RTTIName: "\\CLASS=" + globalClas.getName() };
         }
         const findLocalInterface = (_b = this.current) === null || _b === void 0 ? void 0 : _b.findInterfaceDefinition(name);
         if (findLocalInterface) {
-            return { found: true, id: findLocalInterface, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "INTF" };
+            return { found: true, id: findLocalInterface, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "INTF", RTTIName: RTTIPrefix + "\\INTERFACE=" + findLocalInterface.getName() };
         }
         const globalIntf = this.reg.getObject("INTF", name);
         if (globalIntf) {
-            return { found: true, id: globalIntf.getIdentifier(), type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "INTF" };
+            return { found: true, id: globalIntf.getIdentifier(), type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "INTF", RTTIName: "\\INTERFACE=" + globalIntf.getName() };
         }
         const def = (_c = this.current) === null || _c === void 0 ? void 0 : _c.findDeferred(name);
         if (def !== undefined) {
@@ -20436,6 +20443,7 @@ class TypeUtils {
         else if (type instanceof basic_1.XStringType
             || type instanceof basic_1.HexType
             || type instanceof basic_1.VoidType
+            || type instanceof basic_1.XSequenceType
             || type instanceof basic_1.AnyType
             || type instanceof basic_1.UnknownType) {
             return true;
@@ -21530,7 +21538,7 @@ class BasicTypes {
             const search = this.scope.existsObject(name);
             if (search.found === true && search.id) {
                 this.scope.addReference(chain.getFirstToken(), search.id, _reference_1.ReferenceType.ObjectOrientedReference, this.filename, { ooType: search.ooType, ooName: name });
-                return new Types.ObjectReferenceType(search.id, name);
+                return new Types.ObjectReferenceType(search.id, { qualifiedName: name, RTTIName: search.RTTIName });
             }
         }
         const found = this.resolveTypeName(chain);
@@ -21793,7 +21801,7 @@ class Cast {
             if (tt === undefined || tt instanceof basic_1.VoidType || tt instanceof basic_1.UnknownType) {
                 const found = scope.findObjectDefinition(typeName);
                 if (found) {
-                    tt = new basic_1.ObjectReferenceType(found, typeName);
+                    tt = new basic_1.ObjectReferenceType(found, { qualifiedName: typeName });
                 }
             }
             else {
@@ -24678,10 +24686,23 @@ exports.StringTemplate = void 0;
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
+const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 class StringTemplate {
     runSyntax(node, scope, filename) {
-        for (const s of node.findAllExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename, new basic_1.StringType({ qualifiedName: "STRING" }));
+        var _a;
+        const typeUtils = new _type_utils_1.TypeUtils(scope);
+        for (const templateSource of node.findAllExpressions(Expressions.StringTemplateSource)) {
+            const s = templateSource.findDirectExpression(Expressions.Source);
+            const type = new source_1.Source().runSyntax(s, scope, filename, new basic_1.StringType({ qualifiedName: "STRING" }));
+            if (type === undefined) {
+                throw new Error("No target type determined");
+            }
+            else if (typeUtils.isCharLike(type) === false && typeUtils.isHexLike(type) === false) {
+                throw new Error("Not character like, " + type.constructor.name);
+            }
+            for (const formatSource of ((_a = templateSource.findDirectExpression(Expressions.StringTemplateFormatting)) === null || _a === void 0 ? void 0 : _a.findAllExpressions(Expressions.Source)) || []) {
+                new source_1.Source().runSyntax(formatSource, scope, filename);
+            }
         }
         return new basic_1.StringType({ qualifiedName: "STRING" });
     }
@@ -32771,6 +32792,10 @@ class AbstractType {
         var _a;
         return (_a = this.data) === null || _a === void 0 ? void 0 : _a.qualifiedName;
     }
+    getRTTIName() {
+        var _a;
+        return (_a = this.data) === null || _a === void 0 ? void 0 : _a.RTTIName;
+    }
     getConversionExit() {
         var _a;
         return (_a = this.data) === null || _a === void 0 ? void 0 : _a.conversionExit;
@@ -33517,8 +33542,8 @@ exports.ObjectReferenceType = void 0;
 const _abstract_type_1 = __webpack_require__(/*! ./_abstract_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/_abstract_type.js");
 // use GenericObjectReferenceType for REF TO OBJECT
 class ObjectReferenceType extends _abstract_type_1.AbstractType {
-    constructor(id, qualifiedName) {
-        super({ qualifiedName: qualifiedName });
+    constructor(id, extra) {
+        super(extra);
         this.identifier = id;
     }
     getIdentifierName() {
@@ -36901,12 +36926,18 @@ class DDIC {
         const clas = this.reg.getObject("CLAS", name);
         const globalClas = clas === null || clas === void 0 ? void 0 : clas.getIdentifier();
         if (globalClas) {
-            return { type: new basic_1.ObjectReferenceType(globalClas, name), object: clas };
+            return {
+                type: new basic_1.ObjectReferenceType(globalClas, { qualifiedName: name, RTTIName: "\\CLASS=" + name }),
+                object: clas,
+            };
         }
         const intf = this.reg.getObject("INTF", name);
         const globalIntf = intf === null || intf === void 0 ? void 0 : intf.getIdentifier();
         if (globalIntf) {
-            return { type: new basic_1.ObjectReferenceType(globalIntf, name), object: intf };
+            return {
+                type: new basic_1.ObjectReferenceType(globalIntf, { qualifiedName: name, RTTIName: "\\INTERFACE=" + name }),
+                object: intf,
+            };
         }
         if (this.inErrorNamespace(name) === true) {
             return { type: new basic_1.UnknownType(name) };
@@ -38360,6 +38391,9 @@ class LSPLookup {
         if (variable.getType().getQualifiedName()) {
             value += "\n\nQualified Type Name: ```" + variable.getType().getQualifiedName() + "```";
         }
+        if (variable.getType().getRTTIName()) {
+            value += "\n\nRTTI Name: ```" + variable.getType().getRTTIName() + "```";
+        }
         if (variable.getType().isGeneric() === true) {
             value += "\n\nIs Generic Type";
         }
@@ -46483,7 +46517,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.97.15";
+        return "2.97.16";
     }
     getDDICReferences() {
         return this.references;
@@ -77499,15 +77533,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";
@@ -77521,31 +77554,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) {
@@ -77616,7 +77649,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) {
@@ -77632,13 +77665,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) {
@@ -78149,14 +78182,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);
@@ -80369,8 +80396,20 @@ const parseXml = function(xmlData) {
           textData = this.saveTextToParentTag(textData, currentNode, jPath);
         }
 
-        jPath = jPath.substr(0, jPath.lastIndexOf("."));
-        
+        //check if last tag of nested tag was unpaired tag
+        const lastTagName = jPath.substring(jPath.lastIndexOf(".")+1);
+        if(tagName && this.options.unpairedTags.indexOf(tagName) !== -1 ){
+          throw new Error(`Unpaired tag can not be used as closing tag: </${tagName}>`);
+        }
+        let propIndex = 0
+        if(lastTagName && this.options.unpairedTags.indexOf(lastTagName) !== -1 ){
+          propIndex = jPath.lastIndexOf('.', jPath.lastIndexOf('.')-1)
+          this.tagsNodeStack.pop();
+        }else{
+          propIndex = jPath.lastIndexOf(".");
+        }
+        jPath = jPath.substring(0, propIndex);
+
         currentNode = this.tagsNodeStack.pop();//avoid recursion, set the parent tag scope
         textData = "";
         i = closeIndex;
@@ -80447,23 +80486,22 @@ const parseXml = function(xmlData) {
           }
         }
 
-        if(tagName !== xmlObj.tagname){
-          jPath += jPath ? "." + tagName : tagName;
-        }
-
         //check if last tag was unpaired tag
         const lastTag = currentNode;
         if(lastTag && this.options.unpairedTags.indexOf(lastTag.tagname) !== -1 ){
           currentNode = this.tagsNodeStack.pop();
+          jPath = jPath.substring(0, jPath.lastIndexOf("."));
+        }
+        if(tagName !== xmlObj.tagname){
+          jPath += jPath ? "." + tagName : tagName;
         }
-
         if (this.isItStopNode(this.options.stopNodes, jPath, tagName)) { //TODO: namespace
           let tagContent = "";
           //self-closing tag
           if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
             i = result.closeIndex;
           }
-          //boolean tag
+          //unpaired tag
           else if(this.options.unpairedTags.indexOf(tagName) !== -1){
             i = result.closeIndex;
           }
@@ -80506,8 +80544,8 @@ const parseXml = function(xmlData) {
             if(tagName !== tagExp && attrExpPresent){
               childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
             }
-            jPath = jPath.substr(0, jPath.lastIndexOf("."));
             this.addChild(currentNode, childNode, jPath)
+            jPath = jPath.substr(0, jPath.lastIndexOf("."));
           }
     //opening tag
           else{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.6.26",
+  "version": "2.6.27",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,15 +25,15 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.6.26",
+    "@abaplint/transpiler": "^2.6.27",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
     "@types/node": "^18.15.13",
-    "@abaplint/core": "^2.97.15",
+    "@abaplint/core": "^2.97.16",
     "progress": "^2.0.3",
     "webpack": "^5.80.0",
-    "webpack-cli": "^5.0.1",
+    "webpack-cli": "^5.0.2",
     "typescript": "^5.0.4"
   }
 }