@abaplint/cli 2.102.10 → 2.102.12

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.10";
+        return "2.102.12";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -55720,13 +55721,14 @@ ${indentation}    output = ${uniqueName}.\n`;
             }
         }
     }
+    // todo, optimize, the findVariable() and findType() does a lot of redundant checks
     existsRecursive(spag, name) {
-        const existsDirect = spag.findVariable(name);
+        const existsDirect = spag.findVariable(name) || spag.findType(name);
         if (existsDirect) {
             return true;
         }
         for (const child of spag.getChildren()) {
-            if (child.findVariable(name) || this.existsRecursive(child, name)) {
+            if (child.findVariable(name) || child.findType(name) || this.existsRecursive(child, name)) {
                 return true;
             }
         }
@@ -70994,10 +70996,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 +71101,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 +71175,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.10",
+    "version": "2.102.12",
     "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.10",
+        "@abaplint/core": "^2.102.12",
         "@types/chai": "^4.3.5",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",