@abaplint/transpiler-cli 2.7.120 → 2.7.121

package/build/bundle.js

@@ -49047,7 +49047,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.60";
+        return "2.102.61";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -51611,7 +51611,7 @@ class CheckSubrc extends _abap_rule_1.ABAPRule {
 
 If sy-dbcnt is checked after database statements, it is considered okay.
 
-"SELECT SINGLE @abap_true FROM " is considered as an existence check
+"SELECT SINGLE @abap_true FROM " is considered as an existence check, also "SELECT COUNT( * )" is considered okay
 
 If IS ASSIGNED is checked after assigning, it is considered okay.
 
@@ -51662,6 +51662,8 @@ FIND statement with MATCH COUNT is considered okay if subrc is not checked`,
             else if (config.selectTable === true
                 && statement.get() instanceof Statements.Select
                 && statement.concatTokens().toUpperCase().startsWith("SELECT SINGLE ") === false
+                && statement.concatTokens().toUpperCase().startsWith("SELECT COUNT( * ) ") === false
+                && statement.concatTokens().toUpperCase().startsWith("SELECT COUNT(*) ") === false
                 && this.isChecked(i, statements) === false
                 && this.checksDbcnt(i, statements) === false) {
                 issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.conf.severity));
@@ -78607,6 +78609,7 @@ exports.MessageTranspiler = MessageTranspiler;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MethodImplementationTranspiler = void 0;
+/* eslint-disable max-len */
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
 const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
@@ -78615,7 +78618,7 @@ const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/tr
 const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
 class MethodImplementationTranspiler {
     transpile(node, traversal) {
-        var _a, _b;
+        var _a, _b, _c;
         const token = node.findFirstExpression(abaplint.Expressions.MethodName).getFirstToken();
         let methodName = token.getStr();
         const scope = traversal.findCurrentScopeByToken(token);
@@ -78647,13 +78650,27 @@ class MethodImplementationTranspiler {
                     unique = "INPUT";
                 }
                 const parameterDefault = methodDef === null || methodDef === void 0 ? void 0 : methodDef.getParameterDefault(varName);
-                //        const isOptional = methodDef?.getOptional().includes(varName.toUpperCase());
+                const isOptional = methodDef === null || methodDef === void 0 ? void 0 : methodDef.getOptional().includes(varName.toUpperCase());
                 const passByValue = identifier.getMeta().includes("pass_by_value" /* abaplint.IdentifierMeta.PassByValue */);
                 const type = identifier.getType();
                 if (identifier.getMeta().includes("exporting" /* abaplint.IdentifierMeta.MethodExporting */)) {
                     after += `let ${varName} = ${unique}?.${varName} || ${new transpile_types_1.TranspileTypes().toType(identifier.getType())};\n`;
+                    // begin new
+                }
+                else if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
+                    && parameterDefault === undefined
+                    && passByValue === false
+                    && isOptional === false
+                    && type.isGeneric() === false) {
+                    after += `let ${varName} = ${unique}?.${varName};\n`;
+                    if (identifier.getType().getQualifiedName() !== undefined && identifier.getType().getQualifiedName() !== "") {
+                        after += `if (${varName}.getQualifiedName() !== "${(_a = identifier.getType().getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()}") { ${varName} = undefined; }\n`;
+                    }
+                    after += `if (${varName} === undefined) { ${varName} = ${new transpile_types_1.TranspileTypes().toType(identifier.getType())}.set(${unique}.${varName}); }\n`;
+                    // end new
                 }
-                else if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */) && type.isGeneric() === false) {
+                else if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
+                    && type.isGeneric() === false) {
                     after += new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
                     // note: it might be nessesary to do a type conversion, eg char is passed to xstring parameter
                     after += "if (" + unique + " && " + unique + "." + varName + ") {" + varName + ".set(" + unique + "." + varName + ");}\n";
@@ -78663,67 +78680,7 @@ class MethodImplementationTranspiler {
                     after += "if (" + unique + " && " + unique + "." + varName + ") {" + varName + " = " + unique + "." + varName + ";}\n";
                 }
                 if (parameterDefault) {
-                    let val = "";
-                    if (parameterDefault.get() instanceof abaplint.Expressions.Constant) {
-                        val = new expressions_1.ConstantTranspiler().transpile(parameterDefault, traversal).getCode();
-                    }
-                    else if (parameterDefault.get() instanceof abaplint.Expressions.FieldChain) {
-                        if (parameterDefault.getFirstToken().getStr().toLowerCase() === "abap_true") {
-                            val = "abap.builtin.abap_true";
-                        }
-                        else if (parameterDefault.getFirstToken().getStr().toLowerCase() === "abap_false") {
-                            val = "abap.builtin.abap_false";
-                        }
-                        else if (parameterDefault.getFirstToken().getStr().toLowerCase() === "abap_undefined") {
-                            val = "abap.builtin.abap_undefined";
-                        }
-                        else if (parameterDefault.getFirstToken().getStr().toLowerCase() === "space") {
-                            val = "abap.builtin.space";
-                        }
-                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-langu") {
-                            val = "abap.builtin.sy.get().langu";
-                        }
-                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-mandt") {
-                            val = "abap.builtin.sy.get().mandt";
-                        }
-                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-uname") {
-                            val = "abap.builtin.sy.get().uname";
-                        }
-                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-sysid") {
-                            val = "abap.builtin.sy.get().sysid";
-                        }
-                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-msgid") {
-                            val = "abap.builtin.sy.get().msgid";
-                        }
-                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-msgty") {
-                            val = "abap.builtin.sy.get().msgty";
-                        }
-                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-msgno") {
-                            val = "abap.builtin.sy.get().msgno";
-                        }
-                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-msgv1") {
-                            val = "abap.builtin.sy.get().msgv1";
-                        }
-                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-msgv2") {
-                            val = "abap.builtin.sy.get().msgv2";
-                        }
-                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-msgv3") {
-                            val = "abap.builtin.sy.get().msgv3";
-                        }
-                        else if (parameterDefault.concatTokens().toLowerCase() === "sy-msgv4") {
-                            val = "abap.builtin.sy.get().msgv4";
-                        }
-                        else {
-                            // note: this can be difficult, the "def" might be from an interface, ie. a different scope than the method
-                            val = new expressions_1.FieldChainTranspiler().transpile(parameterDefault, traversal, true, methodDef === null || methodDef === void 0 ? void 0 : methodDef.getFilename(), true).getCode();
-                            if (val.startsWith(parameterDefault.getFirstToken().getStr().toLowerCase()) === true) {
-                                val = "this." + val;
-                            }
-                        }
-                    }
-                    else {
-                        throw new Error("MethodImplementationTranspiler, unknown default param type");
-                    }
+                    const val = this.buildDefault(parameterDefault, traversal, methodDef === null || methodDef === void 0 ? void 0 : methodDef.getFilename());
                     if (passByValue === true || identifier.getMeta().includes("changing" /* abaplint.IdentifierMeta.MethodChanging */)) {
                         after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varName + ".set(" + val + ");}\n";
                     }
@@ -78756,7 +78713,7 @@ class MethodImplementationTranspiler {
         }
         if (method && method.isStatic()) {
             // in ABAP static methods can be called with instance arrows, "->"
-            const className = (_b = (_a = scope.getParent()) === null || _a === void 0 ? void 0 : _a.getIdentifier().sname) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+            const className = (_c = (_b = scope.getParent()) === null || _b === void 0 ? void 0 : _b.getIdentifier().sname) === null || _c === void 0 ? void 0 : _c.toLowerCase();
             staticMethod = "async " + traversal_1.Traversal.escapeNamespace(methodName) + "(" + unique + ") {\n" +
                 "return " + traversal_1.Traversal.escapeNamespace(className) + "." + traversal_1.Traversal.escapeNamespace(methodName) + "(" + unique + ");\n" +
                 "}\n" + "static ";
@@ -78766,6 +78723,77 @@ class MethodImplementationTranspiler {
         return new chunk_1.Chunk().append(str, node, traversal);
     }
     /////////////////////////////
+    buildDefault(parameterDefault, traversal, filename) {
+        let val = "";
+        if (parameterDefault.get() instanceof abaplint.Expressions.Constant) {
+            val = new expressions_1.ConstantTranspiler().transpile(parameterDefault, traversal).getCode();
+        }
+        else if (parameterDefault.get() instanceof abaplint.Expressions.FieldChain) {
+            val = this.buildDefaultFallback(parameterDefault, traversal, filename);
+        }
+        else {
+            throw new Error("MethodImplementationTranspiler, unknown default param type");
+        }
+        return val;
+    }
+    buildDefaultFallback(parameterDefault, traversal, filename) {
+        let val = "";
+        const firstTokenLower = parameterDefault.getFirstToken().getStr().toLowerCase();
+        const concat = parameterDefault.concatTokens().toLowerCase();
+        if (firstTokenLower === "abap_true") {
+            val = "abap.builtin.abap_true";
+        }
+        else if (firstTokenLower === "abap_false") {
+            val = "abap.builtin.abap_false";
+        }
+        else if (firstTokenLower === "abap_undefined") {
+            val = "abap.builtin.abap_undefined";
+        }
+        else if (firstTokenLower === "space") {
+            val = "abap.builtin.space";
+        }
+        else if (concat === "sy-langu") {
+            val = "abap.builtin.sy.get().langu";
+        }
+        else if (concat === "sy-mandt") {
+            val = "abap.builtin.sy.get().mandt";
+        }
+        else if (concat === "sy-uname") {
+            val = "abap.builtin.sy.get().uname";
+        }
+        else if (concat === "sy-sysid") {
+            val = "abap.builtin.sy.get().sysid";
+        }
+        else if (concat === "sy-msgid") {
+            val = "abap.builtin.sy.get().msgid";
+        }
+        else if (concat === "sy-msgty") {
+            val = "abap.builtin.sy.get().msgty";
+        }
+        else if (concat === "sy-msgno") {
+            val = "abap.builtin.sy.get().msgno";
+        }
+        else if (concat === "sy-msgv1") {
+            val = "abap.builtin.sy.get().msgv1";
+        }
+        else if (concat === "sy-msgv2") {
+            val = "abap.builtin.sy.get().msgv2";
+        }
+        else if (concat === "sy-msgv3") {
+            val = "abap.builtin.sy.get().msgv3";
+        }
+        else if (concat === "sy-msgv4") {
+            val = "abap.builtin.sy.get().msgv4";
+        }
+        else {
+            // note: this can be difficult, the "def" might be from an interface, ie. a different scope than the method
+            val = new expressions_1.FieldChainTranspiler().transpile(parameterDefault, traversal, true, filename, true).getCode();
+            if (val.startsWith(parameterDefault.getFirstToken().getStr().toLowerCase()) === true) {
+                val = "this." + val;
+            }
+        }
+        return val;
+    }
     findMethod(name, cdef, traversal) {
         var _a, _b;
         if (cdef === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.7.120",
+  "version": "2.7.121",
   "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.120",
+    "@abaplint/transpiler": "^2.7.121",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.6",
-    "@types/node": "^20.8.7",
-    "@abaplint/core": "^2.102.60",
+    "@types/node": "^20.8.8",
+    "@abaplint/core": "^2.102.61",
     "progress": "^2.0.3",
     "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4",