@abaplint/transpiler-cli 2.11.44 → 2.11.46

package/build/bundle.js

@@ -6815,7 +6815,7 @@ class Source extends combi_1.Expression {
         const conv = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("CONV", _1.TypeNameOrInfer, lparenNoSpace, _1.ConvBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const swit = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("SWITCH", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.SwitchBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
         const value = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("VALUE", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.ValueBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
-        const cond = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("COND", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CondBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
+        const cond = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("COND", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CondBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const reff = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("REF", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), Source, (0, combi_1.optPrio)("OPTIONAL"), rparen), version_1.Version.OpenABAP);
         const exact = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("EXACT", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), Source, rparen, (0, combi_1.optPrio)(after)));
         const filter = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("FILTER", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.FilterBody, rparen));
@@ -14895,7 +14895,7 @@ class Raise {
         const exporting = (0, combi_1.seq)("EXPORTING", expressions_1.ParameterListS);
         const from = (0, combi_1.seq)("TYPE", expressions_1.ClassName, (0, combi_1.opt)((0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v750, (0, combi_1.alt)(mess, messid)), (0, combi_1.ver)(version_1.Version.v752, "USING MESSAGE"))), (0, combi_1.optPrio)(exporting));
         const pre = (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.optPrio)("RESUMABLE"), "EXCEPTION"), "SHORTDUMP");
-        const clas = (0, combi_1.seq)(pre, (0, combi_1.altPrio)(from, (0, combi_1.ver)(version_1.Version.v752, expressions_1.Source), expressions_1.SimpleSource2));
+        const clas = (0, combi_1.seq)(pre, (0, combi_1.altPrio)(from, (0, combi_1.ver)(version_1.Version.v752, expressions_1.Source, version_1.Version.OpenABAP), expressions_1.SimpleSource2));
         const ret = (0, combi_1.seq)("RAISE", (0, combi_1.altPrio)(clas, expressions_1.ExceptionName));
         return ret;
     }
@@ -24851,7 +24851,7 @@ class FieldChain {
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, current.getFirstToken(), message));
                     return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                 }
-                table_expression_1.TableExpression.runSyntax(current, input);
+                table_expression_1.TableExpression.runSyntax(current, input, context);
                 if (!(context instanceof basic_1.VoidType)) {
                     context = context.getRowType();
                 }
