@abaplint/core 2.83.18 → 2.83.22

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

@@ -6,10 +6,10 @@ const expressions_1 = require("../../2_statements/expressions");
 class Constant {
     runSyntax(node) {
         if (node.findDirectExpression(expressions_1.Integer)) {
-            return new basic_1.IntegerType();
+            return new basic_1.IntegerType("I");
         }
         else {
-            return new basic_1.StringType();
+            return new basic_1.StringType("STRING");
         }
     }
 }

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

@@ -58,12 +58,15 @@ class Source {
                         const method = new _builtin_1.BuiltIn().searchBuiltin(tok);
                         scope.addReference(token, method, _reference_1.ReferenceType.BuiltinMethodReference, filename);
                         new cond_1.Cond().runSyntax(node.findDirectExpression(Expressions.Cond), scope, filename);
-                        return new basic_1.CharacterType(1);
+                        return new basic_1.CharacterType(1, "ABAP_BOOL");
                     }
                 case "REDUCE":
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
                         const bodyType = new reduce_body_1.ReduceBody().runSyntax(node.findDirectExpression(Expressions.ReduceBody), scope, filename);
+                        if (foundType === undefined) {
+                            this.addIfInferred(node, scope, filename, bodyType);
+                        }
                         return foundType ? foundType : bodyType;
                     }
                 case "SWITCH":
