Merge pull request #65 from outerbase/invisal/sdk-transform

Moving to SDK transform

Author: invisal

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@outerbase/sdk",
-    "version": "2.0.0-rc.4",
+    "version": "2.0.0-rc.5",
     "description": "",
     "main": "dist/index.js",
     "module": "dist/index.js",
@@ -34,6 +34,7 @@
     "author": "Outerbase",
     "license": "MIT",
     "dependencies": {
+        "@outerbase/sdk-transform": "^1.0.3",
         "handlebars": "^4.7.8"
     },
     "devDependencies": {
@@ -53,11 +54,11 @@
         "mysql2": "^3.11.3",
         "pg": "^8.13.0",
         "prettier": "^3.2.5",
+        "snowflake-sdk": "^1.15.0",
         "ts-jest": "^29.1.3",
         "ts-node": "^10.9.2",
         "tsconfig-paths": "^4.2.0",
         "typescript": "^5.4.5",
-        "ws": "^8.17.1",
-        "snowflake-sdk": "^1.15.0"
+        "ws": "^8.17.1"
     }
 }

package.json

@@ -1,23 +1,17 @@
+import { ColumnHeader, ResultSet } from '@outerbase/sdk-transform';
 import {
     Database,
     TableColumn,
     TableColumnDefinition,
 } from '../models/database';
 
-export interface QueryResultHeader {
-    name: string;
-    displayName: string;
-    type?: string;
-    tableName?: string;
-}
-export interface QueryResult<T = Record<string, unknown>> {
+export interface QueryResult<T = Record<string, unknown>>
+    extends Omit<ResultSet, 'rows'> {
     data: T[];
     count?: number;
-    headers: QueryResultHeader[];
     error: Error | null;
     query: string;
 }
-
 export interface ConnectionSelectOptions {
     where?: { name: string; value: unknown; operator: string }[];
     orderBy?: (string | [string, 'ASC' | 'DESC'])[];

src/connections/index.ts

@@ -7,20 +7,15 @@ import {
 import { SqlConnection } from './sql-base';
 import { Query } from '../query';
 import { QueryType } from '../query-params';
-import {
-    Constraint,
-    Database,
-    Table,
-    TableColumn,
-    TableColumnDefinition,
-} from './../models/database';
+import { Constraint, Database, Table, TableColumn } from './../models/database';
 import { MySQLDialect } from './../query-builder/dialects/mysql';
 import {
     createErrorResult,
-    transformArrayBasedResult,
+    transformFromSdkTransform,
 } from './../utils/transformer';
 import { QueryResult } from '.';
 import { ColumnDataType } from '../query-builder';
+import { transformMySQLResult } from '@outerbase/sdk-transform';
 
 interface MySQLSchemaResult {
     SCHEMA_NAME: string;
@@ -127,10 +122,10 @@ export function buildMySQLDatabaseSchmea({
 
         columnLookup[
             column.TABLE_SCHEMA +
-            '.' +
-            column.TABLE_NAME +
-            '.' +
-            column.COLUMN_NAME
+                '.' +
+                column.TABLE_NAME +
+                '.' +
+                column.COLUMN_NAME
         ] = columnObject;
 
         table.columns.push(columnObject);
@@ -156,10 +151,10 @@ export function buildMySQLDatabaseSchmea({
 
         constraintLookup[
             constraint.TABLE_SCHEMA +
-            '.' +
-            constraint.TABLE_NAME +
-            '.' +
-            constraint.CONSTRAINT_NAME
+                '.' +
+                constraint.TABLE_NAME +
+                '.' +
+                constraint.CONSTRAINT_NAME
         ] = constraintObject;
 
         table.constraints.push(constraintObject);
@@ -169,22 +164,22 @@ export function buildMySQLDatabaseSchmea({
     for (const constraintColumn of constraintColumnsList) {
         const constraint =
             constraintLookup[
-            constraintColumn.TABLE_SCHEMA +
-            '.' +
-            constraintColumn.TABLE_NAME +
-            '.' +
-            constraintColumn.CONSTRAINT_NAME
+                constraintColumn.TABLE_SCHEMA +
+                    '.' +
+                    constraintColumn.TABLE_NAME +
+                    '.' +
+                    constraintColumn.CONSTRAINT_NAME
             ];
 
         if (!constraint) continue;
 
         const currentColumn =
             columnLookup[
-            constraintColumn.TABLE_SCHEMA +
-            '.' +
-            constraintColumn.TABLE_NAME +
-            '.' +
-            constraintColumn.COLUMN_NAME
+                constraintColumn.TABLE_SCHEMA +
+                    '.' +
+                    constraintColumn.TABLE_NAME +
+                    '.' +
+                    constraintColumn.COLUMN_NAME
             ];
         if (currentColumn && constraintColumn.REFERENCED_COLUMN_NAME) {
             currentColumn.definition.references = {
@@ -254,18 +249,11 @@ export class MySQLConnection extends SqlConnection {
             );
 
             if (error) {
-                return createErrorResult(error.message) as QueryResult<T>;
+                return createErrorResult<T>(error.message);
             } else {
-                return transformArrayBasedResult(
-                    fields,
-                    (header) => {
-                        return {
-                            name: header.name,
-                            tableName: header.table,
-                        };
-                    },
-                    rows as unknown[][]
-                ) as QueryResult<T>;
+                return transformFromSdkTransform(
+                    transformMySQLResult([rows, fields])
+                );
             }
         } catch {
             return createErrorResult('Unknown error') as QueryResult<T>;
@@ -377,7 +365,7 @@ export class MySQLConnection extends SqlConnection {
         );
     }
 
-    async connect(): Promise<any> { }
+    async connect(): Promise<any> {}
     async disconnect(): Promise<any> {
         this.conn.destroy();
     }