@markw65/monkeyc-optimizer 1.0.6 → 1.0.9

package/build/util.cjs

@@ -1,4 +1,4 @@
-0 && (module.exports = {isWin,appSupport,connectiq,getSdkPath,globa,last_modified,first_modified,pushUnique,spawnByLine,readByLine,promiseAll,copyRecursiveAsNeeded});
+0 && (module.exports = {globa,last_modified,first_modified,pushUnique,spawnByLine,readByLine,promiseAll,copyRecursiveAsNeeded});
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -3978,13 +3978,9 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "appSupport": () => (/* binding */ appSupport),
-  "connectiq": () => (/* binding */ connectiq),
   "copyRecursiveAsNeeded": () => (/* binding */ copyRecursiveAsNeeded),
   "first_modified": () => (/* binding */ first_modified),
-  "getSdkPath": () => (/* binding */ getSdkPath),
   "globa": () => (/* binding */ globa),
-  "isWin": () => (/* binding */ isWin),
   "last_modified": () => (/* binding */ last_modified),
   "promiseAll": () => (/* binding */ promiseAll),
   "pushUnique": () => (/* binding */ pushUnique),
@@ -4012,18 +4008,9 @@ const external_readline_namespaceObject = require("readline");
 
 
 
-const isWin = process.platform == "win32";
-
-const appSupport = isWin
-  ? `${process.env.APPDATA}`.replace(/\\/g, "/")
-  : `${process.env.HOME}/Library/Application Support`;
-
-const connectiq = `${appSupport}/Garmin/ConnectIQ`;
-
-function getSdkPath() {
-  return promises_namespaceObject.readFile(connectiq + "/current-sdk.cfg")
-    .then((contents) => contents.toString().replace(/^\s*(.*?)\s*$/s, "$1"));
-}
+// Write it this way so that webpack.DefinePlugin doesn't
+// recognize global.lastModifiedSource.
+global["lastModifiedSource" + ""] = 0;
 
 function globa(pattern, options) {
   return new Promise((resolve, reject) => {
@@ -4106,17 +4093,30 @@ function readByLine(file, lineHandler) {
   );
 }
 
-async function promiseAll(promises, parallelism) {
+async function promiseAll(promiseFn, parallelism) {
   parallelism = parallelism || 4;
   const serializer = [];
-  promises.forEach((p, i) => {
-    if (serializer.length < parallelism) {
-      serializer.push(p);
-    } else {
-      serializer[i % parallelism].then(() => p);
+  const results = [];
+  let done = false;
+  let i = 0;
+  const next = () => {
+    const index = i++;
+    if (done) return;
+    const promise = promiseFn(index);
+    if (!promise) {
+      done = true;
+      return;
     }
-  });
-  return Promise.all(serializer);
+    return promise
+      .then((r) => {
+        results[index] = r;
+      })
+      .then(next);
+  };
+  while (i < parallelism) {
+    serializer.push(next());
+  }
+  return Promise.all(serializer).then(() => results);
 }
 
 async function copyRecursiveAsNeeded(source, target, filter) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.6",
+  "version": "1.0.9",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "exports": {
@@ -13,17 +13,19 @@
     "build-debug": "webpack --mode development",
     "build-release": "webpack --mode production",
     "prepack": "webpack --mode production",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "npm run test-remote",
+    "test-remote": "node ./test/test.js --product=pick-one --github"
   },
   "files": [
     "build/optimizer.cjs",
     "build/util.cjs",
+    "build/sdk-util.cjs",
     "build/api.cjs"
   ],
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.12"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.15"
   },
   "devDependencies": {
     "eslint": "^8.12.0",