@abaplint/cli 2.105.22 → 2.105.24

package/build/cli.js

@@ -658,7 +658,14 @@ class Junit {
         return code.map(str => str).join("\n");
     }
     formatFailureMessage(message) {
-        return message.replace("<", "").replace(">", "");
+        let ret = message;
+        while (ret.includes("<")) {
+            ret = ret.replace("<", "&lt;");
+        }
+        while (ret.includes(">")) {
+            ret = ret.replace(">", "&gt;");
+        }
+        return ret;
     }
 }
 exports.Junit = Junit;
@@ -22570,7 +22577,8 @@ class TypeUtils {
                 }
                 return false;
             }
-            else if (target instanceof cgeneric_type_1.CGenericType) {
+            else if (target instanceof cgeneric_type_1.CGenericType
+                || target instanceof basic_1.GenericObjectReferenceType) {
                 return false;
             }
             else if (target instanceof basic_1.XSequenceType || target instanceof basic_1.XStringType) {
@@ -24340,19 +24348,22 @@ const let_1 = __webpack_require__(/*! ./let */ "./node_modules/@abaplint/core/bu
 class ConvBody {
     runSyntax(node, scope, filename) {
         if (node === undefined) {
-            return;
+            throw new Error("ConvBody, node undefined");
         }
         let scoped = false;
         const l = node.findDirectExpression(Expressions.Let);
         if (l) {
             scoped = new let_1.Let().runSyntax(l, scope, filename);
         }
-        for (const s of node.findDirectExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename);
+        const s = node.findDirectExpression(Expressions.Source);
+        if (s === undefined) {
+            throw new Error("ConvBody, no source found");
         }
+        const sourceType = new source_1.Source().runSyntax(s, scope, filename);
         if (scoped === true) {
             scope.pop(node.getLastToken().getEnd());
         }
+        return sourceType;
     }
 }
 exports.ConvBody = ConvBody;
@@ -26698,6 +26709,7 @@ const _builtin_1 = __webpack_require__(/*! ../_builtin */ "./node_modules/@abapl
 const attribute_chain_1 = __webpack_require__(/*! ./attribute_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/attribute_chain.js");
 const dereference_1 = __webpack_require__(/*! ./dereference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/dereference.js");
 const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
+const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 /*
 * Type interference, valid scenarios:
 * typed = VALUE #( ... ).         right hand side must follow left hand type
@@ -26781,7 +26793,10 @@ class Source {
                 case "CONV":
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
-                        new conv_body_1.ConvBody().runSyntax(node.findDirectExpression(Expressions.ConvBody), scope, filename);
+                        const bodyType = new conv_body_1.ConvBody().runSyntax(node.findDirectExpression(Expressions.ConvBody), scope, filename);
+                        if (new _type_utils_1.TypeUtils(scope).isAssignable(foundType, bodyType) === false) {
+                            throw new Error("CONV: Types not compatible");
+                        }
                         this.addIfInferred(node, scope, filename, foundType);
                         return foundType;
                     }
@@ -28227,6 +28242,7 @@ const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_module
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const fstarget_1 = __webpack_require__(/*! ../expressions/fstarget */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/fstarget.js");
 const inline_data_1 = __webpack_require__(/*! ../expressions/inline_data */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/inline_data.js");
+const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 // todo: issue error for short APPEND if the source is without header line
 class Append {
     runSyntax(node, scope, filename) {
@@ -28269,7 +28285,17 @@ class Append {
             else if (targetType instanceof basic_1.VoidType) {
                 rowType = targetType;
             }
-            new source_1.Source().runSyntax(source, scope, filename, rowType);
+            const sourceType = new source_1.Source().runSyntax(source, scope, filename, rowType);
+            if (node.findDirectTokenByText("LINES")) {
+                if (new _type_utils_1.TypeUtils(scope).isAssignable(sourceType, targetType) === false) {
+                    throw new Error("Incompatible types");
+                }
+            }
+            else {
+                if (new _type_utils_1.TypeUtils(scope).isAssignable(sourceType, rowType) === false) {
+                    throw new Error("Incompatible types");
+                }
+            }
         }
         const from = node.findExpressionAfterToken("FROM");
         if (from && from.get() instanceof Expressions.Source) {
@@ -31667,7 +31693,7 @@ class ReadTable {
             }
             else if (t) {
                 const targetType = new target_1.Target().runSyntax(t, scope, filename);
-                if (new _type_utils_1.TypeUtils(scope).isAssignable(rowType, targetType) === false) {
+                if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(rowType, targetType) === false) {
                     throw new Error("Incompatible types");
                 }
             }
@@ -51304,7 +51330,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.105.22";
+        return "2.105.24";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.105.22",
+    "version": "2.105.24",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,12 +38,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.105.22",
+        "@abaplint/core": "^2.105.24",
         "@types/chai": "^4.3.12",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.11.20",
+        "@types/node": "^20.11.22",
         "@types/progress": "^2.0.7",
         "chai": "^4.4.1",
         "chalk": "^5.3.0",