@abaplint/cli 2.113.124 → 2.113.126

package/build/cli.js

@@ -116,7 +116,7 @@ class FileOperations {
             return new core_1.MemoryFile(filename, raw);
         }
     }
-    static async loadFiles(compress, input, bar) {
+    static setupPLimit() {
         let concurrency = os.cpus().length;
         if (concurrency > 8) {
             concurrency = 8;
@@ -124,7 +124,10 @@ class FileOperations {
         else if (concurrency < 1) {
             concurrency = 1;
         }
-        const limit = pLimit(concurrency);
+        return pLimit(concurrency);
+    }
+    static async loadFiles(compress, input, bar) {
+        const limit = this.setupPLimit();
         input = input.filter((filename) => {
             const base = filename.split("/").reverse()[0];
             if (base.split(".").length <= 2) {
@@ -140,18 +143,6 @@ class FileOperations {
             });
         });
         const files = await Promise.all(promises);
-        /*
-        for (const filename of input) {
-          bar.tick("Reading files - " + path.basename(filename));
-    
-          const base = filename.split("/").reverse()[0];
-          if (base.split(".").length <= 2) {
-            continue; // not a abapGit file
-          }
-    
-          files.push(await this.readFile(filename, compress));
-        }
-          */
         return files;
     }
 }
@@ -825,12 +816,17 @@ class Standard {
         return output + " - ";
     }
     build(issue) {
-        const filename = path.normalize(issue.getFilename());
+        let filename = path.normalize(issue.getFilename());
+        if (filename.startsWith("\\\\?\\")) {
+            // windows UNC path
+            filename = filename.substring(4);
+        }
+        const relativePath = path.relative(process.cwd(), filename);
         return {
-            filename: filename + "[" + issue.getStart().getRow() + ", " + issue.getStart().getCol() + "]",
+            filename: relativePath + "[" + issue.getStart().getRow() + ", " + issue.getStart().getCol() + "]",
             description: issue.getMessage() + " (" + issue.getKey() + ")",
             startPos: issue.getStart(),
-            rawFilename: filename,
+            rawFilename: relativePath,
             severity: issue.getSeverity().toString(),
         };
     }
@@ -4410,6 +4406,8 @@ class Compare extends combi_1.Expression {
         const inn = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), "IN", (0, combi_1.altPrio)(_1.Source, list));
         const sopt = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("SUPPLIED", "BOUND", (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("INSTANCE OF", _1.ClassName), version_1.Version.OpenABAP), "REQUESTED", "INITIAL"));
         const between = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), "BETWEEN", _1.Source, "AND", _1.Source);
+        // https://help.sap.com/doc/abapdocu_752_index_htm/7.52/en-us/abennews-740_sp08-expressions.htm
+        // but also seems to work in v740sp05, blah
         const predicate = (0, combi_1.ver)(version_1.Version.v740sp08, _1.MethodCallChain);
         const rett = (0, combi_1.seq)(_1.Source, (0, combi_1.altPrio)((0, combi_1.seq)(_1.CompareOperator, _1.Source), inn, between, sopt));
         const fsassign = (0, combi_1.seq)(_1.SourceFieldSymbolChain, "IS", (0, combi_1.optPrio)("NOT"), "ASSIGNED");
@@ -7961,10 +7959,11 @@ exports.SQLAggregation = SQLAggregation;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SQLAliasField = void 0;
+const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 class SQLAliasField extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^(\/\w+\/)?\w+~(\/\w+\/)?\w+$/);
+        return (0, combi_1.seq)((0, combi_1.regex)(/^(\/\w+\/)?\w+~(\/\w+\/)?\w+$/), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.regex)(/^\w+$/))));
     }
 }
 exports.SQLAliasField = SQLAliasField;
@@ -8822,7 +8821,7 @@ class SQLSource extends combi_1.Expression {
     getRunnable() {
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
         const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(_1.SimpleSource3, paren)));
-        return (0, combi_1.alt)(_1.SQLAliasField, _1.SimpleSource3, at);
+        return (0, combi_1.altPrio)(_1.SQLAliasField, _1.SimpleSource3, at);
     }
 }
 exports.SQLSource = SQLSource;
