@abaplint/transpiler-cli 2.7.55 → 2.7.56

package/build/bundle.js

@@ -20911,6 +20911,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;
@@ -47609,7 +47610,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.8";
+        return "2.102.14";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -52246,6 +52247,7 @@ const objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplin
 const _builtin_1 = __webpack_require__(/*! ../abap/5_syntax/_builtin */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_builtin.js");
 const _scope_type_1 = __webpack_require__(/*! ../abap/5_syntax/_scope_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_scope_type.js");
 const statements_1 = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const crypto = __webpack_require__(/*! crypto */ "crypto");
 // todo: refactor each sub-rule to new classes?
 // todo: add configuration
 class DownportConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -52507,13 +52509,12 @@ Make sure to test the downported code, it might not always be completely correct
                     }
                 }
             }
-            else if (ret.length === 0 && / xsdbool\(/i.test(lowFile.getRaw())) {
+            if (ret.length === 0 && lowFile.getRaw().includes(" xsdbool( ")) {
                 for (let i = 0; i < lowStatements.length; i++) {
                     const high = highStatements[i];
                     const issue = this.replaceXsdBool(high, lowFile, highSyntax);
                     if (issue) {
                         ret.push(issue);
-                        break;
                     }
                 }
             }
@@ -52548,11 +52549,13 @@ Make sure to test the downported code, it might not always be completely correct
             return undefined;
         }
         // downport XSDBOOL() early, as it is valid 702 syntax
+        /*
         let found = this.replaceXsdBool(high, lowFile, highSyntax);
         if (found) {
-            return found;
+          return found;
         }
-        found = this.downportEnum(low, high, lowFile, highSyntax, highFile);
+        */
+        let found = this.downportEnum(low, high, lowFile, highSyntax, highFile);
         if (found) {
             return found;
         }
@@ -54763,8 +54766,14 @@ ${indentation}    output = ${uniqueName}.\n`;
             this.counter++;
             return name;
         }
+        let postfix = "";
+        if (spag.getIdentifier().stype === _scope_type_1.ScopeType.ClassDefinition) {
+            // try making sure this name is not used in subclasses
+            const hash = crypto.createHash("sha1").update(spag.getIdentifier().sname).digest("hex");
+            postfix = "_" + hash.substring(0, 10);
+        }
         while (true) {
-            const name = "temp" + this.counter;
+            const name = "temp" + this.counter + postfix;
             const exists = this.existsRecursive(spag, name);
             this.counter++;
             if (exists === false) {
@@ -54772,13 +54781,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;
             }
         }
@@ -54790,7 +54800,20 @@ ${indentation}    output = ${uniqueName}.\n`;
             if (r.referenceType === _reference_1.ReferenceType.BuiltinMethodReference
                 && r.position.getName().toUpperCase() === "XSDBOOL") {
                 const token = r.position.getToken();
-                const fix = edit_helper_1.EditHelper.replaceRange(lowFile, token.getStart(), token.getEnd(), "boolc");
+                let source = undefined;
+                for (const s of node.findAllExpressionsRecursive(Expressions.Source)) {
+                    if (s.getFirstToken().getStart().equals(token.getStart())) {
+                        source = s;
+                        break;
+                    }
+                }
+                const children = source === null || source === void 0 ? void 0 : source.getChildren();
+                if (source === undefined || (children === null || children === void 0 ? void 0 : children.length) !== 4) {
+                    continue;
+                }
+                // make sure to convert to the correct type, RTTI might be used on the result of XSDBOOL
+                const code = "CONV xsdboolean( boolc( " + children[2].concatTokens() + " ) )";
+                const fix = edit_helper_1.EditHelper.replaceRange(lowFile, source.getFirstToken().getStart(), source.getLastToken().getEnd(), code);
                 return issue_1.Issue.atToken(lowFile, token, "Use BOOLC", this.getMetadata().key, this.conf.severity, fix);
             }
         }
@@ -73881,7 +73904,11 @@ class CallFunctionTranspiler {
             ret.appendString(`await abap.statements.callFunction({name:${fmname},destination:${s.getCode()}${param}});`);
         }
         else {
-            ret.appendString(`await abap.FunctionModules[${fmname}](${param});`);
+            const illegalFunc = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_FUNC'", node.getFirstToken(), true);
+            const call = `abap.FunctionModules[${fmname}]`;
+            ret.appendString(`if (${call} === undefined && ${illegalFunc} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_FUNC not found"; }\n`);
+            ret.appendString(`if (${call} === undefined) { throw new ${illegalFunc}(); }\n`);
+            ret.appendString(`await ${call}(${param});`);
         }
         if (exceptions) {
             const build = call_1.CallTranspiler.buildExceptions(exceptions);
@@ -82067,10 +82094,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);
@@ -82163,7 +82199,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;
@@ -82236,7 +82273,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;
@@ -92548,6 +92585,17 @@ module.exports = require("child_process");
 
 /***/ }),
 
+/***/ "crypto":
+/*!*************************!*\
+  !*** external "crypto" ***!
+  \*************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("crypto");
+
+/***/ }),
+
 /***/ "events":
 /*!*************************!*\
   !*** external "events" ***!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.7.55",
+  "version": "2.7.56",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -26,12 +26,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.7.55",
+    "@abaplint/transpiler": "^2.7.56",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
     "@types/node": "^20.4.5",
-    "@abaplint/core": "^2.102.8",
+    "@abaplint/core": "^2.102.14",
     "progress": "^2.0.3",
     "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4",