@abaplint/core 2.83.21 → 2.83.25

package/build/abaplint.d.ts

@@ -2529,13 +2529,20 @@ declare interface IBuiltinMethod {
 }
 
 declare class ICFService extends AbstractObject {
+    private parsedXML;
     getType(): string;
     getAllowedNaming(): {
         maxLength: number;
         allowNamespace: boolean;
     };
+    setDirty(): void;
     getDescription(): string | undefined;
+    getURL(): string | undefined;
     getHandlerList(): string[] | undefined;
+    parse(): {
+        updated: boolean;
+        runtime: number;
+    };
 }
 
 export declare interface IClassDefinition extends IInterfaceDefinition {
@@ -3245,7 +3252,9 @@ declare interface IScopeData {
         [name: string]: TypedIdentifier;
     };
     deferred: Token[];
-    cdefs: IClassDefinition[];
+    cdefs: {
+        [name: string]: IClassDefinition;
+    };
     idefs: IInterfaceDefinition[];
     forms: IFormDefinition[];
     references: IReference[];

package/build/src/abap/2_statements/expressions/compare.js

@@ -10,11 +10,12 @@ class Compare extends combi_1.Expression {
         const val = (0, combi_1.altPrio)(_1.FieldSub, _1.Constant);
         const list = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeft), val, (0, combi_1.plus)((0, combi_1.seq)(",", val)), (0, combi_1.tok)(tokens_1.ParenRightW));
         const inn = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), "IN", (0, combi_1.altPrio)(_1.Source, list));
-        const sopt = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("SUPPLIED", "BOUND", (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("INSTANCE OF", _1.ClassName)), "REQUESTED", "ASSIGNED", "INITIAL"));
+        const sopt = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("SUPPLIED", "BOUND", (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("INSTANCE OF", _1.ClassName)), "REQUESTED", "INITIAL"));
         const between = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), "BETWEEN", _1.Source, "AND", _1.Source);
         const predicate = (0, combi_1.ver)(version_1.Version.v740sp08, _1.MethodCallChain);
         const rett = (0, combi_1.seq)(_1.Source, (0, combi_1.altPrio)((0, combi_1.seq)(_1.CompareOperator, _1.Source), inn, between, sopt));
-        const ret = (0, combi_1.seq)((0, combi_1.opt)("NOT"), (0, combi_1.altPrio)(rett, predicate));
+        const fsassign = (0, combi_1.seq)(_1.SourceFieldSymbol, "IS", (0, combi_1.optPrio)("NOT"), "ASSIGNED");
+        const ret = (0, combi_1.seq)((0, combi_1.opt)("NOT"), (0, combi_1.altPrio)(rett, predicate, fsassign));
         return ret;
     }
 }

package/build/src/abap/5_syntax/_current_scope.js

@@ -74,8 +74,14 @@ class CurrentScope {
         this.current.getData().extraLikeTypes[upper] = type;
     }
     addClassDefinition(c) {
-        var _a;
-        (_a = this.current) === null || _a === void 0 ? void 0 : _a.getData().cdefs.push(c);
+        if (this.current === undefined) {
+            return;
+        }
+        const name = c.getName().toUpperCase();
+        if (this.current.getData().cdefs[name] !== undefined) {
+            throw new Error(`Class "${name}" already defined`);
+        }
+        this.current.getData().cdefs[name] = c;
     }
     addFormDefinitions(f) {
         if (this.current === undefined) {

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/database_table.js

@@ -19,6 +19,7 @@ class DatabaseTable {
         }
         else {
             scope.addReference(token, found.getIdentifier(), _reference_1.ReferenceType.TableReference, filename);
+            scope.getDDICReferences().addUsing(scope.getParentObj(), { object: found, token: token, filename: filename });
         }
     }
 }

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/abap/5_syntax/spaghetti_scope.js

