@abaplint/cli 2.113.213 → 2.113.215

package/build/cli.js

@@ -24552,7 +24552,7 @@ class BasicTypes {
                 throw new Error("parseType, componentName expected");
             }
             if (found instanceof Types.StructureType) {
-                const newComponents = found.getComponents();
+                const newComponents = [...found.getComponents()];
                 newComponents.push({ name: componentName, type: Types.VoidType.get("INDICATORStodo") });
                 found = new Types.StructureType(newComponents, qualifiedName);
             }
@@ -26017,13 +26017,13 @@ class FieldChain {
             }
             else if (current instanceof nodes_1.ExpressionNode
                 && current.get() instanceof Expressions.TableExpression) {
-                if (!(context instanceof basic_1.TableType) && !(context instanceof basic_1.VoidType)) {
+                if (!(context instanceof basic_1.TableType) && !(context instanceof basic_1.VoidType) && !(context instanceof basic_1.UnknownType)) {
                     const message = "Table expression, expected table";
                     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, context);
-                if (!(context instanceof basic_1.VoidType)) {
+                if (!(context instanceof basic_1.VoidType) && !(context instanceof basic_1.UnknownType)) {
                     context = context.getRowType();
                 }
             }
@@ -27859,9 +27859,13 @@ const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modu
 const isSimple = /^\w+$/;
 class Select {
     static runSyntax(node, input, skipImplicitInto = false) {
-        var _a;
+        var _a, _b;
         const token = node.getFirstToken();
-        const from = node.findDirectExpression(Expressions.SQLFrom);
+        let from = node.findDirectExpression(Expressions.SQLFrom);
+        if (from === undefined) {
+            // huh, sometimes the select expression is wrapped
+            from = node.findFirstExpression(Expressions.SQLFrom);
+        }
         const dbSources = from ? sql_from_1.SQLFrom.runSyntax(from, input) : [];
         if (from === undefined) {
             const message = `Missing FROM`;
@@ -27876,7 +27880,7 @@ class Select {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
         }
-        const isSingle = node.getChildren()[1].concatTokens().toUpperCase() === "SINGLE"
+        const isSingle = ((_a = node.getChildren()[1]) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase()) === "SINGLE"
             || node.get() instanceof Expressions.SelectLoop;
         this.checkFields(fields, dbSources, input, node);
         this.handleInto(node, input, fields, dbSources, isSingle);
@@ -27893,7 +27897,7 @@ class Select {
             && node.findDirectExpression(Expressions.SQLIntoTable) === undefined
             && node.findDirectExpression(Expressions.SQLIntoList) === undefined
             && node.findDirectExpression(Expressions.SQLIntoStructure) === undefined) {
-            const fields = (_a = node.findFirstExpression(Expressions.SQLAggregation)) === null || _a === void 0 ? void 0 : _a.concatTokens();
+            const fields = (_b = node.findFirstExpression(Expressions.SQLAggregation)) === null || _b === void 0 ? void 0 : _b.concatTokens();
             const c = new RegExp(/^count\(\s*\*\s*\)$/, "i");
             if (fields === undefined || c.test(fields) === false) {
                 const nameToken = from === null || from === void 0 ? void 0 : from.findDirectExpression(Expressions.SQLFromSource);
@@ -29155,13 +29159,13 @@ class Target {
             }
             else if (current instanceof nodes_1.ExpressionNode
                 && current.get() instanceof Expressions.TableExpression) {
-                if (!(context instanceof basic_1.TableType) && !(context instanceof basic_1.VoidType)) {
+                if (!(context instanceof basic_1.TableType) && !(context instanceof basic_1.VoidType) && !(context instanceof unknown_type_1.UnknownType)) {
                     const message = "Table expression, expected table";
                     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, context);
-                if (!(context instanceof basic_1.VoidType)) {
+                if (!(context instanceof basic_1.VoidType) && !(context instanceof unknown_type_1.UnknownType)) {
                     context = context.getRowType();
                 }
             }
@@ -29985,7 +29989,7 @@ class Append {
         }
         const fsTarget = node.findExpressionAfterToken("ASSIGNING");
         if (fsTarget && fsTarget.get() instanceof Expressions.FSTarget) {
-            if (!(targetType instanceof basic_1.TableType) && !(targetType instanceof basic_1.VoidType)) {
+            if (!(targetType instanceof basic_1.TableType) && !(targetType instanceof basic_1.VoidType) && !(targetType instanceof basic_1.UnknownType)) {
                 const message = "APPEND to non table type, " + (targetType === null || targetType === void 0 ? void 0 : targetType.constructor.name);
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
@@ -29995,7 +29999,7 @@ class Append {
         }
         const dataTarget = node.findExpressionAfterToken("INTO");
         if (dataTarget && node.concatTokens().toUpperCase().includes(" REFERENCE INTO DATA(")) {
-            if (!(targetType instanceof basic_1.TableType) && !(targetType instanceof basic_1.VoidType)) {
+            if (!(targetType instanceof basic_1.TableType) && !(targetType instanceof basic_1.VoidType) && !(targetType instanceof basic_1.UnknownType)) {
                 const message = "APPEND to non table type, " + (targetType === null || targetType === void 0 ? void 0 : targetType.constructor.name);
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
@@ -40672,7 +40676,7 @@ class CDSDetermineTypes {
                         }
                         components.push({
                             name: f.name,
-                            type: new basic_1.UnknownType("CDS parser error, unknown source, " + ddlsName),
+                            type: new basic_1.UnknownType("CDS parser error, unknown source, " + f.name + ", " + ddlsName),
                         });
                         continue;
                     }
@@ -41234,7 +41238,7 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 class CDSCast extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)));
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.starPrio)((0, combi_1.seq)(".", _1.CDSName)));
         return (0, combi_1.seq)("CAST", "(", (0, combi_1.altPrio)(_1.CDSFunction, _1.CDSCase, _1.CDSAggregate, _1.CDSArithmetics, CDSCast, _1.CDSString, name), "AS", _1.CDSType, (0, combi_1.optPrio)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
     }
 }
@@ -41281,7 +41285,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 const cds_integer_1 = __webpack_require__(/*! ./cds_integer */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_integer.js");
 class CDSCondition extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", (0, combi_1.altPrio)(_1.CDSString, _1.CDSName))));
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.starPrio)((0, combi_1.seq)(".", (0, combi_1.altPrio)(_1.CDSString, _1.CDSName))));
         const left = (0, combi_1.altPrio)(_1.CDSString, _1.CDSFunction, _1.CDSAggregate, name);
         const operators = (0, combi_1.altPrio)("=", (0, combi_1.seq)("!", "="), (0, combi_1.seq)("<", ">"), (0, combi_1.seq)(">", "="), (0, combi_1.seq)("<", "="), "<", ">", "LIKE", "NOT LIKE");
         const compare = (0, combi_1.seq)(operators, (0, combi_1.altPrio)(left, cds_integer_1.CDSInteger));
@@ -41437,8 +41441,8 @@ const cds_cast_1 = __webpack_require__(/*! ./cds_cast */ "./node_modules/@abapli
 class CDSElement extends combi_1.Expression {
     getRunnable() {
         const redirected = (0, combi_1.seq)(": REDIRECTED TO", (0, combi_1.opt)((0, combi_1.alt)("PARENT", "COMPOSITION CHILD")), _1.CDSName);
-        const colonThing = (0, combi_1.seq)(":", (0, combi_1.alt)(_1.CDSName, _1.CDSType));
-        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.altPrio)("KEY", "VIRTUAL")), (0, combi_1.altPrio)(_1.CDSAggregate, _1.CDSString, _1.CDSArithmetics, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)("(", _1.CDSCase, ")"), (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.opt)((0, combi_1.alt)(redirected, colonThing))), _1.CDSInteger), (0, combi_1.opt)(cds_as_1.CDSAs));
+        const colonThing = (0, combi_1.seq)(":", (0, combi_1.alt)(_1.CDSName, _1.CDSType, "LOCALIZED"));
+        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.altPrio)("KEY", "VIRTUAL")), (0, combi_1.altPrio)(_1.CDSAggregate, _1.CDSString, _1.CDSArithmetics, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)("(", _1.CDSCase, ")"), (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.opt)(cds_as_1.CDSAs), (0, combi_1.opt)((0, combi_1.alt)(redirected, colonThing))), _1.CDSInteger), (0, combi_1.opt)(cds_as_1.CDSAs));
     }
 }
 exports.CDSElement = CDSElement;
