@abaplint/cli 2.115.8 → 2.115.10

package/build/cli.js

@@ -13339,14 +13339,16 @@ const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@a
 const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class Field {
     getMatcher() {
-        const module = (0, combi_1.seq)("MODULE", expressions_1.FormName, (0, combi_1.opt)((0, combi_1.alt)("ON INPUT", "ON REQUEST", "ON CHAIN-REQUEST", "AT CURSOR-SELECTION")));
+        const moduleOptions = (0, combi_1.alt)("ON INPUT", "ON REQUEST", "ON CHAIN-REQUEST", "ON CHAIN-INPUT", "AT CURSOR-SELECTION");
+        const module = (0, combi_1.seq)("MODULE", expressions_1.FormName, (0, combi_1.opt)(moduleOptions));
+        const moduleStrange = (0, combi_1.seq)(moduleOptions, "MODULE", expressions_1.FormName);
         const values = (0, combi_1.seq)("VALUES", (0, combi_1.tok)(tokens_1.WParenLeft), "BETWEEN", expressions_1.Constant, "AND", expressions_1.Constant, (0, combi_1.tok)(tokens_1.ParenRightW));
-        const wit = (0, combi_1.seq)("WITH", expressions_1.FieldChain);
+        const wit = (0, combi_1.seq)("WITH", (0, combi_1.altPrio)(expressions_1.FieldChain, expressions_1.Constant));
         const cond = (0, combi_1.seq)(expressions_1.FieldChain, "=", expressions_1.FieldChain);
         const where = (0, combi_1.seq)(cond, (0, combi_1.starPrio)((0, combi_1.seq)("AND", cond)));
         const into = (0, combi_1.seq)("INTO", expressions_1.FieldChain);
         const select = (0, combi_1.seq)("SELECT * FROM", expressions_1.FieldChain, "WHERE", where, (0, combi_1.opt)(into), (0, combi_1.opt)("WHENEVER NOT FOUND SEND ERRORMESSAGE"));
-        const ret = (0, combi_1.seq)("FIELD", expressions_1.FieldChain, (0, combi_1.opt)((0, combi_1.altPrio)(module, values, wit, select)));
+        const ret = (0, combi_1.seq)("FIELD", expressions_1.FieldChain, (0, combi_1.opt)((0, combi_1.altPrio)(module, moduleStrange, values, wit, select)));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -28059,6 +28061,7 @@ const sql_order_by_1 = __webpack_require__(/*! ./sql_order_by */ "./node_modules
 const dynamic_1 = __webpack_require__(/*! ./dynamic */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/dynamic.js");
 const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 const isSimple = /^\w+$/;
 class Select {
     static runSyntax(node, input, skipImplicitInto = false) {
@@ -28310,6 +28313,16 @@ class Select {
                     if (field) {
                         return field;
                     }
+                    else if (fields[0].code === "COUNT(*)") {
+                        if (scope.getVersion() >= version_1.Version.v750
+                            || scope.getVersion() === version_1.Version.OpenABAP
+                            || scope.getVersion() === version_1.Version.Cloud) {
+                            return new basic_1.Integer8Type();
+                        }
+                        else {
+                            return basic_1.IntegerType.get();
+                        }
+                    }
                     else {
                         // todo: aggregated/calculated values
                         return basic_1.VoidType.get("SELECT_todo11");
@@ -39805,6 +39818,7 @@ const _object_oriented_1 = __webpack_require__(/*! ../5_syntax/_object_oriented
 const _reference_1 = __webpack_require__(/*! ../5_syntax/_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
 class ClassDefinition extends _identifier_1.Identifier {
     constructor(node, input) {
+        var _a;
         if (!(node.get() instanceof Structures.ClassDefinition)) {
             throw new Error("ClassDefinition, unexpected node type");
         }
@@ -39827,6 +39841,10 @@ class ClassDefinition extends _identifier_1.Identifier {
         this.aliases = this.attributes.getAliases();
         const events = node.findAllStatements(Statements.Events);
         for (const e of events) {
+            const eventName = (_a = e.findDirectExpression(Expressions.EventName)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
+            if (this.events.find(ev => ev.getName().toUpperCase() === eventName) !== undefined) {
+                throw new Error("Event " + eventName + " already defined");
+            }
             this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input)); // todo, all these are not Public
         }
         this.methodDefs = new method_definitions_1.MethodDefinitions(node, input);
@@ -48724,6 +48742,37 @@ exports.DataElement = DataElement;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/core/build/src/objects/datastore_object.js"
+/*!***************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/objects/datastore_object.js ***!
+  \***************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DatastoreObject = void 0;
+const _abstract_object_1 = __webpack_require__(/*! ./_abstract_object */ "./node_modules/@abaplint/core/build/src/objects/_abstract_object.js");
+class DatastoreObject extends _abstract_object_1.AbstractObject {
+    getType() {
+        return "ODSO";
+    }
+    getAllowedNaming() {
+        return {
+            maxLength: 200,
+            allowNamespace: true,
+        };
+    }
+    getDescription() {
+        // todo
+        return undefined;
+    }
+}
+exports.DatastoreObject = DatastoreObject;
+//# sourceMappingURL=datastore_object.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/core/build/src/objects/dialog_module.js"
 /*!************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/objects/dialog_module.js ***!
@@ -50330,6 +50379,7 @@ __exportStar(__webpack_require__(/*! ./customizing_transaction */ "./node_module
 __exportStar(__webpack_require__(/*! ./data_control */ "./node_modules/@abaplint/core/build/src/objects/data_control.js"), exports);
 __exportStar(__webpack_require__(/*! ./data_definition */ "./node_modules/@abaplint/core/build/src/objects/data_definition.js"), exports);
 __exportStar(__webpack_require__(/*! ./data_element */ "./node_modules/@abaplint/core/build/src/objects/data_element.js"), exports);
+__exportStar(__webpack_require__(/*! ./datastore_object */ "./node_modules/@abaplint/core/build/src/objects/datastore_object.js"), exports);
 __exportStar(__webpack_require__(/*! ./dialog_module */ "./node_modules/@abaplint/core/build/src/objects/dialog_module.js"), exports);
 __exportStar(__webpack_require__(/*! ./documentation */ "./node_modules/@abaplint/core/build/src/objects/documentation.js"), exports);
 __exportStar(__webpack_require__(/*! ./domain */ "./node_modules/@abaplint/core/build/src/objects/domain.js"), exports);
@@ -55260,7 +55310,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.115.8";
+        return "2.115.10";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.115.8",
+    "version": "2.115.10",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.115.8",
+        "@abaplint/core": "^2.115.10",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",