@abaplint/transpiler-cli 2.5.71 → 2.5.73

package/build/bundle.js

@@ -18583,7 +18583,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(),
@@ -18879,7 +18879,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(),
     },
@@ -20099,10 +20099,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("-"))) {
@@ -20659,7 +20659,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
@@ -20792,13 +20792,18 @@ class BasicTypes {
             return undefined;
         }
         let type = undefined;
-        if (text.startsWith("TYPE STANDARD TABLE ") || text.startsWith("LIKE STANDARD TABLE ")) {
+        if (text.startsWith("TYPE STANDARD TABLE ")
+            || text.startsWith("TYPE TABLE ")
+            || text.startsWith("LIKE TABLE ")
+            || text.startsWith("LIKE STANDARD TABLE ")) {
             type = basic_1.TableAccessType.standard;
         }
-        else if (text.startsWith("TYPE SORTED TABLE ") || text.startsWith("LIKE SORTED TABLE ")) {
+        else if (text.startsWith("TYPE SORTED TABLE ")
+            || text.startsWith("LIKE SORTED TABLE ")) {
             type = basic_1.TableAccessType.sorted;
         }
-        else if (text.startsWith("TYPE HASHED TABLE ") || text.startsWith("LIKE HASHED TABLE ")) {
+        else if (text.startsWith("TYPE HASHED TABLE ")
+            || text.startsWith("LIKE HASHED TABLE ")) {
             type = basic_1.TableAccessType.hashed;
         }
         const typeTableKeys = node.findAllExpressions(expressions_1.TypeTableKey);
@@ -20806,7 +20811,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: [],
         };
@@ -20837,8 +20842,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,
         };
@@ -20889,6 +20902,7 @@ class BasicTypes {
                 { name: "low", type: found },
                 { name: "high", type: found },
             ]);
+            options.primaryKey.type = basic_1.TableAccessType.standard;
             return new Types.TableType(structure, options, name);
         }
         else if (text.startsWith("LIKE RANGE OF ")) {
@@ -20903,6 +20917,7 @@ class BasicTypes {
                 { name: "low", type: found },
                 { name: "high", type: found },
             ], name);
+            options.primaryKey.type = basic_1.TableAccessType.standard;
             return new Types.TableType(structure, options);
         }
         else if (typename && (text.startsWith("TYPE TABLE FOR CREATE ")
@@ -20983,7 +20998,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);
@@ -21001,7 +21016,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 ")) {
@@ -21030,17 +21045,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) {
@@ -21054,7 +21069,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);
                 }
             }
         }
@@ -23235,8 +23250,10 @@ class MethodDefReturning {
         if (type === undefined) {
             throw new Error("method_parameter.ts, unexpected structure");
         }
-        const found = new basic_types_1.BasicTypes(filename, scope).parseType(type);
-        //    console.dir(found);
+        let found = new basic_types_1.BasicTypes(filename, scope).parseType(type);
+        if ((found === null || found === void 0 ? void 0 : found.isGeneric()) === true) {
+            found = new basic_1.UnknownType("RETURNING parameter must be fully specified");
+        }
         if (found) {
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, found, meta);
         }
