@abaplint/core 2.113.51 → 2.113.53

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

@@ -6,7 +6,8 @@ const _1 = require(".");
 class InlineLoopDefinition extends combi_1.Expression {
     getRunnable() {
         const index = (0, combi_1.seq)("INDEX INTO", _1.TargetField);
-        return (0, combi_1.seq)((0, combi_1.altPrio)(_1.TargetFieldSymbol, _1.TargetField), "IN", (0, combi_1.opt)("GROUP"), _1.Source, (0, combi_1.optPrio)(index));
+        const key = (0, combi_1.seq)("USING KEY", _1.SimpleName);
+        return (0, combi_1.seq)((0, combi_1.altPrio)(_1.TargetFieldSymbol, _1.TargetField), "IN", (0, combi_1.opt)("GROUP"), _1.Source, (0, combi_1.optPrio)(key), (0, combi_1.optPrio)(index));
     }
 }
 exports.InlineLoopDefinition = InlineLoopDefinition;

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

@@ -6,8 +6,6 @@ const _1 = require(".");
 const version_1 = require("../../../version");
 const sql_group_by_1 = require("./sql_group_by");
 const sql_into_structure_1 = require("./sql_into_structure");
-const tokens_1 = require("../../1_lexer/tokens");
-const sql_field_name_1 = require("./sql_field_name");
 const sql_up_to_1 = require("./sql_up_to");
 class Select extends combi_1.Expression {
     getRunnable() {
@@ -19,8 +17,7 @@ class Select extends combi_1.Expression {
         // todo, HINTS cannot be anywhere, need an expression dedicated for strict sql
         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, _1.SQLHints);
         const permSingle = (0, combi_1.per)(_1.SQLFrom, (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList), where, _1.SQLClient, bypass, sql_group_by_1.SQLGroupBy, fields, _1.DatabaseConnection, _1.SQLHints);
-        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 fieldList = (0, combi_1.optPrio)((0, combi_1.altPrio)(_1.SQLFieldList, paren));
+        const fieldList = (0, combi_1.optPrio)(_1.SQLFieldList);
         const single = (0, combi_1.seq)("SINGLE", (0, combi_1.optPrio)("FOR UPDATE"), fieldList, permSingle);
         const other = (0, combi_1.seq)((0, combi_1.optPrio)("DISTINCT"), fieldList, perm);
         const ret = (0, combi_1.seq)("SELECT", (0, combi_1.altPrio)(single, other));

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

@@ -4,11 +4,13 @@ exports.SQLFieldList = void 0;
 const combi_1 = require("../combi");
 const _1 = require(".");
 const version_1 = require("../../../version");
+const tokens_1 = require("../../1_lexer/tokens");
 class SQLFieldList extends combi_1.Expression {
     getRunnable() {
+        const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), _1.SQLFieldName, (0, combi_1.tok)(tokens_1.WParenRightW));
         const nev = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.starPrio)((0, combi_1.seq)(",", _1.SQLField)));
         const old = (0, combi_1.starPrio)(_1.SQLField);
-        return (0, combi_1.altPrio)("*", _1.Dynamic, (0, combi_1.seq)(_1.SQLField, (0, combi_1.alt)(nev, old)));
+        return (0, combi_1.altPrio)("*", _1.Dynamic, (0, combi_1.seq)(_1.SQLField, (0, combi_1.alt)(nev, old)), paren);
     }
 }
 exports.SQLFieldList = SQLFieldList;

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

