@abaplint/core 2.91.4 → 2.91.7

package/build/abaplint.d.ts

@@ -1124,6 +1124,7 @@ export declare class CurrentScope {
     static buildDefault(reg: IRegistry, obj: IObject): CurrentScope;
     private static addBuiltIn;
     private constructor();
+    getVersion(): Version;
     addType(type: TypedIdentifier | undefined): void;
     addTypeNamed(name: string, type: TypedIdentifier | undefined): void;
     addExtraLikeType(type: TypedIdentifier | undefined): void;

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

@@ -14,10 +14,9 @@ class Select extends combi_1.Expression {
         const into = (0, combi_1.altPrio)(_1.SQLIntoTable, sql_into_structure_1.SQLIntoStructure);
         const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
         const offset = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("OFFSET", _1.SQLSource));
-        const client = (0, combi_1.str)("CLIENT SPECIFIED");
         const bypass = (0, combi_1.str)("BYPASSING BUFFER");
         const fields = (0, combi_1.seq)("FIELDS", _1.SQLFieldList);
-        const perm = (0, combi_1.per)(_1.SQLFrom, into, _1.SQLForAllEntries, where, _1.SQLOrderBy, sql_up_to_1.SQLUpTo, offset, client, _1.SQLHaving, bypass, sql_group_by_1.SQLGroupBy, fields, _1.DatabaseConnection);
+        const perm = (0, combi_1.per)(_1.SQLFrom, into, _1.SQLForAllEntries, where, _1.SQLOrderBy, sql_up_to_1.SQLUpTo, offset, _1.SQLClient, _1.SQLHaving, bypass, sql_group_by_1.SQLGroupBy, fields, _1.DatabaseConnection);
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), sql_field_name_1.SQLFieldName, (0, combi_1.tok)(tokens_1.WParenRightW));
         const ret = (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)("DISTINCT", (0, combi_1.optPrio)((0, combi_1.seq)("SINGLE", (0, combi_1.optPrio)("FOR UPDATE")))), (0, combi_1.optPrio)((0, combi_1.altPrio)(_1.SQLFieldList, paren)), perm, (0, combi_1.optPrio)(_1.SQLHints));
         return ret;

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

@@ -13,11 +13,10 @@ const sql_up_to_1 = require("./sql_up_to");
 class SelectLoop extends combi_1.Expression {
     getRunnable() {
         const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
-        const client = "CLIENT SPECIFIED";
         const bypass = "BYPASSING BUFFER";
         const pack = (0, combi_1.seq)("PACKAGE SIZE", _1.SQLSource);
         const tab = (0, combi_1.seq)(_1.SQLIntoTable, (0, combi_1.alt)(pack, (0, combi_1.seq)(_1.SQLFrom, pack), (0, combi_1.seq)(pack, _1.SQLFrom)));
-        const perm = (0, combi_1.per)(_1.SQLFrom, where, sql_up_to_1.SQLUpTo, sql_order_by_1.SQLOrderBy, sql_having_1.SQLHaving, client, bypass, _1.SQLGroupBy, _1.SQLForAllEntries, (0, combi_1.alt)(tab, sql_into_structure_1.SQLIntoStructure));
+        const perm = (0, combi_1.per)(_1.SQLFrom, where, sql_up_to_1.SQLUpTo, sql_order_by_1.SQLOrderBy, sql_having_1.SQLHaving, _1.SQLClient, bypass, _1.SQLGroupBy, _1.SQLForAllEntries, (0, combi_1.alt)(tab, sql_into_structure_1.SQLIntoStructure));
         const strict = (0, combi_1.seq)(_1.SQLFrom, "FIELDS", sql_field_list_1.SQLFieldList, where, sql_into_structure_1.SQLIntoStructure, sql_up_to_1.SQLUpTo);
         const ret = (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), sql_field_list_loop_1.SQLFieldListLoop, perm), strict), (0, combi_1.optPrio)(sql_hints_1.SQLHints));
         return ret;

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

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLClient = void 0;
+const version_1 = require("../../../version");
 const combi_1 = require("../combi");
 const sql_source_simple_1 = require("./sql_source_simple");
 class SQLClient extends combi_1.Expression {
     getRunnable() {
         // todo, client specified and connection not possible in Cloud
-        const client = (0, combi_1.alt)("CLIENT SPECIFIED", (0, combi_1.seq)("USING CLIENT", sql_source_simple_1.SQLSourceSimple));
+        const client = (0, combi_1.alt)("CLIENT SPECIFIED", (0, combi_1.seq)("USING", (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("CLIENT", sql_source_simple_1.SQLSourceSimple)), (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("CLIENTS IN", (0, combi_1.alt)(sql_source_simple_1.SQLSourceSimple, "T000"))), (0, combi_1.ver)(version_1.Version.v754, "ALL CLIENTS"))));
         return client;
     }
 }

