Upgrade typescript to 5.4.5

- Switch out implementation for generating parallel CJS build - Follow guidelines from here microsoft/TypeScript#54567
langchain-ai · Apr 29, 2024 · 3238a4b · 3238a4b
1 parent 3bee3a3
commit 3238a4b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+  "eslint.workingDirectories": [
+    "./js"
+  ]
+}
diff --git a/js/package.json b/js/package.json
@@ -48,7 +48,7 @@
     "check-npm-version": "node scripts/check-npm-version.js",
     "clean": "rm -rf dist/ && node scripts/create-entrypoints.js clean",
     "build:esm": "tsc --outDir dist/ && rm -rf dist/tests dist/**/tests",
-    "build:cjs": "tsc --outDir dist-cjs/ -p tsconfig.cjs.json && node scripts/move-cjs-to-dist.js && rm -r dist-cjs",
+    "build:cjs": "echo '{}' > src/package.json && tsc --outDir dist-cjs/ -p tsconfig.cjs.json && node scripts/move-cjs-to-dist.js && rm -r dist-cjs src/package.json",
     "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests --testPathIgnorePatterns='\\.int\\.test.[tj]s' --testTimeout 30000",
     "test:integration": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --testPathPattern=\\.int\\.test.ts --testTimeout 100000",
     "test:single": "NODE_OPTIONS=--experimental-vm-modules yarn run jest --config jest.config.cjs --testTimeout 100000",
@@ -104,7 +104,7 @@
     "prettier": "^2.8.8",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.4.5"
   },
   "peerDependencies": {
     "openai": "*"
@@ -195,4 +195,4 @@
     },
     "./package.json": "./package.json"
   }
-}
+}
diff --git a/js/src/utils/async_caller.ts b/js/src/utils/async_caller.ts
@@ -62,8 +62,15 @@ export class AsyncCaller {
     this.maxConcurrency = params.maxConcurrency ?? Infinity;
     this.maxRetries = params.maxRetries ?? 6;
 
-    const PQueue = "default" in PQueueMod ? PQueueMod.default : PQueueMod;
-    this.queue = new PQueue({ concurrency: this.maxConcurrency });
+    if ("default" in PQueueMod) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      this.queue = new (PQueueMod.default as any)({
+        concurrency: this.maxConcurrency,
+      });
+    } else {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      this.queue = new (PQueueMod as any)({ concurrency: this.maxConcurrency });
+    }
     this.onFailedResponseHook = params?.onFailedResponseHook;
   }
 

diff --git a/js/tsconfig.cjs.json b/js/tsconfig.cjs.json
@@ -1,7 +1,6 @@
 {
     "extends": "./tsconfig.json",
     "compilerOptions": {
-        "module": "commonjs",
         "declaration": false
     },
     "exclude": [
@@ -10,4 +9,4 @@
         "docs",
         "**/tests"
     ]
-}
+}
diff --git a/js/tsconfig.json b/js/tsconfig.json
@@ -7,7 +7,7 @@
       "ES2022.Object",
       "DOM"
     ],
-    "module": "ES2020",
+    "module": "NodeNext",
     "moduleResolution": "nodenext",
     "esModuleInterop": true,
     "declaration": true,

diff --git a/js/yarn.lock b/js/yarn.lock
@@ -4432,10 +4432,10 @@ typed-array-length@^1.0.4:
     for-each "^0.3.3"
     is-typed-array "^1.1.9"
 
-typescript@^5.0.4:
-  version "5.0.4"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz"
-  integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==
+typescript@^5.4.5:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"