@@ -8,7 +8,7 @@ class ScopeData {
     constructor() {
         this.data = {
             vars: {},
-            cdefs: [],
+            cdefs: {},
             idefs: [],
             forms: [],
             types: {},
@@ -68,10 +68,9 @@ class SpaghettiScopeNode extends ScopeData {
         let search = this;
         const upper = name.toUpperCase();
         while (search !== undefined) {
-            for (const cdef of search.getData().cdefs) {
-                if (cdef.getName().toUpperCase() === upper) {
-                    return cdef;
-                }
+            const c = search.getData().cdefs[upper];
+            if (c !== undefined) {
+                return c;
             }
             search = search.getParent();
         }

package/build/src/abap/5_syntax/statements/create_object.js

@@ -44,6 +44,7 @@ class CreateObject {
                     continue;
                 }
                 else if (!(found instanceof basic_1.ObjectReferenceType)
+                    && !(found instanceof basic_1.AnyType)
                     && !(found instanceof basic_1.GenericObjectReferenceType)) {
                     throw new Error("Target must be a object reference");
                 }

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/objects/icf_service.js

@@ -13,26 +13,46 @@ class ICFService extends _abstract_object_1.AbstractObject {
             allowNamespace: true,
         };
     }
+    setDirty() {
+        this.parsedXML = undefined;
+        super.setDirty();
+    }
     getDescription() {
         // todo
         return undefined;
     }
-    // todo, cache parsed data
+    getURL() {
+        var _a;
+        this.parse();
+        return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.url;
+    }
     getHandlerList() {
-        const ret = [];
-        const parsed = this.parseRaw2();
+        var _a;
+        this.parse();
+        return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.handlers;
+    }
+    parse() {
+        if (this.parsedXML) {
+            return { updated: false, runtime: 0 };
+        }
+        const start = Date.now();
+        this.parsedXML = {};
+        const parsed = super.parseRaw2();
         if (parsed === undefined
             || parsed.abapGit === undefined
             || parsed.abapGit["asx:abap"]["asx:values"] === undefined) {
-            return undefined;
+            return { updated: false, runtime: 0 };
         }
         const table = parsed.abapGit["asx:abap"]["asx:values"].ICFHANDLER_TABLE;
+        this.parsedXML.handlers = [];
         for (const h of (0, xml_utils_1.xmlToArray)(table)) {
             if (h.ICFHANDLER !== undefined) {
-                ret.push(h.ICFHANDLER.ICFHANDLER);
+                this.parsedXML.handlers.push(h.ICFHANDLER.ICFHANDLER);
             }
         }
-        return ret;
+        this.parsedXML.url = parsed.abapGit["asx:abap"]["asx:values"].URL;
+        const end = Date.now();
+        return { updated: true, runtime: end - start };
     }
 }
 exports.ICFService = ICFService;

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -236,8 +236,12 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
-        // todo: update + modify + insert + delete + select loop
-        if (!(high.get() instanceof Statements.Select)) {
+        // todo: select loop
+        if (!(high.get() instanceof Statements.Select)
+            && !(high.get() instanceof Statements.UpdateDatabase)
+            && !(high.get() instanceof Statements.ModifyDatabase)
+            && !(high.get() instanceof Statements.DeleteDatabase)
+            && !(high.get() instanceof Statements.InsertDatabase)) {
             return undefined;
         }
         let fix = undefined;

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/unknown_types.js

@@ -64,14 +64,15 @@ class UnknownTypes {
     traverse(node) {
         var _a;
         const ret = [];
-        for (const r of node.getData().references) {
+        const nodeData = node.getData();
+        for (const r of nodeData.references) {
             if (r.referenceType === _reference_1.ReferenceType.ObjectOrientedUnknownReference && ((_a = r.extra) === null || _a === void 0 ? void 0 : _a.ooName)) {
                 const message = r.extra.ooName + " unknown";
                 ret.push(issue_1.Issue.atIdentifier(r.position, message, this.getMetadata().key, this.conf.severity));
             }
         }
         if (node.getIdentifier().stype !== _scope_type_1.ScopeType.ClassImplementation) {
-            const vars = node.getData().vars;
+            const vars = nodeData.vars;
             for (const name in vars) {
                 const identifier = vars[name];
                 const found = this.containsUnknown(identifier.getType());
@@ -80,7 +81,7 @@ class UnknownTypes {
                     ret.push(issue_1.Issue.atIdentifier(identifier, message, this.getMetadata().key, this.conf.severity));
                 }
             }
-            const types = node.getData().types;
+            const types = nodeData.types;
             for (const name in types) {
                 const identifier = types[name];
                 const found = this.containsUnknown(identifier.getType());
@@ -90,14 +91,15 @@ class UnknownTypes {
                 }
             }
         }
-        for (const v of node.getData().idefs) {
+        for (const v of nodeData.idefs) {
             const found = this.checkMethodParameters(v);
             if (found) {
                 const message = "Contains unknown, " + found.found;
                 ret.push(issue_1.Issue.atIdentifier(found.id, message, this.getMetadata().key, this.conf.severity));
             }
         }
-        for (const v of node.getData().cdefs) {
+        for (const name in nodeData.cdefs) {
+            const v = nodeData.cdefs[name];
             const found = this.checkMethodParameters(v);
             if (found) {
                 const message = "Contains unknown, " + found.found;

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.21",
+    "version": "2.83.25",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,20 +45,20 @@
     },
     "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.8",
+        "@types/node": "^17.0.9",
         "chai": "^4.3.4",
-        "eslint": "^8.6.0",
-        "mocha": "^9.1.3",
+        "eslint": "^8.7.0",
+        "mocha": "^9.1.4",
         "c8": "^7.11.0",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^0.97.0",
         "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"