package/build/src/abap/2_statements/statements/append.js

@@ -9,9 +9,11 @@ class Append {
         const assigning = (0, combi_1.seq)("ASSIGNING", expressions_1.FSTarget);
         const reference = (0, combi_1.seq)("REFERENCE INTO", expressions_1.Target);
         const sorted = (0, combi_1.seq)("SORTED BY", expressions_1.Field);
-        const range = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.seq)("FROM", expressions_1.Source)), (0, combi_1.optPrio)((0, combi_1.seq)("TO", expressions_1.Source)));
+        const fromIndex = (0, combi_1.seq)("FROM", expressions_1.Source);
+        const toIndex = (0, combi_1.seq)("TO", expressions_1.Source);
+        const toTarget = (0, combi_1.seq)("TO", expressions_1.Target);
         const src = (0, combi_1.alt)(expressions_1.SimpleSource4, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source));
-        return (0, combi_1.seq)("APPEND", (0, combi_1.altPrio)("INITIAL LINE", (0, combi_1.seq)((0, combi_1.optPrio)("LINES OF"), src)), (0, combi_1.opt)(range), (0, combi_1.optPrio)((0, combi_1.seq)("TO", expressions_1.Target)), (0, combi_1.opt)((0, combi_1.altPrio)(assigning, reference)), (0, combi_1.optPrio)("CASTING"), (0, combi_1.optPrio)(sorted));
+        return (0, combi_1.seq)("APPEND", (0, combi_1.altPrio)("INITIAL LINE", (0, combi_1.seq)((0, combi_1.optPrio)("LINES OF"), src)), (0, combi_1.optPrio)(fromIndex), (0, combi_1.opt)((0, combi_1.alt)((0, combi_1.seq)(toIndex, toTarget), toTarget)), (0, combi_1.opt)((0, combi_1.altPrio)(assigning, reference)), (0, combi_1.optPrio)("CASTING"), (0, combi_1.optPrio)(sorted));
     }
 }
 exports.Append = Append;

package/build/src/abap/2_statements/statements/delete_internal.js

@@ -9,10 +9,11 @@ class DeleteInternal {
         const index = (0, combi_1.seq)("INDEX", expressions_1.Source);
         const keyName = (0, combi_1.altPrio)(expressions_1.SimpleName, expressions_1.Dynamic);
         const using = (0, combi_1.seq)("USING KEY", keyName);
-        const fromTo = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.seq)("FROM", expressions_1.Source)), (0, combi_1.optPrio)((0, combi_1.seq)("TO", expressions_1.Source)));
+        const from = (0, combi_1.optPrio)((0, combi_1.seq)("FROM", expressions_1.Source));
+        const fromTo = (0, combi_1.seq)(from, (0, combi_1.optPrio)((0, combi_1.seq)("TO", expressions_1.Source)));
         const where = (0, combi_1.seq)("WHERE", (0, combi_1.alt)(expressions_1.ComponentCond, expressions_1.Dynamic));
         const key = (0, combi_1.seq)("WITH TABLE KEY", (0, combi_1.opt)((0, combi_1.seq)(keyName, "COMPONENTS")), (0, combi_1.plus)(expressions_1.ComponentCompare));
-        const table = (0, combi_1.seq)("TABLE", expressions_1.Target, (0, combi_1.alt)((0, combi_1.per)(index, using), fromTo, key));
+        const table = (0, combi_1.seq)("TABLE", expressions_1.Target, (0, combi_1.alt)((0, combi_1.per)(index, using), from, key));
         const other = (0, combi_1.seq)(expressions_1.Target, (0, combi_1.alt)((0, combi_1.per)(index, using), fromTo, key), (0, combi_1.opt)(where));
         const f = (0, combi_1.seq)(expressions_1.FieldSub, (0, combi_1.optPrio)(expressions_1.FieldOffset), (0, combi_1.optPrio)(expressions_1.FieldLength));
         const adjacent = (0, combi_1.seq)("ADJACENT DUPLICATES FROM", expressions_1.Target, (0, combi_1.optPrio)(using), (0, combi_1.opt)((0, combi_1.seq)("COMPARING", (0, combi_1.altPrio)("ALL FIELDS", (0, combi_1.plus)((0, combi_1.altPrio)(f, expressions_1.Dynamic))))), (0, combi_1.optPrio)(using));

