@abaplint/transpiler-cli 2.5.71 → 2.5.72

package/build/bundle.js

@@ -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);
@@ -20815,6 +20820,9 @@ 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;
@@ -20889,6 +20897,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 +20912,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 ")
@@ -23235,8 +23245,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);
         }
@@ -26460,7 +26472,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) {
@@ -32697,7 +32714,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 +32989,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";
@@ -33477,6 +33496,11 @@ 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
+            && ((_b = this.options.primaryKey) === null || _b === void 0 ? void 0 : _b.keyFields.length) === 0) {
+            return true;
+        }
         return this.rowType.isGeneric();
     }
     containsVoid() {
@@ -46213,7 +46237,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.51";
+        return "2.96.2";
     }
     getDDICReferences() {
         return this.references;
@@ -54533,6 +54557,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 +56124,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);
@@ -62103,7 +62197,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 +63026,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 +63041,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],
             badExample: `SELECT * FROM tab INTO TABLE res WHERE field = val.`,
             goodExample: `SELECT * FROM tab INTO TABLE @res WHERE field = @val.`,
         };
@@ -62958,52 +63054,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;
@@ -76273,7 +76362,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.71",
+  "version": "2.5.72",
   "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.72",
     "@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.96.2",
     "progress": "^2.0.3",
     "webpack": "^5.77.0",
     "webpack-cli": "^5.0.1",