@abaplint/core 2.80.6 → 2.80.10

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

@@ -9,10 +9,15 @@ const sql_alias_field_1 = require("./sql_alias_field");
 const sql_field_name_1 = require("./sql_field_name");
 class SQLFunction extends combi_1.Expression {
     getRunnable() {
+        const param = (0, combi_1.altPrio)(sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField);
         const uuid = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("uuid", (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const abs = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("abs", (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.altPrio)(sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const cast = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("cast", (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.altPrio)(sql_field_name_1.SQLFieldName, sql_alias_field_1.SQLAliasField), "AS CHAR", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        return (0, combi_1.altPrio)(uuid, abs, cast);
+        const abs = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("abs", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const ceil = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("ceil", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const floor = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("floor", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const div = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("div", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const mod = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("mod", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const cast = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("cast", (0, combi_1.tok)(tokens_1.ParenLeftW), param, "AS CHAR", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        return (0, combi_1.altPrio)(uuid, abs, ceil, floor, cast, div, mod);
     }
 }
 exports.SQLFunction = SQLFunction;

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

@@ -6,9 +6,8 @@ const basic_1 = require("../../types/basic");
 const source_1 = require("./source");
 class FieldAssignment {
     runSyntax(node, scope, filename, targetType) {
-        var _a;
-        const name = (_a = node.findDirectExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.concatTokens();
-        if (name === undefined) {
+        const fieldSub = node.findDirectExpression(Expressions.FieldSub);
+        if (fieldSub === undefined) {
             throw new Error("FieldAssignment, FieldSub node not found");
         }
         const s = node.findDirectExpression(Expressions.Source);
@@ -17,10 +16,17 @@ class FieldAssignment {
         }
         let type = undefined;
         if (targetType instanceof basic_1.StructureType) {
-            type = targetType.getComponentByName(name);
-            if (type === undefined && targetType.containsVoid() === false) {
-                throw new Error(`field ${name} does not exist in structure`);
+            let context = targetType;
+            for (const c of fieldSub.getChildren()) {
+                const text = c.concatTokens();
+                if (text !== "-" && context instanceof basic_1.StructureType) {
+                    context = context.getComponentByName(text);
+                    if (context === undefined && targetType.containsVoid() === false) {
+                        throw new Error(`field ${text} does not exist in structure`);
+                    }
+                }
             }
+            type = context;
         }
         else if (targetType instanceof basic_1.VoidType) {
             type = targetType;

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeleteReport = void 0;
+const Expressions = require("../../2_statements/expressions");
+const source_1 = require("../expressions/source");
+class DeleteReport {
+    runSyntax(node, scope, filename) {
+        for (const s of node.findDirectExpressions(Expressions.Source)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
+    }
+}
+exports.DeleteReport = DeleteReport;
+//# sourceMappingURL=delete_report.js.map

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetCursor = void 0;
+const Expressions = require("../../2_statements/expressions");
+const target_1 = require("../expressions/target");
+class GetCursor {
+    runSyntax(node, scope, filename) {
+        for (const t of node.findAllExpressions(Expressions.Target)) {
+            new target_1.Target().runSyntax(t, scope, filename);
+        }
+    }
+}
+exports.GetCursor = GetCursor;
+//# sourceMappingURL=get_cursor.js.map

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InsertTextpool = void 0;
+const Expressions = require("../../2_statements/expressions");
+const source_1 = require("../expressions/source");
+class InsertTextpool {
+    runSyntax(node, scope, filename) {
+        for (const s of node.findDirectExpressions(Expressions.Source)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
+    }
+}
+exports.InsertTextpool = InsertTextpool;
+//# sourceMappingURL=insert_textpool.js.map

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

@@ -122,11 +122,14 @@ const set_titlebar_1 = require("./statements/set_titlebar");
 const call_transaction_1 = require("./statements/call_transaction");
 const set_handler_1 = require("./statements/set_handler");
 const wait_1 = require("./statements/wait");
+const delete_report_1 = require("./statements/delete_report");
 const shift_1 = require("./statements/shift");
 const set_bit_1 = require("./statements/set_bit");
 const modify_screen_1 = require("./statements/modify_screen");
 const delete_cluster_1 = require("./statements/delete_cluster");
 const unassign_1 = require("./statements/unassign");
+const insert_textpool_1 = require("./statements/insert_textpool");
+const get_cursor_1 = require("./statements/get_cursor");
 // -----------------------------------
 const map = {};
 function addToMap(handler) {
@@ -146,6 +149,7 @@ if (Object.keys(map).length === 0) {
     addToMap(new move_1.Move());
     addToMap(new get_badi_1.GetBadi());
     addToMap(new call_badi_1.CallBadi());
+    addToMap(new get_cursor_1.GetCursor());
     addToMap(new replace_1.Replace());
     addToMap(new truncate_dataset_1.TruncateDataset());
     addToMap(new assert_1.Assert());
@@ -154,8 +158,10 @@ if (Object.keys(map).length === 0) {
     addToMap(new set_pf_status_1.SetPFStatus());
     addToMap(new set_titlebar_1.SetTitlebar());
     addToMap(new submit_1.Submit());
+    addToMap(new insert_textpool_1.InsertTextpool());
     addToMap(new read_table_1.ReadTable());
     addToMap(new syntax_check_1.SyntaxCheck());
+    addToMap(new delete_report_1.DeleteReport());
     addToMap(new import_1.Import());
     addToMap(new collect_1.Collect());
     addToMap(new export_1.Export());

package/build/src/lsp/references.js

@@ -30,12 +30,12 @@ class References {
         const locs = this.search(lookup.definitionId, lookup.scope);
         return locs.map(_lsp_utils_1.LSPUtils.identiferToLocation);
     }
+    // todo, cleanup this mehtod, some of the method parameters are not used anymore?
     search(identifier, node, exitAfterFound = false, removeDuplicates = true) {
         let ret = [];
         // todo, this first assumes that the identifier is a variable?
-        if (node.getIdentifier().stype === _scope_type_1.ScopeType.Method
-            || node.getIdentifier().stype === _scope_type_1.ScopeType.FunctionModule
-            || node.getIdentifier().stype === _scope_type_1.ScopeType.Form) {
+        const stype = node.getIdentifier().stype;
+        if (stype === _scope_type_1.ScopeType.Method || stype === _scope_type_1.ScopeType.FunctionModule || stype === _scope_type_1.ScopeType.Form) {
             ret = this.findReferences(node, identifier);
         }
         if (ret.length > 1 && exitAfterFound === true) {
@@ -71,15 +71,16 @@ class References {
         var _a;
         const ret = [];
         if (node.getIdentifier().stype !== _scope_type_1.ScopeType.BuiltIn) {
+            const upper = identifier.getName().toUpperCase();
             // this is for finding the definitions
             const vars = node.getData().vars;
-            const vid = vars[identifier.getName().toUpperCase()];
+            const vid = vars[upper];
             if (vid === null || vid === void 0 ? void 0 : vid.equals(identifier)) {
                 ret.push(vid);
             }
             // this is for finding the definitions
             const types = node.getData().types;
-            const tid = types[identifier.getName().toUpperCase()];
+            const tid = types[upper];
             if (tid === null || tid === void 0 ? void 0 : tid.equals(identifier)) {
                 ret.push(tid);
             }

package/build/src/registry.js

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

package/build/src/rules/unused_types.js

@@ -36,23 +36,25 @@ class WorkArea {
         return this.workarea.length;
     }
 }
-function removeDuplicates(list) {
-    const deduplicated = [];
-    for (const result of list) {
-        let cont = false;
-        for (const d of deduplicated) {
-            if (result.getStart().equals(d.getStart())) {
-                cont = true;
-                break;
-            }
-        }
-        if (cont === true) {
-            continue;
-        }
-        deduplicated.push(result);
-    }
-    return deduplicated;
+/*
+function removeDuplicates(list: readonly TypedIdentifier[]): readonly TypedIdentifier[] {
+  const deduplicated: TypedIdentifier[] = [];
+  for (const result of list) {
+    let cont = false;
+    for (const d of deduplicated) {
+      if (result.getStart().equals(d.getStart())) {
+        cont = true;
+        break;
+      }
+    }
+    if (cont === true) {
+      continue;
+    }
+    deduplicated.push(result);
+  }
+  return deduplicated;
 }
+*/
 class UnusedTypesConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -103,7 +105,10 @@ class UnusedTypes {
             return []; // exit early if all types are used in the current object
         }
         for (const o of this.reg.getObjects()) {
-            if (o instanceof _abap_object_1.ABAPObject) {
+            if (o === obj) {
+                continue;
+            }
+            else if (o instanceof _abap_object_1.ABAPObject) {
                 if (this.reg.isDependency(o)) {
                     continue; // do not search in dependencies
                 }
@@ -116,7 +121,7 @@ class UnusedTypes {
         }
         // what is left is unused
         const ret = [];
-        for (const t of removeDuplicates(this.workarea.get())) {
+        for (const t of this.workarea.get()) {
             const message = "Type \"" + t.getName() + "\" not used";
             const file = obj.getABAPFileByName(t.getFilename());
             if (file === undefined) {

package/build/src/rules/unused_variables.js

@@ -8,10 +8,10 @@ const syntax_1 = require("../abap/5_syntax/syntax");
 const _abap_object_1 = require("../objects/_abap_object");
 const _scope_type_1 = require("../abap/5_syntax/_scope_type");
 const objects_1 = require("../objects");
-const references_1 = require("../lsp/references");
 const edit_helper_1 = require("../edit_helper");
 const Statements = require("../abap/2_statements/statements");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
+const _reference_1 = require("../abap/5_syntax/_reference");
 class UnusedVariablesConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -22,6 +22,39 @@ class UnusedVariablesConf extends _basic_rule_config_1.BasicRuleConfig {
     }
 }
 exports.UnusedVariablesConf = UnusedVariablesConf;
+class WorkArea {
+    constructor() {
+        this.workarea = [];
+    }
+    push(id, count = 1) {
+        for (const w of this.workarea) {
+            if (id.equals(w.id)) {
+                return;
+            }
+        }
+        this.workarea.push({ id, count });
+    }
+    removeIfExists(id) {
+        if (id === undefined) {
+            return;
+        }
+        for (let i = 0; i < this.workarea.length; i++) {
+            if (id.equals(this.workarea[i].id)) {
+                this.workarea[i].count--;
+                if (this.workarea[i].count === 0) {
+                    this.workarea.splice(i, 1);
+                }
+                return;
+            }
+        }
+    }
+    get() {
+        return this.workarea;
+    }
+    count() {
+        return this.workarea.length;
+    }
+}
 class UnusedVariables {
     constructor() {
         this.conf = new UnusedVariablesConf();
@@ -33,11 +66,11 @@ class UnusedVariables {
             shortDescription: `Checks for unused variables and constants`,
             extendedInformation: `WARNING: slow
 
-      Experimental, might give false positives. Skips event parameters.
+Experimental, might give false positives. Skips event parameters.
 
-      Note that this currently does not work if the source code uses macros.
+Note that this currently does not work if the source code uses macros.
 
-      Unused variables are not reported if the object contains syntax errors.`,
+Unused variables are not reported if the object contains syntax errors. Errors found in INCLUDES are reported for the main program.`,
             tags: [_irule_1.RuleTag.Quickfix],
             pragma: "##NEEDED",
             pseudoComment: "EC NEEDED",
@@ -68,67 +101,91 @@ class UnusedVariables {
         if (syntax.issues.length > 0) {
             return [];
         }
-        const results = this.traverse(syntax.spaghetti.getTop(), obj);
-        // remove duplicates, quick and dirty
-        const deduplicated = [];
-        for (const result of results) {
-            let cont = false;
-            for (const d of deduplicated) {
-                if (result.getStart().equals(d.getStart())) {
-                    cont = true;
-                    break;
-                }
-            }
-            if (cont === true) {
+        this.workarea = new WorkArea();
+        const top = syntax.spaghetti.getTop();
+        this.buildWorkarea(top, obj);
+        if (this.workarea.count() === 0) {
+            return this.buildIssues(obj); // exit early if all types are used
+        }
+        this.findUses(top, obj);
+        for (const o of this.reg.getObjects()) {
+            if (o === obj) {
                 continue;
             }
-            deduplicated.push(result);
+            else if (o instanceof _abap_object_1.ABAPObject) {
+                if (this.reg.isDependency(o)) {
+                    continue; // do not search in dependencies
+                }
+                const syntax = new syntax_1.SyntaxLogic(this.reg, o).run();
+                this.findUses(syntax.spaghetti.getTop(), o);
+                if (this.workarea.count() === 0) {
+                    return this.buildIssues(obj); // exit early if all types are used
+                }
+            }
         }
-        return deduplicated;
+        return this.buildIssues(obj);
     }
-    traverse(node, obj) {
-        const ret = [];
-        if (node.getIdentifier().stype === _scope_type_1.ScopeType.OpenSQL) {
-            return [];
-        }
-        if (node.getIdentifier().stype !== _scope_type_1.ScopeType.BuiltIn) {
-            ret.push(...this.checkNode(node, obj));
+    findUses(node, obj) {
+        for (const r of node.getData().references) {
+            if (r.referenceType === _reference_1.ReferenceType.DataReadReference
+                || r.referenceType === _reference_1.ReferenceType.DataWriteReference
+                || r.referenceType === _reference_1.ReferenceType.TypeReference) {
+                this.workarea.removeIfExists(r.resolved);
+            }
         }
         for (const c of node.getChildren()) {
-            ret.push(...this.traverse(c, obj));
+            this.findUses(c, obj);
         }
-        return ret;
     }
-    checkNode(node, obj) {
+    buildWorkarea(node, obj) {
         var _a;
+        const stype = node.getIdentifier().stype;
+        if (stype === _scope_type_1.ScopeType.OpenSQL) {
+            return;
+        }
+        for (const c of node.getChildren()) {
+            this.buildWorkarea(c, obj);
+        }
+        if (stype !== _scope_type_1.ScopeType.BuiltIn) {
+            const vars = node.getData().vars;
+            for (const name in vars) {
+                const meta = vars[name].getMeta();
+                if (((_a = this.conf.skipNames) === null || _a === void 0 ? void 0 : _a.length) > 0
+                    && this.conf.skipNames.some((a) => a.toUpperCase() === name)) {
+                    continue;
+                }
+                else if (name === "ME"
+                    || name === "SUPER"
+                    || meta.includes("event_parameter" /* EventParameter */)) {
+                    // todo, workaround for "me" and "super", these should somehow be typed to built-in
+                    continue;
+                }
+                const isInline = meta.includes("inline" /* InlineDefinition */);
+                this.workarea.push(vars[name], isInline ? 2 : 1);
+            }
+        }
+    }
+    buildIssues(obj) {
         const ret = [];
-        const vars = node.getData().vars;
-        for (const name in vars) {
-            if (((_a = this.conf.skipNames) === null || _a === void 0 ? void 0 : _a.length) > 0
-                && this.conf.skipNames.some((a) => a.toUpperCase() === name)) {
+        for (const w of this.workarea.get()) {
+            const filename = w.id.getFilename();
+            if (this.reg.isFileDependency(filename) === true) {
                 continue;
             }
-            if (name === "ME"
-                || name === "SUPER"
-                || vars[name].getMeta().includes("event_parameter" /* EventParameter */)) {
-                // todo, workaround for "me" and "super", these should somehow be typed to built-in
+            else if (obj instanceof objects_1.Program === false && obj.containsFile(filename) === false) {
                 continue;
             }
-            else if ((obj.containsFile(vars[name].getFilename())
-                || node.getIdentifier().stype === _scope_type_1.ScopeType.Program
-                || node.getIdentifier().stype === _scope_type_1.ScopeType.Form)
-                && this.isUsed(vars[name], node) === false) {
-                const message = "Variable \"" + name.toLowerCase() + "\" not used";
-                const statement = this.findStatement(vars[name]);
-                if (statement === null || statement === void 0 ? void 0 : statement.getPragmas().map(t => t.getStr()).includes(this.getMetadata().pragma + "")) {
-                    continue;
-                }
-                else if (this.suppressedbyPseudo(statement, vars[name], obj)) {
-                    continue;
-                }
-                const fix = this.buildFix(vars[name], obj);
-                ret.push(issue_1.Issue.atIdentifier(vars[name], message, this.getMetadata().key, this.conf.severity, fix));
+            const statement = this.findStatement(w.id);
+            if (statement === null || statement === void 0 ? void 0 : statement.getPragmas().map(t => t.getStr()).includes(this.getMetadata().pragma + "")) {
+                continue;
             }
+            else if (this.suppressedbyPseudo(statement, w.id, obj)) {
+                continue;
+            }
+            const name = w.id.getName();
+            const message = "Variable \"" + name.toLowerCase() + "\" not used";
+            const fix = this.buildFix(w.id, obj);
+            ret.push(issue_1.Issue.atIdentifier(w.id, message, this.getMetadata().key, this.conf.severity, fix));
         }
         return ret;
     }
@@ -151,16 +208,6 @@ class UnusedVariables {
         }
         return false;
     }
-    isUsed(id, node) {
-        const isInline = id.getMeta().includes("inline" /* InlineDefinition */);
-        const found = new references_1.References(this.reg).search(id, node, true, isInline === false);
-        if (isInline === true) {
-            return found.length > 2; // inline definitions are always written to
-        }
-        else {
-            return found.length > 1;
-        }
-    }
     findStatement(v) {
         const file = this.reg.getFileByName(v.getFilename());
         if (file === undefined) {

package/package.json

@@ -1,29 +1,19 @@
 {
     "name": "@abaplint/core",
-    "version": "2.80.6",
+    "version": "2.80.10",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
     "scripts": {
-        "madge.orphans": "madge --extensions ts --ts-config tsconfig.json --orphans src/",
-        "madge.svg": "madge --extensions ts --ts-config tsconfig.json  --image graph.svg src/",
-        "madge.circular": "madge --extensions ts --ts-config tsconfig.json --circular src/",
         "lint": "eslint src/**/*.ts test/**/*.ts --format unix",
         "lint:fix": "eslint src/**/*.ts test/**/*.ts --format unix --fix",
-        "compile": "tsc",
-        "postcompile": "sh scripts/version.sh",
-        "pretest": "npm run compile",
-        "test": "mocha --timeout 1000",
+        "compile": "tsc && sh scripts/version.sh",
+        "test": "npm run compile && mocha --timeout 1000 && npm run lint && npm run schema && api-extractor run",
         "test:only": "npm run compile && mocha",
         "test:parallel": "npm run compile && mocha --timeout 1000 --parallel --reporter dot",
-        "posttest": "npm run lint && npm run schema && api-extractor run",
-        "prepublishOnly": "rm -rf build && npm run test",
-        "precoverage": "npm run compile",
-        "coverage": "c8 mocha",
-        "postcoverage": "c8 report --reporter=html",
-        "preschema": "node scripts/schema.js > scripts/schema.ts",
-        "schema": "ts-json-schema-generator --tsconfig tsconfig_schema.json --jsDoc extended --path scripts/schema.ts > scripts/schema.json",
-        "postschema": "node scripts/schema_post.js"
+        "coverage": "npm run compile && c8 mocha && c8 report --reporter=html",
+        "schema": "node scripts/schema.js > scripts/schema.ts && ts-json-schema-generator --tsconfig tsconfig_schema.json --jsDoc extended --path scripts/schema.ts > scripts/schema.json && node scripts/schema_post.js",
+        "publish:patch": "npm --no-git-tag-version version patch && rm -rf build && npm install && npm run test && npm publish --access public"
     },
     "mocha": {
         "recursive": true,
@@ -54,13 +44,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.18.17",
+        "@microsoft/api-extractor": "^7.18.19",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
-        "@types/node": "^16.11.6",
+        "@types/node": "^16.11.7",
         "chai": "^4.3.4",
-        "eslint": "^8.1.0",
-        "madge": "^5.0.1",
+        "eslint": "^8.2.0",
         "mocha": "^9.1.3",
         "c8": "^7.10.0",
         "source-map-support": "^0.5.20",