@abaplint/cli 2.101.2 → 2.101.4

package/build/cli.js

@@ -18917,7 +18917,7 @@ class ABAPFileInformation {
         }
     }
     parseClasses(structure) {
-        var _a, _b, _c;
+        var _a;
         for (const found of structure.findAllStructures(Structures.ClassDefinition)) {
             const className = found.findFirstStatement(Statements.ClassDefinition).findFirstExpression(Expressions.ClassName).getFirstToken();
             const methods = this.parseMethodDefinition(found.findFirstStructure(Structures.PublicSection), visibility_1.Visibility.Public);
@@ -18936,8 +18936,26 @@ class ABAPFileInformation {
             const containsGlobal = found.findFirstExpression(Expressions.ClassGlobal);
             const cdef = found.findFirstStatement(Statements.ClassDefinition);
             const concat = (cdef === null || cdef === void 0 ? void 0 : cdef.concatTokens().toUpperCase()) || "";
-            const duration = (_b = cdef === null || cdef === void 0 ? void 0 : cdef.findExpressionAfterToken("DURATION")) === null || _b === void 0 ? void 0 : _b.concatTokens().toUpperCase();
-            const riskLevel = (_c = cdef === null || cdef === void 0 ? void 0 : cdef.findExpressionAfterToken("LEVEL")) === null || _c === void 0 ? void 0 : _c.concatTokens().toUpperCase();
+            let riskLevel;
+            if (concat.includes("RISK LEVEL CRITICAL")) {
+                riskLevel = _abap_file_information_1.RiskLevel.critical;
+            }
+            else if (concat.includes("RISK LEVEL DANGEROUS")) {
+                riskLevel = _abap_file_information_1.RiskLevel.dangerous;
+            }
+            else if (concat.includes("RISK LEVEL HARMLESS")) {
+                riskLevel = _abap_file_information_1.RiskLevel.harmless;
+            }
+            let duration;
+            if (concat.includes("DURATION SHORT")) {
+                duration = _abap_file_information_1.Duration.short;
+            }
+            else if (concat.includes("DURATION LONG")) {
+                duration = _abap_file_information_1.Duration.long;
+            }
+            else if (concat.includes("DURATION MEDIUM")) {
+                duration = _abap_file_information_1.Duration.medium;
+            }
             this.classes.push({
                 name: className.getStr(),
                 identifier: new _identifier_1.Identifier(className, this.filename),
@@ -29791,45 +29809,50 @@ const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@a
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const message_source_1 = __webpack_require__(/*! ../expressions/message_source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/message_source.js");
 const raise_with_1 = __webpack_require__(/*! ../expressions/raise_with */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/raise_with.js");
+const _object_oriented_1 = __webpack_require__(/*! ../_object_oriented */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_object_oriented.js");
+const method_parameters_1 = __webpack_require__(/*! ../expressions/method_parameters */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/method_parameters.js");
 class Raise {
     runSyntax(node, scope, filename) {
         // todo
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
+        const helper = new _object_oriented_1.ObjectOriented(scope);
+        let method;
         const classTok = (_a = node.findDirectExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
-        const classNam = classTok === null || classTok === void 0 ? void 0 : classTok.getStr();
-        if (classNam) {
-            const found = scope.existsObject(classNam);
+        const className = classTok === null || classTok === void 0 ? void 0 : classTok.getStr();
+        if (className) {
+            const found = scope.existsObject(className);
             if (found.found === true && found.id) {
                 scope.addReference(classTok, found.id, found.type, filename);
+                const def = scope.findObjectDefinition(className);
+                method = (_b = helper.searchMethodName(def, "CONSTRUCTOR")) === null || _b === void 0 ? void 0 : _b.method;
             }
-            else if (scope.getDDIC().inErrorNamespace(classNam) === false) {
-                const extra = { ooName: classNam, ooType: "Void" };
+            else if (scope.getDDIC().inErrorNamespace(className) === false) {
+                const extra = { ooName: className, ooType: "Void" };
                 scope.addReference(classTok, undefined, _reference_1.ReferenceType.ObjectOrientedVoidReference, filename, extra);
+                method = new basic_1.VoidType(className);
             }
             else {
-                throw new Error("RAISE, unknown class " + classNam);
+                throw new Error("RAISE, unknown class " + className);
             }
         }
-        let prev = "";
-        for (const c of node.getChildren()) {
-            if (c instanceof nodes_1.ExpressionNode
-                && (c.get() instanceof Expressions.SimpleSource2 || c.get() instanceof Expressions.Source)) {
-                const type = new source_1.Source().runSyntax(c, scope, filename);
-                if (prev === "EXCEPTION"
-                    && type
-                    && !(type instanceof basic_1.VoidType)
-                    && !(type instanceof basic_1.ObjectReferenceType)) {
-                    throw new Error("RAISE EXCEPTION, must be object reference, got " + type.constructor.name);
-                }
+        const c = node.findExpressionAfterToken("EXCEPTION");
+        if (c instanceof nodes_1.ExpressionNode && (c.get() instanceof Expressions.SimpleSource2 || c.get() instanceof Expressions.Source)) {
+            const type = new source_1.Source().runSyntax(c, scope, filename);
+            if (type instanceof basic_1.VoidType) {
+                method = type;
+            }
+            else if (type instanceof basic_1.ObjectReferenceType) {
+                const def = scope.findObjectDefinition(type.getIdentifierName());
+                method = (_c = helper.searchMethodName(def, "CONSTRUCTOR")) === null || _c === void 0 ? void 0 : _c.method;
+            }
+            else if (type !== undefined) {
+                throw new Error("RAISE EXCEPTION, must be object reference, got " + type.constructor.name);
             }
-            prev = c.concatTokens().toUpperCase();
         }
-        // todo, check parameters vs constructor
+        // check parameters vs constructor
         const param = node.findDirectExpression(Expressions.ParameterListS);
         if (param) {
-            for (const s of param.findAllExpressions(Expressions.Source)) {
-                new source_1.Source().runSyntax(s, scope, filename);
-            }
+            new method_parameters_1.MethodParameters().checkExporting(param, scope, method, filename, true);
         }
         for (const s of node.findDirectExpressions(Expressions.RaiseWith)) {
             new raise_with_1.RaiseWith().runSyntax(s, scope, filename);
@@ -29843,8 +29866,8 @@ class Raise {
         for (const s of node.findDirectExpressions(Expressions.MessageSource)) {
             new message_source_1.MessageSource().runSyntax(s, scope, filename);
         }
-        const id = (_b = node.findExpressionAfterToken("ID")) === null || _b === void 0 ? void 0 : _b.concatTokens();
-        const number = (_c = node.findDirectExpression(Expressions.MessageNumber)) === null || _c === void 0 ? void 0 : _c.concatTokens();
+        const id = (_d = node.findExpressionAfterToken("ID")) === null || _d === void 0 ? void 0 : _d.concatTokens();
+        const number = (_e = node.findDirectExpression(Expressions.MessageNumber)) === null || _e === void 0 ? void 0 : _e.concatTokens();
         if ((id === null || id === void 0 ? void 0 : id.startsWith("'")) && number) {
             const messageClass = id.substring(1, id.length - 1).toUpperCase();
             scope.getMSAGReferences().addUsing(filename, node.getFirstToken(), messageClass, number);
@@ -47991,7 +48014,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.101.2";
+        return "2.101.4";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.101.2",
+    "version": "2.101.4",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.101.2",
+        "@abaplint/core": "^2.101.4",
         "@types/chai": "^4.3.5",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",
@@ -55,7 +55,7 @@
         "mocha": "^10.2.0",
         "progress": "^2.0.3",
         "typescript": "^5.0.4",
-        "webpack": "^5.83.1",
+        "webpack": "^5.84.0",
         "webpack-cli": "^5.1.1",
         "xml-js": "^1.6.11"
     },