fix(commonjs): import p-queue dynamically (#97)

Signed-off-by: Tomas Pilar <tomas.pilar@ibm.com> Co-authored-by: Tomas Dvorak <toomas2d@gmail.com>
IBM · Mar 21, 2024 · 9c34f48 · 9c34f48
1 parent d44ec5e
commit 9c34f48
Show file tree

Hide file tree

Showing 5 changed files with 268 additions and 111 deletions.
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "pinst": "^3.0.0",
     "prettier": "^3.0.3",
     "ts-node": "^10.9.1",
-    "tsup": "^7.2.0",
+    "tsup": "^8.0.2",
     "typescript": "^5.3.3",
     "vitest": "^0.34.6"
   },

diff --git a/src/utils/concurrency.ts b/src/utils/concurrency.ts
@@ -1,4 +1,4 @@
-import PQueue, { QueueAddOptions } from 'p-queue';
+import type { default as PQueueType, QueueAddOptions } from 'p-queue';
 
 import { HttpError } from '../errors.js';
 
@@ -11,8 +11,13 @@ function isConcurrencyLimitError(err: unknown): err is HttpError {
   );
 }
 
+const PQueue = (async () => {
+  const lib = await import('p-queue');
+  return lib.default;
+})();
+
 export class ConcurrencyLimiter {
-  private _queue?: PQueue;
+  private _queue?: PQueueType;
   private _limiterPromise?: ReturnType<Limiter>;
 
   constructor(private readonly limiter: Limiter) {}
@@ -42,6 +47,6 @@ export class ConcurrencyLimiter {
 
     this._limiterPromise = this.limiter();
     const { limit } = await this._limiterPromise;
-    this._queue = new PQueue({ concurrency: limit });
+    this._queue = new (await PQueue)({ concurrency: limit });
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -29,4 +29,4 @@
   "ts-node": {
     "esm": true
   }
-}
+}
diff --git a/tsup.config.ts b/tsup.config.ts
@@ -16,6 +16,7 @@ export default defineConfig({
   format: ['esm', 'cjs'],
   platform: 'node',
   shims: true,
+  splitting: true,
   env: {
     NODE_ENV: 'production',
     GENAI_DEFAULT_ENDPOINT: GENAI_DEFAULT_ENDPOINT,
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,4 +29,4 @@ @@
       "ts-node": {
         "esm": true
       }
-    }
+    }