@abaplint/cli 2.102.9 → 2.102.11

package/build/cli.js

@@ -21858,6 +21858,7 @@ class TypeUtils {
             return false;
         }
         else if (target instanceof basic_1.IntegerType
+            || target instanceof basic_1.CharacterType
             || target instanceof basic_1.StringType) {
             if (source instanceof basic_1.TableType && source.isWithHeader() === false) {
                 return false;
@@ -48556,7 +48557,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.9";
+        return "2.102.11";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -53959,7 +53960,7 @@ ${indentation}`);
         if (tt === undefined) {
             return undefined;
         }
-        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax, "ty_");
         const code = `TYPES ${uniqueName} ${tt.concatTokens()}.\n`;
         const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), code);
         const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, tt.getFirstToken().getStart(), tt.getLastToken().getEnd(), "TYPE " + uniqueName);
@@ -55704,15 +55705,15 @@ ${indentation}    output = ${uniqueName}.\n`;
         }
         return undefined;
     }
-    uniqueName(position, filename, highSyntax) {
+    uniqueName(position, filename, highSyntax, prefix = "") {
         const spag = highSyntax.spaghetti.lookupPosition(position, filename);
         if (spag === undefined) {
-            const name = "temprr" + this.counter;
+            const name = prefix + "temprr" + this.counter;
             this.counter++;
             return name;
         }
         while (true) {
-            const name = "temp" + this.counter;
+            const name = prefix + "temp" + this.counter;
             const exists = this.existsRecursive(spag, name);
             this.counter++;
             if (exists === false) {
@@ -55739,7 +55740,7 @@ ${indentation}    output = ${uniqueName}.\n`;
                 && r.position.getName().toUpperCase() === "XSDBOOL") {
                 const token = r.position.getToken();
                 let source = undefined;
-                for (const s of node.findAllExpressions(Expressions.Source)) {
+                for (const s of node.findAllExpressionsRecursive(Expressions.Source)) {
                     if (s.getFirstToken().getStart().equals(token.getStart())) {
                         source = s;
                         break;
@@ -70994,10 +70995,19 @@ Builder.prototype.j2x = function(jObj, level) {
   let val = '';
   for (let key in jObj) {
     if (typeof jObj[key] === 'undefined') {
-      // supress undefined node
+      // supress undefined node only if it is not an attribute
+      if (this.isAttribute(key)) {
+        val += '';
+      }
     } else if (jObj[key] === null) {
-      if(key[0] === "?") val += this.indentate(level) + '<' + key + '?' + this.tagEndChar;
-      else val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
+      // null attribute should be ignored by the attribute list, but should not cause the tag closing
+      if (this.isAttribute(key)) {
+        val += '';
+      } else if (key[0] === '?') {
+        val += this.indentate(level) + '<' + key + '?' + this.tagEndChar;
+      } else {
+        val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
+      }
       // val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
     } else if (jObj[key] instanceof Date) {
       val += this.buildTextValNode(jObj[key], key, '', level);
@@ -71090,7 +71100,8 @@ Builder.prototype.buildObjectNode = function(val, key, attrStr, level) {
       tagEndExp = "";
     }
   
-    if (attrStr && val.indexOf('<') === -1) {
+    // attrStr is an empty string in case the attribute came as undefined or null
+    if ((attrStr || attrStr === '') && val.indexOf('<') === -1) {
       return ( this.indentate(level) + '<' +  key + attrStr + piClosingChar + '>' + val + tagEndExp );
     } else if (this.options.commentPropName !== false && key === this.options.commentPropName && piClosingChar.length === 0) {
       return this.indentate(level) + `<!--${val}-->` + this.newLine;
@@ -71163,7 +71174,7 @@ function indentate(level) {
 }
 
 function isAttribute(name /*, options*/) {
-  if (name.startsWith(this.options.attributeNamePrefix)) {
+  if (name.startsWith(this.options.attributeNamePrefix) && name !== this.options.textNodeName) {
     return name.substr(this.attrPrefixLen);
   } else {
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.102.9",
+    "version": "2.102.11",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.102.9",
+        "@abaplint/core": "^2.102.11",
         "@types/chai": "^4.3.5",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",