wip: first run of cleanup

Author: mabels

eslint.config.mjs

@@ -0,0 +1,50 @@
+import eslint from "@eslint/js";
+import tseslint from "typescript-eslint";
+import importPlugin from "eslint-plugin-import";
+
+const opts = tseslint.config(
+  eslint.configs.recommended,
+  //   ...tseslint.configs.recommended,
+  ...tseslint.configs.strict,
+  ...tseslint.configs.stylistic,
+  {
+    languageOptions: {
+      globals: {
+        queueMicrotask: "readonly",
+      },
+    },
+  },
+  {
+    ignores: [
+      "babel.config.cjs",
+      "jest.config.js",
+      "**/dist/",
+      "**/pubdir/",
+      "**/node_modules/",
+      "**/scripts/",
+      "**/examples/",
+      "scripts/",
+      "smoke/react/",
+      "src/missingTypes/lib.deno.d.ts",
+      "**/.cache/**",
+      "**/.esm-cache/**",
+      "**/.wrangler/**",
+    ],
+  },
+  {
+    plugins: {
+      import: importPlugin,
+    },
+    rules: {
+      // "no-console": ["warn"],
+      "import/no-duplicates": ["error"],
+    },
+  },
+  {
+    rules: {
+      // "no-restricted-globals": ["error", "URL", "TextDecoder", "TextEncoder"],
+    },
+  },
+);
+
+export default opts;

package.json

@@ -3,6 +3,7 @@
   "version": "0.10.2",
   "description": "Lightweight library for making AI API calls with streaming support",
   "main": "dist/index.js",
