@abaplint/transpiler-cli 2.10.57 → 2.10.59

package/build/bundle.js

@@ -71,6 +71,9 @@ exports.FileOperations = void 0;
 const fs = __webpack_require__(/*! fs */ "fs");
 const path = __webpack_require__(/*! path */ "path");
 const glob = __webpack_require__(/*! glob */ "./node_modules/glob/glob.js");
+const pLimit = __webpack_require__(/*! p-limit */ "./node_modules/p-limit/index.js");
+const os = __webpack_require__(/*! node:os */ "node:os");
+const fsPromises = __webpack_require__(/*! node:fs/promises */ "node:fs/promises");
 class FileOperations {
     static deleteFolderRecursive(p) {
         if (fs.existsSync(p) === false) {
@@ -78,26 +81,46 @@ class FileOperations {
         }
         fs.rmSync(p, { recursive: true });
     }
-    static loadFiles(config) {
-        const files = [];
+    static setupPLimit() {
+        let concurrency = os.cpus().length;
+        if (concurrency > 8) {
+            concurrency = 8;
+        }
+        else if (concurrency < 1) {
+            concurrency = 1;
+        }
+        return pLimit(concurrency);
+    }
+    static async readAllFiles(filesToRead, outputFolder) {
+        const limit = this.setupPLimit();
+        const promises = filesToRead.map((filename) => {
+            return limit(async () => {
+                return {
+                    filename: path.basename(filename),
+                    relative: path.relative(outputFolder, path.dirname(filename)),
+                    contents: await fsPromises.readFile(filename, "utf8"),
+                };
+            });
+        });
+        return Promise.all(promises);
+    }
+    static async loadFiles(config) {
         const filter = (config.input_filter ?? []).map(pattern => new RegExp(pattern, "i"));
         let skipped = 0;
         let added = 0;
         const folders = Array.isArray(config.input_folder) ? config.input_folder : [config.input_folder];
+        const filesToRead = [];
         for (const folder of folders) {
             for (const filename of glob.sync(folder + "/**", { nosort: true, nodir: true })) {
                 if (filter.length > 0 && filter.some(a => a.test(filename)) === false) {
                     skipped++;
                     continue;
                 }
-                files.push({
-                    filename: path.basename(filename),
-                    relative: path.relative(config.output_folder, path.dirname(filename)),
-                    contents: fs.readFileSync(filename, "utf8"),
-                });
+                filesToRead.push(filename);
                 added++;
             }
         }
+        const files = await this.readAllFiles(filesToRead, config.output_folder);
         console.log(added + " files added from source");
         console.log(skipped + " files skipped in source");
         return files;
@@ -3291,6 +3314,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");
@@ -6842,10 +6867,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;
@@ -7703,7 +7729,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;
@@ -18245,9 +18271,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;
@@ -18760,9 +18787,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);
     }
 }
@@ -22069,6 +22097,7 @@ exports.TypeUtils = void 0;
 const types_1 = __webpack_require__(/*! ../types */ "./node_modules/@abaplint/core/build/src/abap/types/index.js");
 const basic_1 = __webpack_require__(/*! ../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const cgeneric_type_1 = __webpack_require__(/*! ../types/basic/cgeneric_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/cgeneric_type.js");
+const Expressions = __webpack_require__(/*! ../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 // todo: refactor to static? for performance
 class TypeUtils {
     constructor(scope) {
@@ -22287,8 +22316,22 @@ class TypeUtils {
         }
         return false;
     }
-    isAssignableStrict(source, target, calculated = false) {
+    isCalculated(node) {
+        /*
+        if (node.getChildren().length === 1
+            && node.get() instanceof Expressions.Source
+            && node.getFirstChild()?.get() instanceof Expressions.MethodCallChain) {
+          return false;
+        }
+        */
+        const calculated = node.findFirstExpression(Expressions.MethodCallChain) !== undefined
+            || node.findFirstExpression(Expressions.StringTemplate) !== undefined
+            || node.findFirstExpression(Expressions.ArithOperator) !== undefined;
+        return calculated;
+    }
+    isAssignableStrict(source, target, node) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
+        const calculated = node ? this.isCalculated(node) : false;
         /*
             console.dir(source);
             console.dir(target);
@@ -22340,6 +22383,13 @@ class TypeUtils {
         else if (source instanceof basic_1.StringType) {
             if (target instanceof basic_1.StructureType && this.structureContainsString(target)) {
                 return false;
+                /*
+              } else if (target instanceof CharacterType) {
+                if (source.getAbstractTypeData()?.derivedFromConstant === true) {
+                  return true;
+                }
+                return false;
+                */
             }
             else if (target instanceof basic_1.IntegerType) {
                 if (((_f = source.getAbstractTypeData()) === null || _f === void 0 ? void 0 : _f.derivedFromConstant) === true) {
@@ -25568,15 +25618,12 @@ class MethodCallParam {
             if (child.get() instanceof Expressions.Source) {
                 sourceType = new source_1.Source().runSyntax(child, input, targetType);
             }
-            const calculated = child.findFirstExpression(Expressions.MethodCallChain) !== undefined
-                || child.findFirstExpression(Expressions.StringTemplate) !== undefined
-                || child.findFirstExpression(Expressions.ArithOperator) !== undefined;
             if (sourceType === undefined) {
                 const message = "No source type determined, method source";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
             }
-            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(sourceType, targetType, calculated) === false) {
+            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(sourceType, targetType, child) === false) {
                 const message = "Method parameter type not compatible";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
@@ -25867,15 +25914,12 @@ class MethodParameters {
         }
         for (const item of items) {
             const parameter = allImporting.find(p => p.getName().toUpperCase() === item.name);
-            const calculated = item.source.findFirstExpression(Expressions.MethodCallChain) !== undefined
-                || item.source.findFirstExpression(Expressions.StringTemplate) !== undefined
-                || item.source.findFirstExpression(Expressions.ArithOperator) !== undefined;
             if (parameter === undefined) {
                 const message = "Method importing parameter \"" + item.name + "\" does not exist";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 continue;
             }
-            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(item.sourceType, parameter.getType(), calculated) === false) {
+            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(item.sourceType, parameter.getType(), item.source) === false) {
                 const message = "Method parameter type not compatible, " + item.name;
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
@@ -29787,16 +29831,13 @@ class CreateObject {
             }
             const source = p.findDirectExpression(Expressions.Source);
             const sourceType = new source_1.Source().runSyntax(source, input);
-            const calculated = (source === null || source === void 0 ? void 0 : source.findFirstExpression(Expressions.MethodCallChain)) !== undefined
-                || (source === null || source === void 0 ? void 0 : source.findFirstExpression(Expressions.StringTemplate)) !== undefined
-                || (source === null || source === void 0 ? void 0 : source.findFirstExpression(Expressions.ArithOperator)) !== undefined;
             const found = allImporting === null || allImporting === void 0 ? void 0 : allImporting.find(p => p.getName().toUpperCase() === name);
             if (found === undefined) {
                 const message = `constructor parameter "${name}" does not exist`;
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
             }
-            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(sourceType, found.getType(), calculated) === false) {
+            else if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(sourceType, found.getType(), source) === false) {
                 const message = `constructor parameter "${name}" type not compatible`;
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                 return;
@@ -53098,7 +53139,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.121";
+        return "2.113.125";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -61840,6 +61881,7 @@ https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#check-vs-re
             else if (this.conf.allowCheck === false && get instanceof Statements.Check && stack.length === 0) {
                 const message = "CHECK is not allowed outside of loops";
                 let tokensString = statement.concatTokens();
+                tokensString = tokensString.replace(/^check /i, "CHECK ");
                 tokensString = tokensString.split("CHECK")[1].trim();
                 const replacement = "IF NOT " + tokensString + "\n  RETURN.\nENDIF.";
                 const fix = edit_helper_1.EditHelper.replaceRange(file, statement.getFirstToken().getStart(), statement.getLastToken().getEnd(), replacement);
@@ -75368,8 +75410,9 @@ ENDINTERFACE.`,
         var _a;
         const issues = [];
         for (const s of ((_a = file.getStructure()) === null || _a === void 0 ? void 0 : _a.findAllStatements(Statements.MethodDef)) || []) {
-            if (s.findDirectExpression(Expressions.MethodDefExceptions)) {
-                issues.push(issue_1.Issue.atStatement(file, s, this.getMessage(), this.getMetadata().key));
+            const expr = s.findDirectExpression(Expressions.MethodDefExceptions);
+            if (expr) {
+                issues.push(issue_1.Issue.atToken(file, expr.getFirstToken(), this.getMessage(), this.getMetadata().key));
             }
         }
         return issues;
@@ -76769,14 +76812,6 @@ class Chunk {
             this.appendString(str);
         }
     }
-    /*
-      public copy(): Chunk {
-        const ret = new Chunk();
-        ret.raw = this.raw;
-        ret.mappings = [...this.mappings];
-        return ret;
-      }
-    */
     join(chunks, str = ", ") {
         for (let i = 0; i < chunks.length; i++) {
             this.appendChunk(chunks[i]);
@@ -82398,8 +82433,16 @@ class ClearTranspiler {
     transpile(node, traversal) {
         const target = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Target));
         const ret = new chunk_1.Chunk();
+        /*
         ret.appendChunk(target);
-        ret.append(".clear();", node.getLastToken(), traversal);
+        ret.append(".clear();", node.getLastToken().getEnd(), traversal);
+        */
+        ret.append(target.getCode() + ".clear();", node.getLastToken().getEnd(), traversal);
+        //    ret.append(target.getCode() + ".clear();", node, traversal);
+        /*
+            ret.append(target.getCode(), node.getFirstToken().getStart(), traversal);
+            ret.append(".clear();", node.getLastToken().getEnd(), traversal);
+            */
         return ret;
     }
 }
@@ -94650,6 +94693,88 @@ function onceStrict (fn) {
 }
 
 
+/***/ }),
+
+/***/ "./node_modules/p-limit/index.js":
+/*!***************************************!*\
+  !*** ./node_modules/p-limit/index.js ***!
+  \***************************************/
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+"use strict";
+
+const Queue = __webpack_require__(/*! yocto-queue */ "./node_modules/yocto-queue/index.js");
+
+const pLimit = concurrency => {
+	if (!((Number.isInteger(concurrency) || concurrency === Infinity) && concurrency > 0)) {
+		throw new TypeError('Expected `concurrency` to be a number from 1 and up');
+	}
+
+	const queue = new Queue();
+	let activeCount = 0;
+
+	const next = () => {
+		activeCount--;
+
+		if (queue.size > 0) {
+			queue.dequeue()();
+		}
+	};
+
+	const run = async (fn, resolve, ...args) => {
+		activeCount++;
+
+		const result = (async () => fn(...args))();
+
+		resolve(result);
+
+		try {
+			await result;
+		} catch {}
+
+		next();
+	};
+
+	const enqueue = (fn, resolve, ...args) => {
+		queue.enqueue(run.bind(null, fn, resolve, ...args));
+
+		(async () => {
+			// This function needs to wait until the next microtask before comparing
+			// `activeCount` to `concurrency`, because `activeCount` is updated asynchronously
+			// when the run function is dequeued and called. The comparison in the if-statement
+			// needs to happen asynchronously as well to get an up-to-date value for `activeCount`.
+			await Promise.resolve();
+
+			if (activeCount < concurrency && queue.size > 0) {
+				queue.dequeue()();
+			}
+		})();
+	};
+
+	const generator = (fn, ...args) => new Promise(resolve => {
+		enqueue(fn, resolve, ...args);
+	});
+
+	Object.defineProperties(generator, {
+		activeCount: {
+			get: () => activeCount
+		},
+		pendingCount: {
+			get: () => queue.size
+		},
+		clearQueue: {
+			value: () => {
+				queue.clear();
+			}
+		}
+	});
+
+	return generator;
+};
+
+module.exports = pLimit;
+
+
 /***/ }),
 
 /***/ "./node_modules/path-is-absolute/index.js":
@@ -100584,6 +100709,84 @@ function wrappy (fn, cb) {
 }
 
 
+/***/ }),
+
+/***/ "./node_modules/yocto-queue/index.js":
+/*!*******************************************!*\
+  !*** ./node_modules/yocto-queue/index.js ***!
+  \*******************************************/
+/***/ ((module) => {
+
+class Node {
+	/// value;
+	/// next;
+
+	constructor(value) {
+		this.value = value;
+
+		// TODO: Remove this when targeting Node.js 12.
+		this.next = undefined;
+	}
+}
+
+class Queue {
+	// TODO: Use private class fields when targeting Node.js 12.
+	// #_head;
+	// #_tail;
+	// #_size;
+
+	constructor() {
+		this.clear();
+	}
+
+	enqueue(value) {
+		const node = new Node(value);
+
+		if (this._head) {
+			this._tail.next = node;
+			this._tail = node;
+		} else {
+			this._head = node;
+			this._tail = node;
+		}
+
+		this._size++;
+	}
+
+	dequeue() {
+		const current = this._head;
+		if (!current) {
+			return;
+		}
+
+		this._head = this._head.next;
+		this._size--;
+		return current.value;
+	}
+
+	clear() {
+		this._head = undefined;
+		this._tail = undefined;
+		this._size = 0;
+	}
+
+	get size() {
+		return this._size;
+	}
+
+	* [Symbol.iterator]() {
+		let current = this._head;
+
+		while (current) {
+			yield current.value;
+			current = current.next;
+		}
+	}
+}
+
+module.exports = Queue;
+
+
 /***/ }),
 
 /***/ "assert":
@@ -100641,6 +100844,28 @@ module.exports = require("fs");
 
 /***/ }),
 
+/***/ "node:fs/promises":
+/*!***********************************!*\
+  !*** external "node:fs/promises" ***!
+  \***********************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("node:fs/promises");
+
+/***/ }),
+
+/***/ "node:os":
+/*!**************************!*\
+  !*** external "node:os" ***!
+  \**************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("node:os");
+
+/***/ }),
+
 /***/ "os":
 /*!*********************!*\
   !*** external "os" ***!
@@ -100841,7 +101066,7 @@ async function run() {
     console.log("Transpiler CLI");
     const config = config_1.TranspilerConfig.find(process.argv[2]);
     const libFiles = loadLib(config);
-    const files = file_operations_1.FileOperations.loadFiles(config);
+    const files = await file_operations_1.FileOperations.loadFiles(config);
     console.log("\nBuilding");
     const t = new Transpiler.Transpiler(config.options);
     const reg = new abaplint.Registry();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.10.57",
+  "version": "2.10.59",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,15 +27,16 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.113.121",
-    "@abaplint/transpiler": "^2.10.57",
+    "@abaplint/core": "^2.113.125",
+    "@abaplint/transpiler": "^2.10.59",
     "@types/glob": "^8.1.0",
-    "@types/node": "^22.15.21",
+    "@types/node": "^22.15.29",
     "@types/progress": "^2.0.7",
     "glob": "=7.2.0",
     "progress": "^2.0.3",
     "ts-json-schema-generator": "^2.4.0",
     "typescript": "^5.8.3",
+    "p-limit": "^3.1.0",
     "webpack-cli": "^6.0.1",
     "webpack": "^5.99.9"
   }