@abaplint/core 2.93.61 → 2.93.63

package/build/abaplint.d.ts

@@ -646,6 +646,10 @@ declare class CDSDefineAbstract extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CDSDefineCustom extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSDefineProjection extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -692,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;
 }
@@ -2076,6 +2084,7 @@ declare namespace ExpressionsCDS {
         CDSComposition,
         CDSCondition,
         CDSDefineAbstract,
+        CDSDefineCustom,
         CDSDefineProjection,
         CDSDefineView,
         CDSElement,
@@ -2083,6 +2092,7 @@ declare namespace ExpressionsCDS {
         CDSGroupBy,
         CDSJoin,
         CDSName,
+        CDSParametersSelect,
         CDSParameters,
         CDSRelation,
         CDSSelect,
@@ -3868,12 +3878,12 @@ declare class MethodParameters extends Expression {
 }
 
 declare class MethodParameters_2 implements IMethodParameters {
+    private preferred;
+    private returning;
     private readonly importing;
     private readonly optional;
     private readonly exporting;
     private readonly changing;
-    private preferred;
-    private returning;
     private readonly exceptions;
     private readonly defaults;
     private readonly filename;

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

@@ -16,7 +16,8 @@ class MethodDef {
         const result = (0, combi_1.seq)("RESULT", expressions_1.MethodParamName);
         const link = (0, combi_1.seq)("LINK", expressions_1.MethodParamName);
         const full = (0, combi_1.seq)("FULL", expressions_1.MethodParamName);
-        const behavior = (0, combi_1.altPrio)((0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, "FOR ACTION", expressions_1.TypeName, result), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, "FOR CREATE", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation)), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, "FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, "FOR READ", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation), (0, combi_1.optPrio)(full), result, (0, combi_1.optPrio)(link)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("DETERMINE ON MODIFY IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("DETERMINE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName));
+        const modify = (0, combi_1.alt)((0, combi_1.seq)("FOR ACTION", expressions_1.TypeName, result), (0, combi_1.seq)("FOR CREATE", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation)), (0, combi_1.seq)("FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("FOR UPDATE", expressions_1.TypeName));
+        const behavior = (0, combi_1.altPrio)((0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, "FOR READ", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation), (0, combi_1.optPrio)(full), result, (0, combi_1.optPrio)(link)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("DETERMINE", (0, combi_1.alt)("ON MODIFY", "ON SAVE"), "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName));
         // todo, this is only from version something
         const amdp = (0, combi_1.seq)("AMDP OPTIONS CDS SESSION CLIENT CURRENT", (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefRaising));
         const ret = (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-METHODS", "METHODS"), expressions_1.MethodName, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), expressions_1.EventHandler), parameters, testing, (0, combi_1.seq)("FOR", (0, combi_1.alt)(tableFunction, ddl, behavior)), amdp, "NOT AT END OF MODE", (0, combi_1.optPrio)(expressions_1.Redefinition)));

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

@@ -545,6 +545,28 @@ class BasicTypes {
                 this.scope.addReference(expr.getTokens()[2], byName, _reference_1.ReferenceType.TypeReference, this.filename);
             }
         }
+        else if (chainText.includes("->")) {
+            const [varName, typeName] = chainText.split("->");
+            const varVar = this.scope.findVariable(varName);
+            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();
+                    if (byName === undefined || foundType === undefined) {
+                        return new Types.UnknownType(typeName + " not found in class or interface");
+                    }
+                    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]);
             foundType = found === null || found === void 0 ? void 0 : found.getType();

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

@@ -146,6 +146,11 @@ class MethodParameters {
                 }
             }
         }
+        // RAP parameters, temporary fix
+        const 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 exporting = node.findFirstExpression(Expressions.MethodDefExporting);
         if (exporting) {
             this.add(this.exporting, exporting, scope, ["exporting" /* IdentifierMeta.MethodExporting */]);

package/build/src/cds/cds_parser.js

@@ -26,6 +26,9 @@ class CDSParser {
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             res = combi_1.Combi.run(new Expressions.CDSAnnotate(), tokens, version_1.defaultVersion);
         }
+        if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
+            res = combi_1.Combi.run(new Expressions.CDSDefineCustom(), tokens, version_1.defaultVersion);
+        }
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             return undefined;
         }

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSDefineCustom = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+const cds_name_1 = require("./cds_name");
+const cds_type_1 = require("./cds_type");
+class CDSDefineCustom extends combi_1.Expression {
+    getRunnable() {
+        const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", cds_type_1.CDSType, ";");
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE ROOT CUSTOM ENTITY"), cds_name_1.CDSName, (0, combi_1.str)("{"), (0, combi_1.plus)(field), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
+    }
+}
+exports.CDSDefineCustom = CDSDefineCustom;
+//# sourceMappingURL=cds_define_custom.js.map

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_relation.js

@@ -5,7 +5,8 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSRelation extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.regex)(/^[\w_]+$/), (0, combi_1.opt)(_1.CDSAs));
+        const pre = (0, combi_1.seq)("/", (0, combi_1.regex)(/^[\w_]+$/), "/");
+        return (0, combi_1.seq)((0, combi_1.opt)(pre), (0, combi_1.regex)(/^[\w_]+$/), (0, combi_1.opt)(_1.CDSAs));
     }
 }
 exports.CDSRelation = CDSRelation;

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);
@@ -30,6 +29,7 @@ __exportStar(require("./cds_cast"), exports);
 __exportStar(require("./cds_composition"), exports);
 __exportStar(require("./cds_condition"), exports);
 __exportStar(require("./cds_define_abstract"), exports);
+__exportStar(require("./cds_define_custom"), exports);
 __exportStar(require("./cds_define_projection"), exports);
 __exportStar(require("./cds_define_view"), exports);
 __exportStar(require("./cds_element"), exports);
@@ -37,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.61";
+        return "2.93.63";
     }
     getDDICReferences() {
         return this.references;

package/package.json

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