@abaplint/core 2.112.6 → 2.112.8

package/build/abaplint.d.ts

@@ -807,6 +807,10 @@ declare class CDSElement extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CDSExtendView extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSFunction extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -815,6 +819,10 @@ declare class CDSGroupBy extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CDSHaving extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSInteger extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -2351,14 +2359,16 @@ declare namespace ExpressionsCDS {
         CDSDefineProjection,
         CDSDefineView,
         CDSElement,
+        CDSExtendView,
         CDSFunction,
         CDSGroupBy,
-        CDSProviderContract,
+        CDSHaving,
         CDSInteger,
         CDSJoin,
         CDSName,
         CDSParametersSelect,
         CDSParameters,
+        CDSProviderContract,
         CDSRelation,
         CDSSelect,
         CDSSource,

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

@@ -316,9 +316,9 @@ class ObjectOriented {
         return ignore;
     }
     // returns list of interfaces implemented
-    fromInterfaces(classDefinition, skip) {
+    fromInterfaces(definition, skip) {
         const ignore = [];
-        for (const i of classDefinition.getImplementing()) {
+        for (const i of definition.getImplementing()) {
             ignore.push(...this.fromInterfaceByName(i.name, ignore.concat(skip || [])));
         }
         return ignore;

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

@@ -796,7 +796,7 @@ class BasicTypes {
             const attr = token.getStr();
             const c = new _object_oriented_1.ObjectOriented(this.input.scope).searchConstantName(obj, attr);
             if (c instanceof class_constant_1.ClassConstant) {
-                this.input.scope.addReference(firstToken, obj, _reference_1.ReferenceType.ObjectOrientedReference, this.input.filename);
+                this.input.scope.addReference(firstToken, obj, _reference_1.ReferenceType.ObjectOrientedReference, this.input.filename, { ooName: obj.getName() });
                 this.input.scope.addReference(token, c, _reference_1.ReferenceType.DataReadReference, this.input.filename);
                 const val = c.getValue();
                 if (typeof val === "string") {

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

@@ -11,6 +11,7 @@ const _scope_type_1 = require("../5_syntax/_scope_type");
 const event_definition_1 = require("./event_definition");
 const method_definitions_1 = require("./method_definitions");
 const _reference_1 = require("../5_syntax/_reference");
+const _object_oriented_1 = require("../5_syntax/_object_oriented");
 class InterfaceDefinition extends _identifier_1.Identifier {
     constructor(node, input) {
         if (!(node.get() instanceof Structures.Interface)) {
@@ -76,32 +77,12 @@ class InterfaceDefinition extends _identifier_1.Identifier {
     }
     parse(input, node) {
         this.checkInterfacesExists(input, node);
+        const helper = new _object_oriented_1.ObjectOriented(input.scope);
+        helper.fromInterfaces(this);
         // todo, proper sequencing, the statements should be processed line by line
         this.attributes = new class_attributes_1.Attributes(node, input);
         this.typeDefinitions = this.attributes.getTypes();
         this.aliases = this.attributes.getAliases();
-        // todo, cleanup aliases, vs "object_oriented.ts" vs "class_implementation.ts"
-        // this adds the aliased types to scope?
-        /*
-        for (const a of this.aliases) {
-          const [objName, fieldName] = a.getComponent().split("~");
-          const idef = input.scope.findInterfaceDefinition(objName);
-          if (idef) {
-            const foundType = idef.getTypeDefinitions().getByName(fieldName);
-            if (foundType) {
-              input.scope.addTypeNamed(a.getName(), foundType);
-            } else {
-              const foundField = idef.getAttributes().findByName(fieldName);
-              if (foundField && foundField instanceof ClassConstant) {
-                const token = new TokenIdentifier(a.getStart(), a.getName());
-                const id = new TypedIdentifier(token, input.filename, foundField.getType());
-                const constant = new ClassConstant(id, Visibility.Public, foundField.getValue());
-                input.scope.addIdentifier(constant);
-              }
-            }
-          }
-        }
-        */
         const events = node.findAllStatements(Statements.Events);
         for (const e of events) {
             this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input));

package/build/src/cds/cds_parser.js

@@ -29,6 +29,9 @@ class CDSParser {
         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)) {
+            res = combi_1.Combi.run(new Expressions.CDSExtendView(), tokens, version_1.defaultVersion);
+        }
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             return undefined;
         }

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSExtendView = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+const cds_name_1 = require("./cds_name");
+class CDSExtendView extends combi_1.Expression {
+    getRunnable() {
+        const namedot = (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", cds_name_1.CDSName)), (0, combi_1.opt)(_1.CDSAs));
+        const valueNested = (0, combi_1.seq)("{", namedot, (0, combi_1.star)((0, combi_1.seq)(",", namedot)), "}");
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("EXTEND VIEW"), (0, combi_1.opt)((0, combi_1.str)("ENTITY")), cds_name_1.CDSName, (0, combi_1.str)("WITH"), (0, combi_1.opt)(cds_name_1.CDSName), valueNested, (0, combi_1.opt)(";"));
+    }
+}
+exports.CDSExtendView = CDSExtendView;
+//# sourceMappingURL=cds_extend_view.js.map

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSHaving = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSHaving extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)("HAVING", _1.CDSCondition);
+    }
+}
+exports.CDSHaving = CDSHaving;
+//# sourceMappingURL=cds_having.js.map

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

@@ -10,7 +10,7 @@ class CDSSelect extends combi_1.Expression {
         const fields = (0, combi_1.opt)((0, combi_1.seq)((0, combi_1.star)((0, combi_1.seq)(_1.CDSElement, ",")), _1.CDSElement));
         const distinct = (0, combi_1.str)("DISTINCT");
         const elements = (0, combi_1.seq)((0, combi_1.str)("{"), (0, combi_1.plus)(_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.str)("}"));
-        return (0, combi_1.seq)("SELECT", (0, combi_1.opt)(distinct), (0, combi_1.opt)(fields), "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.opt)(elements), (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), (0, combi_1.opt)(fields), "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.opt)(elements), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(_1.CDSGroupBy), (0, combi_1.opt)(_1.CDSHaving), (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

@@ -33,14 +33,16 @@ __exportStar(require("./cds_define_custom"), exports);
 __exportStar(require("./cds_define_projection"), exports);
 __exportStar(require("./cds_define_view"), exports);
 __exportStar(require("./cds_element"), exports);
+__exportStar(require("./cds_extend_view"), exports);
 __exportStar(require("./cds_function"), exports);
 __exportStar(require("./cds_group_by"), exports);
-__exportStar(require("./cds_provider_contract"), exports);
+__exportStar(require("./cds_having"), exports);
 __exportStar(require("./cds_integer"), 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_provider_contract"), exports);
 __exportStar(require("./cds_relation"), exports);
 __exportStar(require("./cds_select"), exports);
 __exportStar(require("./cds_source"), exports);

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.112.6";
+        return "2.112.8";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/cyclic_oo.js

@@ -31,7 +31,7 @@ class CyclicOO {
         return {
             key: "cyclic_oo",
             title: "Cyclic OO",
-            shortDescription: `Finds cyclic OO references`,
+            shortDescription: `Finds cyclic/circular OO references`,
             extendedInformation: `Runs for global INTF + CLAS objects
 
 Objects must be without syntax errors for this rule to take effect

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.112.6",
+    "version": "2.112.8",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,20 +50,20 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.47.2",
+        "@microsoft/api-extractor": "^7.47.4",
         "@types/chai": "^4.3.16",
         "@types/mocha": "^10.0.7",
-        "@types/node": "^20.14.11",
-        "chai": "^4.4.1",
+        "@types/node": "^22.0.0",
+        "chai": "^4.5.0",
         "eslint": "^8.57.0",
         "mocha": "^10.7.0",
         "c8": "^10.1.2",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^2.3.0",
-        "typescript": "^5.5.3"
+        "typescript": "^5.5.4"
     },
     "dependencies": {
-        "fast-xml-parser": "^4.4.0",
+        "fast-xml-parser": "^4.4.1",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.5"
     }