@@ -19364,9 +19363,10 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DynproLoop = void 0;
 const Statements = __webpack_require__(/*! ../../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 const _combi_1 = __webpack_require__(/*! ./_combi */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/_combi.js");
+const chain_1 = __webpack_require__(/*! ./chain */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/chain.js");
 class DynproLoop {
     getMatcher() {
-        return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.DynproLoop), (0, _combi_1.star)((0, _combi_1.sta)(Statements.Module)), (0, _combi_1.sta)(Statements.EndLoop));
+        return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.DynproLoop), (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.Module), (0, _combi_1.sub)(chain_1.Chain))), (0, _combi_1.sta)(Statements.EndLoop));
     }
 }
 exports.DynproLoop = DynproLoop;
@@ -19879,9 +19879,10 @@ const Statements = __webpack_require__(/*! ../../2_statements/statements */ "./n
 const _combi_1 = __webpack_require__(/*! ./_combi */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/_combi.js");
 const chain_1 = __webpack_require__(/*! ./chain */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/chain.js");
 const loop_1 = __webpack_require__(/*! ./loop */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/loop.js");
+const dynpro_loop_1 = __webpack_require__(/*! ./dynpro_loop */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/dynpro_loop.js");
 class ProcessAfterInput {
     getMatcher() {
-        const pai = (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.Module), (0, _combi_1.sta)(Statements.Field), (0, _combi_1.sta)(Statements.CallSubscreen), (0, _combi_1.sub)(chain_1.Chain), (0, _combi_1.sub)(loop_1.Loop)));
+        const pai = (0, _combi_1.star)((0, _combi_1.alt)((0, _combi_1.sta)(Statements.Module), (0, _combi_1.sta)(Statements.Field), (0, _combi_1.sta)(Statements.CallSubscreen), (0, _combi_1.sub)(chain_1.Chain), (0, _combi_1.sub)(dynpro_loop_1.DynproLoop), (0, _combi_1.sub)(loop_1.Loop)));
         return (0, _combi_1.seq)((0, _combi_1.sta)(Statements.ProcessAfterInput), pai);
     }
 }
@@ -22475,6 +22476,19 @@ class CurrentScope {
         }
         return false;
     }
+    isAnyOO() {
+        let curr = this.current;
+        while (curr !== undefined) {
+            const stype = curr.getIdentifier().stype;
+            if (stype === _scope_type_1.ScopeType.ClassDefinition
+                || stype === _scope_type_1.ScopeType.ClassImplementation
+                || stype === _scope_type_1.ScopeType.Interface) {
+                return true;
+            }
+            curr = curr.getParent();
+        }
+        return false;
+    }
     isGlobalOO() {
         return this.parentObj.getType() === "INTF" || this.parentObj.getType() === "CLAS";
     }
@@ -23893,7 +23907,7 @@ class BasicTypes {
             if (type === undefined) {
                 type = (_a = this.input.scope.getDDIC().lookupNoVoid(name)) === null || _a === void 0 ? void 0 : _a.type;
             }
-            if (type === undefined && this.input.scope.isOO() === false && this.input.scope.getDDIC().inErrorNamespace(name) === false) {
+            if (type === undefined && this.input.scope.isAnyOO() === false && this.input.scope.getDDIC().inErrorNamespace(name) === false) {
                 this.input.scope.addReference(chain.getChildren()[0].getFirstToken(), undefined, _reference_1.ReferenceType.VoidType, this.input.filename);
                 return new Types.VoidType(name);
             }
@@ -25464,7 +25478,6 @@ class DataDefinition {
             }
         }
         if (name) {
-            console.dir("undef");
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), input.filename, new basic_1.UnknownType("DataDefinition, fallback"));
         }
         return undefined;
@@ -54230,7 +54243,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.124";
+        return "2.113.126";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -76952,7 +76965,7 @@ class XMLConsistency {
                 issues.push(issue_1.Issue.atRow(file, 1, "Class matching XML name not found in ABAP file", this.getMetadata().key, this.conf.severity));
             }
         }
-        if (obj instanceof Objects.Interface) {
+        else if (obj instanceof Objects.Interface) {
             const name = obj.getNameFromXML();
             if (name === undefined) {
                 issues.push(issue_1.Issue.atRow(file, 1, "Name undefined in XML", this.getMetadata().key, this.conf.severity));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.124",
+    "version": "2.113.126",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,16 +38,16 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.124",
+        "@abaplint/core": "^2.113.126",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",
-        "@types/node": "^22.15.21",
+        "@types/node": "^22.15.30",
         "@types/progress": "^2.0.7",
         "chai": "^4.5.0",
         "p-limit": "^3.1.0",
         "chalk": "^5.4.1",
-        "eslint": "^9.27.0",
+        "eslint": "^9.28.0",
         "glob": "^11.0.2",
         "json5": "^2.2.3",
         "memfs": "^4.17.2",