@abaplint/cli 2.113.121 → 2.113.122

package/build/cli.js

@@ -973,7 +973,11 @@ async function loadDependencies(config, compress, bar, base) {
         if (d.url) {
             process.stderr.write("Clone: " + d.url + "\n");
             const dir = fs.mkdtempSync(path.join(os.tmpdir(), "abaplint-"));
-            childProcess.execSync("git clone --quiet --depth 1 " + d.url + " .", { cwd: dir, stdio: "inherit" });
+            let branch = "";
+            if (d.branch) {
+                branch = "-b " + d.branch + " ";
+            }
+            childProcess.execSync("git clone --quiet --depth 1 " + branch + d.url + " .", { cwd: dir, stdio: "inherit" });
             const names = file_operations_1.FileOperations.loadFileNames(dir + d.files);
             files = files.concat(await file_operations_1.FileOperations.loadFiles(compress, names, bar));
             file_operations_1.FileOperations.deleteFolderRecursive(dir);
@@ -23184,6 +23188,7 @@ exports.TypeUtils = void 0;
 const types_1 = __webpack_require__(/*! ../types */ "./node_modules/@abaplint/core/build/src/abap/types/index.js");
 const basic_1 = __webpack_require__(/*! ../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const cgeneric_type_1 = __webpack_require__(/*! ../types/basic/cgeneric_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/cgeneric_type.js");
+const Expressions = __webpack_require__(/*! ../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 // todo: refactor to static? for performance
 class TypeUtils {
     constructor(scope) {
@@ -23402,8 +23407,22 @@ class TypeUtils {
         }
         return false;
     }
-    isAssignableStrict(source, target, calculated = false) {
+    isCalculated(node) {
+        /*
+        if (node.getChildren().length === 1
+            && node.get() instanceof Expressions.Source
+            && node.getFirstChild()?.get() instanceof Expressions.MethodCallChain) {
+          return false;
+        }
+        */
+        const calculated = node.findFirstExpression(Expressions.MethodCallChain) !== undefined
+            || node.findFirstExpression(Expressions.StringTemplate) !== undefined
+            || node.findFirstExpression(Expressions.ArithOperator) !== undefined;
+        return calculated;
+    }
+    isAssignableStrict(source, target, node) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
+        const calculated = node ? this.isCalculated(node) : false;
         /*
             console.dir(source);
             console.dir(target);
@@ -23455,6 +23474,13 @@ class TypeUtils {
         else if (source instanceof basic_1.StringType) {
             if (target instanceof basic_1.StructureType && this.structureContainsString(target)) {
                 return false;
+                /*
+              } else if (target instanceof CharacterType) {
+                if (source.getAbstractTypeData()?.derivedFromConstant === true) {
+                  return true;
+                }
+                return false;
+                */
             }
             else if (target instanceof basic_1.IntegerType) {
                 if (((_f = source.getAbstractTypeData()) === null || _f === void 0 ? void 0 : _f.derivedFromConstant) === true) {
@@ -26683,15 +26709,12 @@ class MethodCallParam {
             if (child.get() instanceof Expressions.Source) {
                 sourceType = new source_1.Source().runSyntax(child, input, targetType);
             }
-            const calculated = child.findFirstExpression(Expressions.MethodCallChain) !== undefined
-                || child.findFirstExpression(Expressions.StringTemplate) !== undefined
-                || child.findFirstExpression(Expressions.ArithOperator) !== undefined;
             if (sourceType === undefined) {
                 const message = "No source type determined, method source";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
             }
-            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(sourceType, targetType, calculated) === false) {
+            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(sourceType, targetType, child) === false) {
                 const message = "Method parameter type not compatible";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
@@ -26982,15 +27005,12 @@ class MethodParameters {
         }
         for (const item of items) {
             const parameter = allImporting.find(p => p.getName().toUpperCase() === item.name);
-            const calculated = item.source.findFirstExpression(Expressions.MethodCallChain) !== undefined
-                || item.source.findFirstExpression(Expressions.StringTemplate) !== undefined
-                || item.source.findFirstExpression(Expressions.ArithOperator) !== undefined;
             if (parameter === undefined) {
                 const message = "Method importing parameter \"" + item.name + "\" does not exist";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 continue;
             }
-            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(item.sourceType, parameter.getType(), calculated) === false) {
+            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(item.sourceType, parameter.getType(), item.source) === false) {
                 const message = "Method parameter type not compatible, " + item.name;
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
@@ -30902,16 +30922,13 @@ class CreateObject {
             }
             const source = p.findDirectExpression(Expressions.Source);
             const sourceType = new source_1.Source().runSyntax(source, input);
-            const calculated = (source === null || source === void 0 ? void 0 : source.findFirstExpression(Expressions.MethodCallChain)) !== undefined
-                || (source === null || source === void 0 ? void 0 : source.findFirstExpression(Expressions.StringTemplate)) !== undefined
-                || (source === null || source === void 0 ? void 0 : source.findFirstExpression(Expressions.ArithOperator)) !== undefined;
             const found = allImporting === null || allImporting === void 0 ? void 0 : allImporting.find(p => p.getName().toUpperCase() === name);
             if (found === undefined) {
                 const message = `constructor parameter "${name}" does not exist`;
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
             }
-            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(sourceType, found.getType(), calculated) === false) {
+            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(sourceType, found.getType(), source) === false) {
                 const message = `constructor parameter "${name}" type not compatible`;
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
@@ -54213,7 +54230,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.121";
+        return "2.113.122";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -62955,6 +62972,7 @@ https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#check-vs-re
             else if (this.conf.allowCheck === false && get instanceof Statements.Check && stack.length === 0) {
                 const message = "CHECK is not allowed outside of loops";
                 let tokensString = statement.concatTokens();
+                tokensString = tokensString.replace(/^check /i, "CHECK ");
                 tokensString = tokensString.split("CHECK")[1].trim();
                 const replacement = "IF NOT " + tokensString + "\n  RETURN.\nENDIF.";
                 const fix = edit_helper_1.EditHelper.replaceRange(file, statement.getFirstToken().getStart(), statement.getLastToken().getEnd(), replacement);
@@ -76483,8 +76501,9 @@ ENDINTERFACE.`,
         var _a;
         const issues = [];
         for (const s of ((_a = file.getStructure()) === null || _a === void 0 ? void 0 : _a.findAllStatements(Statements.MethodDef)) || []) {
-            if (s.findDirectExpression(Expressions.MethodDefExceptions)) {
-                issues.push(issue_1.Issue.atStatement(file, s, this.getMessage(), this.getMetadata().key));
+            const expr = s.findDirectExpression(Expressions.MethodDefExceptions);
+            if (expr) {
+                issues.push(issue_1.Issue.atToken(file, expr.getFirstToken(), this.getMessage(), this.getMetadata().key));
             }
         }
         return issues;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.121",
+    "version": "2.113.122",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.121",
+        "@abaplint/core": "^2.113.122",
         "@types/chai": "^4.3.20",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
@@ -53,7 +53,7 @@
         "json5": "^2.2.3",
         "memfs": "^4.17.2",
         "minimist": "^1.2.8",
-        "mocha": "^11.4.0",
+        "mocha": "^11.5.0",
         "progress": "^2.0.3",
         "typescript": "^5.8.3",
         "webpack": "^5.99.9",