package/build/src/abap/2_statements/statements/insert_database.js

@@ -6,11 +6,10 @@ const expressions_1 = require("../expressions");
 const tokens_1 = require("../../1_lexer/tokens");
 class InsertDatabase {
     getMatcher() {
-        const client = (0, combi_1.str)("CLIENT SPECIFIED");
         const sub = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), expressions_1.Select, (0, combi_1.tok)(tokens_1.WParenRightW));
-        const f = (0, combi_1.seq)((0, combi_1.opt)(client), (0, combi_1.opt)(expressions_1.DatabaseConnection), "FROM", (0, combi_1.opt)("TABLE"), (0, combi_1.alt)(expressions_1.SQLSource, sub), (0, combi_1.opt)("ACCEPTING DUPLICATE KEYS"));
-        const from = (0, combi_1.seq)(expressions_1.DatabaseTable, (0, combi_1.opt)((0, combi_1.alt)(f, client, expressions_1.DatabaseConnection)));
-        const into = (0, combi_1.seq)("INTO", expressions_1.DatabaseTable, (0, combi_1.opt)("CLIENT SPECIFIED"), (0, combi_1.opt)(expressions_1.DatabaseConnection), "VALUES", expressions_1.SQLSource);
+        const f = (0, combi_1.seq)((0, combi_1.opt)(expressions_1.SQLClient), (0, combi_1.opt)(expressions_1.DatabaseConnection), "FROM", (0, combi_1.opt)("TABLE"), (0, combi_1.alt)(expressions_1.SQLSource, sub), (0, combi_1.opt)("ACCEPTING DUPLICATE KEYS"));
+        const from = (0, combi_1.seq)(expressions_1.DatabaseTable, (0, combi_1.opt)((0, combi_1.alt)(f, expressions_1.SQLClient, expressions_1.DatabaseConnection)));
+        const into = (0, combi_1.seq)("INTO", expressions_1.DatabaseTable, (0, combi_1.opt)(expressions_1.SQLClient), (0, combi_1.opt)(expressions_1.DatabaseConnection), "VALUES", expressions_1.SQLSource);
         return (0, combi_1.seq)("INSERT", (0, combi_1.alt)(from, into));
     }
 }

package/build/src/abap/2_statements/statements/modify_database.js

@@ -6,8 +6,7 @@ const expressions_1 = require("../expressions");
 class ModifyDatabase {
     getMatcher() {
         const from = (0, combi_1.seq)("FROM", (0, combi_1.opt)("TABLE"), expressions_1.SQLSource);
-        const client = (0, combi_1.str)("CLIENT SPECIFIED");
-        const options = (0, combi_1.per)(expressions_1.DatabaseConnection, from, client);
+        const options = (0, combi_1.per)(expressions_1.DatabaseConnection, from, expressions_1.SQLClient);
         return (0, combi_1.seq)("MODIFY", expressions_1.DatabaseTable, options);
     }
 }

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

@@ -35,6 +35,9 @@ class CurrentScope {
         }
     }
     ///////////////////////////
