@abaplint/core 2.83.22 → 2.84.0

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/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/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/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.22";
+        return "2.84.0";
     }
     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;
@@ -361,10 +365,14 @@ ${indentation}`);
         }
         const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         const name = ((_c = inlineData.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "error";
-        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), `TYPES: BEGIN OF ${uniqueName},
+        let fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), `TYPES: BEGIN OF ${uniqueName},
 ${fieldDefinitions}${indentation}      END OF ${uniqueName}.
 ${indentation}DATA ${name} TYPE STANDARD TABLE OF ${uniqueName} WITH DEFAULT KEY.
 ${indentation}`);
+        if (fieldDefinitions === "") {
+            fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), `DATA ${name} TYPE STANDARD TABLE OF ${tableName} WITH DEFAULT KEY.
+${indentation}`);
+        }
         const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, inlineData.getFirstToken().getStart(), inlineData.getLastToken().getEnd(), name);
         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);

package/build/src/rules/index.js

@@ -100,6 +100,7 @@ __exportStar(require("./no_yoda_conditions"), exports);
 __exportStar(require("./object_naming"), exports);
 __exportStar(require("./obsolete_statement"), exports);
 __exportStar(require("./omit_parameter_name"), exports);
+__exportStar(require("./omit_preceding_zeros"), exports);
 __exportStar(require("./omit_receiving"), exports);
 __exportStar(require("./parser_702_chaining"), exports);
 __exportStar(require("./parser_error"), exports);

package/build/src/rules/method_length.js

@@ -38,13 +38,13 @@ class MethodLength {
             tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.SingleFile],
         };
     }
-    getDescription(issueType, actual) {
+    getDescription(issueType, actual, type) {
         switch (issueType) {
             case IssueType.EmptyMethod: {
-                return "Empty method/form";
+                return "Empty " + type;
             }
             case IssueType.MaxStatements: {
-                return "Reduce method/form length to max " + this.conf.statements + " statements, currently " + actual;
+                return "Reduce " + type + " length to max " + this.conf.statements + " statements, currently " + actual;
             }
             default: {
                 return "";
@@ -62,15 +62,16 @@ class MethodLength {
     }
     run(obj) {
         const methodStats = method_length_stats_1.MethodLengthStats.run(obj);
-        const methodIssues = this.check(methodStats);
+        const methodIssues = this.check(methodStats, "METHOD");
         let formIssues = [];
         if (this.conf.checkForms) {
             const formStats = form_length_stats_1.FormLengthStats.run(obj);
-            formIssues = this.check(formStats);
+            formIssues = this.check(formStats, "FORM");
         }
         return methodIssues.concat(formIssues);
     }
-    check(stats) {
+    // ***********************
+    check(stats, type) {
         const issues = [];
         for (const s of stats) {
             if ((this.conf.ignoreTestClasses === true)
@@ -78,12 +79,12 @@ class MethodLength {
                 continue;
             }
             if (s.count === 0 && this.conf.errorWhenEmpty === true) {
-                const issue = issue_1.Issue.atPosition(s.file, s.pos, this.getDescription(IssueType.EmptyMethod, "0"), this.getMetadata().key, this.conf.severity);
+                const issue = issue_1.Issue.atPosition(s.file, s.pos, this.getDescription(IssueType.EmptyMethod, "0", type), this.getMetadata().key, this.conf.severity);
                 issues.push(issue);
                 continue;
             }
             if (s.count > this.conf.statements) {
-                const message = this.getDescription(IssueType.MaxStatements, s.count.toString());
+                const message = this.getDescription(IssueType.MaxStatements, s.count.toString(), type);
                 const issue = issue_1.Issue.atPosition(s.file, s.pos, message, this.getMetadata().key, this.conf.severity);
                 issues.push(issue);
             }

package/build/src/rules/omit_preceding_zeros.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OmitPrecedingZeros = exports.OmitPrecedingZerosConf = void 0;
+const _abap_rule_1 = require("./_abap_rule");
+const _basic_rule_config_1 = require("./_basic_rule_config");
+const issue_1 = require("../issue");
+const Expressions = require("../abap/2_statements/expressions");
+const _irule_1 = require("./_irule");
+class OmitPrecedingZerosConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.OmitPrecedingZerosConf = OmitPrecedingZerosConf;
+class OmitPrecedingZeros extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new OmitPrecedingZerosConf();
+    }
+    getMetadata() {
+        return {
+            key: "omit_preceding_zeros",
+            title: "Omit preceding zeros",
+            shortDescription: `Omit preceding zeros from integer constants`,
+            tags: [_irule_1.RuleTag.SingleFile],
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file) {
+        var _a;
+        const issues = [];
+        for (const i of ((_a = file.getStructure()) === null || _a === void 0 ? void 0 : _a.findAllExpressions(Expressions.Integer)) || []) {
+            const token = i.getLastToken();
+            const str = token.getStr();
+            if (str.length > 1 && str.startsWith("0")) {
+                const message = "Omit preceding zeros";
+                const issue = issue_1.Issue.atToken(file, token, message, this.getMetadata().key, this.getConfig().severity);
+                issues.push(issue);
+            }
+        }
+        return issues;
+    }
+}
+exports.OmitPrecedingZeros = OmitPrecedingZeros;
+//# sourceMappingURL=omit_preceding_zeros.js.map

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.83.22",
+    "version": "2.84.0",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,10 +48,10 @@
         "@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",