@@ -27832,16 +27832,39 @@ exports.SwitchBody = SwitchBody;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TableExpression = void 0;
+const nodes_1 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const component_chain_1 = __webpack_require__(/*! ./component_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_chain.js");
 class TableExpression {
-    static runSyntax(node, input) {
+    static runSyntax(node, input, rowType) {
         if (node === undefined) {
             return;
         }
-        for (const s of node.findDirectExpressions(Expressions.Source)) {
+        let context = rowType;
+        if (context instanceof basic_1.TableType) {
+            context = context.getRowType();
+        }
+        if (node.getChildren().length === 3) {
+            const s = node.findDirectExpression(Expressions.Source);
+            source_1.Source.runSyntax(s, input, context);
+        }
+        else if (node.findDirectTokenByText("INDEX")) {
+            const s = node.findDirectExpression(Expressions.Source);
             source_1.Source.runSyntax(s, input);
         }
+        else {
+            let fieldType = undefined;
+            for (const c of node.getChildren()) {
+                if (c instanceof nodes_1.ExpressionNode && c.get() instanceof Expressions.ComponentChainSimple) {
+                    fieldType = component_chain_1.ComponentChain.runSyntax(context, c, input);
+                }
+                else if (c instanceof nodes_1.ExpressionNode && c.get() instanceof Expressions.Source) {
+                    source_1.Source.runSyntax(c, input, fieldType);
+                }
+            }
+        }
     }
 }
 exports.TableExpression = TableExpression;
@@ -27959,7 +27982,7 @@ class Target {
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                     return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                 }
-                table_expression_1.TableExpression.runSyntax(current, input);
+                table_expression_1.TableExpression.runSyntax(current, input, context);
                 if (!(context instanceof basic_1.VoidType)) {
                     context = context.getRowType();
                 }
@@ -31156,15 +31179,22 @@ const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modu
 const assert_error_1 = __webpack_require__(/*! ../assert_error */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/assert_error.js");
 class IncludeType {
     runSyntax(node, input) {
-        var _a, _b;
+        var _a, _b, _c;
         const components = [];
         const iname = node.findFirstExpression(Expressions.TypeName);
         if (iname === undefined) {
             throw new assert_error_1.AssertError("IncludeType, unexpected node structure");
         }
         const name = iname.getFirstToken().getStr();
+        const isStructure = node.findDirectTokenByText("STRUCTURE") !== undefined;
         let ityp = new basic_types_1.BasicTypes(input).parseType(iname);
-        const as = (_a = node.findExpressionAfterToken("AS")) === null || _a === void 0 ? void 0 : _a.concatTokens();
+        if (ityp instanceof basic_1.VoidType && isStructure) {
+            const found = (_a = input.scope.findVariable(name)) === null || _a === void 0 ? void 0 : _a.getType();
+            if (found) {
+                ityp = found;
+            }
+        }
+        const as = (_b = node.findExpressionAfterToken("AS")) === null || _b === void 0 ? void 0 : _b.concatTokens();
         if (as && ityp instanceof basic_1.StructureType) {
             ityp = new basic_1.StructureType(ityp.getComponents().concat([{
                     name: as,
@@ -31172,7 +31202,18 @@ class IncludeType {
                     asInclude: true,
                 }]));
         }
-        const suffix = (_b = node.findExpressionAfterToken("SUFFIX")) === null || _b === void 0 ? void 0 : _b.concatTokens();
+        else if (ityp instanceof basic_1.TableType && isStructure) {
+            ityp = ityp.getRowType();
+        }
+        else if (ityp instanceof basic_1.VoidType) {
+            return ityp;
+        }
+        if (!(ityp instanceof basic_1.StructureType)) {
+            const message = "not structured, " + name;
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, iname.getFirstToken(), message));
+            return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+        }
+        const suffix = (_c = node.findExpressionAfterToken("SUFFIX")) === null || _c === void 0 ? void 0 : _c.concatTokens();
         if (suffix && ityp instanceof basic_1.StructureType) {
             const components = [];
             for (const c of ityp.getComponents()) {
@@ -34132,9 +34173,7 @@ exports.Constants = Constants;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Data = void 0;
-const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 const data_1 = __webpack_require__(/*! ../statements/data */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/data.js");
-const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
 const nodes_1 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const type_1 = __webpack_require__(/*! ../statements/type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/type.js");
 const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
@@ -34143,9 +34182,10 @@ const Basic = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abap
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const Statements = __webpack_require__(/*! ../../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 const Structures = __webpack_require__(/*! ../../3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
+const include_type_1 = __webpack_require__(/*! ../statements/include_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/include_type.js");
 class Data {
     static runSyntax(node, input) {
-        var _a, _b;
+        var _a;
         const fouth = (_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.getChildren()[3];
         const isCommonPart = fouth instanceof nodes_1.TokenNode && fouth.concatTokens() === "COMMON";
         if (isCommonPart) {
@@ -34180,25 +34220,47 @@ class Data {
             }
             else if (c instanceof nodes_1.StatementNode && ctyp instanceof Statements.IncludeType) {
                 // INCLUDES
-                const typeToken = (_b = c.findFirstExpression(Expressions.TypeName)) === null || _b === void 0 ? void 0 : _b.getFirstToken();
-                const typeName = typeToken === null || typeToken === void 0 ? void 0 : typeToken.getStr();
+                /*
+                const typeToken = c.findFirstExpression(Expressions.TypeName)?.getFirstToken();
+                const typeName = typeToken?.getStr();
+        
                 let foundId = input.scope.findType(typeName);
                 if (foundId === undefined) {
-                    foundId = input.scope.findVariable(typeName);
+                  foundId = input.scope.findVariable(typeName);
                 }
-                let found = foundId === null || foundId === void 0 ? void 0 : foundId.getType();
+        
+                let found = foundId?.getType();
                 if (found === undefined) {
-                    const f = input.scope.getDDIC().lookupTableOrView(typeName).type;
-                    if (f instanceof _typed_identifier_1.TypedIdentifier) {
-                        found = f.getType();
-                    }
-                    else {
-                        found = f;
-                    }
+                  const f = input.scope.getDDIC().lookupTableOrView(typeName).type;
+                  if (f instanceof TypedIdentifier) {
+                    found = f.getType();
+                  } else {
+                    found = f;
+                  }
+                } else {
+                  input.scope.addReference(typeToken, foundId, ReferenceType.TypeReference, input.filename);
                 }
-                else {
-                    input.scope.addReference(typeToken, foundId, _reference_1.ReferenceType.TypeReference, input.filename);
+                if (found instanceof Basic.VoidType) {
+                  if (table === true) {
+                    const ttyp = new Basic.TableType(found, {withHeader: true, keyType: Basic.TableKeyType.default});
+                    return new TypedIdentifier(name, input.filename, ttyp);
+                  } else {
+                    return new TypedIdentifier(name, input.filename, found);
+                  }
                 }
+                if (found instanceof Basic.UnknownType) {
+                  return new TypedIdentifier(name, input.filename, new Basic.UnknownType("unknown type, " + typeName));
+                }
+                if (found instanceof Basic.TableType && found.isWithHeader()) {
+                  found = found.getRowType();
+                }
+                if (!(found instanceof Basic.StructureType)) {
+                  const message = "not structured, " + typeName;
+                  input.issues.push(syntaxIssue(input, typeToken!, message));
+                  return new TypedIdentifier(name, input.filename, Basic.VoidType.get(CheckSyntaxKey));
+                }
+        */
+                const found = new include_type_1.IncludeType().runSyntax(c, input);
                 if (found instanceof Basic.VoidType) {
                     if (table === true) {
                         const ttyp = new Basic.TableType(found, { withHeader: true, keyType: Basic.TableKeyType.default });
@@ -34208,18 +34270,7 @@ class Data {
                         return new _typed_identifier_1.TypedIdentifier(name, input.filename, found);
                     }
                 }
-                if (found instanceof Basic.UnknownType) {
-                    return new _typed_identifier_1.TypedIdentifier(name, input.filename, new Basic.UnknownType("unknown type, " + typeName));
-                }
-                if (found instanceof Basic.TableType && found.isWithHeader()) {
-                    found = found.getRowType();
-                }
-                if (!(found instanceof Basic.StructureType)) {
-                    const message = "not structured, " + typeName;
-                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, typeToken, message));
-                    return new _typed_identifier_1.TypedIdentifier(name, input.filename, Basic.VoidType.get(_syntax_input_1.CheckSyntaxKey));
-                }
-                for (const c of found.getComponents()) {
+                for (const c of found) {
                     components.push(c);
                 }
             }
@@ -53794,7 +53845,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.182";
+        return "2.113.184";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -61739,6 +61790,9 @@ ${indentation}    output = ${uniqueName}.\n`;
     }
     replaceLineFunctions(node, lowFile, highSyntax, highFile) {
         var _a, _b;
+        if (this.lowReg.getConfig().getVersion() === version_1.Version.OpenABAP) {
+            return undefined;
+        }
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
         for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
             if (r.referenceType !== _reference_1.ReferenceType.BuiltinMethodReference) {
@@ -78848,6 +78902,87 @@ exports.CondTranspiler = CondTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/expressions/cond_body.js":
+/*!******************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/expressions/cond_body.js ***!
+  \******************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CondBodyTranspiler = void 0;
+const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+const type_name_or_infer_1 = __webpack_require__(/*! ./type_name_or_infer */ "./node_modules/@abaplint/transpiler/build/src/expressions/type_name_or_infer.js");
+const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
+const cond_1 = __webpack_require__(/*! ./cond */ "./node_modules/@abaplint/transpiler/build/src/expressions/cond.js");
+const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/transpiler/build/src/expressions/source.js");
+class CondBodyTranspiler {
+    transpile(typ, body, traversal) {
+        if (!(typ.get() instanceof core_1.Expressions.TypeNameOrInfer)) {
+            throw new Error("CondBodyTranspiler, Expected TypeNameOrInfer");
+        }
+        else if (body.findDirectExpression(core_1.Expressions.Let)) {
+            throw new Error("CondBodyTranspiler, Let not supported, todo");
+        }
+        const whenThen = [];
+        const expressions = [];
+        for (const c of body.getChildren()) {
+            if (c instanceof core_1.Nodes.TokenNode) {
+                if (c.concatTokens() === "ELSE") {
+                    break;
+                }
+            }
+            else {
+                expressions.push(c);
+            }
+        }
+        for (let i = 0; i < expressions.length; i = i + 2) {
+            whenThen.push({ when: expressions[i], then: expressions[i + 1] });
+        }
+        const type = new type_name_or_infer_1.TypeNameOrInfer().findType(typ, traversal);
+        const target = transpile_types_1.TranspileTypes.toType(type);
+        const ret = new chunk_1.Chunk();
+        ret.appendString("(" + target + ".set(");
+        ret.appendString("await (async () => {\n");
+        for (const { when, then } of whenThen) {
+            let condition = "";
+            if (when.get() instanceof core_1.Expressions.Cond) {
+                condition = new cond_1.CondTranspiler().transpile(when, traversal).getCode();
+            }
+            else {
+                throw new Error("CondBodyTranspiler, Expected Cond, todo, " + when.get().constructor.name);
+            }
+            let value = "";
+            if (then.get() instanceof core_1.Expressions.Source) {
+                value = new source_1.SourceTranspiler().transpile(then, traversal).getCode();
+            }
+            else {
+                throw new Error("CondBodyTranspiler, Expected Source, todo, " + then.get().constructor.name);
+            }
+            ret.appendString(`if (${condition}) { return ${value}; }\n`);
+        }
+        const els = body.findExpressionAfterToken("ELSE");
+        if (els) {
+            if (!(els.get() instanceof core_1.Expressions.Source)) {
+                throw new Error("CondBodyTranspiler, Expected Source, todo, " + els.get().constructor.name);
+            }
+            const value = new source_1.SourceTranspiler().transpile(els, traversal).getCode();
+            ret.appendString(`return ${value};\n`);
+        }
+        else {
+            ret.appendString(`return ${target};\n`);
+        }
+        ret.appendString("})()))");
+        return ret;
+    }
+}
+exports.CondBodyTranspiler = CondBodyTranspiler;
+//# sourceMappingURL=cond_body.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/expressions/cond_sub.js":
 /*!*****************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/expressions/cond_sub.js ***!
@@ -79509,6 +79644,7 @@ __exportStar(__webpack_require__(/*! ./let */ "./node_modules/@abaplint/transpil
 __exportStar(__webpack_require__(/*! ./message_number */ "./node_modules/@abaplint/transpiler/build/src/expressions/message_number.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call_body.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call_chain */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call_chain.js"), exports);
+__exportStar(__webpack_require__(/*! ./cond_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/cond_body.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call_param */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call_param.js"), exports);
 __exportStar(__webpack_require__(/*! ./new_object */ "./node_modules/@abaplint/transpiler/build/src/expressions/new_object.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call.js"), exports);
@@ -80464,6 +80600,9 @@ class SourceTranspiler {
                 else if (c.get() instanceof core_1.Expressions.CorrespondingBody) {
                     continue;
                 }
+                else if (c.get() instanceof core_1.Expressions.CondBody) {
+                    continue;
+                }
                 else {
                     ret.appendString("SourceUnknown$" + c.get().constructor.name);
                 }
@@ -80508,6 +80647,17 @@ class SourceTranspiler {
                 }
                 ret.appendChunk(new corresponding_body_1.CorrespondingBodyTranspiler().transpile(typ, correspondingBody, traversal));
             }
+            else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr().toUpperCase() === "COND") {
+                const typ = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
+                if (typ === undefined) {
+                    throw new Error("TypeNameOrInfer not found in CondBody");
+                }
+                const condBody = node.findDirectExpression(core_1.Expressions.CondBody);
+                if (condBody === undefined) {
+                    throw new Error("CondBody not found");
+                }
+                ret.appendChunk(new _1.CondBodyTranspiler().transpile(typ, condBody, traversal));
+            }
             else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr().toUpperCase() === "REF") {
                 const infer = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
                 if (infer?.concatTokens() !== "#") {
@@ -87272,7 +87422,10 @@ class RaiseTranspiler {
         const classNameToken = node.findFirstExpression(abaplint.Expressions.ClassName)?.getFirstToken();
         const className = classNameToken?.getStr();
         if (className === undefined) {
-            const s = node.findFirstExpression(abaplint.Expressions.SimpleSource2);
+            let s = node.findFirstExpression(abaplint.Expressions.SimpleSource2);
+            if (s === undefined) {
+                s = node.findFirstExpression(abaplint.Expressions.Source);
+            }
             if (s === undefined) {
                 const name = node.findFirstExpression(abaplint.Expressions.ExceptionName)?.concatTokens().toLowerCase();
                 return new chunk_1.Chunk().append(`throw new abap.ClassicError({classic: "${name}"});`, node, traversal);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.11.44",
+  "version": "2.11.46",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,8 +27,8 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.113.182",
-    "@abaplint/transpiler": "^2.11.44",
+    "@abaplint/core": "^2.113.184",
+    "@abaplint/transpiler": "^2.11.46",
     "@types/glob": "^8.1.0",
     "@types/node": "^24.3.0",
     "@types/progress": "^2.0.7",