@forge/sql 0.0.1-experimental-8f73b3e → 0.0.1-experimental-f20602a

package/out/__test__/sql.test.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const api_1 = require("@forge/api");
 const sql_1 = require("../sql");
 const sql_statement_1 = require("../sql-statement");
-const response_handler_1 = require("../utils/response-handler");
 jest.mock('@forge/api');
 jest.mock('../sql-statement');
 jest.mock('../utils/response-handler', () => ({
@@ -32,7 +31,7 @@ describe('SqlClient', () => {
         it('should send a request with the correct options and return the response', async () => {
             const mockResponse = { ok: true, status: 200 };
             mockFetch.mockResolvedValue(mockResponse);
-            const path = 'api/v1/sql/execute';
+            const path = 'api/v1/execute';
             const options = { method: 'GET', headers: { 'Custom-Header': 'value' } };
             const response = await sqlClient['sendRequest'](path, options);
             expect(mockFetch).toHaveBeenCalledWith(path, {
@@ -48,7 +47,7 @@ describe('SqlClient', () => {
         it('should handle requests without options', async () => {
             const mockResponse = { ok: true, status: 200 };
             mockFetch.mockResolvedValue(mockResponse);
-            const path = 'api/v1/sql/execute';
+            const path = 'api/v1/execute';
             const response = await sqlClient['sendRequest'](path);
             expect(mockFetch).toHaveBeenCalledWith(path, {
                 redirect: 'follow',
@@ -61,7 +60,7 @@ describe('SqlClient', () => {
         it('should propagate fetch errors', async () => {
             const mockError = new Error('Network error');
             mockFetch.mockRejectedValue(mockError);
-            const path = 'api/v1/sql/execute';
+            const path = 'api/v1/execute';
             await expect(sqlClient['sendRequest'](path)).rejects.toThrow(mockError);
             expect(mockFetch).toHaveBeenCalledWith(path, expect.any(Object));
         });
@@ -72,7 +71,7 @@ describe('SqlClient', () => {
             mockFetch.mockResolvedValue(mockResponse);
             mockGetResponseBody.mockResolvedValue({ rows: [] });
             const result = await sqlClient.storageApi('SELECT * FROM test');
-            expect(mockFetch).toHaveBeenCalledWith('api/v1/sql/execute', {
+            expect(mockFetch).toHaveBeenCalledWith('api/v1/execute', {
                 method: 'POST',
                 body: JSON.stringify({ query: 'SELECT * FROM test', params: [], method: 'all' }),
                 redirect: 'follow',
@@ -87,7 +86,7 @@ describe('SqlClient', () => {
             mockGetResponseBody.mockResolvedValue({ rows: [] });
             const params = [1];
             const result = await sqlClient.storageApi('SELECT * FROM test WHERE id = ?', params, 'one');
-            expect(mockFetch).toHaveBeenCalledWith('api/v1/sql/execute', {
+            expect(mockFetch).toHaveBeenCalledWith('api/v1/execute', {
                 method: 'POST',
                 body: JSON.stringify({ query: 'SELECT * FROM test WHERE id = ?', params, method: 'one' }),
                 redirect: 'follow',
@@ -102,7 +101,7 @@ describe('SqlClient', () => {
             const mockError = new Error('Invalid JSON');
             mockGetResponseBody.mockRejectedValue(mockError);
             await expect(sqlClient.storageApi('INVALID SQL QUERY')).rejects.toThrow(mockError);
-            expect(mockFetch).toHaveBeenCalledWith('api/v1/sql/execute', expect.any(Object));
+            expect(mockFetch).toHaveBeenCalledWith('api/v1/execute', expect.any(Object));
             expect(mockGetResponseBody).toHaveBeenCalledWith(mockResponse);
         });
     });
@@ -140,10 +139,9 @@ describe('SqlClient', () => {
             expect(mockSqlStatement.execute).toHaveBeenCalled();
         });
         it('should handle API errors', async () => {
-            const mockApiError = new response_handler_1.ApiError(400, 'BAD_REQUEST', 'Invalid query');
-            mockSqlStatement.execute.mockRejectedValue(mockApiError);
-            const result = await sqlClient.execute('INVALID SQL QUERY');
-            expect(result).toEqual({ rows: [], err: mockApiError });
+            const mockApiError1 = new Error('INVALID SQL QUERY');
+            mockSqlStatement.execute.mockRejectedValueOnce(mockApiError1);
+            await expect(sqlClient.execute('INVALID SQL QUERY')).rejects.toThrow(mockApiError1);
             expect(sql_statement_1.SqlStatement).toHaveBeenCalledWith('INVALID SQL QUERY', expect.any(Function));
             expect(mockSqlStatement.execute).toHaveBeenCalled();
         });

package/out/errorCodes.d.ts

@@ -0,0 +1,6 @@
+export declare const errorCodes: {
+    SQL_EXECUTION_ERROR: string;
+    INVALID_SQL_QUERY: string;
+    QUERY_TIMED_OUT: string;
+};
+//# sourceMappingURL=errorCodes.d.ts.map

package/out/errorCodes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errorCodes.d.ts","sourceRoot":"","sources":["../src/errorCodes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU;;;;CAItB,CAAC"}

package/out/errorCodes.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.errorCodes = void 0;
+exports.errorCodes = {
+    SQL_EXECUTION_ERROR: 'SQL_EXECUTION_ERROR',
+    INVALID_SQL_QUERY: 'INVALID_SQL_QUERY',
+    QUERY_TIMED_OUT: 'QUERY_TIMED_OUT'
+};

package/out/index.d.ts

@@ -1,3 +1,5 @@
 import { sql } from './sql';
+import { errorCodes } from './errorCodes';
+export { errorCodes };
 export default sql;
 //# sourceMappingURL=index.d.ts.map

package/out/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,eAAe,GAAG,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,CAAC;AACtB,eAAe,GAAG,CAAC"}

package/out/index.js

@@ -1,4 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.errorCodes = void 0;
 const sql_1 = require("./sql");
+const errorCodes_1 = require("./errorCodes");
+Object.defineProperty(exports, "errorCodes", { enumerable: true, get: function () { return errorCodes_1.errorCodes; } });
 exports.default = sql_1.sql;

package/out/sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../src/sql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAY,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG9D,qBAAa,SAAS;YACN,WAAW;IAcnB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,aAAkB,EAAE,MAAM,SAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAQ5F,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;IAI9B,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CASlC;AAED,eAAO,MAAM,GAAG,WAAkB,CAAC"}
+{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../src/sql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAY,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE9D,qBAAa,SAAS;YACN,WAAW;IAYnB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,aAAkB,EAAE,MAAM,SAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAQ5F,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;IAI9B,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CASlC;AAED,eAAO,MAAM,GAAG,WAAkB,CAAC"}

package/out/sql.js

@@ -1,22 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sql = exports.SqlClient = void 0;
-const tslib_1 = require("tslib");
-const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
+const api_1 = require("@forge/api");
 const response_handler_1 = require("./utils/response-handler");
 const sql_statement_1 = require("./sql-statement");
-const fetch_1 = require("@forge/api/out/api/fetch");
 class SqlClient {
     async sendRequest(path, options) {
-        const url = `https://sql/${path}`;
-        options = (0, fetch_1.addMagicAgent)(options);
-        options.redirect = 'follow';
-        options.headers = {
-            ...options.headers,
+        const response = await (0, api_1.__fetchProduct)({ provider: 'none', remote: 'sql' })(path, {
+            ...options,
             redirect: 'follow',
-            'Content-Type': 'application/json'
-        };
-        const response = await (0, node_fetch_1.default)(url, options);
+            headers: {
+                ...options?.headers,
+                'Content-Type': 'application/json'
+            }
+        });
         return response;
     }
     async storageApi(query, params = [], method = 'all') {
@@ -30,12 +27,7 @@ class SqlClient {
         return new sql_statement_1.SqlStatement(query, this.storageApi.bind(this));
     }
     async execute(query) {
-        try {
-            return await this.prepare(query).execute();
-        }
-        catch (e) {
-            return { rows: [], err: e };
-        }
+        return await this.prepare(query).execute();
     }
     async _provision() {
         try {

package/out/utils/__test__/response-handler.test.js

@@ -4,7 +4,7 @@ const response_handler_1 = require("../response-handler");
 describe('getResponseBody', () => {
     it('should return parsed response when response is ok', async () => {
         const mockResponse = {
-            text: jest.fn().mockResolvedValue(JSON.stringify({ response: { rows: [] } })),
+            text: jest.fn().mockResolvedValue(JSON.stringify({ rows: [] })),
             ok: true,
             status: 200
         };
@@ -15,7 +15,7 @@ describe('getResponseBody', () => {
         const mockResponse = {
             text: jest
                 .fn()
-                .mockResolvedValue(JSON.stringify({ error: { code: 'ERROR_CODE', title: 'Error Title', data: { info: 'detail' } } })),
+                .mockResolvedValue(JSON.stringify({ code: 'ERROR_CODE', message: 'Error Title', debug: { info: 'detail' } })),
             ok: false,
             status: 400
         };
@@ -24,7 +24,7 @@ describe('getResponseBody', () => {
             status: 400,
             code: 'ERROR_CODE',
             message: 'Error Title',
-            data: { info: 'detail' }
+            debug: { info: 'detail' }
         });
     });
     it('should throw ApiError with UNKNOWN_ERROR when response is not ok and error JSON is invalid', async () => {

package/out/utils/response-handler.d.ts

@@ -3,7 +3,8 @@ export declare class ApiError extends Error {
     readonly status: number;
     readonly code: string;
     readonly suggestion?: string | undefined;
-    constructor(status: number, code: string, message: string, suggestion?: string | undefined);
+    readonly debug?: any;
+    constructor(status: number, code: string, message: string, suggestion?: string | undefined, debug?: any);
 }
 export declare function getResponseBody(response: Response): Promise<Result>;
 //# sourceMappingURL=response-handler.d.ts.map

package/out/utils/response-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response-handler.d.ts","sourceRoot":"","sources":["../../src/utils/response-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAE3C,qBAAa,QAAS,SAAQ,KAAK;IAE/B,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAErB,QAAQ,CAAC,UAAU,CAAC;gBAHX,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACN,UAAU,CAAC,oBAAQ;CAI/B;AAED,wBAAsB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CA0BzE"}
+{"version":3,"file":"response-handler.d.ts","sourceRoot":"","sources":["../../src/utils/response-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAE3C,qBAAa,QAAS,SAAQ,KAAK;IAE/B,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAErB,QAAQ,CAAC,UAAU,CAAC;IACpB,QAAQ,CAAC,KAAK,CAAC;gBAJN,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACN,UAAU,CAAC,oBAAQ,EACnB,KAAK,CAAC,KAAK;CAIvB;AAED,wBAAsB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CA2BzE"}

package/out/utils/response-handler.js

@@ -5,11 +5,13 @@ class ApiError extends Error {
     status;
     code;
     suggestion;
-    constructor(status, code, message, suggestion) {
+    debug;
+    constructor(status, code, message, suggestion, debug) {
         super(message);
         this.status = status;
         this.code = code;
         this.suggestion = suggestion;
+        this.debug = debug;
     }
 }
 exports.ApiError = ApiError;
@@ -18,7 +20,7 @@ async function getResponseBody(response) {
     if (!response.ok) {
         try {
             const parsedError = JSON.parse(responseText);
-            throw new ApiError(response.status, parsedError?.error?.code, parsedError?.error?.message, parsedError?.error?.suggestion);
+            throw new ApiError(response.status, parsedError?.code, parsedError?.message, parsedError?.suggestion, parsedError?.debug);
         }
         catch (e) {
             if (!(e instanceof ApiError)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/sql",
-  "version": "0.0.1-experimental-8f73b3e",
+  "version": "0.0.1-experimental-f20602a",
   "description": "Forge SQL package",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -21,6 +21,6 @@
     "node-fetch": "2.7.0"
   },
   "dependencies": {
-    "@forge/api": "^3.9.1-experimental-8f73b3e"
+    "@forge/api": "^3.9.2-next.0-experimental-f20602a"
   }
 }