@@ -12,7 +12,7 @@ class StringTemplateFormatting extends combi_1.Expression {
         const alignOptions = (0, combi_1.altPrio)("LEFT", "RIGHT", "CENTER", _1.Source);
         const dateTimeOptions = (0, combi_1.altPrio)("RAW", "ISO", "USER", "ENVIRONMENT", _1.Source, dynamic_1.Dynamic);
         const timeStampOptions = (0, combi_1.altPrio)("SPACE", "ISO", "USER", "ENVIRONMENT", _1.Source);
-        const numberOptions = (0, combi_1.altPrio)("RAW", "USER", "ENVIRONMENT", _1.Source);
+        const numberOptions = (0, combi_1.altPrio)("RAW", "USER", "ENVIRONMENT", _1.Source, dynamic_1.Dynamic);
         const signOptions = (0, combi_1.altPrio)("LEFT", "LEFTPLUS", "LEFTSPACE", "RIGHT", "RIGHTPLUS", "RIGHTSPACE", _1.Source);
         const caseOptions = (0, combi_1.altPrio)("RAW", "UPPER", "LOWER", _1.Source, dynamic_1.Dynamic);
         const zeroXSDOptions = (0, combi_1.altPrio)("YES", "NO", _1.Source);

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

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 class TargetFieldSymbol extends combi_1.Expression {
     getRunnable() {
-        return new _1.FieldSymbol();
+        return (0, combi_1.seq)(_1.FieldSymbol, (0, combi_1.optPrio)(_1.TableBody));
     }
 }
 exports.TargetFieldSymbol = TargetFieldSymbol;

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

@@ -22,7 +22,7 @@ class MethodDef {
         const behavior = (0, combi_1.altPrio)((0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, (0, combi_1.altPrio)(forRead, forfunction)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR CREATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR READ", expressions_1.TypeName, result), (0, combi_1.seq)((0, combi_1.alt)("BEHAVIOR", "LOCK"), "IMPORTING", expressions_1.MethodParamName, "FOR LOCK", expressions_1.TypeName), (0, combi_1.seq)("DETERMINE", (0, combi_1.alt)("ON MODIFY", "ON SAVE"), "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("GLOBAL AUTHORIZATION IMPORTING REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)("INSTANCE AUTHORIZATION IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)("INSTANCE FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result));
         // todo, this is only from version something
         const amdp = (0, combi_1.seq)("AMDP OPTIONS CDS SESSION CLIENT CURRENT", (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefRaising));
-        const ret = (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-METHODS", "METHODS"), expressions_1.MethodName, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), expressions_1.EventHandler), parameters, testing, (0, combi_1.seq)("FOR", (0, combi_1.alt)(tableFunction, ddl, behavior)), amdp, "NOT AT END OF MODE", (0, combi_1.optPrio)(expressions_1.Redefinition)));
+        const ret = (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-METHODS", "METHODS"), expressions_1.MethodName, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), (0, combi_1.optPrio)(def), expressions_1.EventHandler), parameters, testing, (0, combi_1.seq)("FOR", (0, combi_1.alt)(tableFunction, ddl, behavior)), amdp, "NOT AT END OF MODE", (0, combi_1.optPrio)(expressions_1.Redefinition)));
         return ret;
     }
 }

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

@@ -32,7 +32,7 @@ class SelectionScreen {
         const posIntegers = (0, combi_1.regex)(/^(0?[1-9]|[1234567][0-9]|8[0-3])$/);
         const pos = (0, combi_1.seq)("POSITION", (0, combi_1.altPrio)(posIntegers, posSymbols));
         const incl = (0, combi_1.seq)("INCLUDE BLOCKS", expressions_1.BlockName);
-        const tabbed = (0, combi_1.seq)("BEGIN OF TABBED BLOCK", expressions_1.InlineField, "FOR", expressions_1.Integer, "LINES", (0, combi_1.optPrio)("NO INTERVALS"));
+        const tabbed = (0, combi_1.seq)("BEGIN OF TABBED BLOCK", expressions_1.BlockName, "FOR", expressions_1.Integer, "LINES", (0, combi_1.optPrio)("NO INTERVALS"));
         const uline = (0, combi_1.seq)("ULINE", (0, combi_1.opt)(position));
         const param = (0, combi_1.seq)("INCLUDE PARAMETERS", expressions_1.Field);
         const iso = (0, combi_1.seq)("INCLUDE SELECT-OPTIONS", expressions_1.Field);

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

@@ -67,7 +67,7 @@ class ObjectOriented {
         return undefined;
     }
     findMethodViaAlias(methodName, def) {
-        for (const a of def.getAliases()) {
+        for (const a of def.getAliases() || []) {
             if (a.getName().toUpperCase() === methodName.toUpperCase()) {
                 const comp = a.getComponent();
                 const res = this.findMethodInInterface(comp.split("~")[0], comp.split("~")[1]);
@@ -150,9 +150,12 @@ class ObjectOriented {
             return undefined;
         }
         const upper = name.toUpperCase();
-        for (const a of def.getAttributes().getAll()) {
-            if (a.getName().toUpperCase() === upper) {
-                return a;
+        const attr = def.getAttributes();
+        if (attr) {
+            for (const a of attr.getAll()) {
+                if (a.getName().toUpperCase() === upper) {
+                    return a;
+                }
             }
         }
         for (const a of def.getAliases() || []) {
@@ -266,7 +269,11 @@ class ObjectOriented {
         return { method: undefined, def: undefined };
     }
     findMethod(def, methodName) {
-        for (const method of def.getMethodDefinitions().getAll()) {
+        const defs = def.getMethodDefinitions();
+        if (defs === undefined) {
+            return undefined;
+        }
+        for (const method of defs.getAll()) {
             if (method.getName().toUpperCase() === methodName.toUpperCase()) {
                 if (method.isRedefinition()) {
                     return this.findMethodInSuper(def, methodName);

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

@@ -379,6 +379,9 @@ class TypeUtils {
         return this.isAssignable(source, target);
     }
     isAssignable(source, target) {
+        if (source === undefined || target === undefined) {
+            return true;
+        }
         /*
             console.dir(source);
             console.dir(target);

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

@@ -112,7 +112,7 @@ class Source {
                         const foundType = this.determineType(node, input, targetType);
                         const bodyType = new conv_body_1.ConvBody().runSyntax(node.findDirectExpression(Expressions.ConvBody), input);
                         if (new _type_utils_1.TypeUtils(input.scope).isAssignable(foundType, bodyType) === false) {
-                            const message = "CONV: Types not compatible";
+                            const message = `CONV: Types not compatible, ${foundType === null || foundType === void 0 ? void 0 : foundType.constructor.name}, ${bodyType === null || bodyType === void 0 ? void 0 : bodyType.constructor.name}`;
                             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                             return new basic_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                         }

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

@@ -7,30 +7,35 @@ const basic_1 = require("../../types/basic");
 const _syntax_input_1 = require("../_syntax_input");
 class SelectionScreen {
     runSyntax(node, input) {
-        const field = node.findFirstExpression(Expressions.InlineField);
-        if (field === undefined) {
+        const blockNode = node.findFirstExpression(Expressions.BlockName);
+        const blockToken = blockNode === null || blockNode === void 0 ? void 0 : blockNode.getFirstToken();
+        const blockName = blockNode === null || blockNode === void 0 ? void 0 : blockNode.concatTokens();
+        if (blockName !== undefined && blockName.length > 16) {
+            const message = "SELECTION-SCREEN block name too long, " + blockName;
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
         }
-        if (field.getFirstToken().getStr().length > 8) {
+        const field = node.findFirstExpression(Expressions.InlineField);
+        if (field !== undefined && field.getFirstToken().getStr().length > 8) {
             const message = "SELECTION-SCREEN name too long, " + field.getFirstToken().getStr();
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, field.getFirstToken(), message));
             return;
         }
-        const name = field.getFirstToken();
+        const fieldName = field === null || field === void 0 ? void 0 : field.getFirstToken();
         const concat = node.concatTokens().toUpperCase();
-        if (concat.includes("BEGIN OF TABBED BLOCK")) {
+        if (concat.includes("BEGIN OF TABBED BLOCK") && blockToken) {
             const type = new basic_1.StructureType([
                 { name: "PROG", type: new basic_1.CharacterType(40) },
                 { name: "DYNNR", type: new basic_1.CharacterType(4) },
                 { name: "ACTIVETAB", type: new basic_1.CharacterType(132) },
             ]);
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(name, input.filename, type, ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
+            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(blockToken, input.filename, type, ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
         }
-        else if (concat.startsWith("SELECTION-SCREEN TAB")) {
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(name, input.filename, new basic_1.CharacterType(83), ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
+        else if (concat.startsWith("SELECTION-SCREEN TAB") && fieldName) {
+            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(fieldName, input.filename, new basic_1.CharacterType(83), ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
         }
-        else {
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(name, input.filename, new basic_1.CharacterType(83)));
+        else if (fieldName) {
+            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(fieldName, input.filename, new basic_1.CharacterType(83)));
         }
     }
 }

package/build/src/cds/cds_determine_types.js

@@ -4,7 +4,7 @@ exports.CDSDetermineTypes = void 0;
 const basic_1 = require("../abap/types/basic");
 const ddic_1 = require("../ddic");
 class CDSDetermineTypes {
-    parseType(reg, parsedData) {
+    parseType(reg, parsedData, ddlsName) {
         const ddic = new ddic_1.DDIC(reg);
         if ((parsedData === null || parsedData === void 0 ? void 0 : parsedData.fields.length) === 0) {
             return new basic_1.VoidType("DDLS:todo");
@@ -30,7 +30,7 @@ class CDSDetermineTypes {
                     if ((source === null || source === void 0 ? void 0 : source.name) === undefined) {
                         components.push({
                             name: f.name,
-                            type: new basic_1.UnknownType("CDS parser error, unknown source"),
+                            type: new basic_1.UnknownType("CDS parser error, unknown source, " + ddlsName),
                         });
                         continue;
                     }
@@ -75,7 +75,7 @@ class CDSDetermineTypes {
                 else {
                     components.push({
                         name: f.name,
-                        type: new basic_1.VoidType("DDLS:fieldname"),
+                        type: new basic_1.VoidType("DDLS:fieldname:" + ddlsName),
                     });
                 }
             }

package/build/src/objects/data_definition.js

@@ -38,7 +38,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
     }
     parseType(reg) {
         this.parse();
-        return new cds_determine_types_1.CDSDetermineTypes().parseType(reg, this.parsedData);
+        return new cds_determine_types_1.CDSDetermineTypes().parseType(reg, this.parsedData, this.getName());
     }
     getParsedData() {
         return this.parsedData;

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.51";
+        return "2.113.53";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/selection_screen_naming.js

@@ -95,7 +95,11 @@ class SelectionScreenNaming extends _abap_rule_1.ABAPRule {
             return statNode.findFirstExpression(expressions_1.FieldSub);
         }
         else if (statNode.get() instanceof statements_1.SelectionScreen) {
-            return statNode.findFirstExpression(expressions_1.InlineField);
+            let ret = statNode.findFirstExpression(expressions_1.InlineField);
+            if (ret === undefined && statNode.concatTokens().toUpperCase().includes(" BEGIN OF TABBED BLOCK")) {
+                ret = statNode.findFirstExpression(expressions_1.BlockName);
+            }
+            return ret;
         }
         else {
             return undefined;

package/package.json

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