@cparra/apexdocs 3.17.0-beta.4 → 3.17.0-beta.6

package/dist/cli/generate.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 
-var logger$1 = require('../logger-DK9lGHPu.js');
+var logger$1 = require('../logger-PMTbceqG.js');
 var cosmiconfig = require('cosmiconfig');
 var yargs = require('yargs');
 var E = require('fp-ts/Either');

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 
-var logger = require('./logger-DK9lGHPu.js');
+var logger = require('./logger-PMTbceqG.js');
 var E = require('fp-ts/Either');
 require('fp-ts/function');
 require('fp-ts/TaskEither');

package/dist/{logger-DK9lGHPu.js → logger-PMTbceqG.js}

@@ -1185,9 +1185,7 @@ class WorkerPool {
       return Promise.reject(new Error("WorkerPool is terminating; cannot accept new tasks."));
     }
     if (this.queue.length >= this.maxQueueSize) {
-      return Promise.reject(
-        new Error(`WorkerPool queue limit exceeded (maxQueueSize=${this.maxQueueSize}).`)
-      );
+      return Promise.reject(new Error(`WorkerPool queue limit exceeded (maxQueueSize=${this.maxQueueSize}).`));
     }
     const id = this.nextTaskId++;
     return new Promise((resolve, reject) => {
@@ -1239,10 +1237,10 @@ class WorkerPool {
       if (this.drainOnTerminate) {
         yield this.waitForDrain();
       }
-      const terminations = Array.from(this.allWorkers).map((w) => __async$6(this, null, function* () {
-        this.rejectInFlight(w, new Error("WorkerPool terminated with task still in flight."));
+      const terminations = Array.from(this.allWorkers).map((worker) => __async$6(this, null, function* () {
+        this.rejectInFlight(worker, new Error("WorkerPool terminated with task still in flight."));
         try {
-          yield w.terminate();
+          yield worker.terminate();
         } catch (e) {
         }
       }));
@@ -1276,11 +1274,11 @@ class WorkerPool {
     }
   }
   getIdleOrCreateWorker() {
-    const idle = this.idleWorkers.pop();
-    if (idle) return idle;
+    const idleWorker = this.idleWorkers.pop();
+    if (idleWorker) return idleWorker;
     if (this.allWorkers.size < this.maxWorkers) {
-      const w = this.spawnWorker();
-      return w;
+      const spawnedWorker = this.spawnWorker();
+      return spawnedWorker;
     }
     return null;
   }
@@ -1307,11 +1305,11 @@ class WorkerPool {
     });
     try {
       worker.postMessage({ id: task.id, payload: task.payload });
-    } catch (e) {
+    } catch (error) {
       this.inFlightByWorker.delete(worker);
       this.busyWorkers.delete(worker);
       this.idleWorkers.push(worker);
-      task.reject(e);
+      task.reject(error);
       this.failedTasks++;
       this.pump();
     }
@@ -1322,25 +1320,23 @@ class WorkerPool {
     if (!inFlight) {
       return;
     }
-    const m = msg;
-    const sameId = typeof (m == null ? void 0 : m.id) === "number" && m.id === inFlight.id;
-    const okFlag = typeof (m == null ? void 0 : m.ok) === "boolean";
-    if (!sameId || !okFlag) {
+    const message = msg;
+    const isSameTaskId = typeof (message == null ? void 0 : message.id) === "number" && message.id === inFlight.id;
+    const hasOkFlag = typeof (message == null ? void 0 : message.ok) === "boolean";
+    if (!isSameTaskId || !hasOkFlag) {
       this.finishTask(worker);
-      inFlight.reject(
-        new Error("WorkerPool received an invalid response message for the in-flight task.")
-      );
+      inFlight.reject(new Error("WorkerPool received an invalid response message for the in-flight task."));
       this.failedTasks++;
       this.pump();
       return;
     }
     this.finishTask(worker);
-    if (m.ok) {
+    if (message.ok) {
       this.completedTasks++;
-      inFlight.resolve(m.result);
+      inFlight.resolve(message.result);
     } else {
       this.failedTasks++;
-      inFlight.reject((_a = m.error) != null ? _a : new Error("Worker indicated failure without an error payload."));
+      inFlight.reject((_a = message.error) != null ? _a : new Error("Worker indicated failure without an error payload."));
     }
     this.pump();
   }
@@ -1376,9 +1372,9 @@ class WorkerPool {
     this.allWorkers.delete(worker);
   }
   idleWorkersRemove(worker) {
-    const idx = this.idleWorkers.indexOf(worker);
-    if (idx !== -1) {
-      this.idleWorkers.splice(idx, 1);
+    const workerIndex = this.idleWorkers.indexOf(worker);
+    if (workerIndex !== -1) {
+      this.idleWorkers.splice(workerIndex, 1);
     }
   }
   waitForDrain() {
@@ -1469,31 +1465,11 @@ function isWorkerReflectionEnabled(config) {
   return (_b = config == null ? void 0 : config.parallelReflection) != null ? _b : true;
 }
 function getWorkerEntrypointPath() {
-  const candidate1 = path$1.resolve(__dirname, "./apex-reflection.worker.js");
-  if (fs.existsSync(candidate1)) {
-    return candidate1;
-  }
-  const candidate1b = path$1.resolve(__dirname, "../apex-reflection.worker.js");
-  if (fs.existsSync(candidate1b)) {
-    return candidate1b;
-  }
-  let dir = __dirname;
-  for (let i = 0; i < 10; i++) {
-    const maybeDist1 = path$1.resolve(dir, "../../..");
-    const candidate2a = path$1.resolve(maybeDist1, "core", "reflection", "apex", "apex-reflection.worker.js");
-    if (fs.existsSync(candidate2a)) {
-      return candidate2a;
-    }
-    const maybeDist2 = path$1.resolve(dir, "../../../..");
-    const candidate2b = path$1.resolve(maybeDist2, "core", "reflection", "apex", "apex-reflection.worker.js");
-    if (fs.existsSync(candidate2b)) {
-      return candidate2b;
-    }
-    const parent = path$1.dirname(dir);
-    if (parent === dir) break;
-    dir = parent;
-  }
-  return candidate1;
+  const candidate = path$1.resolve(__dirname, "./apex-reflection.worker.js");
+  if (fs.existsSync(candidate)) {
+    return candidate;
+  }
+  return candidate;
 }
 function reflectAsTaskParallel(apexBundles, config) {
   return TE__namespace.tryCatch(

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@cparra/apexdocs",
-  "version": "3.17.0-beta.4",
+  "version": "3.17.0-beta.6",
   "description": "Library with CLI capabilities to generate documentation for Salesforce Apex classes.",
+  "engines": {
+    "node": ">=18"
+  },
   "keywords": [
     "apex",
     "salesforce",
@@ -36,13 +39,14 @@
       "output": []
     },
     "build": {
-      "command": "tsc --noEmit --pretty && pkgroll --target node18 && node -e \"const fs=require('fs'); const path=require('path'); const src=path.join(__dirname,'src','core','reflection','apex','apex-reflection.worker.ts'); const distRoot=path.join(__dirname,'dist'); const candidates=[]; (function walk(dir){ for (const ent of fs.readdirSync(dir,{withFileTypes:true})) { const p=path.join(dir,ent.name); if (ent.isDirectory()) walk(p); else if (ent.isFile() && ent.name==='generate.js') candidates.push(p); } })(distRoot); if (!candidates.length) throw new Error('Could not locate dist bundle to determine worker output location'); const distEntry=candidates[0]; const destDir=path.join(path.dirname(distEntry),'..','core','reflection','apex'); fs.mkdirSync(destDir,{recursive:true}); const out=path.join(destDir,'apex-reflection.worker.js'); const ts=require('typescript'); const input=fs.readFileSync(src,'utf8'); const res=ts.transpileModule(input,{compilerOptions:{module:ts.ModuleKind.CommonJS,target:ts.ScriptTarget.ES2018,esModuleInterop:true}}); fs.writeFileSync(out,res.outputText,'utf8'); if (!fs.existsSync(out)) throw new Error('Failed to write worker entrypoint'); const rootOut=path.join(distRoot,'apex-reflection.worker.js'); fs.copyFileSync(out, rootOut); if (!fs.existsSync(rootOut)) throw new Error('Failed to copy worker entrypoint to dist root');\"",
+      "command": "tsc --noEmit --pretty && pkgroll --target node18 && tsc --project ./tsconfig.worker.json",
       "dependencies": [
         "lint"
       ],
       "files": [
         "src/**/*.ts",
-        "tsconfig.json"
+        "tsconfig.json",
+        "tsconfig.worker.json"
       ],
       "output": [
         "dist"

package/dist/core/reflection/apex/apex-reflection.worker.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const node_worker_threads_1 = require("node:worker_threads");
-const apex_reflection_1 = require("@cparra/apex-reflection");
-function isRequestMessage(msg) {
-    if (!msg || typeof msg !== 'object')
-        return false;
-    const m = msg;
-    if (typeof m.id !== 'number')
-        return false;
-    if (!m.payload || typeof m.payload !== 'object')
-        return false;
-    const p = m.payload;
-    return typeof p.content === 'string';
-}
-function post(msg) {
-    // `parentPort` should always exist in a worker, but guard anyway.
-    if (!node_worker_threads_1.parentPort) {
-        return;
-    }
-    node_worker_threads_1.parentPort.postMessage(msg);
-}
-function reflectOrThrow(rawSource) {
-    const result = (0, apex_reflection_1.reflect)(rawSource);
-    if (result.typeMirror) {
-        return result.typeMirror;
-    }
-    if (result.error) {
-        throw result.error;
-    }
-    throw new Error('Unknown reflection failure: no typeMirror or error returned.');
-}
-if (!node_worker_threads_1.parentPort) {
-    throw new Error('apex-reflection.worker started without a parentPort');
-}
-node_worker_threads_1.parentPort.on('message', (msg) => {
-    if (!isRequestMessage(msg)) {
-        // Can't correlate without a valid id; ignore.
-        return;
-    }
-    const { id, payload } = msg;
-    try {
-        const typeMirror = reflectOrThrow(payload.content);
-        post({ id, ok: true, result: typeMirror });
-    }
-    catch (e) {
-        const message = (e === null || e === void 0 ? void 0 : e.message) &&
-            typeof e.message === 'string'
-            ? e.message
-            : 'Unknown error';
-        post({
-            id,
-            ok: false,
-            error: { message },
-        });
-    }
-});