@abaplint/core 2.96.2 → 2.97.0

package/build/abaplint.d.ts

@@ -401,6 +401,7 @@ declare namespace BasicTypes {
         IStructureComponent,
         StructureType,
         TableAccessType,
+        TableKeyType,
         ITableKey,
         ITableOptions,
         TableType_2 as TableType,
@@ -3626,13 +3627,14 @@ declare interface ISyntaxSettings {
 
 declare type ITableKey = {
     name: string;
-    type?: TableAccessType;
+    type: TableAccessType;
     keyFields: string[];
     isUnique: boolean;
 };
 
 declare type ITableOptions = {
     withHeader: boolean;
+    keyType: TableKeyType;
     primaryKey?: ITableKey;
     secondary?: ITableKey[];
 };
@@ -5959,6 +5961,12 @@ declare class TableExpression extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare enum TableKeyType {
+    default = "DEFAULT",
+    user = "USER",
+    empty = "EMPTY"
+}
+
 declare class Tables implements IStatement {
     getMatcher(): IStatementRunnable;
 }

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

@@ -388,7 +388,7 @@ BuiltIn.methods = [
     {
         name: "CONCAT_LINES_OF",
         mandatory: {
-            "table": new basic_1.TableType(new basic_1.AnyType(), { withHeader: false }),
+            "table": new basic_1.TableType(new basic_1.AnyType(), { withHeader: false, keyType: basic_1.TableKeyType.default }),
         },
         optional: {
             "sep": new basic_1.StringType(),
@@ -684,7 +684,7 @@ BuiltIn.methods = [
     {
         name: "LINES",
         mandatory: {
-            "val": new basic_1.TableType(new basic_1.AnyType(), { withHeader: false }),
+            "val": new basic_1.TableType(new basic_1.AnyType(), { withHeader: false, keyType: basic_1.TableKeyType.default }),
         },
         return: new basic_1.IntegerType(),
     },

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

@@ -90,10 +90,10 @@ class Procedural {
             }
             if (param.direction === types_1.FunctionModuleParameterDirection.tables) {
                 if (found instanceof basic_1.TableType) {
-                    found = new basic_1.TableType(found.getRowType(), { withHeader: true });
+                    found = new basic_1.TableType(found.getRowType(), { withHeader: true, keyType: basic_1.TableKeyType.default });
                 }
                 else {
-                    found = new basic_1.TableType(found, { withHeader: true });
+                    found = new basic_1.TableType(found, { withHeader: true, keyType: basic_1.TableKeyType.default });
                 }
             }
             if ((found instanceof basic_1.UnknownType || found instanceof basic_1.VoidType) && ((_a = param.type) === null || _a === void 0 ? void 0 : _a.includes("-"))) {

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

@@ -143,7 +143,7 @@ class BasicTypes {
                 }
                 else if (child.concatTokens() === "[]") {
                     if (type instanceof Types.TableType) {
-                        type = new basic_1.TableType(type.getRowType(), { withHeader: false });
+                        type = new basic_1.TableType(type.getRowType(), { withHeader: false, keyType: Types.TableKeyType.default });
                     }
                 }
                 else { // field name
@@ -295,7 +295,7 @@ class BasicTypes {
         const isNamed = (firstKey === null || firstKey === void 0 ? void 0 : firstKey.findDirectExpression(expressions_1.Field)) !== undefined;
         const primaryKey = {
             name: "primary_key",
-            type: type,
+            type: type || basic_1.TableAccessType.standard,
             isUnique: isNamed ? false : (firstKey === null || firstKey === void 0 ? void 0 : firstKey.concatTokens().toUpperCase().includes("WITH UNIQUE ")) === true,
             keyFields: [],
         };
@@ -304,9 +304,6 @@ class BasicTypes {
             for (const k of (firstKey === null || firstKey === void 0 ? void 0 : firstKey.findDirectExpressions(expressions_1.FieldSub)) || []) {
                 primaryKey.keyFields.push(k.concatTokens().toUpperCase());
             }
-            if (primaryKey.keyFields.length === 0 && text.includes(" DEFAULT KEY")) {
-                primaryKey.keyFields.push("TABLE_LINE");
-            }
         }
         else {
             start = 0;
@@ -329,8 +326,16 @@ class BasicTypes {
             }
             secondaryKeys.push(secondary);
         }
+        let keyType = Types.TableKeyType.user;
+        if (text.includes(" EMPTY KEY")) {
+            keyType = Types.TableKeyType.empty;
+        }
+        else if (text.includes(" DEFAULT KEY")) {
+            keyType = Types.TableKeyType.default;
+        }
         const options = {
             withHeader: text.includes(" WITH HEADER LINE"),
+            keyType: keyType,
             primaryKey: primaryKey,
             secondary: secondaryKeys,
         };
@@ -477,7 +482,7 @@ class BasicTypes {
             || text === "TYPE HASHED TABLE"
             || text === "TYPE INDEX TABLE"
             || text === "TYPE ANY TABLE") {
-            return new Types.TableType(new Types.AnyType(), { withHeader: node.concatTokens().toUpperCase().includes("WITH HEADER LINE") });
+            return new Types.TableType(new Types.AnyType(), { withHeader: node.concatTokens().toUpperCase().includes("WITH HEADER LINE"), keyType: Types.TableKeyType.default });
         }
         else if (text.startsWith("LIKE ")) {
             let sub = node.findFirstExpression(Expressions.Type);
@@ -495,7 +500,7 @@ class BasicTypes {
             }
             found = this.resolveLikeName(sub);
             if (found && this.isOccurs(node)) {
-                found = new Types.TableType(found, { withHeader: text.includes("WITH HEADER LINE") }, qualifiedName);
+                found = new Types.TableType(found, { withHeader: text.includes("WITH HEADER LINE"), keyType: Types.TableKeyType.default }, qualifiedName);
             }
         }
         else if (text.startsWith("TYPE LINE OF ")) {
@@ -524,17 +529,17 @@ class BasicTypes {
             found = this.resolveTypeName(typeName, this.findLength(node), this.findDecimals(node), qualifiedName);
             const concat = node.concatTokens().toUpperCase();
             if (found && this.isOccurs(node)) {
-                found = new Types.TableType(found, { withHeader: concat.includes(" WITH HEADER LINE") }, qualifiedName);
+                found = new Types.TableType(found, { withHeader: concat.includes(" WITH HEADER LINE"), keyType: Types.TableKeyType.default }, qualifiedName);
             }
             else if (found && concat.includes(" WITH HEADER LINE")) {
                 if (found instanceof Types.VoidType) {
-                    found = new Types.TableType(found, { withHeader: true });
+                    found = new Types.TableType(found, { withHeader: true, keyType: Types.TableKeyType.default });
                 }
                 else if (!(found instanceof Types.TableType)) {
                     throw new Error("WITH HEADER LINE can only be used with internal table");
                 }
                 else {
-                    found = new Types.TableType(found.getRowType(), { withHeader: true });
+                    found = new Types.TableType(found.getRowType(), { withHeader: true, keyType: Types.TableKeyType.default });
                 }
             }
             if (found === undefined && typeName === undefined) {
@@ -548,7 +553,7 @@ class BasicTypes {
                 }
                 found = new Types.CharacterType(length, { qualifiedName: qualifiedName }); // fallback
                 if (this.isOccurs(node)) {
-                    found = new Types.TableType(found, { withHeader: concat.includes(" WITH HEADER LINE") }, qualifiedName);
+                    found = new Types.TableType(found, { withHeader: concat.includes(" WITH HEADER LINE"), keyType: Types.TableKeyType.default }, qualifiedName);
                 }
             }
         }

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

@@ -32,7 +32,7 @@ class Controls {
                 { name: "LINE_SELECTOR", type: new basic_1.CharacterType(1) },
                 { name: "H_GRID", type: new basic_1.CharacterType(1) },
                 { name: "V_GRID", type: new basic_1.CharacterType(1) },
-                { name: "COLS", type: new basic_1.TableType(cols, { withHeader: false }) },
+                { name: "COLS", type: new basic_1.TableType(cols, { withHeader: false, keyType: basic_1.TableKeyType.default }) },
                 { name: "INVISIBLE", type: new basic_1.CharacterType(1) },
             ]);
             const id = new _typed_identifier_1.TypedIdentifier(token, filename, type);

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

@@ -21,13 +21,13 @@ class Find {
                 { name: "LINE", type: new basic_1.IntegerType() },
                 { name: "OFFSET", type: new basic_1.IntegerType() },
                 { name: "LENGTH", type: new basic_1.IntegerType() },
-                { name: "SUBMATCHES", type: new basic_1.TableType(sub, { withHeader: false }) },
+                { name: "SUBMATCHES", type: new basic_1.TableType(sub, { withHeader: false, keyType: basic_1.TableKeyType.default }) },
             ], "MATCH_RESULT", "MATCH_RESULT");
             if (node.concatTokens().toUpperCase().startsWith("FIND FIRST")) {
                 this.inline(rfound, scope, filename, type);
             }
             else {
-                this.inline(rfound, scope, filename, new basic_1.TableType(type, { withHeader: false }, "MATCH_RESULT_TAB"));
+                this.inline(rfound, scope, filename, new basic_1.TableType(type, { withHeader: false, keyType: basic_1.TableKeyType.default }, "MATCH_RESULT_TAB"));
             }
         }
         const ofound = node.findExpressionsAfterToken("OFFSET");

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

@@ -21,7 +21,7 @@ class Ranges {
                 { name: "low", type: found },
                 { name: "high", type: found },
             ]);
-            const type = new basic_1.TableType(structure, { withHeader: true });
+            const type = new basic_1.TableType(structure, { withHeader: true, keyType: basic_1.TableKeyType.default });
             const id = new _typed_identifier_1.TypedIdentifier(nameToken, filename, type);
             scope.addIdentifier(id);
         }

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

@@ -39,7 +39,7 @@ class SelectOption {
                 { name: "LOW", type: found },
                 { name: "HIGH", type: found },
             ]);
-            scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, filename, new basic_1.TableType(stru, { withHeader: true })));
+            scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, filename, new basic_1.TableType(stru, { withHeader: true, keyType: basic_1.TableKeyType.default })));
             return;
         }
         if (nameToken) {

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

@@ -10,7 +10,7 @@ const _type_utils_1 = require("../_type_utils");
 class Split {
     runSyntax(node, scope, filename) {
         const intoTable = node.findTokenSequencePosition("INTO", "TABLE") !== undefined;
-        const type = intoTable ? new basic_1.TableType(new basic_1.StringType(), { withHeader: false }) : new basic_1.StringType();
+        const type = intoTable ? new basic_1.TableType(new basic_1.StringType(), { withHeader: false, keyType: basic_1.TableKeyType.default }) : new basic_1.StringType();
         for (const target of node.findAllExpressions(Expressions.Target)) {
             const inline = target.findDirectExpression(Expressions.InlineData);
             if (inline) {

package/build/src/abap/5_syntax/structures/data.js

@@ -58,7 +58,7 @@ class Data {
                 }
                 if (found instanceof Basic.VoidType) {
                     if (table === true) {
-                        return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.TableType(found, { withHeader: true }));
+                        return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.TableType(found, { withHeader: true, keyType: Basic.TableKeyType.default }));
                     }
                     else {
                         return new _typed_identifier_1.TypedIdentifier(name, filename, found);
@@ -76,7 +76,7 @@ class Data {
             }
         }
         if (table === true) {
-            return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.TableType(new Basic.StructureType(components), { withHeader: true }));
+            return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.TableType(new Basic.StructureType(components), { withHeader: true, keyType: Basic.TableKeyType.default }));
         }
         else {
             const val = Object.keys(values).length > 0 ? values : undefined;

package/build/src/abap/5_syntax/structures/statics.js

@@ -49,7 +49,7 @@ class Statics {
                 }
                 if (found instanceof Basic.VoidType) {
                     if (table === true) {
-                        return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.TableType(found, { withHeader: true }));
+                        return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.TableType(found, { withHeader: true, keyType: Basic.TableKeyType.default }));
                     }
                     else {
                         return new _typed_identifier_1.TypedIdentifier(name, filename, found);
@@ -67,7 +67,7 @@ class Statics {
             }
         }
         if (table === true) {
-            return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.TableType(new Basic.StructureType(components), { withHeader: true }));
+            return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.TableType(new Basic.StructureType(components), { withHeader: true, keyType: Basic.TableKeyType.default }));
         }
         else {
             return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.StructureType(components));