@@ -41643,7 +41647,7 @@ class CDSJoin extends combi_1.Expression {
     getRunnable() {
         const cond = (0, combi_1.seq)(_1.CDSSource, "ON", cds_condition_1.CDSCondition);
         const foo = (0, combi_1.altPrio)((0, combi_1.seq)("(", cond, ")"), cond);
-        return (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("LEFT OUTER TO ONE", "LEFT OUTER", "INNER")), "JOIN", foo);
+        return (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("LEFT OUTER TO ONE", "LEFT OUTER", "INNER", "CROSS")), "JOIN", foo);
     }
 }
 exports.CDSJoin = CDSJoin;
@@ -48049,7 +48053,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         return undefined;
     }
     findFieldNames(tree) {
-        var _a, _b;
+        var _a, _b, _c;
         let expr = tree.findFirstExpression(expressions_1.CDSSelect);
         if (expr === undefined) {
             expr = tree.findFirstExpression(expressions_1.CDSAnnotate);
@@ -48061,14 +48065,16 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             let prefix = "";
             let found = (_a = e.findDirectExpression(expressions_1.CDSAs)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.CDSName);
             if (found === undefined) {
-                const list = e.findAllExpressions(expressions_1.CDSName);
-                if (e.concatTokens().toUpperCase().includes(" REDIRECTED TO ")) {
-                    found = list[0];
-                }
-                else {
-                    found = list[list.length - 1];
-                    if (list.length > 1) {
-                        prefix = list[0].concatTokens();
+                const list = (_b = e.findDirectExpression(expressions_1.CDSPrefixedName)) === null || _b === void 0 ? void 0 : _b.findAllExpressions(expressions_1.CDSName);
+                if (list) {
+                    if (e.concatTokens().toUpperCase().includes(" REDIRECTED TO ")) {
+                        found = list[0];
+                    }
+                    else {
+                        found = list[list.length - 1];
+                        if (list.length > 1) {
+                            prefix = list[0].concatTokens();
+                        }
                     }
                 }
             }
@@ -48076,7 +48082,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
                 continue;
             }
             const name = found === null || found === void 0 ? void 0 : found.concatTokens();
-            if ((_b = this.parsedData) === null || _b === void 0 ? void 0 : _b.associations.some(a => { var _a; return a.name.toUpperCase() === name.toUpperCase() || ((_a = a.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === name.toUpperCase(); })) {
+            if ((_c = this.parsedData) === null || _c === void 0 ? void 0 : _c.associations.some(a => { var _a; return a.name.toUpperCase() === name.toUpperCase() || ((_a = a.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === name.toUpperCase(); })) {
                 continue;
             }
             const annotations = [];
@@ -54512,7 +54518,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.213";
+        return "2.113.215";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.213",
+    "version": "2.113.215",
     "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.213",
+        "@abaplint/core": "^2.113.215",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",