fix: Some CR fixes

Author: asafgardin

package-lock.json

@@ -15,10 +15,14 @@
   "scripts": {
     "build": "tsc",
     "test": "jest",
+    "unused-deps": "npx depcheck --json | jq '.dependencies == []'",
+    "clean-build": "rm -rf ./dist",
     "lint": "npx eslint 'src/**/*.{ts,tsx}' --no-ignore",
     "format": "prettier --write \"src/**/*.ts\"",
     "prepare": "npm run build",
-    "example": "npx tsx src/example.ts"
+    "example": "npx tsx src/example.ts",
+    "circular": "madge --circular --extensions ts src",
+    "quality": "npm run circular && npm run lint && tsc --noEmit && npm run format && npm run unused-deps"
   },
   "files": [
     "dist"
@@ -32,9 +36,6 @@
   "license": "MIT",
   "dependencies": {
     "@types/node": "^18.11.18",
-    "abort-controller": "^3.0.0",
-    "agentkeepalive": "^4.5.0",
-    "form-data-encoder": "^4.0.2",
     "formdata-node": "^6.0.3",
     "node-fetch": "^2.7.0"
   },
@@ -47,6 +48,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "globals": "^15.12.0",
+    "madge": "^6.1.0",
     "prettier": "^3.3.3",
     "ts-node": "^10.5.0",
     "tsc-multi": "^1.1.0",

package.json

@@ -1,8 +1,8 @@
-import * as Core from './Core';
-import * as Models from './types';
+import * as Types from './types';
 import { AI21EnvConfig } from './EnvConfig';
 import { MissingAPIKeyError } from './errors';
 import { Chat } from './resources/chat';
+import { APIClient } from './APIClient';
 
 export interface AI21Options {
   apiKey: string;
@@ -11,7 +11,7 @@ export interface AI21Options {
   timeout: number;
   maxRetries: number;
 }
-export class AI21 extends Core.APIClient {
+export class AI21 extends APIClient {
   private apiKey: string;
   private _options: AI21Options;
 
@@ -46,13 +46,13 @@ export class AI21 extends Core.APIClient {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  protected override authHeaders(_: Models.FinalRequestOptions): Core.Headers {
+  protected override authHeaders(_: Types.FinalRequestOptions): Types.Headers {
     return {
       Authorization: `Bearer ${this.apiKey}`,
     };
   }
 
-  protected override defaultHeaders(opts: Models.FinalRequestOptions): Core.Headers {
+  protected override defaultHeaders(opts: Types.FinalRequestOptions): Types.Headers {
     return {
       ...super.defaultHeaders(opts),
       'User-Agent': this.getUserAgent(),

src/Client.ts renamed to src/AI21.ts

@@ -1,5 +1,5 @@
-import { AI21Error } from './errors.js';
-import { VERSION } from './version.js';
+import { AI21Error } from './errors';
+import { VERSION } from './version';
 
 import fetch from 'node-fetch';
 import { HeadersInit, RequestInit } from 'node-fetch';
@@ -10,12 +10,11 @@ import {
   HTTPMethod,
   PromiseOrValue,
   DefaultQuery,
+  Headers,
 } from './types/index.js';
 import { AI21EnvConfig } from './EnvConfig.js';
 import { handleAPIResponse } from './ResponseHandler.js';
 
-export type Headers = Record<string, string | null | undefined>;
-
 const validatePositiveInteger = (name: string, n: unknown): number => {
   if (typeof n !== 'number' || !Number.isInteger(n)) {
     throw new AI21Error(`${name} must be an integer`);

src/Core.ts renamed to src/APIClient.ts

@@ -1,9 +1,9 @@
-import type { AI21 } from './index';
+import type { APIClient } from './APIClient';
 
 export class APIResource {
-  protected _client: AI21;
+  protected _client: APIClient;
 
-  constructor(client: AI21) {
+  constructor(client: APIClient) {
     this._client = client;
   }
 }

src/APIResource.ts

@@ -1,4 +1,4 @@
-import { AI21 } from './Client';
+import { AI21 } from './ai21';
 
 /*
   This is a temporary example to test the API streaming/non-streaming functionality.

src/example.ts

@@ -1,4 +1,4 @@
-export { AI21 } from './Client';
+export { AI21 } from './ai21';
 export { VERSION } from './version';
 export { RequestOptions } from './types';
 export { AI21Error, MissingAPIKeyError } from './errors';

src/index.ts

@@ -31,3 +31,4 @@ export type FinalRequestOptions = RequestOptions & {
 
 export type DefaultQuery = Record<string, unknown>;
 export type PromiseOrValue<T> = T | Promise<T>;
+export type Headers = Record<string, string | null | undefined>;

src/types/API.ts

@@ -34,4 +34,5 @@ export {
   type HTTPMethod,
   type DefaultQuery,
   type PromiseOrValue,
+  type Headers,
 } from './API';

src/types/index.ts

@@ -1 +1,3 @@
-export const VERSION = '0.0.1';
+import { version } from '../package.json';
+
+export const VERSION = version;