@abaplint/core 2.113.93 → 2.113.95

package/build/abaplint.d.ts

@@ -827,6 +827,10 @@ declare class CDSDefineProjection extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CDSDefineTableFunction extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSDefineView extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -2442,11 +2446,12 @@ declare namespace ExpressionsCDS {
         CDSDefineAbstract,
         CDSDefineCustom,
         CDSDefineProjection,
+        CDSDefineTableFunction,
         CDSDefineView,
         CDSElement,
         CDSExtendView,
-        CDSFunction,
         CDSFunctionInput,
+        CDSFunction,
         CDSGroupBy,
         CDSHaving,
         CDSInteger,

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

@@ -4,9 +4,10 @@ exports.FieldSub = void 0;
 const combi_1 = require("../combi");
 const tokens_1 = require("../../1_lexer/tokens");
 const table_body_1 = require("./table_body");
+const field_length_1 = require("./field_length");
 class FieldSub extends combi_1.Expression {
     getRunnable() {
-        const ret = (0, combi_1.seq)((0, combi_1.regex)(/^\*?!?&?(\/\w+\/)?[a-zA-Z_%$\?][\w%$\$\*]*$/), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.regex)(/^[\w%$\$\*]+$/))), (0, combi_1.opt)(table_body_1.TableBody));
+        const ret = (0, combi_1.seq)((0, combi_1.regex)(/^\*?!?&?(\/\w+\/)?[a-zA-Z_%$\?][\w%$\$\*]*$/), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.regex)(/^[\w%$\$\*]+$/))), (0, combi_1.opt)(field_length_1.FieldLength), (0, combi_1.opt)(table_body_1.TableBody));
         return ret;
     }
 }

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

@@ -8,7 +8,7 @@ const integer_1 = require("./integer");
 const sql_function_input_1 = require("./sql_function_input");
 class SQLFunction extends combi_1.Expression {
     getRunnable() {
-        const castTypes = (0, combi_1.altPrio)((0, combi_1.seq)("CHAR", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)), (0, combi_1.seq)("DEC", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, ",", integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)), "FLTP", "NUMC", "INT8");
+        const castTypes = (0, combi_1.altPrio)((0, combi_1.seq)("CHAR", (0, combi_1.optPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)))), (0, combi_1.seq)("DEC", (0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, ",", integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)), (0, combi_1.seq)("NUMC", (0, combi_1.optPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), integer_1.Integer, (0, combi_1.tok)(tokens_1.WParenRightW)))), "FLTP", "INT2", "INT8");
         const commaParam = (0, combi_1.seq)(",", sql_function_input_1.SQLFunctionInput);
         // note: the function names are not keywords, they are usually in lower case
         const abs = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.regex)(/^abs$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW)));

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

@@ -17,7 +17,7 @@ class TypeTable extends combi_1.Expression {
         const rangeLike = (0, combi_1.seq)("RANGE OF", field_chain_1.FieldChain, (0, combi_1.optPrio)(header), (0, combi_1.optPrio)(initial), (0, combi_1.optPrio)("VALUE IS INITIAL"));
         // a maximum of 15 secondary table keys can be defined
         // "WITH" is not allowed as a field name in keys
-        const typetable = (0, combi_1.alt)(generic, (0, combi_1.seq)(normal1, (0, combi_1.alt)((0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))), (0, combi_1.seq)((0, combi_1.plus)(type_table_key_1.TypeTableKey), (0, combi_1.optPrio)(initial)))));
+        const typetable = (0, combi_1.alt)(generic, (0, combi_1.seq)(normal1, (0, combi_1.alt)((0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))), (0, combi_1.seq)((0, combi_1.plus)(type_table_key_1.TypeTableKey), (0, combi_1.optPrio)(initial))), (0, combi_1.optPrio)("VALUE IS INITIAL")));
         const occurs = (0, combi_1.seq)("OCCURS", (0, combi_1.altPrio)(_1.Integer, field_chain_1.FieldChain));
         const derived = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("TABLE FOR", (0, combi_1.altPrio)("ACTION IMPORT", "ACTION RESULT", "CREATE", "EVENT", "REPORTED EARLY", "FAILED EARLY", "FAILED", "LOCK", "DETERMINATION", "READ RESULT", "UPDATE"), (0, combi_1.alt)(_1.TypeName, _1.EntityAssociation)));
         const oldType = (0, combi_1.seq)((0, combi_1.opt)("REF TO"), _1.TypeName, (0, combi_1.alt)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), header));

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

