@abaplint/core 2.95.46 → 2.95.48

package/build/src/abap/5_syntax/expressions/source.js

@@ -65,7 +65,7 @@ class Source {
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
                         const bodyType = new reduce_body_1.ReduceBody().runSyntax(node.findDirectExpression(Expressions.ReduceBody), scope, filename, foundType);
-                        if (foundType === undefined) {
+                        if (foundType === undefined || foundType.isGeneric() === true) {
                             this.addIfInferred(node, scope, filename, bodyType);
                         }
                         return foundType ? foundType : bodyType;
@@ -74,7 +74,7 @@ class Source {
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
                         const bodyType = new switch_body_1.SwitchBody().runSyntax(node.findDirectExpression(Expressions.SwitchBody), scope, filename);
-                        if (foundType === undefined) {
+                        if (foundType === undefined || foundType.isGeneric() === true) {
                             this.addIfInferred(node, scope, filename, bodyType);
                         }
                         return foundType ? foundType : bodyType;
@@ -83,7 +83,7 @@ class Source {
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
                         const bodyType = new cond_body_1.CondBody().runSyntax(node.findDirectExpression(Expressions.CondBody), scope, filename, foundType);
-                        if (foundType === undefined) {
+                        if (foundType === undefined || foundType.isGeneric() === true) {
                             this.addIfInferred(node, scope, filename, bodyType);
                         }
                         return foundType ? foundType : bodyType;

package/build/src/abap/5_syntax/expressions/string_template.js

@@ -9,7 +9,7 @@ class StringTemplate {
         for (const s of node.findAllExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename, new basic_1.StringType({ qualifiedName: "STRING" }));
         }
-        return new basic_1.StringType();
+        return new basic_1.StringType({ qualifiedName: "STRING" });
     }
 }
 exports.StringTemplate = StringTemplate;

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.46";
+        return "2.95.48";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -285,6 +285,16 @@ Only one transformation is applied to a statement at a time, so multiple steps m
                     }
                 }
             }
+            else if (ret.length === 0 && / xsdbool\(/i.test(lowFile.getRaw())) {
+                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;
+                    }
+                }
+            }
         }
         return ret;
     }
@@ -315,7 +325,12 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (low.getFirstToken().getStart() instanceof position_1.VirtualPosition) {
             return undefined;
         }
-        let found = this.downportEnum(low, high, lowFile, highSyntax, highFile);
+        // downport XSDBOOL() early, as it is valid 702 syntax
+        let found = this.replaceXsdBool(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
+        found = this.downportEnum(low, high, lowFile, highSyntax, highFile);
         if (found) {
             return found;
         }
@@ -457,10 +472,6 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.replaceXsdBool(high, lowFile, highSyntax);
-        if (found) {
-            return found;
-        }
         found = this.replaceLineFunctions(high, lowFile, highSyntax, highFile);
         if (found) {
             return found;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.95.46",
+    "version": "2.95.48",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
         "@microsoft/api-extractor": "^7.34.4",
         "@types/chai": "^4.3.4",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.15.3",
+        "@types/node": "^18.15.5",
         "chai": "^4.3.7",
         "eslint": "^8.36.0",
         "mocha": "^10.2.0",