@abaplint/cli 2.113.75 → 2.113.76

package/build/cli.js

@@ -10744,6 +10744,31 @@ exports.CallSelectionScreen = CallSelectionScreen;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/call_subscreen.js":
+/*!**********************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/call_subscreen.js ***!
+  \**********************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CallSubscreen = void 0;
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+class CallSubscreen {
+    getMatcher() {
+        const including = (0, combi_1.seq)("INCLUDING", expressions_1.Source, expressions_1.Source);
+        const ret = (0, combi_1.seq)("CALL SUBSCREEN", expressions_1.Source, (0, combi_1.optPrio)(including));
+        return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
+    }
+}
+exports.CallSubscreen = CallSubscreen;
+//# sourceMappingURL=call_subscreen.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/call_transaction.js":
 /*!************************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/call_transaction.js ***!
@@ -13023,6 +13048,30 @@ exports.FetchNextCursor = FetchNextCursor;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/field.js":
+/*!*************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/field.js ***!
+  \*************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Field = void 0;
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+class Field {
+    getMatcher() {
+        const ret = (0, combi_1.seq)("FIELD", expressions_1.FieldSub, "MODULE", expressions_1.FormName, (0, combi_1.opt)((0, combi_1.alt)("ON INPUT", "ON REQUEST")));
+        return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
+    }
+}
+exports.Field = Field;
+//# sourceMappingURL=field.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/field_group.js":
 /*!*******************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/field_group.js ***!
@@ -14220,6 +14269,7 @@ __exportStar(__webpack_require__(/*! ./endfunction */ "./node_modules/@abaplint/
 __exportStar(__webpack_require__(/*! ./retry */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/retry.js"), exports);
 __exportStar(__webpack_require__(/*! ./authority_check */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/authority_check.js"), exports);
 __exportStar(__webpack_require__(/*! ./set_parameter */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/set_parameter.js"), exports);
+__exportStar(__webpack_require__(/*! ./field */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/field.js"), exports);
 __exportStar(__webpack_require__(/*! ./get_cursor */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/get_cursor.js"), exports);
 __exportStar(__webpack_require__(/*! ./call_kernel */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/call_kernel.js"), exports);
 __exportStar(__webpack_require__(/*! ./call_transaction */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/call_transaction.js"), exports);
@@ -14229,6 +14279,9 @@ __exportStar(__webpack_require__(/*! ./uline */ "./node_modules/@abaplint/core/b
 __exportStar(__webpack_require__(/*! ./data_begin */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/data_begin.js"), exports);
 __exportStar(__webpack_require__(/*! ./data_end */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/data_end.js"), exports);
 __exportStar(__webpack_require__(/*! ./type_begin */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/type_begin.js"), exports);
+__exportStar(__webpack_require__(/*! ./process_after_input */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/process_after_input.js"), exports);
+__exportStar(__webpack_require__(/*! ./process_before_output */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/process_before_output.js"), exports);
+__exportStar(__webpack_require__(/*! ./process_on_value_request */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/process_on_value_request.js"), exports);
 __exportStar(__webpack_require__(/*! ./type_end */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/type_end.js"), exports);
 __exportStar(__webpack_require__(/*! ./raise_event */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/raise_event.js"), exports);
 __exportStar(__webpack_require__(/*! ./cleanup */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/cleanup.js"), exports);
@@ -14242,6 +14295,7 @@ __exportStar(__webpack_require__(/*! ./end_test_seam */ "./node_modules/@abaplin
 __exportStar(__webpack_require__(/*! ./delete_memory */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/delete_memory.js"), exports);
 __exportStar(__webpack_require__(/*! ./provide */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/provide.js"), exports);
 __exportStar(__webpack_require__(/*! ./endexec */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/endexec.js"), exports);
+__exportStar(__webpack_require__(/*! ./call_subscreen */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/call_subscreen.js"), exports);
 __exportStar(__webpack_require__(/*! ./sort_dataset */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/sort_dataset.js"), exports);
 __exportStar(__webpack_require__(/*! ./get_permissions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/get_permissions.js"), exports);
 __exportStar(__webpack_require__(/*! ./set_locks */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/set_locks.js"), exports);
@@ -15453,6 +15507,72 @@ exports.Private = Private;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/process_after_input.js":
+/*!***************************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/process_after_input.js ***!
+  \***************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ProcessAfterInput = void 0;
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+class ProcessAfterInput {
+    getMatcher() {
+        return (0, combi_1.verNot)(version_1.Version.Cloud, "PROCESS AFTER INPUT");
+    }
+}
+exports.ProcessAfterInput = ProcessAfterInput;
+//# sourceMappingURL=process_after_input.js.map
+
+/***/ }),
+
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/process_before_output.js":
+/*!*****************************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/process_before_output.js ***!
+  \*****************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ProcessBeforeOutput = void 0;
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+class ProcessBeforeOutput {
+    getMatcher() {
+        return (0, combi_1.verNot)(version_1.Version.Cloud, "PROCESS BEFORE OUTPUT");
+    }
+}
+exports.ProcessBeforeOutput = ProcessBeforeOutput;
+//# sourceMappingURL=process_before_output.js.map
+
+/***/ }),
+
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/process_on_value_request.js":
+/*!********************************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/process_on_value_request.js ***!
+  \********************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ProcessOnValueRequest = void 0;
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+class ProcessOnValueRequest {
+    getMatcher() {
+        return (0, combi_1.verNot)(version_1.Version.Cloud, "PROCESS ON VALUE-REQUEST");
+    }
+}
+exports.ProcessOnValueRequest = ProcessOnValueRequest;
+//# sourceMappingURL=process_on_value_request.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/program.js":
 /*!***************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/statements/program.js ***!
@@ -18201,6 +18321,9 @@ class StructureParser {
         else if (filename.endsWith(".intf.abap")) {
             return new Structures.InterfaceGlobal();
         }
+        else if (filename.match(/\.screen\_\d+\.abap$/i)) {
+            return new Structures.DynproLogic();
+        }
         else {
             // todo, add a special structure for TYPE-POOLS
             return new Structures.Any();
@@ -19004,6 +19127,31 @@ exports.Do = Do;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/dynpro_logic.js":
+/*!********************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/3_structures/structures/dynpro_logic.js ***!
+  \********************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DynproLogic = void 0;
+const Statements = __webpack_require__(/*! ../../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const _combi_1 = __webpack_require__(/*! ./_combi */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/_combi.js");
+class DynproLogic {
+    getMatcher() {
+        const pai = (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.Module), (0, _combi_1.sta)(Statements.CallSubscreen)));
+        const pbo = (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.Module), (0, _combi_1.sta)(Statements.Field), (0, _combi_1.sta)(Statements.CallSubscreen)));
+        const pov = (0, _combi_1.star)((0, _combi_1.sta)(Statements.Field));
+        return (0, _combi_1.seq)((0, _combi_1.sta)(Statements.ProcessBeforeOutput), pbo, (0, _combi_1.sta)(Statements.ProcessAfterInput), pai, (0, _combi_1.opt)((0, _combi_1.seq)((0, _combi_1.sta)(Statements.ProcessOnValueRequest), pov)));
+    }
+}
+exports.DynproLogic = DynproLogic;
+//# sourceMappingURL=dynpro_logic.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/else.js":
 /*!************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/3_structures/structures/else.js ***!
@@ -19219,9 +19367,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./any */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/any.js"), exports);
-__exportStar(__webpack_require__(/*! ./at */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/at.js"), exports);
 __exportStar(__webpack_require__(/*! ./at_first */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/at_first.js"), exports);
 __exportStar(__webpack_require__(/*! ./at_last */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/at_last.js"), exports);
+__exportStar(__webpack_require__(/*! ./at */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/at.js"), exports);
 __exportStar(__webpack_require__(/*! ./body */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/body.js"), exports);
 __exportStar(__webpack_require__(/*! ./case_type */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/case_type.js"), exports);
 __exportStar(__webpack_require__(/*! ./case */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/case.js"), exports);
@@ -19236,7 +19384,7 @@ __exportStar(__webpack_require__(/*! ./constants */ "./node_modules/@abaplint/co
 __exportStar(__webpack_require__(/*! ./data */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/data.js"), exports);
 __exportStar(__webpack_require__(/*! ./define */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/define.js"), exports);
 __exportStar(__webpack_require__(/*! ./do */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/do.js"), exports);
-__exportStar(__webpack_require__(/*! ./type_mesh */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/type_mesh.js"), exports);
+__exportStar(__webpack_require__(/*! ./dynpro_logic */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/dynpro_logic.js"), exports);
 __exportStar(__webpack_require__(/*! ./else */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/else.js"), exports);
 __exportStar(__webpack_require__(/*! ./elseif */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/elseif.js"), exports);
 __exportStar(__webpack_require__(/*! ./enhancement_section */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/enhancement_section.js"), exports);
@@ -19264,6 +19412,7 @@ __exportStar(__webpack_require__(/*! ./test_injection */ "./node_modules/@abapli
 __exportStar(__webpack_require__(/*! ./test_seam */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/test_seam.js"), exports);
 __exportStar(__webpack_require__(/*! ./try */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/try.js"), exports);
 __exportStar(__webpack_require__(/*! ./type_enum */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/type_enum.js"), exports);
+__exportStar(__webpack_require__(/*! ./type_mesh */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/type_mesh.js"), exports);
 __exportStar(__webpack_require__(/*! ./types */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/types.js"), exports);
 __exportStar(__webpack_require__(/*! ./when_type */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/when_type.js"), exports);
 __exportStar(__webpack_require__(/*! ./when */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/when.js"), exports);
@@ -52997,6 +53146,7 @@ const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ ".
 const Expressions = __webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 const virtual_position_1 = __webpack_require__(/*! ../virtual_position */ "./node_modules/@abaplint/core/build/src/virtual_position.js");
+const structures_1 = __webpack_require__(/*! ../abap/3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
 // todo, will break if there is multiple statements per line?
 class Indent {
     constructor(options) {
@@ -53025,11 +53175,13 @@ class Indent {
     }
     // returns list of expected indentation for each line/statement?
     getExpectedIndents(file) {
+        var _a;
         const ret = [];
         const init = 1;
         const stack = new Stack();
         let indent = init;
         let parentIsEvent = false;
+        const isDynpro = ((_a = file.getStructure()) === null || _a === void 0 ? void 0 : _a.get()) instanceof structures_1.DynproLogic;
         let previousStatement = undefined;
         for (const statement of file.getStatements()) {
             if (statement.getFirstToken().getStart() instanceof virtual_position_1.VirtualPosition) {
@@ -53067,6 +53219,9 @@ class Indent {
                 || type instanceof Statements.AtPF
                 || type instanceof Statements.Initialization
                 || type instanceof Statements.AtUserCommand
+                || type instanceof Statements.ProcessAfterInput
+                || type instanceof Statements.ProcessBeforeOutput
+                || type instanceof Statements.ProcessOnValueRequest
                 || type instanceof Statements.TopOfPage
                 || type instanceof Statements.Get
                 || type instanceof Statements.EndOfSelection
@@ -53076,7 +53231,7 @@ class Indent {
             }
             else if (type instanceof Statements.Form
                 || (type instanceof Statements.Include && parentIsEvent)
-                || type instanceof Statements.Module
+                || (type instanceof Statements.Module && isDynpro === false)
                 || type instanceof Statements.ClassImplementation
                 || type instanceof Statements.ClassDefinition) {
                 indent = init;
@@ -53121,7 +53276,7 @@ class Indent {
             ret.push(indent);
             if (type instanceof Statements.If
                 || type instanceof Statements.While
-                || type instanceof Statements.Module
+                || (type instanceof Statements.Module && isDynpro === false)
                 || type instanceof Statements.SelectLoop
                 || type instanceof Statements.FunctionModule
                 || type instanceof Statements.Interface
@@ -53131,6 +53286,9 @@ class Indent {
                 || type instanceof Statements.AtLast
                 || type instanceof Statements.ExecSQL
                 || type instanceof Statements.Catch
+                || type instanceof Statements.ProcessAfterInput
+                || type instanceof Statements.ProcessBeforeOutput
+                || type instanceof Statements.ProcessOnValueRequest
                 || type instanceof Statements.Define
                 || type instanceof Statements.When
                 || type instanceof Statements.WhenType
@@ -53348,7 +53506,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.75";
+        return "2.113.76";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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