@abaplint/core 2.105.4 → 2.105.6

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

@@ -7,7 +7,6 @@ const position_1 = require("../../position");
 const spaghetti_scope_1 = require("./spaghetti_scope");
 const _identifier_1 = require("../4_file_information/_identifier");
 const _scope_type_1 = require("./_scope_type");
-const _reference_1 = require("./_reference");
 const syntax_1 = require("./syntax");
 class CurrentScope {
     static buildDefault(reg, obj) {
@@ -99,8 +98,14 @@ class CurrentScope {
         this.current.getData().forms.push(...f);
     }
     addInterfaceDefinition(i) {
-        var _a;
-        (_a = this.current) === null || _a === void 0 ? void 0 : _a.getData().idefs.push(i);
+        if (this.current === undefined) {
+            return;
+        }
+        const name = i.getName().toUpperCase();
+        if (this.current.getData().cdefs[name] !== undefined) {
+            throw new Error(`Interface "${name}" already defined`);
+        }
+        this.current.getData().idefs[name] = i;
     }
     addNamedIdentifier(name, identifier) {
         if (this.current === undefined) {
@@ -195,11 +200,10 @@ class CurrentScope {
         }
         return false;
     }
-    // todo, found + type can be removed from method output?
     existsObject(name) {
         var _a, _b, _c;
         if (name === undefined) {
-            return { found: false };
+            return undefined;
         }
         let prefixRTTI = "";
         if (this.parentObj.getType() === "PROG") {
@@ -213,28 +217,28 @@ class CurrentScope {
             if (findLocalClass.isGlobal() === true) {
                 prefixRTTI = "";
             }
-            return { found: true, id: findLocalClass, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "CLAS", RTTIName: prefixRTTI + "\\CLASS=" + findLocalClass.getName() };
+            return { id: findLocalClass, ooType: "CLAS", RTTIName: prefixRTTI + "\\CLASS=" + findLocalClass.getName() };
         }
         const globalClas = this.reg.getObject("CLAS", name);
         if (globalClas) {
-            return { found: true, id: globalClas.getIdentifier(), type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "CLAS", RTTIName: "\\CLASS=" + globalClas.getName() };
+            return { id: globalClas.getIdentifier(), ooType: "CLAS", RTTIName: "\\CLASS=" + globalClas.getName() };
         }
         const findLocalInterface = (_b = this.current) === null || _b === void 0 ? void 0 : _b.findInterfaceDefinition(name);
         if (findLocalInterface) {
             if (findLocalInterface.isGlobal() === true) {
                 prefixRTTI = "";
             }
-            return { found: true, id: findLocalInterface, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "INTF", RTTIName: prefixRTTI + "\\INTERFACE=" + findLocalInterface.getName() };
+            return { id: findLocalInterface, ooType: "INTF", RTTIName: prefixRTTI + "\\INTERFACE=" + findLocalInterface.getName() };
         }
         const globalIntf = this.reg.getObject("INTF", name);
         if (globalIntf) {
-            return { found: true, id: globalIntf.getIdentifier(), type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "INTF", RTTIName: "\\INTERFACE=" + globalIntf.getName() };
+            return { id: globalIntf.getIdentifier(), ooType: "INTF", RTTIName: "\\INTERFACE=" + globalIntf.getName() };
         }
         const def = (_c = this.current) === null || _c === void 0 ? void 0 : _c.findDeferred(name);
         if (def !== undefined) {
-            return { found: true, id: def };
+            return { id: def };
         }
-        return { found: false };
+        return undefined;
     }
     ///////////////////////////
     /** Lookup class in local and global scope */

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

@@ -771,7 +771,7 @@ class BasicTypes {
         else if (firstNode.get() instanceof Expressions.ClassName) {
             const obj = this.scope.findObjectDefinition(firstName);
             if (obj === undefined) {
-                if (this.scope.existsObject(firstName).found === true) {
+                if (this.scope.existsObject(firstName) !== undefined) {
                     return undefined;
                 }
                 else if (this.scope.getDDIC().inErrorNamespace(firstName) === true) {
@@ -818,7 +818,7 @@ class BasicTypes {
                 return new Types.GenericObjectReferenceType();
             }
             const search = this.scope.existsObject(name);
-            if (search.found === true && search.id) {
+            if (search === null || search === void 0 ? void 0 : search.id) {
                 this.scope.addReference(chain.getFirstToken(), search.id, _reference_1.ReferenceType.ObjectOrientedReference, this.filename, { ooType: search.ooType, ooName: name });
                 return new Types.ObjectReferenceType(search.id, { qualifiedName: name, RTTIName: search.RTTIName });
             }

package/build/src/abap/5_syntax/expressions/field_chain.js

@@ -171,8 +171,8 @@ class FieldChain {
                 return new basic_1.GenericObjectReferenceType();
             }
             const found = scope.existsObject(classNam);
-            if (found.found === true && found.id) {
-                scope.addReference(classTok, found.id, found.type, filename);
+            if (found === null || found === void 0 ? void 0 : found.id) {
+                scope.addReference(classTok, found.id, _reference_1.ReferenceType.ObjectOrientedReference, filename);
                 return new basic_1.ObjectReferenceType(found.id);
             }
             else if (scope.getDDIC().inErrorNamespace(classNam) === false) {

package/build/src/abap/5_syntax/expressions/method_call_param.js

@@ -29,8 +29,13 @@ class MethodCallParam {
         else if (child instanceof nodes_1.ExpressionNode
             && (child.get() instanceof Expressions.Source
                 || child.get() instanceof Expressions.ConstantString)) {
-            if (!(method instanceof basic_1.VoidType) && method.getParameters().getImporting().length === 0) {
-                throw new Error("Method \"" + method.getName() + "\" has no importing parameters");
+            if (!(method instanceof basic_1.VoidType)) {
+                if (method.getParameters().getImporting().length === 0) {
+                    throw new Error("Method \"" + method.getName() + "\" has no importing parameters");
+                }
+                else if (method.getParameters().getRequiredParameters().length > 1) {
+                    throw new Error("Method \"" + method.getName() + "\" has more than one importing or changing parameter");
+                }
             }
             let targetType = undefined;
             if (!(method instanceof basic_1.VoidType)) {

package/build/src/abap/5_syntax/expressions/new_object.js

@@ -23,6 +23,12 @@ class NewObject {
             if (clas) {
                 scope.addReference(typeToken, clas, _reference_1.ReferenceType.InferredType, filename);
             }
+            else {
+                const intf = scope.findInterfaceDefinition(targetType.getIdentifierName());
+                if (intf) {
+                    throw new Error(intf.getName() + " is an interface, cannot be instantiated");
+                }
+            }
             ret = targetType;
             if ((clas === null || clas === void 0 ? void 0 : clas.isAbstract()) === true) {
                 throw new Error(clas.getName() + " is abstract, cannot be instantiated");

package/build/src/abap/5_syntax/expressions/target.js

@@ -12,6 +12,7 @@ const field_offset_1 = require("./field_offset");
 const _reference_1 = require("../_reference");
 const table_expression_1 = require("./table_expression");
 const expressions_1 = require("../../2_statements/expressions");
+const field_length_1 = require("./field_length");
 class Target {
     runSyntax(node, scope, filename) {
         const concat = node.concatTokens();
@@ -94,8 +95,18 @@ class Target {
         }
         const offset = node.findDirectExpression(Expressions.FieldOffset);
         if (offset) {
+            if (context instanceof basic_1.XStringType || context instanceof basic_1.StringType) {
+                throw new Error("xstring/string offset/length in writer position not possible");
+            }
             new field_offset_1.FieldOffset().runSyntax(offset, scope, filename);
         }
+        const length = node.findDirectExpression(Expressions.FieldLength);
+        if (length) {
+            if (context instanceof basic_1.XStringType || context instanceof basic_1.StringType) {
+                throw new Error("xstring/string offset/length in writer position not possible");
+            }
+            new field_length_1.FieldLength().runSyntax(length, scope, filename);
+        }
         return context;
     }
     /////////////////////////////////

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

@@ -9,7 +9,7 @@ class ScopeData {
         this.data = {
             vars: {},
             cdefs: {},
-            idefs: [], // todo, refactor to object
+            idefs: {},
             forms: [], // todo, refactor to object
             types: {},
             extraLikeTypes: {},
@@ -111,26 +111,13 @@ class SpaghettiScopeNode extends ScopeData {
         }
         return undefined;
     }
-    // todo, can be deleted, not called from anywhere?
-    listFormDefinitions() {
-        let search = this;
-        const ret = [];
-        while (search !== undefined) {
-            for (const form of search.getData().forms) {
-                ret.push(form);
-            }
-            search = search.getParent();
-        }
-        return ret;
-    }
-    // todo, optimize
     findInterfaceDefinition(name) {
         let search = this;
+        const upper = name.toUpperCase();
         while (search !== undefined) {
-            for (const idef of search.getData().idefs) {
-                if (idef.getName().toUpperCase() === name.toUpperCase()) {
-                    return idef;
-                }
+            const idef = search.getData().idefs[upper];
+            if (idef) {
+                return idef;
             }
             search = search.getParent();
         }
@@ -140,9 +127,9 @@ class SpaghettiScopeNode extends ScopeData {
         let search = this;
         const upper = name.toUpperCase();
         while (search !== undefined) {
-            const data = search.getData();
-            if (data.types[upper]) {
-                return data.types[upper];
+            const found = search.getData().types[upper];
+            if (found) {
+                return found;
             }
             search = search.getParent();
         }

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

@@ -19,9 +19,9 @@ class Assign {
         const thirdAssign = assignSource === null || assignSource === void 0 ? void 0 : assignSource.getChildren()[2];
         if ((secondAssign === null || secondAssign === void 0 ? void 0 : secondAssign.concatTokens()) === "=>" && firstAssign && (thirdAssign === null || thirdAssign === void 0 ? void 0 : thirdAssign.get()) instanceof Expressions.Dynamic) {
             const name = firstAssign.concatTokens();
-            const found = scope.findObjectDefinition(name) === undefined || scope.findVariable(name);
-            if (found === undefined && scope.getDDIC().inErrorNamespace(name)) {
-                throw new Error(secondAssign.concatTokens() + " not found");
+            const found = scope.findClassDefinition(name) || scope.findVariable(name);
+            if (found === undefined && scope.getDDIC().inErrorNamespace(name) && name.startsWith("(") === false) {
+                throw new Error(name + " not found, dynamic");
             }
             sourceType = new basic_1.VoidType("Dynamic");
         }

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

@@ -15,8 +15,8 @@ class Catch {
             const token = c.getFirstToken();
             const className = token.getStr().toUpperCase();
             const found = scope.existsObject(className);
-            if (found.found === true && found.id) {
-                scope.addReference(token, found.id, found.type, filename);
+            if (found === null || found === void 0 ? void 0 : found.id) {
+                scope.addReference(token, found.id, _reference_1.ReferenceType.ObjectOrientedReference, filename);
             }
             else if (scope.getDDIC().inErrorNamespace(className) === false) {
                 const extra = { ooName: className, ooType: "Void" };
@@ -35,7 +35,7 @@ class Catch {
         if (target === null || target === void 0 ? void 0 : target.findDirectExpression(Expressions.InlineData)) {
             const token = (_b = target.findFirstExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.getFirstToken();
             const found = scope.existsObject(firstClassName);
-            if (token && found.found === true && firstClassName && found.id) {
+            if (token && firstClassName && (found === null || found === void 0 ? void 0 : found.id)) {
                 const identifier = new _typed_identifier_1.TypedIdentifier(token, filename, new basic_1.ObjectReferenceType(found.id), ["inline" /* IdentifierMeta.InlineDefinition */]);
                 scope.addIdentifier(identifier);
                 scope.addReference(token, identifier, _reference_1.ReferenceType.DataWriteReference, filename);

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

@@ -26,7 +26,7 @@ class ClassLocalFriends {
             const className = classNames[i].concatTokens();
             // make sure to check also DEFINITION DEFERRED
             const found = scope.existsObject(className);
-            if (found.found === false) {
+            if (found === undefined) {
                 throw new Error(`Class ${className.toUpperCase()} not found`);
             }
         }

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

@@ -20,8 +20,8 @@ class Raise {
         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);
+            if (found === null || found === void 0 ? void 0 : found.id) {
+                scope.addReference(classTok, found.id, _reference_1.ReferenceType.ObjectOrientedReference, filename);
                 const def = scope.findObjectDefinition(className);
                 method = (_b = helper.searchMethodName(def, "CONSTRUCTOR")) === null || _b === void 0 ? void 0 : _b.method;
             }

package/build/src/abap/types/basic/void_type.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VoidType = void 0;
 const _abstract_type_1 = require("./_abstract_type");
 class VoidType extends _abstract_type_1.AbstractType {
-    constructor(voided, name) {
-        super({ qualifiedName: name });
+    constructor(voided, qualifiedName) {
+        super({ qualifiedName: qualifiedName });
         this.voided = voided;
     }
     getVoided() {

package/build/src/objects/neptune_api.js

@@ -8,8 +8,9 @@ class NeptuneAPI extends _abstract_object_1.AbstractObject {
     }
     getAllowedNaming() {
         return {
-            maxLength: 30,
+            maxLength: 100,
             allowNamespace: true,
+            customRegex: /.*/i,
         };
     }
     getDescription() {

package/build/src/registry.js

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

package/build/src/rules/abapdoc.js

@@ -13,6 +13,8 @@ class AbapdocConf extends _basic_rule_config_1.BasicRuleConfig {
         this.checkLocal = false;
         this.classDefinition = false;
         this.interfaceDefinition = false;
+        /** Ignores classes flagged as FOR TESTING */
+        this.ignoreTestClasses = true;
     }
 }
 exports.AbapdocConf = AbapdocConf;
@@ -52,8 +54,11 @@ https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#abap-doc-on
             if (this.conf.checkLocal === false && classDef.isLocal === true) {
                 continue;
             }
+            if (this.conf.ignoreTestClasses === true && classDef.isForTesting === true) {
+                continue;
+            }
             methods = methods.concat(classDef.methods.filter(m => m.visibility === visibility_1.Visibility.Public));
-            if (this.getConfig().classDefinition === true) {
+            if (this.conf.classDefinition === true) {
                 const previousRow = classDef.identifier.getStart().getRow() - 2;
                 if (((_a = rows[previousRow]) === null || _a === void 0 ? void 0 : _a.trim().substring(0, 2)) !== "\"!") {
                     const message = "Missing ABAP Doc for class " + classDef.identifier.getToken().getStr();
@@ -67,7 +72,7 @@ https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#abap-doc-on
                 continue;
             }
             methods = methods.concat(interfaceDef.methods);
-            if (this.getConfig().interfaceDefinition === true) {
+            if (this.conf.interfaceDefinition === true) {
                 const previousRow = interfaceDef.identifier.getStart().getRow() - 2;
                 if (((_b = rows[previousRow]) === null || _b === void 0 ? void 0 : _b.trim().substring(0, 2)) !== "\"!") {
                     const message = "Missing ABAP Doc for interface " + interfaceDef.identifier.getToken().getStr();

package/build/src/rules/allowed_object_naming.js

@@ -4,6 +4,7 @@ exports.AllowedObjectNaming = exports.AllowedObjectNamingConf = void 0;
 const issue_1 = require("../issue");
 const _irule_1 = require("./_irule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
+const NAME_REGEX = /^(\/[A-Z_\d]{3,8}\/)?[A-Z_\d<> ]+$/i;
 class AllowedObjectNamingConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.AllowedObjectNamingConf = AllowedObjectNamingConf;
@@ -43,7 +44,7 @@ class AllowedObjectNaming {
                 message = "Name not allowed";
             }
         }
-        else if (name.match(/^(\/[A-Z_\d]{3,8}\/)?[A-Z_\d<> ]+$/i) === null) {
+        else if (name.match(NAME_REGEX) === null) {
             message = "Name not allowed";
         }
         if (message.length > 0) {

package/build/src/rules/identical_conditions.js

@@ -17,8 +17,8 @@ class Conditions {
     push(e) {
         this.arr.push(e.concatTokens());
     }
-    hasDuplicates() {
-        return this.arr.some(x => this.arr.indexOf(x) !== this.arr.lastIndexOf(x));
+    findFirstDuplicate() {
+        return this.arr.find(x => this.arr.indexOf(x) !== this.arr.lastIndexOf(x));
     }
 }
 class IdenticalConditionsConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -77,8 +77,9 @@ Prerequsites: code is pretty printed with identical cAsE`,
                 return [];
             }
         }
-        if (conditions.hasDuplicates()) {
-            const message = "Identical conditions";
+        const duplicate = conditions.findFirstDuplicate();
+        if (duplicate) {
+            const message = "Identical conditions: " + duplicate;
             const issue = issue_1.Issue.atToken(file, node.getFirstToken(), message, this.getMetadata().key, this.conf.severity);
             return [issue];
         }
@@ -101,8 +102,9 @@ Prerequsites: code is pretty printed with identical cAsE`,
                 conditions.push(c);
             }
         }
-        if (conditions.hasDuplicates()) {
-            const message = "Identical conditions";
+        const duplicate = conditions.findFirstDuplicate();
+        if (duplicate) {
+            const message = "Identical conditions: " + duplicate;
             const issue = issue_1.Issue.atStatement(file, i, message, this.getMetadata().key, this.conf.severity);
             return [issue];
         }
@@ -123,8 +125,9 @@ Prerequsites: code is pretty printed with identical cAsE`,
                 conditions.push(s);
             }
         }
-        if (conditions.hasDuplicates()) {
-            const message = "Identical conditions";
+        const duplicate = conditions.findFirstDuplicate();
+        if (duplicate) {
+            const message = "Identical conditions: " + duplicate;
             const issue = issue_1.Issue.atStatement(file, i, message, this.getMetadata().key, this.conf.severity);
             return [issue];
         }

package/build/src/rules/unknown_types.js

@@ -98,7 +98,8 @@ class UnknownTypes {
                 }
             }
         }
-        for (const v of nodeData.idefs) {
+        for (const name in nodeData.idefs) {
+            const v = nodeData.idefs[name];
             const found = this.checkParameters(v);
             if (found) {
                 const message = "Contains unknown, " + found.found;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.105.4",
+    "version": "2.105.6",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.38.5",
+        "@microsoft/api-extractor": "^7.39.0",
         "@types/chai": "^4.3.11",
         "@types/mocha": "^10.0.6",
         "@types/node": "^20.10.5",