Fix PR #755: Restore missing Query type and add comprehensive tests

- Restore accidentally removed Query type definition
- Fix linting errors with lexical declarations in switch cases
- Add comprehensive unit tests for BasicAuth and OAuth2Auth classes
- Update package.json to include unit test script
- All tests now pass successfully

Author: nakulgan

package.json

@@ -48,7 +48,9 @@
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
-    "test:it": "jest --testPathPatterns tests/it",
+    "test:it": "jest --testPathPattern tests/it",
+    "test:unit": "jest --testPathPattern tests/unit",
+    "test": "jest",
     "test:lint": "eslint . --flag unstable_ts_config",
     "publish": "yarn build && yarn npm publish"
   }

src/index.ts

@@ -159,6 +159,16 @@ export type QueryInfo = {
   failureInfo?: QueryFailureInfo;
 };
 
+export type Query = {
+  query: string;
+  catalog?: string;
+  schema?: string;
+  user?: string;
+  session?: Session;
+  extraCredential?: ExtraCredential;
+  extraHeaders?: RequestHeaders;
+};
+
 /**
  * It takes a Headers object and returns a new object with the same keys, but only the values that are
  * truthy
@@ -204,15 +214,16 @@ class Client {
 
     if (options.auth) {
       switch (options.auth.type) {
-        case 'basic':
+        case 'basic': {
           const basic: BasicAuth = <BasicAuth>options.auth;
           clientConfig.auth = {
             username: basic.username,
             password: basic.password ?? '',
           };
           headers[TRINO_USER_HEADER] = basic.username;
           break;
-        case 'oauth2':
+        }
+        case 'oauth2': {
           const oauth2: OAuth2Auth = <OAuth2Auth>options.auth;
           headers['Authorization'] = `Bearer ${oauth2.token}`;
           if (oauth2.clientId) {
@@ -243,6 +254,7 @@ class Client {
             headers['Grant-Type'] = oauth2.grantType;
           }
           break;
+        }
         default:
           throw new Error(`Unsupported auth type: ${options.auth.type}`);
       }

tests/unit/auth.spec.ts

@@ -0,0 +1,81 @@
+import {BasicAuth, OAuth2Auth} from '../../src';
+
+describe('Auth Classes', () => {
+  describe('BasicAuth', () => {
+    test('should create BasicAuth with username only', () => {
+      const auth = new BasicAuth('testuser');
+      expect(auth.username).toBe('testuser');
+      expect(auth.password).toBeUndefined();
+      expect(auth.type).toBe('basic');
+    });
+
+    test('should create BasicAuth with username and password', () => {
+      const auth = new BasicAuth('testuser', 'testpass');
+      expect(auth.username).toBe('testuser');
+      expect(auth.password).toBe('testpass');
+      expect(auth.type).toBe('basic');
+    });
+  });
+
+  describe('OAuth2Auth', () => {
+    test('should create OAuth2Auth with token only', () => {
+      const auth = new OAuth2Auth('test-token');
+      expect(auth.token).toBe('test-token');
+      expect(auth.type).toBe('oauth2');
+      expect(auth.clientId).toBeUndefined();
+      expect(auth.clientSecret).toBeUndefined();
+      expect(auth.refreshToken).toBeUndefined();
+      expect(auth.tokenEndpoint).toBeUndefined();
+      expect(auth.scopes).toBeUndefined();
+      expect(auth.tokenType).toBeUndefined();
+      expect(auth.expiresIn).toBeUndefined();
+      expect(auth.redirectUri).toBeUndefined();
+      expect(auth.grantType).toBeUndefined();
+    });
+
+    test('should create OAuth2Auth with all optional parameters', () => {
+      const auth = new OAuth2Auth(
+        'test-token',
+        'client-id',
+        'client-secret',
+        'refresh-token',
+        'https://example.com/oauth2/token',
+        ['read', 'write'],
+        'Bearer',
+        3600,
+        'https://example.com/callback',
+        'authorization_code'
+      );
+
+      expect(auth.token).toBe('test-token');
+      expect(auth.clientId).toBe('client-id');
+      expect(auth.clientSecret).toBe('client-secret');
+      expect(auth.refreshToken).toBe('refresh-token');
+      expect(auth.tokenEndpoint).toBe('https://example.com/oauth2/token');
+      expect(auth.scopes).toEqual(['read', 'write']);
+      expect(auth.tokenType).toBe('Bearer');
+      expect(auth.expiresIn).toBe(3600);
+      expect(auth.redirectUri).toBe('https://example.com/callback');
+      expect(auth.grantType).toBe('authorization_code');
+      expect(auth.type).toBe('oauth2');
+    });
+
+    test('should create OAuth2Auth with some optional parameters', () => {
+      const auth = new OAuth2Auth(
+        'test-token',
+        'client-id',
+        undefined,
+        'refresh-token',
+        undefined,
+        ['read']
+      );
+
+      expect(auth.token).toBe('test-token');
+      expect(auth.clientId).toBe('client-id');
+      expect(auth.clientSecret).toBeUndefined();
+      expect(auth.refreshToken).toBe('refresh-token');
+      expect(auth.tokenEndpoint).toBeUndefined();
+      expect(auth.scopes).toEqual(['read']);
+    });
+  });
+});