@abaplint/cli 2.113.118 → 2.113.119

package/build/cli.js

@@ -83,12 +83,15 @@ exports.CompressedFile = CompressedFile;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.FileOperations = void 0;
-const fs = __webpack_require__(/*! fs */ "fs");
-const path = __webpack_require__(/*! path */ "path");
-const zlib = __webpack_require__(/*! zlib */ "zlib");
-const glob = __webpack_require__(/*! glob */ "./node_modules/glob/glob.js");
-const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const compressed_file_1 = __webpack_require__(/*! ./compressed_file */ "./build/src/compressed_file.js");
+const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const fs = __webpack_require__(/*! node:fs */ "node:fs");
+const fsPromises = __webpack_require__(/*! node:fs/promises */ "node:fs/promises");
+const glob = __webpack_require__(/*! glob */ "./node_modules/glob/glob.js");
+const os = __webpack_require__(/*! node:os */ "node:os");
+const path = __webpack_require__(/*! node:path */ "node:path");
+const pLimit = __webpack_require__(/*! p-limit */ "./node_modules/p-limit/index.js");
+const zlib = __webpack_require__(/*! node:zlib */ "node:zlib");
 class FileOperations {
     static deleteFolderRecursive(dir) {
         if (fs.existsSync(dir) === false) {
@@ -103,26 +106,54 @@ class FileOperations {
         }
         return files;
     }
+    static async readFile(filename, compress) {
+        // note that readFileSync is typically faster than async readFile,
+        // https://medium.com/@adamhooper/node-synchronous-code-runs-faster-than-asynchronous-code-b0553d5cf54e
+        const raw = await fsPromises.readFile(filename, { encoding: "utf8" });
+        if (compress === true) {
+            // todo, util.promisify(zlib.deflate) does not seem to work?
+            return new compressed_file_1.CompressedFile(filename, zlib.deflateSync(raw).toString("base64"));
+        }
+        else {
+            return new core_1.MemoryFile(filename, raw);
+        }
+    }
     static async loadFiles(compress, input, bar) {
-        const files = [];
-        bar.set(input.length, "Reading files");
-        for (const filename of input) {
-            bar.tick("Reading files - " + path.basename(filename));
+        let concurrency = os.cpus().length;
+        if (concurrency > 8) {
+            concurrency = 8;
+        }
+        else if (concurrency < 1) {
+            concurrency = 1;
+        }
+        const limit = pLimit(concurrency);
+        input = input.filter((filename) => {
             const base = filename.split("/").reverse()[0];
             if (base.split(".").length <= 2) {
-                continue; // not a abapGit file
-            }
-            // note that readFileSync is typically faster than async readFile,
-            // https://medium.com/@adamhooper/node-synchronous-code-runs-faster-than-asynchronous-code-b0553d5cf54e
-            const raw = fs.readFileSync(filename, "utf8");
-            if (compress === true) {
-                // todo, util.promisify(zlib.deflate) does not seem to work?
-                files.push(new compressed_file_1.CompressedFile(filename, zlib.deflateSync(raw).toString("base64")));
-            }
-            else {
-                files.push(new core_1.MemoryFile(filename, raw));
+                return false;
             }
+            return true;
+        });
+        bar.set(input.length, "Reading files");
+        const promises = input.map((filename) => {
+            return limit(async () => {
+                bar.tick("Reading files - " + path.basename(filename));
+                return this.readFile(filename, compress);
+            });
+        });
+        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;
     }
 }
@@ -19676,7 +19707,7 @@ const _combi_1 = __webpack_require__(/*! ./_combi */ "./node_modules/@abaplint/c
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
 class Loop {
     getMatcher() {
-        return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.Loop), (0, _combi_1.star)((0, _combi_1.sub)(_1.Body)), (0, _combi_1.sta)(Statements.EndLoop));
+        return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.Loop), (0, _combi_1.alt)((0, _combi_1.sub)(_1.Chain), (0, _combi_1.star)((0, _combi_1.sub)(_1.Body))), (0, _combi_1.sta)(Statements.EndLoop));
     }
 }
 exports.Loop = Loop;
@@ -54157,7 +54188,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.118";
+        return "2.113.119";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -83613,6 +83644,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":
@@ -88681,6 +88794,84 @@ module.exports = function(xml, userOptions) {
 };
 
 
+/***/ }),
+
+/***/ "./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":
@@ -88749,6 +88940,28 @@ module.exports = require("node:crypto");
 
 /***/ }),
 
+/***/ "node:fs":
+/*!**************************!*\
+  !*** external "node:fs" ***!
+  \**************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("node:fs");
+
+/***/ }),
+
+/***/ "node:fs/promises":
+/*!***********************************!*\
+  !*** external "node:fs/promises" ***!
+  \***********************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("node:fs/promises");
+
+/***/ }),
+
 /***/ "node:os":
 /*!**************************!*\
   !*** external "node:os" ***!
@@ -88760,6 +88973,17 @@ module.exports = require("node:os");
 
 /***/ }),
 
+/***/ "node:path":
+/*!****************************!*\
+  !*** external "node:path" ***!
+  \****************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("node:path");
+
+/***/ }),
+
 /***/ "node:process":
 /*!*******************************!*\
   !*** external "node:process" ***!
@@ -88782,6 +89006,17 @@ module.exports = require("node:tty");
 
 /***/ }),
 
+/***/ "node:zlib":
+/*!****************************!*\
+  !*** external "node:zlib" ***!
+  \****************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("node:zlib");
+
+/***/ }),
+
 /***/ "os":
 /*!*********************!*\
   !*** external "os" ***!

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.118",
+    "version": "2.113.119",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.118",
+        "@abaplint/core": "^2.113.119",
         "@types/chai": "^4.3.20",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
@@ -46,18 +46,18 @@
         "@types/node": "^22.15.19",
         "@types/progress": "^2.0.7",
         "chai": "^4.5.0",
+        "p-limit": "^3.1.0",
         "chalk": "^5.4.1",
         "eslint": "^9.27.0",
         "glob": "^7.2.3",
         "json5": "^2.2.3",
         "memfs": "^4.17.2",
         "minimist": "^1.2.8",
-        "mocha": "^11.3.0",
+        "mocha": "^11.4.0",
         "progress": "^2.0.3",
         "typescript": "^5.8.3",
         "webpack": "^5.99.8",
         "webpack-cli": "^6.0.1",
         "xml-js": "^1.6.11"
-    },
-    "dependencies": {}
+    }
 }