@abaplint/core 2.93.62 → 2.93.64

package/build/abaplint.d.ts

@@ -696,6 +696,10 @@ declare class CDSParameters extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CDSParametersSelect extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 export declare class CDSParser {
     parse(file: IFile | undefined): ExpressionNode | undefined;
 }
@@ -2088,6 +2092,7 @@ declare namespace ExpressionsCDS {
         CDSGroupBy,
         CDSJoin,
         CDSName,
+        CDSParametersSelect,
         CDSParameters,
         CDSRelation,
         CDSSelect,

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

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Include = void 0;
 const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
-const version_1 = require("../../../version");
 class Include {
     getMatcher() {
         const ret = (0, combi_1.seq)("INCLUDE", expressions_1.IncludeName, (0, combi_1.opt)("IF FOUND"));
-        return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
+        return ret;
     }
 }
 exports.Include = Include;

package/build/src/abap/5_syntax/basic_types.js

@@ -551,6 +551,8 @@ class BasicTypes {
             const foo = varVar === null || varVar === void 0 ? void 0 : varVar.getType();
             if (foo instanceof basic_1.ObjectReferenceType) {
                 const id = foo.getIdentifier();
+                const type = id instanceof types_1.ClassDefinition ? "CLAS" : "INTF";
+                this.scope.addReference(expr.getFirstToken(), id, _reference_1.ReferenceType.ObjectOrientedReference, this.filename, { ooType: type, ooName: id.getName() });
                 if (id instanceof types_1.ClassDefinition) {
                     const byName = new _object_oriented_1.ObjectOriented(this.scope).searchTypeName(id, typeName);
                     foundType = byName === null || byName === void 0 ? void 0 : byName.getType();
@@ -560,6 +562,10 @@ class BasicTypes {
                     this.scope.addReference(expr.getTokens()[2], byName, _reference_1.ReferenceType.TypeReference, this.filename);
                 }
             }
+            // todo, ugh, hmm
+            while (subs.length > 0) {
+                subs.shift();
+            }
         }
         else {
             const found = this.scope.findType(subs[0]);

package/build/src/abap/5_syntax/statements/class_implementation.js

@@ -24,6 +24,10 @@ class ClassImplementation {
         if (sup) {
             scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(new tokens_1.Identifier(new position_1.Position(1, 1), "super"), _builtin_1.BuiltIn.filename, new basic_1.ObjectReferenceType(sup)));
         }
+        else {
+            // todo: instead of the void type, do proper typing, ie. only empty constructor method
+            scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(new tokens_1.Identifier(new position_1.Position(1, 1), "super"), _builtin_1.BuiltIn.filename, new basic_1.VoidType("noSuper")));
+        }
         scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(new tokens_1.Identifier(new position_1.Position(1, 1), "me"), _builtin_1.BuiltIn.filename, new basic_1.ObjectReferenceType(classDefinition)));
         helper.addAliasedAttributes(classDefinition); // todo, this is not correct, take care of instance vs static
         const classAttributes = classDefinition.getAttributes();

package/build/src/abap/5_syntax/statements/loop.js

@@ -40,6 +40,7 @@ class Loop {
             throw new Error("Loop, no header line");
         }
         else if (!(sourceType instanceof basic_1.TableType)
+            && !(sourceType instanceof basic_1.AnyType)
             && !(sourceType instanceof basic_1.VoidType)
             && concat.startsWith("LOOP AT GROUP ") === false) {
             throw new Error("Loop, not a table type");

package/build/src/abap/types/method_parameters.js

@@ -10,6 +10,7 @@ const method_def_returning_1 = require("../5_syntax/expressions/method_def_retur
 const method_param_1 = require("../5_syntax/expressions/method_param");
 const _object_oriented_1 = require("../5_syntax/_object_oriented");
 const _reference_1 = require("../5_syntax/_reference");
+const identifier_1 = require("../1_lexer/tokens/identifier");
 // todo:
 // this.exceptions = [];
 // also consider RAISING vs EXCEPTIONS
@@ -147,9 +148,19 @@ class MethodParameters {
             }
         }
         // RAP parameters, temporary fix
-        const rapName = node.findExpressionAfterToken("IMPORTING");
+        let rapName = node.findExpressionAfterToken("IMPORTING");
         if (rapName) {
-            this.importing.push(new _typed_identifier_1.TypedIdentifier(rapName.getFirstToken(), filename, new basic_1.VoidType("RapMethodParameter"), ["importing" /* IdentifierMeta.MethodImporting */]));
+            const token = rapName.getFirstToken();
+            this.importing.push(new _typed_identifier_1.TypedIdentifier(token, filename, new basic_1.VoidType("RapMethodParameter"), ["importing" /* IdentifierMeta.MethodImporting */]));
+            if (node.concatTokens().toUpperCase().includes(" FOR VALIDATE ON SAVE")) {
+                this.exporting.push(new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(token.getStart(), "failed"), filename, new basic_1.VoidType("RapMethodParameter"), ["exporting" /* IdentifierMeta.MethodExporting */]));
+                this.exporting.push(new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(token.getStart(), "reported"), filename, new basic_1.VoidType("RapMethodParameter"), ["exporting" /* IdentifierMeta.MethodExporting */]));
+            }
+        }
+        rapName = node.findExpressionAfterToken("RESULT");
+        if (rapName) {
+            const token = rapName.getFirstToken();
+            this.importing.push(new _typed_identifier_1.TypedIdentifier(token, filename, new basic_1.VoidType("RapMethodParameter"), ["exporting" /* IdentifierMeta.MethodExporting */]));
         }
         const exporting = node.findFirstExpression(Expressions.MethodDefExporting);
         if (exporting) {

package/build/src/cds/expressions/cds_annotation_object.js

@@ -6,9 +6,9 @@ const combi_1 = require("../../abap/2_statements/combi");
 const cds_annotation_simple_1 = require("./cds_annotation_simple");
 class CDSAnnotationObject extends combi_1.Expression {
     getRunnable() {
-        const value = (0, combi_1.alt)(CDSAnnotationObject, _1.CDSAnnotationArray, cds_annotation_simple_1.CDSAnnotationSimple);
+        const value = (0, combi_1.seq)(":", (0, combi_1.alt)(CDSAnnotationObject, _1.CDSAnnotationArray, cds_annotation_simple_1.CDSAnnotationSimple));
         const namedot = (0, combi_1.seq)(_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName)));
-        const valueNested = (0, combi_1.seq)("{", namedot, ":", value, (0, combi_1.star)((0, combi_1.seq)(",", namedot, ":", value)), "}");
+        const valueNested = (0, combi_1.seq)("{", namedot, (0, combi_1.opt)(value), (0, combi_1.star)((0, combi_1.seq)(",", namedot, (0, combi_1.opt)(value))), "}");
         return valueNested;
     }
 }