+  "type": "module",
   "browser": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -18,13 +19,14 @@
   },
   "scripts": {
     "build": "tsc",
-    "test": "jest --testMatch=\"**/*unit*.test.ts\"",
-    "test:integration": "jest simple.integration",
+    "lint": "eslint .",
+    "test": "vitest --run",
+    "test:integration": "vitest simple.integration",
     "test:all": "pnpm test && pnpm test:integration",
     "prepublishOnly": "npm run build",
     "typecheck": "tsc --noEmit",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "coverage": "jest --coverage",
+    "coverage": "vitest --coverage",
     "check": "npm run typecheck && npm run format && npm run test && npm run build"
   },
   "keywords": [
@@ -39,15 +41,20 @@
   "author": "",
   "license": "MIT or Apache-2.0",
   "devDependencies": {
+    "@eslint/js": "^9.31.0",
     "@types/jest": "^29.5.3",
     "@types/node": "^20.4.2",
     "@types/node-fetch": "^2.6.12",
-    "dotenv": "^16.4.7",
+    "eslint": "^9.31.0",
+    "eslint-plugin-import": "^2.32.0",
     "jest": "^29.6.1",
     "node-fetch": "^3.3.2",
     "prettier": "^3.5.3",
     "ts-jest": "^29.1.1",
-    "typescript": "^5.1.6"
+    "typescript": "^5.1.6",
+    "typescript-eslint": "^8.37.0",
+    "vitest": "^3.2.4",
+    "zx": "^8.7.1"
   },
   "engines": {
     "node": ">=14.0.0"

src/api-core.ts

@@ -9,14 +9,17 @@ import {
   Schema,
   StreamResponse,
   ThenableStreamResponse,
-} from "./types";
-import { globalDebug } from "./key-management";
-import { callAINonStreaming } from "./non-streaming";
-import { callAIStreaming } from "./streaming";
+  isToolUseType,
+  isToolUseResponse,
+  isOpenAIArray,
+} from "./types.js";
+import { globalDebug } from "./key-management.js";
+import { callAINonStreaming } from "./non-streaming.js";
+import { callAIStreaming } from "./streaming.js";
+import { PACKAGE_VERSION } from "./version.js";
+import { callAiEnv } from "./utils.js";
 
 // Import package version for debugging
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const PACKAGE_VERSION = require("../package.json").version;
 
 /**
  * Main API interface function for making AI API calls
@@ -38,12 +41,15 @@ function callAi(prompt: string | Message[], options: CallAIOptions = {}) {
   let schemaStrategy: SchemaStrategy = {
     strategy: "none" as const,
     model: options.model || "openai/gpt-3.5-turbo",
-    prepareRequest: () => ({}),
-    processResponse: (response: any) => {
+    prepareRequest: () => (undefined),
+    processResponse: (response) => {
       // If response is an object, stringify it to match expected test output
       if (response && typeof response === "object") {
         return JSON.stringify(response);
       }
+      if (typeof response !== "string") {
+        throw new Error(`Unexpected response type: ${typeof response}`);
+      }
       return response;
     },
     shouldForceStream: false,
@@ -61,11 +67,16 @@ function callAi(prompt: string | Message[], options: CallAIOptions = {}) {
         shouldForceStream: false,
         prepareRequest: (schema) => {
           // Parse the schema to extract the function definition
-          let toolDef: any = {};
+          let toolDef: {
+            name?: string;
+            description?: string;
+            parameters?: unknown;
+          } = {};
 
           if (typeof schema === "string") {
             try {
               toolDef = JSON.parse(schema);
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
             } catch (e) {
               // If it's not valid JSON, we'll use it as a plain description
               toolDef = { description: schema };
@@ -104,17 +115,17 @@ function callAi(prompt: string | Message[], options: CallAIOptions = {}) {
           }
 
           // Handle direct tool_use format
-          if (response && response.type === "tool_use") {
+          if (isToolUseType(response)) {
             return response.input || "{}";
           }
 
           // Handle object with tool_use property
-          if (response && response.tool_use) {
+          if (isToolUseResponse(response)) {
             return response.tool_use.input || "{}";
           }
 
           // Handle array of tool calls (OpenAI format)
-          if (Array.isArray(response)) {
+          if (isOpenAIArray(response)) {
             if (
               response.length > 0 &&
               response[0].function &&
@@ -308,9 +319,7 @@ function prepareRequestParams(
   options: CallAIOptions = {},
 ) {
   // Get API key from options or window.CALLAI_API_KEY (exactly matching original)
-  const apiKey =
-    options.apiKey ||
-    (typeof window !== "undefined" ? (window as any).CALLAI_API_KEY : null);
+  const apiKey = options.apiKey || callAiEnv.CALLAI_API_KEY
 
   // Validate API key with original error message
   if (!apiKey) {

src/api.ts

@@ -2,19 +2,22 @@
  * Core API implementation for call-ai
  */
 import {
+  CallAIError,
   CallAIOptions,
   Message,
   ResponseMeta,
   SchemaStrategy,
   StreamResponse,
-} from "./types";
-import { chooseSchemaStrategy } from "./strategies";
-import { responseMetadata, boxString, getMeta } from "./response-metadata";
-import { keyStore, globalDebug } from "./key-management";
-import { handleApiError, checkForInvalidModelError } from "./error-handling";
-import { createBackwardCompatStreamingProxy } from "./api-core";
-import { extractContent, extractClaudeResponse } from "./non-streaming";
-import { createStreamingGenerator } from "./streaming";
+} from "./types.js";
+import { chooseSchemaStrategy } from "./strategies/index.js";
+import { responseMetadata, boxString } from "./response-metadata.js";
+import { keyStore, globalDebug } from "./key-management.js";
+import { handleApiError, checkForInvalidModelError } from "./error-handling.js";
+import { createBackwardCompatStreamingProxy } from "./api-core.js";
+import { extractContent, extractClaudeResponse } from "./non-streaming.js";
+import { createStreamingGenerator } from "./streaming.js";
+import { PACKAGE_VERSION } from "./version.js";
+import { callAiEnv } from "./utils.js";
 
 // Key management is now imported from ./key-management
 
@@ -33,11 +36,10 @@ import { createStreamingGenerator } from "./streaming";
 
 // boxString and getMeta functions are now imported from ./response-metadata
 // Re-export getMeta to maintain backward compatibility
-export { getMeta };
+// export { getMeta };
 
 // Import package version for debugging
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const PACKAGE_VERSION = require("../package.json").version;
+ 
 
 // Default fallback model when the primary model fails or is unavailable
 const FALLBACK_MODEL = "openrouter/auto";
@@ -252,13 +254,13 @@ export function callAi(
           }
 
           // Create error with standard format
-          const error = new Error(errorMessage);
-
-          // Add useful metadata
-          (error as any).status = response.status;
-          (error as any).statusText = response.statusText;
-          (error as any).details = errorJson;
-          (error as any).contentType = contentType;
+          const error = new CallAIError({
+            message: errorMessage,
+            status: response.status,
+            statusText: response.statusText,
+            details: errorJson,
+            contentType,
+          })
           throw error;
         } catch (jsonError) {
           // If JSON parsing fails, extract a useful message from the raw error body
@@ -295,11 +297,13 @@ export function callAi(
             );
           }
 