@@ -26225,7 +26242,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);
@@ -26460,7 +26477,12 @@ class Data {
     runSyntax(node, scope, filename) {
         const dd = node.findFirstExpression(Expressions.DataDefinition);
         if (dd) {
-            return new data_definition_1.DataDefinition().runSyntax(dd, scope, filename);
+            const id = new data_definition_1.DataDefinition().runSyntax(dd, scope, filename);
+            if ((id === null || id === void 0 ? void 0 : id.getType().isGeneric()) === true
+                && (id === null || id === void 0 ? void 0 : id.getType().containsVoid()) === false) {
+                throw new Error("DATA definition cannot be generic");
+            }
+            return id;
         }
         const name = node.findFirstExpression(Expressions.DefinitionName);
         if (name) {
@@ -26867,13 +26889,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");
@@ -28403,7 +28425,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);
         }
@@ -28863,7 +28885,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) {
@@ -29150,7 +29172,7 @@ const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/
 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) {
@@ -30025,7 +30047,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);
@@ -30043,7 +30065,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;
@@ -30114,7 +30136,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);
@@ -30132,7 +30154,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));
@@ -32697,7 +32719,8 @@ class DataReference extends _abstract_type_1.AbstractType {
         return "REF TO " + this.type.toABAP();
     }
     isGeneric() {
-        return this.type.isGeneric();
+        // a DATA definition can be "REF TO data", so its not generic
+        return false;
     }
     containsVoid() {
         return this.type.containsVoid();
@@ -32971,7 +32994,8 @@ class GenericObjectReferenceType extends _abstract_type_1.AbstractType {
         return "```REF TO object```";
     }
     isGeneric() {
-        return true;
+        // a DATA definition can be "REF TO object", so its not generic
+        return false;
     }
     toABAP() {
         return "REF TO object";
@@ -33430,7 +33454,7 @@ exports.StructureType = StructureType;
 "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 = __webpack_require__(/*! ./_abstract_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/_abstract_type.js");
 var TableAccessType;
 (function (TableAccessType) {
@@ -33440,6 +33464,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;
@@ -33477,6 +33507,12 @@ 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;
+        }
         return this.rowType.isGeneric();
     }
     containsVoid() {
@@ -34280,10 +34316,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");
@@ -36518,7 +36554,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":
@@ -45005,6 +45041,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) || []) {
@@ -46213,7 +46250,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.51";
+        return "2.97.0";
     }
     getDDICReferences() {
         return this.references;
@@ -49639,7 +49676,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) {
@@ -50903,7 +50940,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.
@@ -50936,7 +50973,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() {
@@ -54533,6 +54570,75 @@ exports.FullyTypeConstants = FullyTypeConstants;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/rules/fully_type_itabs.js":
+/*!*************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/rules/fully_type_itabs.js ***!
+  \*************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.FullyTypeITabs = exports.FullyTypeITabsConf = void 0;
+const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
+const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
+const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const Expressions = __webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+class FullyTypeITabsConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.FullyTypeITabsConf = FullyTypeITabsConf;
+class FullyTypeITabs extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new FullyTypeITabsConf();
+    }
+    getMetadata() {
+        return {
+            key: "fully_type_itabs",
+            title: "Fully type internal tables",
+            shortDescription: `No implict table types or table keys`,
+            badExample: `DATA lt_foo TYPE TABLE OF ty.
+DATA lt_bar TYPE STANDARD TABLE OF ty.`,
+            goodExample: `DATA lt_foo TYPE STANDARD TABLE OF ty WITH EMPTY KEY.`,
+            tags: [_irule_1.RuleTag.SingleFile],
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file) {
+        const issues = [];
+        for (const statement of file.getStatements()) {
+            if (!(statement.get() instanceof Statements.Data)) {
+                continue;
+            }
+            const tt = statement.findFirstExpression(Expressions.TypeTable);
+            if (tt === undefined) {
+                continue;
+            }
+            const concat = tt.concatTokens().toUpperCase();
+            if (concat.includes("TYPE TABLE OF")) {
+                const message = "Specify table type";
+                issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.conf.severity));
+            }
+            else if (concat.includes(" WITH ") === false) {
+                const message = "Specify table key";
+                issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.conf.severity));
+            }
+        }
+        return issues;
+    }
+}
+exports.FullyTypeITabs = FullyTypeITabs;
+//# sourceMappingURL=fully_type_itabs.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/rules/function_module_recommendations.js":
 /*!****************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/rules/function_module_recommendations.js ***!
@@ -56031,6 +56137,7 @@ __exportStar(__webpack_require__(/*! ./forbidden_pseudo_and_pragma */ "./node_mo
 __exportStar(__webpack_require__(/*! ./forbidden_void_type */ "./node_modules/@abaplint/core/build/src/rules/forbidden_void_type.js"), exports);
 __exportStar(__webpack_require__(/*! ./form_tables_obsolete */ "./node_modules/@abaplint/core/build/src/rules/form_tables_obsolete.js"), exports);
 __exportStar(__webpack_require__(/*! ./fully_type_constants */ "./node_modules/@abaplint/core/build/src/rules/fully_type_constants.js"), exports);
+__exportStar(__webpack_require__(/*! ./fully_type_itabs */ "./node_modules/@abaplint/core/build/src/rules/fully_type_itabs.js"), exports);
 __exportStar(__webpack_require__(/*! ./function_module_recommendations */ "./node_modules/@abaplint/core/build/src/rules/function_module_recommendations.js"), exports);
 __exportStar(__webpack_require__(/*! ./functional_writing */ "./node_modules/@abaplint/core/build/src/rules/functional_writing.js"), exports);
 __exportStar(__webpack_require__(/*! ./global_class */ "./node_modules/@abaplint/core/build/src/rules/global_class.js"), exports);
@@ -56108,6 +56215,7 @@ __exportStar(__webpack_require__(/*! ./space_before_dot */ "./node_modules/@abap
 __exportStar(__webpack_require__(/*! ./sql_escape_host_variables */ "./node_modules/@abaplint/core/build/src/rules/sql_escape_host_variables.js"), exports);
 __exportStar(__webpack_require__(/*! ./start_at_tab */ "./node_modules/@abaplint/core/build/src/rules/start_at_tab.js"), exports);
 __exportStar(__webpack_require__(/*! ./static_call_via_instance */ "./node_modules/@abaplint/core/build/src/rules/static_call_via_instance.js"), exports);
+__exportStar(__webpack_require__(/*! ./strict_sql */ "./node_modules/@abaplint/core/build/src/rules/strict_sql.js"), exports);
 __exportStar(__webpack_require__(/*! ./superclass_final */ "./node_modules/@abaplint/core/build/src/rules/superclass_final.js"), exports);
 __exportStar(__webpack_require__(/*! ./superfluous_value */ "./node_modules/@abaplint/core/build/src/rules/superfluous_value.js"), exports);
 __exportStar(__webpack_require__(/*! ./sy_modification */ "./node_modules/@abaplint/core/build/src/rules/sy_modification.js"), exports);
@@ -62103,7 +62211,8 @@ If the target is a sorted/hashed table, no issue is reported`,
                 type = found;
             }
             if (type instanceof basic_1.TableType
-                && ((type === null || type === void 0 ? void 0 : type.getAccessType()) === basic_1.TableAccessType.sorted || (type === null || type === void 0 ? void 0 : type.getAccessType()) === basic_1.TableAccessType.hashed)) {
+                && ((type === null || type === void 0 ? void 0 : type.getAccessType()) === basic_1.TableAccessType.sorted
+                    || (type === null || type === void 0 ? void 0 : type.getAccessType()) === basic_1.TableAccessType.hashed)) {
                 return true;
             }
         }
@@ -62931,6 +63040,7 @@ const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@ab
 const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
 const version_1 = __webpack_require__(/*! ../version */ "./node_modules/@abaplint/core/build/src/version.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 class SQLEscapeHostVariablesConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.SQLEscapeHostVariablesConf = SQLEscapeHostVariablesConf;
@@ -62945,7 +63055,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],
+            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.`,
         };
@@ -62958,52 +63068,45 @@ class SQLEscapeHostVariables extends _abap_rule_1.ABAPRule {
     }
     runParsed(file, obj) {
         const issues = [];
-        if (obj.getType() === "INTF") {
+        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) {
+        if (this.reg.getConfig().getVersion() < version_1.Version.v740sp02
+            && this.reg.getConfig().getVersion() !== version_1.Version.Cloud) {
             return [];
         }
         for (const s of file.getStatements()) {
-            const str = s.concatTokens().toUpperCase();
-            if (s.get() instanceof Statements.Select
-                || s.get() instanceof Statements.SelectLoop) {
-                // this is not completely correct and does not catch all, but okay for now
-                // todo: replace with logic from "else if" branch below, when/if it proves to work
-                if (str.includes(" INTO ( @")
-                    || str.includes(" INTO (@")
-                    || str.includes(" INTO @")
-                    || str.includes(" INTO TABLE @")
-                    || str.includes(" INTO CORRESPONDING FIELDS OF @")
-                    || str.includes(" INTO CORRESPONDING FIELDS OF TABLE @")
-                    || str.includes(" APPENDING TABLE @")
-                    || (str.includes(" APPENDING ") === false && str.includes(" INTO ") === false)
-                    || str.includes(" APPENDING CORRESPONDING FIELDS OF TABLE @")) {
-                    continue;
-                }
-                else {
-                    const message = "Escape SQL host variables";
-                    const issue = issue_1.Issue.atToken(file, s.getFirstToken(), message, this.getMetadata().key, this.conf.severity);
-                    issues.push(issue);
-                }
-            }
-            else if (s.get() instanceof Statements.UpdateDatabase
+            if (s.get() instanceof Statements.UpdateDatabase
                 || s.get() instanceof Statements.ModifyDatabase
+                || s.get() instanceof Statements.Select
+                || s.get() instanceof Statements.SelectLoop
                 || s.get() instanceof Statements.InsertDatabase
                 || s.get() instanceof Statements.DeleteDatabase) {
-                if (str.startsWith("MODIFY SCREEN FROM ")) {
-                    continue;
-                }
                 for (const o of s.findAllExpressions(Expressions.SQLSource)) {
                     const first = o.getFirstChild();
                     if (((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.Source && first.getChildren()[0].get() instanceof Expressions.FieldChain)
                         || ((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.SimpleSource3 && first.getChildren()[0].get() instanceof Expressions.FieldChain)) {
                         const message = "Escape SQL host variables";
-                        const issue = issue_1.Issue.atToken(file, first.getFirstToken(), message, this.getMetadata().key, this.conf.severity);
+                        const firstToken = o.getFirstChild().getFirstToken();
+                        const fix = edit_helper_1.EditHelper.replaceToken(file, firstToken, "@" + (firstToken === null || firstToken === void 0 ? void 0 : firstToken.getStr()));
+                        const issue = issue_1.Issue.atToken(file, first.getFirstToken(), message, this.getMetadata().key, this.conf.severity, fix);
                         issues.push(issue);
                         break;
                     }
                 }
+                for (const o of s.findAllExpressions(Expressions.SQLTarget)) {
+                    const escaped = o.findDirectTokenByText("@");
+                    if (escaped !== undefined) {
+                        continue;
+                    }
+                    const message = "Escape SQL host variables";
+                    const firstToken = o.getFirstChild().getFirstToken();
+                    const fix = edit_helper_1.EditHelper.replaceToken(file, firstToken, "@" + (firstToken === null || firstToken === void 0 ? void 0 : firstToken.getStr()));
+                    const issue = issue_1.Issue.atToken(file, o.getFirstToken(), message, this.getMetadata().key, this.conf.severity, fix);
+                    issues.push(issue);
+                    break;
+                }
             }
         }
         return issues;
@@ -63189,6 +63292,87 @@ exports.StaticCallViaInstance = StaticCallViaInstance;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/rules/strict_sql.js":
+/*!*******************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/rules/strict_sql.js ***!
+  \*******************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.StrictSQL = exports.StrictSQLConf = void 0;
+const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const Expressions = __webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
+const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
+const version_1 = __webpack_require__(/*! ../version */ "./node_modules/@abaplint/core/build/src/version.js");
+const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+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
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/rules/superclass_final.js":
 /*!*************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/rules/superclass_final.js ***!
@@ -76273,7 +76457,7 @@ class ClassImplementationTranspiler {
             if (isStatic === false) {
                 continue;
             }
-            ret += clasName + "." + alias.getName().toLowerCase() + " = " + clasName + "." + alias.getComponent().replace("~", "$") + ";\n";
+            ret += traversal_1.Traversal.escapeNamespace(clasName) + "." + alias.getName().toLowerCase() + " = " + traversal_1.Traversal.escapeNamespace(clasName) + "." + traversal_1.Traversal.escapeNamespace(alias.getComponent().replace("~", "$")) + ";\n";
         }
         // this is not correct, ABAP does not invocate the class constructor at require time,
         // but this will probably work
@@ -77365,13 +77549,14 @@ class Traversal {
         return undefined;
     }
     buildAttributes(def) {
+        var _a, _b;
         const attr = [];
         // TODO: visibility is wrong for classes
-        for (const a of (def === null || def === void 0 ? void 0 : def.getAttributes().getAll()) || []) {
+        for (const a of ((_a = def === null || def === void 0 ? void 0 : def.getAttributes()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
             const type = new transpile_types_1.TranspileTypes().toType(a.getType());
             attr.push(`"${a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "U", "is_constant": " "}`);
         }
-        for (const a of (def === null || def === void 0 ? void 0 : def.getAttributes().getConstants()) || []) {
+        for (const a of ((_b = def === null || def === void 0 ? void 0 : def.getAttributes()) === null || _b === void 0 ? void 0 : _b.getConstants()) || []) {
             const type = new transpile_types_1.TranspileTypes().toType(a.getType());
             attr.push(`"${a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "U", "is_constant": "X"}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.71",
+  "version": "2.5.73",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,12 +25,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.71",
+    "@abaplint/transpiler": "^2.5.73",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
     "@types/node": "^18.15.11",
-    "@abaplint/core": "^2.95.51",
+    "@abaplint/core": "^2.97.0",
     "progress": "^2.0.3",
     "webpack": "^5.77.0",
     "webpack-cli": "^5.0.1",