@abaplint/core 2.113.75 → 2.113.76

package/build/abaplint.d.ts

@@ -703,6 +703,10 @@ declare class CallSelectionScreen implements IStatement {
     getMatcher(): IStatementRunnable;
 }
 
+declare class CallSubscreen implements IStatement {
+    getMatcher(): IStatementRunnable;
+}
+
 declare class CallTransaction implements IStatement {
     getMatcher(): IStatementRunnable;
 }
@@ -1868,6 +1872,10 @@ declare type DynproHeader = {
 
 declare type DynproList = DynproHeader[];
 
+declare class DynproLogic implements IStructure {
+    getMatcher(): IStructureRunnable;
+}
+
 declare class EcattTestConfiguration extends AbstractObject {
     getType(): string;
     getAllowedNaming(): {
@@ -2237,7 +2245,7 @@ declare namespace Expressions {
         FieldOffset,
         FieldSub,
         FieldSymbol_2 as FieldSymbol,
-        Field,
+        Field_2 as Field,
         FilterBody,
         FinalMethods,
         FindType,
@@ -2471,7 +2479,11 @@ declare class FetchNextCursor implements IStatement {
     getMatcher(): IStatementRunnable;
 }
 
-declare class Field extends Expression {
+declare class Field implements IStatement {
+    getMatcher(): IStatementRunnable;
+}
+
+declare class Field_2 extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
@@ -5230,6 +5242,18 @@ declare class PrivateSection implements IStructure {
     getMatcher(): IStructureRunnable;
 }
 
+declare class ProcessAfterInput implements IStatement {
+    getMatcher(): IStatementRunnable;
+}
+
+declare class ProcessBeforeOutput implements IStatement {
+    getMatcher(): IStatementRunnable;
+}
+
+declare class ProcessOnValueRequest implements IStatement {
+    getMatcher(): IStatementRunnable;
+}
+
 declare class Program extends ABAPObject {
     private parsedXML;
     getType(): string;
@@ -6450,6 +6474,7 @@ declare namespace Statements {
         Retry,
         AuthorityCheck,
         SetParameter,
+        Field,
         GetCursor,
         CallKernel,
         CallTransaction,
@@ -6459,6 +6484,9 @@ declare namespace Statements {
         DataBegin,
         DataEnd,
         TypeBegin,
+        ProcessAfterInput,
+        ProcessBeforeOutput,
+        ProcessOnValueRequest,
         TypeEnd,
         RaiseEvent,
         Cleanup_2 as Cleanup,
@@ -6472,6 +6500,7 @@ declare namespace Statements {
         DeleteMemory,
         Provide_2 as Provide,
         EndExec,
+        CallSubscreen,
         SortDataset,
         GetPermissions,
         SetLocks,
@@ -6579,9 +6608,9 @@ declare class StructureNode extends AbstractNode<StructureNode | StatementNode>
 declare namespace Structures {
     export {
         Any,
-        At,
         AtFirst,
         AtLast,
+        At,
         Body,
         CaseType,
         Case,
@@ -6596,7 +6625,7 @@ declare namespace Structures {
         Data,
         Define,
         Do,
-        TypeMesh,
+        DynproLogic,
         Else,
         ElseIf,
         EnhancementSection,
@@ -6624,6 +6653,7 @@ declare namespace Structures {
         TestSeam,
         Try,
         TypeEnum,
+        TypeMesh,
         Types_2 as Types,
         WhenType,
         When,

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CallSubscreen = void 0;
+const combi_1 = require("../combi");
+const expressions_1 = require("../expressions");
+const version_1 = require("../../../version");
+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

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Field = void 0;
+const combi_1 = require("../combi");
+const expressions_1 = require("../expressions");
+const version_1 = require("../../../version");
+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

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

@@ -294,6 +294,7 @@ __exportStar(require("./endfunction"), exports);
 __exportStar(require("./retry"), exports);
 __exportStar(require("./authority_check"), exports);
 __exportStar(require("./set_parameter"), exports);
+__exportStar(require("./field"), exports);
 __exportStar(require("./get_cursor"), exports);
 __exportStar(require("./call_kernel"), exports);
 __exportStar(require("./call_transaction"), exports);
@@ -303,6 +304,9 @@ __exportStar(require("./uline"), exports);
 __exportStar(require("./data_begin"), exports);
 __exportStar(require("./data_end"), exports);
 __exportStar(require("./type_begin"), exports);
+__exportStar(require("./process_after_input"), exports);
+__exportStar(require("./process_before_output"), exports);
+__exportStar(require("./process_on_value_request"), exports);
 __exportStar(require("./type_end"), exports);
 __exportStar(require("./raise_event"), exports);
 __exportStar(require("./cleanup"), exports);
@@ -316,6 +320,7 @@ __exportStar(require("./end_test_seam"), exports);
 __exportStar(require("./delete_memory"), exports);
 __exportStar(require("./provide"), exports);
 __exportStar(require("./endexec"), exports);
+__exportStar(require("./call_subscreen"), exports);
 __exportStar(require("./sort_dataset"), exports);
 __exportStar(require("./get_permissions"), exports);
 __exportStar(require("./set_locks"), exports);

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProcessAfterInput = void 0;
+const combi_1 = require("../combi");
+const version_1 = require("../../../version");
+class ProcessAfterInput {
+    getMatcher() {
+        return (0, combi_1.verNot)(version_1.Version.Cloud, "PROCESS AFTER INPUT");
+    }
+}
+exports.ProcessAfterInput = ProcessAfterInput;
+//# sourceMappingURL=process_after_input.js.map

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProcessBeforeOutput = void 0;
+const combi_1 = require("../combi");
+const version_1 = require("../../../version");
+class ProcessBeforeOutput {
+    getMatcher() {
+        return (0, combi_1.verNot)(version_1.Version.Cloud, "PROCESS BEFORE OUTPUT");
+    }
+}
+exports.ProcessBeforeOutput = ProcessBeforeOutput;
+//# sourceMappingURL=process_before_output.js.map

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProcessOnValueRequest = void 0;
+const combi_1 = require("../combi");
+const version_1 = require("../../../version");
+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

package/build/src/abap/3_structures/structure_parser.js

@@ -29,6 +29,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();

package/build/src/abap/3_structures/structures/dynpro_logic.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DynproLogic = void 0;
+const Statements = require("../../2_statements/statements");
+const _combi_1 = require("./_combi");
+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

package/build/src/abap/3_structures/structures/index.js

@@ -15,9 +15,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./any"), exports);
-__exportStar(require("./at"), exports);
 __exportStar(require("./at_first"), exports);
 __exportStar(require("./at_last"), exports);
+__exportStar(require("./at"), exports);
 __exportStar(require("./body"), exports);
 __exportStar(require("./case_type"), exports);
 __exportStar(require("./case"), exports);
@@ -32,7 +32,7 @@ __exportStar(require("./constants"), exports);
 __exportStar(require("./data"), exports);
 __exportStar(require("./define"), exports);
 __exportStar(require("./do"), exports);
-__exportStar(require("./type_mesh"), exports);
+__exportStar(require("./dynpro_logic"), exports);
 __exportStar(require("./else"), exports);
 __exportStar(require("./elseif"), exports);
 __exportStar(require("./enhancement_section"), exports);
@@ -60,6 +60,7 @@ __exportStar(require("./test_injection"), exports);
 __exportStar(require("./test_seam"), exports);
 __exportStar(require("./try"), exports);
 __exportStar(require("./type_enum"), exports);
+__exportStar(require("./type_mesh"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./when_type"), exports);
 __exportStar(require("./when"), exports);

package/build/src/pretty_printer/indent.js

@@ -5,6 +5,7 @@ const Statements = require("../abap/2_statements/statements");
 const Expressions = require("../abap/2_statements/expressions");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
 const virtual_position_1 = require("../virtual_position");
+const structures_1 = require("../abap/3_structures/structures");
 // todo, will break if there is multiple statements per line?
 class Indent {
     constructor(options) {
@@ -33,11 +34,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) {
@@ -75,6 +78,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
@@ -84,7 +90,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;
@@ -129,7 +135,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
@@ -139,6 +145,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

package/build/src/registry.js

@@ -67,7 +67,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/core",
-    "version": "2.113.75",
+    "version": "2.113.76",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -57,7 +57,7 @@
         "chai": "^4.5.0",
         "eslint": "^9.16.0",
         "mocha": "^11.0.1",
-        "c8": "^10.1.2",
+        "c8": "^10.1.3",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^2.3.0",
         "typescript": "^5.7.2"