@@ -8,7 +8,8 @@ class DeleteDatabase {
     getMatcher() {
         const where = (0, combi_1.seq)("WHERE", (0, combi_1.altPrio)(expressions_1.SQLCond, expressions_1.Dynamic));
         const from = (0, combi_1.seq)("FROM", expressions_1.DatabaseTable, (0, combi_1.optPrio)(sql_client_1.SQLClient), (0, combi_1.optPrio)(expressions_1.DatabaseConnection), (0, combi_1.opt)(where));
-        const table = (0, combi_1.seq)(expressions_1.DatabaseTable, (0, combi_1.optPrio)(sql_client_1.SQLClient), (0, combi_1.optPrio)(expressions_1.DatabaseConnection), "FROM", (0, combi_1.opt)("TABLE"), expressions_1.SQLSourceSimple);
+        const fromSomething = (0, combi_1.seq)("FROM", (0, combi_1.opt)("TABLE"), expressions_1.SQLSourceSimple);
+        const table = (0, combi_1.seq)(expressions_1.DatabaseTable, (0, combi_1.optPrio)(sql_client_1.SQLClient), (0, combi_1.optPrio)(expressions_1.DatabaseConnection), (0, combi_1.optPrio)(fromSomething));
         const ret = (0, combi_1.seq)("DELETE", (0, combi_1.altPrio)(from, table));
         return ret;
     }

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

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

package/build/src/cds/cds_parser.js

@@ -29,6 +29,9 @@ class CDSParser {
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             res = combi_1.Combi.run(new Expressions.CDSDefineCustom(), tokens, version_1.defaultVersion);
         }
+        if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
+            res = combi_1.Combi.run(new Expressions.CDSDefineTableFunction(), tokens, version_1.defaultVersion);
+        }
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             res = combi_1.Combi.run(new Expressions.CDSExtendView(), tokens, version_1.defaultVersion);
         }

package/build/src/cds/expressions/cds_define_table_function.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSDefineTableFunction = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+const cds_name_1 = require("./cds_name");
+class CDSDefineTableFunction extends combi_1.Expression {
+    getRunnable() {
+        const methodName = (0, combi_1.seq)(cds_name_1.CDSName, "=", ">", cds_name_1.CDSName);
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE TABLE FUNCTION"), cds_name_1.CDSName, _1.CDSWithParameters, (0, combi_1.str)("RETURNS {"), (0, combi_1.plus)((0, combi_1.seq)(cds_name_1.CDSName, ":", _1.CDSType, ";")), (0, combi_1.str)("} IMPLEMENTED BY METHOD"), methodName, (0, combi_1.opt)(";"));
+    }
+}
+exports.CDSDefineTableFunction = CDSDefineTableFunction;
+//# sourceMappingURL=cds_define_table_function.js.map

package/build/src/cds/expressions/index.js

@@ -31,11 +31,12 @@ __exportStar(require("./cds_condition"), exports);
 __exportStar(require("./cds_define_abstract"), exports);
 __exportStar(require("./cds_define_custom"), exports);
 __exportStar(require("./cds_define_projection"), exports);
+__exportStar(require("./cds_define_table_function"), exports);
 __exportStar(require("./cds_define_view"), exports);
 __exportStar(require("./cds_element"), exports);
 __exportStar(require("./cds_extend_view"), exports);
-__exportStar(require("./cds_function"), exports);
 __exportStar(require("./cds_function_input"), exports);
+__exportStar(require("./cds_function"), exports);
 __exportStar(require("./cds_group_by"), exports);
 __exportStar(require("./cds_having"), exports);
 __exportStar(require("./cds_integer"), exports);

package/build/src/objects/function_group.js

@@ -78,13 +78,13 @@ class FunctionGroup extends _abap_object_1.ABAPObject {
                 if (namespaced) {
                     search = search.replace(/\//g, "#");
                 }
-                if ((i.startsWith("L") || namespaced) && f.getFilename().includes(search.toLowerCase())) {
+                if ((i.startsWith("L") || namespaced) && f.getFilename().includes(search.toLowerCase() + ".")) {
                     ret.push({ file: f, name: i });
                 }
                 // fix for URL encoded? Uris
                 if (namespaced) {
                     search = i.replace(/\//g, "%23");
-                    if (f.getFilename().includes(search.toLowerCase())) {
+                    if (f.getFilename().includes(search.toLowerCase() + ".")) {
                         ret.push({ file: f, name: i });
                     }
                 }

package/build/src/registry.js

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

package/package.json

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