fix: correct gptscript bin path behavior

There is a big difference between running the tests and importing this as a module, specifically when not setting GPTSCRIPT_BIN. This change addresses these differences to allow both contexts to work.
gptscript-ai · May 30, 2024 · ca2f708 · ca2f708
1 parent a83af5b
commit ca2f708
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -53,6 +53,7 @@
     "url": "^0.11.3"
   },
   "jest": {
+    "preset": "ts-jest/presets/default-esm",
     "transform": {
       "^.+\\.ts?$": [
         "ts-jest",

diff --git a/scripts/install-binary.js b/scripts/install-binary.js
@@ -85,7 +85,7 @@ const suffix = {
 
 const url = `${gptscript_info.url}${gptscript_info.version}/gptscript-${gptscript_info.version}-${pltfm}-${arch}.${suffix}`;
 
-const outputDir = path.resolve('..', 'bin');
+const outputDir = path.resolve('bin');
 
 const fileExist = (path) => {
     try {

diff --git a/src/gptscript.ts b/src/gptscript.ts
@@ -668,7 +668,7 @@ function getCmdPath(): string {
 		return process.env.GPTSCRIPT_BIN
 	}
 
-	return path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "bin", "gptscript")
+	return path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "bin", "gptscript")
 }
 
 function parseBlocksFromNodes(nodes: any[]): Block[] {

diff --git a/tests/gptscript.test.ts b/tests/gptscript.test.ts
@@ -1,7 +1,9 @@
 import * as gptscript from "../src/gptscript"
 import path from "path"
+import {fileURLToPath} from "url"
 
 let client: gptscript.Client
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 describe("gptscript module", () => {
 	beforeAll(async () => {

diff --git a/tsconfig.json b/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
-    "moduleResolution": "bundler",
+    "moduleResolution": "node",
     "rootDir": "./src",
     "declaration": true,
     "outDir": "./dist",