+    getVersion() {
+        return this.reg.getConfig().getVersion();
+    }
     addType(type) {
         if (type === undefined) {
             return;

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

@@ -4,13 +4,24 @@ exports.MoveCorresponding = void 0;
 const Expressions = require("../../2_statements/expressions");
 const source_1 = require("../expressions/source");
 const target_1 = require("../expressions/target");
+const version_1 = require("../../../version");
+const basic_1 = require("../../types/basic");
 class MoveCorresponding {
     runSyntax(node, scope, filename) {
-        for (const s of node.findDirectExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename);
+        const s = node.findDirectExpression(Expressions.Source);
+        const t = node.findDirectExpression(Expressions.Target);
+        if (s === undefined || t === undefined) {
+            throw new Error("MoveCorresponding, source or target not found");
         }
-        for (const t of node.findDirectExpressions(Expressions.Target)) {
-            new target_1.Target().runSyntax(t, scope, filename);
+        const sourceType = new source_1.Source().runSyntax(s, scope, filename);
+        const targetType = new target_1.Target().runSyntax(t, scope, filename);
+        if (scope.getVersion() < version_1.Version.v740sp05) {
+            if (sourceType instanceof basic_1.TableType && sourceType.isWithHeader() === false) {
+                throw new Error("MOVE-CORRESPONSING with tables possible from v740sp05");
+            }
+            else if (targetType instanceof basic_1.TableType && targetType.isWithHeader() === false) {
+                throw new Error("MOVE-CORRESPONSING with tables possible from v740sp05");
+            }
         }
     }
 }

package/build/src/registry.js

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

package/build/src/rules/obsolete_statement.js

@@ -65,6 +65,8 @@ class ObsoleteStatementConf extends _basic_rule_config_1.BasicRuleConfig {
         this.regex = true;
         /** Check for OCCURENCES vs OCCURRENCES usage */
         this.occurences = true;
+        /** Check for CLIENT SPECIFIED */
+        this.clientSpecified = true;
     }
 }
 exports.ObsoleteStatementConf = ObsoleteStatementConf;
@@ -119,7 +121,9 @@ CALL TRANSFORMATION OBJECTS: https://help.sap.com/doc/abapdocu_752_index_htm/7.5
 
 POSIX REGEX: https://help.sap.com/doc/abapdocu_755_index_htm/7.55/en-US/index.htm
 
-OCCURENCES: check for OCCURENCES vs OCCURRENCES`,
+OCCURENCES: check for OCCURENCES vs OCCURRENCES
+
+CLIENT SPECIFIED, from 754: https://help.sap.com/doc/abapdocu_latest_index_htm/latest/en-US/index.htm?file=abapselect_client_obsolete.htm`,
         };
     }
     getConfig() {
@@ -229,7 +233,7 @@ OCCURENCES: check for OCCURENCES vs OCCURRENCES`,
             }
             if (this.conf.withHeaderLine === true && sta instanceof Statements.Data) {
                 if (staNode.concatTokens().toUpperCase().includes("WITH HEADER LINE")) {
-                    const token = staNode.getFirstToken();
+                    const token = staNode.getTokens().find(t => t.getStr().toUpperCase() === "WITH");
                     if (token) {
                         const issue = issue_1.Issue.atToken(file, token, "WITH HEADER LINE is obsolete", this.getMetadata().key, this.conf.severity);
                         issues.push(issue);
@@ -283,6 +287,19 @@ OCCURENCES: check for OCCURENCES vs OCCURRENCES`,
                     issues.push(issue);
                 }
             }
+            if (configVersion >= version_1.Version.v754 && this.conf.clientSpecified
+                && (sta instanceof Statements.Select
+                    || sta instanceof Statements.SelectLoop
+                    || sta instanceof Statements.DeleteDatabase
+                    || sta instanceof Statements.InsertDatabase
+                    || sta instanceof Statements.ModifyDatabase
+                    || sta instanceof Statements.UpdateDatabase)) {
+                const concat = staNode.concatTokens().toUpperCase();
+                if (concat.includes(" CLIENT SPECIFIED")) {
+                    const issue = issue_1.Issue.atStatement(file, staNode, "Use USING CLIENT", this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+            }
             if (configVersion >= version_1.Version.v756 && this.conf.regex) {
                 if (sta instanceof Statements.Find || sta instanceof Statements.Replace) {
                     if ((_c = staNode.findFirstExpression(Expressions.FindType)) === null || _c === void 0 ? void 0 : _c.concatTokens().includes("REGEX")) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.91.4",
+    "version": "2.91.7",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,17 +45,17 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.25.0",
+        "@microsoft/api-extractor": "^7.28.3",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^18.0.0",
+        "@types/node": "^18.0.3",
         "chai": "^4.3.6",
-        "eslint": "^8.17.0",
+        "eslint": "^8.19.0",
         "mocha": "^10.0.0",
         "c8": "^7.11.3",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^1.0.0",
-        "typescript": "^4.7.3"
+        "typescript": "^4.7.4"
     },
     "dependencies": {
         "fast-xml-parser": "^4.0.8",