-          const error = new Error(errorMessage);
-          (error as any).status = response.status;
-          (error as any).statusText = response.statusText;
-          (error as any).details = errorBody;
-          (error as any).contentType = contentType;
+          const error = new CallAIError({
+            message: errorMessage,
+            status: response.status,
+            statusText: response.statusText,
+            details: errorBody,
+            contentType,
+          })
           throw error;
         }
       } catch (responseError) {
@@ -309,12 +313,14 @@ export function callAi(
         }
 
         // Fallback error
-        const error = new Error(
-          `API returned ${response.status}: ${response.statusText}`,
-        );
-        (error as any).status = response.status;
-        (error as any).statusText = response.statusText;
-        (error as any).contentType = contentType;
+        const error = new CallAIError(
+          {
+            message: `API returned ${response.status}: ${response.statusText}`,
+            status: response.status,
+            statusText: response.statusText,
+            details: undefined,
+            contentType,
+          })
         throw error;
       }
     }
@@ -328,7 +334,7 @@ export function callAi(
   })();
 
   // For backward compatibility with v0.6.x where users didn't await the result
-  if (process.env.NODE_ENV !== "production") {
+  if (callAiEnv.NODE_ENV !== "production") {
     if (options.debug) {
       console.warn(
         `[callAi:${PACKAGE_VERSION}] No await found - using legacy streaming pattern. This will be removed in a future version and may cause issues with certain models.`,
@@ -337,7 +343,7 @@ export function callAi(
   }
 
   // Create a proxy object that acts both as a Promise and an AsyncGenerator for backward compatibility
-  // @ts-ignore - We're deliberately implementing a proxy with dual behavior
+  //... @ts-ignore - We're deliberately implementing a proxy with dual behavior
   return createBackwardCompatStreamingProxy(streamPromise);
 }
 
@@ -414,6 +420,7 @@ async function bufferStreamingResults(
 
 // checkForInvalidModelError is imported from error-handling.ts
 
+
 /**
  * Prepare request parameters common to both streaming and non-streaming calls
  */
@@ -428,10 +435,9 @@ function prepareRequestParams(
   schemaStrategy: SchemaStrategy;
 } {
   // First try to get the API key from options or window globals
-  let apiKey =
+  const apiKey =
     options.apiKey ||
-    keyStore.current || // Try keyStore first in case it was refreshed in a previous call
-    (typeof window !== "undefined" ? (window as any).CALLAI_API_KEY : null);
+    keyStore.current || callAiEnv.CALLAI_API_KEY() // Try keyStore first in case it was refreshed in a previous call
   const schema = options.schema || null;
 
   // If no API key exists, we won't throw immediately. We'll continue and let handleApiError
@@ -442,12 +448,7 @@ function prepareRequestParams(
   const model = schemaStrategy.model;
 
   // Get custom chat API origin if set
-  const customChatOrigin =
-    options.chatUrl ||
-    (typeof window !== "undefined" ? (window as any).CALLAI_CHAT_URL : null) ||
-    (typeof process !== "undefined" && process.env
-      ? process.env.CALLAI_CHAT_URL
-      : null);
+  const customChatOrigin = options.chatUrl || callAiEnv.CALLAI_CHAT_URL;
 
   // Use custom origin or default OpenRouter URL
   const endpoint =
@@ -462,14 +463,14 @@ function prepareRequestParams(
     : [{ role: "user", content: prompt }];
 
   // Common parameters for both streaming and non-streaming
-  const requestParams: any = {
+  const requestParams: CallAIOptions = {
     model,
     messages,
     stream: options.stream !== undefined ? options.stream : false,
   };
 
   // Only include temperature if explicitly set
-  if (options.temperature !== undefined) {
+  if (options.temperature) {
     requestParams.temperature = options.temperature;
   }
 
@@ -555,7 +556,7 @@ function prepareRequestParams(
 async function callAINonStreaming(
   prompt: string | Message[],
   options: CallAIOptions = {},
-  isRetry: boolean = false,
+  isRetry = false,
 ): Promise<string> {
   try {
     // Start timing for metadata
@@ -593,10 +594,13 @@ async function callAINonStreaming(
       }
 
       // Create a proper error object with the status code preserved
-      const error: any = new Error(`HTTP error! Status: ${response.status}`);
-      // Add status code as a property of the error object
-      error.status = response.status;
-      error.statusCode = response.status; // Add statusCode for compatibility with different error patterns
+      const error = new CallAIError({
+        message: `HTTP error! Status: ${response.status}`,
+        status: response.status,
+        statusText: response.statusText,
+        details: undefined,
+        contentType: "text/plain",
+      })
       throw error;
     }