package/build/src/abap/types/basic/table_type.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableType = exports.TableAccessType = void 0;
+exports.TableType = exports.TableKeyType = exports.TableAccessType = void 0;
 const _abstract_type_1 = require("./_abstract_type");
 var TableAccessType;
 (function (TableAccessType) {
@@ -10,6 +10,12 @@ var TableAccessType;
     TableAccessType["index"] = "INDEX";
     TableAccessType["any"] = "ANY";
 })(TableAccessType = exports.TableAccessType || (exports.TableAccessType = {}));
+var TableKeyType;
+(function (TableKeyType) {
+    TableKeyType["default"] = "DEFAULT";
+    TableKeyType["user"] = "USER";
+    TableKeyType["empty"] = "EMPTY";
+})(TableKeyType = exports.TableKeyType || (exports.TableKeyType = {}));
 class TableType extends _abstract_type_1.AbstractType {
     constructor(rowType, options, qualifiedName) {
         var _a;
@@ -49,6 +55,7 @@ class TableType extends _abstract_type_1.AbstractType {
     isGeneric() {
         var _a, _b;
         if (((_a = this.options.primaryKey) === null || _a === void 0 ? void 0 : _a.type) !== TableAccessType.standard
+            && this.options.keyType === TableKeyType.user
             && ((_b = this.options.primaryKey) === null || _b === void 0 ? void 0 : _b.keyFields.length) === 0) {
             return true;
         }

package/build/src/abap/types/form_definition.js

@@ -49,10 +49,10 @@ class FormDefinition extends _identifier_1.Identifier {
                 let type = p.getType();
                 const isStructure = param.findDirectTokenByText("STRUCTURE") !== undefined;
                 if (isStructure) {
-                    type = new basic_1.TableType(type, { withHeader: true });
+                    type = new basic_1.TableType(type, { withHeader: true, keyType: basic_1.TableKeyType.default });
                 }
                 if (type instanceof basic_1.TableType) {
-                    type = new basic_1.TableType(type.getRowType(), { withHeader: true });
+                    type = new basic_1.TableType(type.getRowType(), { withHeader: true, keyType: basic_1.TableKeyType.default });
                 }
                 else if (!(type instanceof basic_1.UnknownType) && !(type instanceof basic_1.VoidType)) {
                     type = new basic_1.UnknownType("FORM TABLES type must be table type");

package/build/src/ddic.js

@@ -66,7 +66,7 @@ class DDIC {
             case "%_C_POINTER":
                 return new Types.HexType(8, qualifiedName);
             case "TABLE":
-                return new Types.TableType(new Types.AnyType(), { withHeader: false });
+                return new Types.TableType(new Types.AnyType(), { withHeader: false, keyType: Types.TableKeyType.default });
             case "DATA":
                 return new Types.AnyType({ qualifiedName: qualifiedName });
             case "NUMERIC":

package/build/src/objects/table_type.js

@@ -32,6 +32,7 @@ class TableType extends _abstract_object_1.AbstractObject {
         var _a, _b, _c;
         const tableOptions = {
             withHeader: false,
+            keyType: Types.TableKeyType.user,
             secondary: [],
         };
         for (const k of ((_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.dd43v) || []) {

package/build/src/registry.js

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

package/build/src/rules/constant_classes.js

@@ -24,7 +24,7 @@ class ConstantClasses {
             title: "Validate constant classes",
             shortDescription: `Checks that a class contains exactly the constants corresponding to a domain's fixed values.`,
             extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#prefer-enumeration-classes-to-constants-interfaces`,
-            tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.Experimental],
+            tags: [_irule_1.RuleTag.Styleguide],
         };
     }
     initialize(reg) {

package/build/src/rules/downport.js

@@ -122,7 +122,7 @@ class Downport {
         return {
             key: "downport",
             title: "Downport statement",
-            shortDescription: `Experimental downport functionality`,
+            shortDescription: `Downport functionality`,
             extendedInformation: `Much like the 'commented_code' rule this rule loops through unknown statements and tries parsing with
 a higher level language version. If successful, various rules are applied to downport the statement.
 Target downport version is always v702, thus rule is only enabled if target version is v702.
@@ -155,7 +155,7 @@ Current rules:
 * MESSAGE with non simple source
 
 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],
+            tags: [_irule_1.RuleTag.Downport, _irule_1.RuleTag.Quickfix],
         };
     }
     getConfig() {

package/build/src/rules/index.js

@@ -142,6 +142,7 @@ __exportStar(require("./space_before_dot"), exports);
 __exportStar(require("./sql_escape_host_variables"), exports);
 __exportStar(require("./start_at_tab"), exports);
 __exportStar(require("./static_call_via_instance"), exports);
+__exportStar(require("./strict_sql"), exports);
 __exportStar(require("./superclass_final"), exports);
 __exportStar(require("./superfluous_value"), exports);
 __exportStar(require("./sy_modification"), exports);

package/build/src/rules/sql_escape_host_variables.js

@@ -23,7 +23,7 @@ class SQLEscapeHostVariables extends _abap_rule_1.ABAPRule {
             title: "Escape SQL host variables",
             shortDescription: `Escape SQL host variables, from 740sp05`,
             extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#avoid-obsolete-language-elements`,
-            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Styleguide, _irule_1.RuleTag.Quickfix],
+            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Styleguide, _irule_1.RuleTag.Quickfix, _irule_1.RuleTag.Syntax],
             badExample: `SELECT * FROM tab INTO TABLE res WHERE field = val.`,
             goodExample: `SELECT * FROM tab INTO TABLE @res WHERE field = @val.`,
         };

package/build/src/rules/strict_sql.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StrictSQL = exports.StrictSQLConf = void 0;
+const Statements = require("../abap/2_statements/statements");
+const Expressions = require("../abap/2_statements/expressions");
+const issue_1 = require("../issue");
+const _abap_rule_1 = require("./_abap_rule");
+const _basic_rule_config_1 = require("./_basic_rule_config");
+const version_1 = require("../version");
+const _irule_1 = require("./_irule");
+class StrictSQLConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.StrictSQLConf = StrictSQLConf;
+class StrictSQL extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new StrictSQLConf();
+    }
+    getMetadata() {
+        return {
+            key: "strict_sql",
+            title: "Strict SQL",
+            shortDescription: `Strict SQL`,
+            extendedInformation: `https://help.sap.com/doc/abapdocu_751_index_htm/7.51/en-US/abapinto_clause.htm
+
+https://help.sap.com/doc/abapdocu_751_index_htm/7.51/en-us/abenopensql_strict_mode_750.htm
+
+Also see separate rule sql_escape_host_variables`,
+            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Syntax],
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file, obj) {
+        const issues = [];
+        const type = obj.getType();
+        if (type === "INTF" || type === "TYPE") {
+            return [];
+        }
+        if (this.reg.getConfig().getVersion() < version_1.Version.v740sp02
+            && this.reg.getConfig().getVersion() !== version_1.Version.Cloud) {
+            return [];
+        }
+        for (const s of file.getStatements()) {
+            if (s.get() instanceof Statements.Select
+                || s.get() instanceof Statements.SelectLoop) {
+                const expr = s.findDirectExpression(Expressions.Select);
+                const where = expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLCond);
+                const into = (expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLIntoStructure))
+                    || (expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLIntoTable));
+                if (into === undefined || where === undefined) {
+                    continue;
+                }
+                if (where.getFirstToken().getStart().isBefore(into.getFirstToken().getStart())) {
+                    continue;
+                }
+                const message = "INTO/APPENDING must be last in strict SQL";
+                const issue = issue_1.Issue.atToken(file, s.getFirstToken(), message, this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+                break;
+            }
+        }
+        return issues;
+    }
+}
+exports.StrictSQL = StrictSQL;
+//# sourceMappingURL=strict_sql.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.96.2",
+    "version": "2.97.0",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",