package/build/src/cds/expressions/cds_parameters_select.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSParametersSelect = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSParametersSelect extends combi_1.Expression {
+    getRunnable() {
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
+        const value = (0, combi_1.alt)(name, _1.CDSString);
+        const nameValue = (0, combi_1.seq)(name, ":", value);
+        return (0, combi_1.seq)("(", nameValue, (0, combi_1.star)((0, combi_1.seq)(",", nameValue)), ")");
+    }
+}
+exports.CDSParametersSelect = CDSParametersSelect;
+//# sourceMappingURL=cds_parameters_select.js.map

package/build/src/cds/expressions/cds_select.js

@@ -4,11 +4,10 @@ exports.CDSSelect = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 const cds_association_1 = require("./cds_association");
-const cds_element_1 = require("./cds_element");
 const cds_join_1 = require("./cds_join");
 class CDSSelect extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("SELECT", (0, combi_1.opt)("DISTINCT"), "FROM", _1.CDSSource, (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.star)(cds_association_1.CDSAssociation), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.str)("{"), (0, combi_1.plus)(cds_element_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", cds_element_1.CDSElement)), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSGroupBy), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), CDSSelect)));
+        return (0, combi_1.seq)("SELECT", (0, combi_1.opt)("DISTINCT"), "FROM", _1.CDSSource, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.star)(cds_association_1.CDSAssociation), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.str)("{"), (0, combi_1.plus)(_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSGroupBy), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), CDSSelect)));
     }
 }
 exports.CDSSelect = CDSSelect;

package/build/src/cds/expressions/index.js

@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./cds_aggregate"), exports);
-__exportStar(require("./cds_aggregate"), exports);
 __exportStar(require("./cds_annotate"), exports);
 __exportStar(require("./cds_annotation_array"), exports);
 __exportStar(require("./cds_annotation_object"), exports);
@@ -38,6 +37,7 @@ __exportStar(require("./cds_function"), exports);
 __exportStar(require("./cds_group_by"), exports);
 __exportStar(require("./cds_join"), exports);
 __exportStar(require("./cds_name"), exports);
+__exportStar(require("./cds_parameters_select"), exports);
 __exportStar(require("./cds_parameters"), exports);
 __exportStar(require("./cds_relation"), exports);
 __exportStar(require("./cds_select"), exports);

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.93.62";
+        return "2.93.64";
     }
     getDDICReferences() {
         return this.references;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.62",
+    "version": "2.93.64",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",