@@ -75,7 +78,11 @@ class Source {
                 case "COND":
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
-                        return new cond_body_1.CondBody().runSyntax(node.findDirectExpression(Expressions.CondBody), scope, filename, foundType);
+                        const bodyType = new cond_body_1.CondBody().runSyntax(node.findDirectExpression(Expressions.CondBody), scope, filename, foundType);
+                        if (foundType === undefined) {
+                            this.addIfInferred(node, scope, filename, bodyType);
+                        }
+                        return foundType ? foundType : bodyType;
                     }
                 case "CONV":
                     {
@@ -155,6 +162,18 @@ class Source {
         return context;
     }
     ////////////////////////////////
+    addIfInferred(node, scope, filename, inferredType) {
+        const basic = new basic_types_1.BasicTypes(filename, scope);
+        const typeExpression = node.findFirstExpression(Expressions.TypeNameOrInfer);
+        const typeToken = typeExpression === null || typeExpression === void 0 ? void 0 : typeExpression.getFirstToken();
+        const typeName = typeToken === null || typeToken === void 0 ? void 0 : typeToken.getStr();
+        if (typeName === "#" && inferredType) {
+            const found = basic.lookupQualifiedName(inferredType.getQualifiedName());
+            if (found) {
+                scope.addReference(typeToken, found, _reference_1.ReferenceType.InferredType, filename);
+            }
+        }
+    }
     determineType(node, scope, filename, targetType) {
         const basic = new basic_types_1.BasicTypes(filename, scope);
         const typeExpression = node.findFirstExpression(Expressions.TypeNameOrInfer);

package/build/src/objects/_abstract_object.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractObject = void 0;
-const fastxmlparser = require("fast-xml-parser");
+const fast_xml_parser_1 = require("fast-xml-parser");
 const _identifier_1 = require("../abap/4_file_information/_identifier");
 const identifier_1 = require("../abap/1_lexer/tokens/identifier");
 const position_1 = require("../position");
@@ -100,7 +100,7 @@ class AbstractObject {
             return undefined;
         }
         try {
-            return fastxmlparser.parse(xml, { parseNodeValue: false, ignoreAttributes: true, trimValues: false });
+            return new fast_xml_parser_1.XMLParser({ parseTagValue: false, ignoreAttributes: true, trimValues: false }).parse(xml);
         }
         catch (_a) {
             return undefined;

package/build/src/objects/function_group.js

@@ -4,7 +4,7 @@ exports.FunctionGroup = void 0;
 const _abap_object_1 = require("./_abap_object");
 const types_1 = require("../abap/types");
 const xml_utils_1 = require("../xml_utils");
-const fastxmlparser = require("fast-xml-parser");
+const fast_xml_parser_1 = require("fast-xml-parser");
 class FunctionGroup extends _abap_object_1.ABAPObject {
     constructor() {
         super(...arguments);
@@ -123,7 +123,7 @@ class FunctionGroup extends _abap_object_1.ABAPObject {
             if (found === undefined) {
                 return {};
             }
-            const parsed = fastxmlparser.parse(found.getRaw(), { parseNodeValue: false, ignoreAttributes: true, trimValues: false });
+            const parsed = new fast_xml_parser_1.XMLParser({ parseTagValue: false, ignoreAttributes: true, trimValues: false }).parse(found.getRaw());
             this.findTexts(parsed);
         }
         return this.texts;

package/build/src/registry.js

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

package/build/src/rules/definitions_top.js

@@ -47,10 +47,10 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
         if (structure === undefined) {
             return [];
         }
-        // one fix per file
-        this.fixed = false;
         const routines = structure.findAllStructures(Structures.Form).concat(structure.findAllStructures(Structures.Method));
         for (const r of routines) {
+            // one fix per routine
+            this.fixed = false;
             this.mode = DEFINITION;
             this.moveTo = r.getFirstStatement();
             const found = this.walk(r, file);
@@ -89,7 +89,7 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
                     || c.get() instanceof Statements.Static
                     || c.get() instanceof Statements.FieldSymbol)) {
                 if (this.mode === AFTER) {
-                    // only one fix per file, as it reorders a lot
+                    // only one fix per routine, as it reorders a lot
                     let fix = undefined;
                     if (this.fixed === false && this.moveTo) {
                         fix = this.buildFix(file, c, this.moveTo);

package/build/src/rules/downport.js

@@ -55,6 +55,7 @@ Current rules:
 * SELECT/INSERT/MODIFY/DELETE/UPDATE "," in field list removed, "@" in source/targets removed
 * PARTIALLY IMPLEMENTED removed, it can be quick fixed via rule implement_methods
 * RAISE EXCEPTION ... MESSAGE
+* APPEND expression is outlined
 
 Only one transformation is applied to a statement at a time, so multiple steps might be required to do the full downport.`,
             tags: [_irule_1.RuleTag.Experimental, _irule_1.RuleTag.Downport, _irule_1.RuleTag.Quickfix],
@@ -223,6 +224,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.replaceAppendExpression(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         // todo, add more rules here
         return undefined;
     }
@@ -364,6 +369,28 @@ ${indentation}`);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, inlineData.getFirstToken(), "Outline SELECT @DATA", this.getMetadata().key, this.conf.severity, fix);
     }
+    replaceAppendExpression(high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.Append)) {
+            return undefined;
+        }
+        const children = high.getChildren();
+        if (children[1].get() instanceof Expressions.Source) {
+            const source = children[1];
+            const target = high.findDirectExpression(Expressions.Target);
+            if (target === undefined) {
+                return undefined;
+            }
+            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            const firstToken = high.getFirstToken();
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${uniqueName} LIKE LINE OF ${target === null || target === void 0 ? void 0 : target.concatTokens()}.
+${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, source.getFirstToken().getStart(), source.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Outline APPEND source expression", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
     replaceTableExpression(node, lowFile, highSyntax) {
         var _a;
         for (const fieldChain of node.findAllExpressionsRecursive(Expressions.FieldChain)) {

package/build/src/rules/remove_descriptions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemoveDescriptions = exports.RemoveDescriptionsConf = void 0;
 const issue_1 = require("../issue");
-const fastxmlparser = require("fast-xml-parser");
+const fast_xml_parser_1 = require("fast-xml-parser");
 const Objects = require("../objects");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const position_1 = require("../position");
@@ -95,7 +95,7 @@ Consider using ABAP Doc for documentation.`,
         return this.checkXML(xml, file);
     }
     checkXML(xml, file) {
-        const parsed = fastxmlparser.parse(xml, { parseNodeValue: false, ignoreAttributes: true, trimValues: false });
+        const parsed = new fast_xml_parser_1.XMLParser({ parseTagValue: false, ignoreAttributes: true, trimValues: false }).parse(xml);
         if (parsed === undefined || parsed.abapGit["asx:abap"]["asx:values"] === undefined) {
             return [];
         }

package/build/src/rules/xml_consistency.js

@@ -5,7 +5,7 @@ const issue_1 = require("../issue");
 const _irule_1 = require("./_irule");
 const Objects = require("../objects");
 const _basic_rule_config_1 = require("./_basic_rule_config");
-const fastxmlparser = require("fast-xml-parser");
+const fast_xml_parser_1 = require("fast-xml-parser");
 class XMLConsistencyConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.XMLConsistencyConf = XMLConsistencyConf;
@@ -39,7 +39,7 @@ class XMLConsistency {
         }
         const xml = obj.getXML();
         if (xml) {
-            const res = fastxmlparser.validate(xml);
+            const res = fast_xml_parser_1.XMLValidator.validate(xml);
             if (res !== true) {
                 issues.push(issue_1.Issue.atRow(file, 1, "XML parser error: " + res.err.msg, this.getMetadata().key, this.conf.severity));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.83.18",
+    "version": "2.83.22",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,10 +45,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.19.3",
+        "@microsoft/api-extractor": "^7.19.4",
         "@types/chai": "^4.3.0",
         "@types/mocha": "^9.0.0",
-        "@types/node": "^17.0.6",
+        "@types/node": "^17.0.8",
         "chai": "^4.3.4",
         "eslint": "^8.6.0",
         "mocha": "^9.1.3",
@@ -58,7 +58,7 @@
         "typescript": "^4.5.4"
     },
     "dependencies": {
-        "fast-xml-parser": "^3.21.1",
+        "fast-xml-parser": "^4.0.1",
         "json5": "^2.2.0",
         "vscode-languageserver-protocol": "^3.16.0",
         "vscode-languageserver-types": "^3.16.0"