refactor: devScripts update (#173)

* chore: updates from devScripts * test: timeout could be undefined --------- Co-authored-by: mshanemc <[email protected]>
forcedotcom · Feb 28, 2023 · ba7a6f5 · ba7a6f5
1 parent e2eea56
commit ba7a6f5
Show file tree

Hide file tree

Showing 4 changed files with 2,618 additions and 782 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,9 @@ coverage
 docs
 
 # -- CLEAN ALL
+*.tsbuildinfo
+.eslintcache
+.wireit
 node_modules
 
 # --

diff --git a/package.json b/package.json
@@ -13,21 +13,21 @@
     "vendor/lodash.js"
   ],
   "scripts": {
-    "build": "sf-build",
+    "build": "wireit",
     "ci-docs": "yarn sf-ci-docs",
     "clean": "sf-clean",
     "clean-all": "sf-clean all",
-    "compile": "sf-compile",
+    "compile": "wireit",
     "docs": "sf-docs",
-    "format": "sf-format",
-    "lint": "sf-lint",
+    "format": "wireit",
+    "lint": "wireit",
     "lint-fix": "yarn sf-lint --fix",
     "lodash": "./scripts/build-lodash.sh",
     "postcompile": "shx cp -r src/nodash/support.d.ts lib/nodash",
     "prepack": "sf-prepack",
     "prepare": "sf-install",
-    "pretest": "sf-compile-test",
-    "test": "sf-test"
+    "test": "wireit",
+    "test:only": "wireit"
   },
   "dependencies": {
     "@salesforce/ts-types": "^1.7.3",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@salesforce/dev-config": "^3.0.0",
-    "@salesforce/dev-scripts": "^3.1.0",
+    "@salesforce/dev-scripts": "^4.1.1",
     "@salesforce/prettier-config": "^0.0.2",
     "@typescript-eslint/eslint-plugin": "^5.44.0",
     "@typescript-eslint/parser": "^5.53.0",
@@ -58,6 +58,77 @@
     "pretty-quick": "^3.1.0",
     "sinon": "10.0.0",
     "ts-node": "^10.0.0",
-    "typescript": "^4.9.5"
+    "typescript": "^4.9.5",
+    "wireit": "^0.9.5"
+  },
+  "wireit": {
+    "build": {
+      "dependencies": [
+        "compile",
+        "lint"
+      ]
+    },
+    "compile": {
+      "command": "tsc -p . --pretty --incremental",
+      "files": [
+        "src/**/*.ts",
+        "tsconfig.json",
+        "messages/**"
+      ],
+      "output": [
+        "lib/**",
+        "*.tsbuildinfo"
+      ],
+      "clean": "if-file-deleted"
+    },
+    "format": {
+      "command": "prettier --write \"+(src|test|schemas)/**/*.+(ts|js|json)|command-snapshot.json\"",
+      "files": [
+        "src/**/*.ts",
+        "test/**/*.ts",
+        "schemas/**/*.json",
+        "command-snapshot.json",
+        ".prettier*"
+      ],
+      "output": []
+    },
+    "lint": {
+      "command": "eslint src test --color --cache --cache-location .eslintcache",
+      "files": [
+        "src/**/*.ts",
+        "test/**/*.ts",
+        "messages/**",
+        ".eslint*"
+      ],
+      "output": []
+    },
+    "test:compile": {
+      "command": "tsc -p \"./test\" --pretty",
+      "files": [
+        "test/**/*.ts",
+        "tsconfig.json",
+        "test/tsconfig.json"
+      ],
+      "output": []
+    },
+    "test": {
+      "dependencies": [
+        "test:only",
+        "test:compile"
+      ]
+    },
+    "test:only": {
+      "command": "nyc mocha \"test/**/*.test.ts\"",
+      "files": [
+        "test/**/*.ts",
+        "src/**/*.ts",
+        "tsconfig.json",
+        ".mocha*",
+        "test/tsconfig.json",
+        "!*.nut.ts",
+        ".nycrc"
+      ],
+      "output": []
+    }
   }
-}
+}
diff --git a/src/throttledPromiseAll.ts b/src/throttledPromiseAll.ts
@@ -90,7 +90,9 @@ export class ThrottledPromiseAll<T, O = T> {
         timeoutPromise = new Promise((resolve, reject) => {
           this.timeout = setTimeout(() => {
             try {
-              clearTimeout(this.timeout);
+              if (this.timeout) {
+                clearTimeout(this.timeout);
+              }
               this.stop();
               reject(new Error(`PromiseQueue timed out after ${this.wait.milliseconds} milliseconds`));
             } catch (e) {
@@ -115,7 +117,9 @@ export class ThrottledPromiseAll<T, O = T> {
   }
 
   private stop(): void {
-    clearTimeout(this.timeout);
+    if (this.timeout) {
+      clearTimeout(this.timeout);
+    }
     this.queue.splice(0, this.queue.length);
   }