@xube/kit-aws 0.0.111 → 0.0.113

package/dist/index.d.ts

@@ -8,6 +8,10 @@ export * from "./resources/dynamodb/transform";
 export * from "./resources/parameter-store/get";
 export * from "./resources/athena/client";
 export * from "./resources/athena/get";
+export * from "./resources/athena/query";
+export * from "./resources/athena/transform";
+export * from "./resources/athena/types";
+export * from "./resources/athena/wait";
 export * from "./resources/kinesis/client";
 export * from "./resources/kinesis/put";
 export * from "./resources/firehose/client";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,8BAA8B,CAAC;AAE7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAE/C,cAAc,iCAAiC,CAAC;AAEhD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AAEvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AAExC,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,8BAA8B,CAAC;AAE7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAE/C,cAAc,iCAAiC,CAAC;AAEhD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AAExC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AAExC,cAAc,6BAA6B,CAAC"}

package/dist/index.js

@@ -24,6 +24,10 @@ __exportStar(require("./resources/dynamodb/transform"), exports);
 __exportStar(require("./resources/parameter-store/get"), exports);
 __exportStar(require("./resources/athena/client"), exports);
 __exportStar(require("./resources/athena/get"), exports);
+__exportStar(require("./resources/athena/query"), exports);
+__exportStar(require("./resources/athena/transform"), exports);
+__exportStar(require("./resources/athena/types"), exports);
+__exportStar(require("./resources/athena/wait"), exports);
 __exportStar(require("./resources/kinesis/client"), exports);
 __exportStar(require("./resources/kinesis/put"), exports);
 __exportStar(require("./resources/firehose/client"), exports);

package/dist/resources/athena/get.d.ts

@@ -1,21 +1,7 @@
-import { AthenaClient, GetQueryResultsCommandOutput, ResultSet } from "@aws-sdk/client-athena";
+import { GetQueryResultsCommandOutput } from "@aws-sdk/client-athena";
 import { APIGatewayProxyResult } from "aws-lambda";
-import { XubeLog } from "@xube/kit-log";
-export declare const waitForQueryCompletion: (athena: AthenaClient, queryExecutionId: string, log?: XubeLog, maxWaitTimeMs?: number, pollIntervalMs?: number) => Promise<boolean>;
-export declare const transformAthenaResults: (resultSet: ResultSet | undefined, isNextPage: boolean) => Record<string, any>[];
-interface PaginationParams {
-    isNextPage: boolean;
-    queryExecutionId?: string;
-    nextToken?: string;
-}
-type FetchDataRequest = {
-    from: number;
-    to?: number;
-    nextToken?: string;
-    queryExecutionId?: string;
-};
-export declare const handlePagination: (request: FetchDataRequest) => Promise<string>;
+import { PaginationParams, FetchDataRequest } from "./types";
+export declare const handlePagination: (request: FetchDataRequest, glueDatabaseName: string, glueTableName: string, s3BucketName: string, s3BucketAthenaResultsPrefix: string) => Promise<string>;
 export declare const fetchQueryResults: (queryExecutionId: string, paginationParams: PaginationParams, limit: number) => Promise<GetQueryResultsCommandOutput>;
 export declare const formatResponse: (resultsResponse: GetQueryResultsCommandOutput, queryExecutionId: string, paginationParams: PaginationParams) => APIGatewayProxyResult;
-export {};
 //# sourceMappingURL=get.d.ts.map

package/dist/resources/athena/get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/resources/athena/get.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,4BAA4B,EAC5B,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAIxC,eAAO,MAAM,sBAAsB,WACzB,YAAY,oBACF,MAAM,QACnB,OAAO,kBACG,MAAM,mBACL,MAAM,KACrB,OAAO,CAAC,OAAO,CAgDjB,CAAC;AAEF,eAAO,MAAM,sBAAsB,cACtB,SAAS,GAAG,SAAS,cACpB,OAAO,KAClB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAsBrB,CAAC;AAEF,UAAU,gBAAgB;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AA+DF,eAAO,MAAM,gBAAgB,YAClB,gBAAgB,KACxB,OAAO,CAAC,MAAM,CAahB,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBACV,MAAM,oBACN,gBAAgB,SAC3B,MAAM,KACZ,OAAO,CAAC,4BAA4B,CAiBtC,CAAC;AAEF,eAAO,MAAM,cAAc,oBACR,4BAA4B,oBAC3B,MAAM,oBACN,gBAAgB,KACjC,qBAuBF,CAAC"}
+{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/resources/athena/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,4BAA4B,EAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAKnD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAK7D,eAAO,MAAM,gBAAgB,YAClB,gBAAgB,oBACP,MAAM,iBACT,MAAM,gBACP,MAAM,+BACS,MAAM,KAClC,OAAO,CAAC,MAAM,CAkBhB,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBACV,MAAM,oBACN,gBAAgB,SAC3B,MAAM,KACZ,OAAO,CAAC,4BAA4B,CAiBtC,CAAC;AAEF,eAAO,MAAM,cAAc,oBACR,4BAA4B,oBAC3B,MAAM,oBACN,gBAAgB,KACjC,qBAuBF,CAAC"}

package/dist/resources/athena/get.js

@@ -1,107 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatResponse = exports.fetchQueryResults = exports.handlePagination = exports.transformAthenaResults = exports.waitForQueryCompletion = void 0;
+exports.formatResponse = exports.fetchQueryResults = exports.handlePagination = void 0;
 const client_athena_1 = require("@aws-sdk/client-athena");
 const kit_constants_1 = require("@xube/kit-constants");
-const kit_log_1 = require("@xube/kit-log");
 const zod_1 = require("zod");
 const client_1 = require("./client");
-const waitForQueryCompletion = async (athena, queryExecutionId, log = kit_log_1.XubeLog.getInstance(), maxWaitTimeMs = 300000, pollIntervalMs = 500) => {
-    const startTime = Date.now();
-    let attempts = 0;
-    const maxAttempts = Math.ceil(maxWaitTimeMs / pollIntervalMs);
-    while (attempts < maxAttempts) {
-        attempts++;
-        const queryExecution = await athena.send(new client_athena_1.GetQueryExecutionCommand({
-            QueryExecutionId: queryExecutionId,
-        }));
-        const state = queryExecution.QueryExecution?.Status?.State;
-        if (state === "SUCCEEDED") {
-            log.info(`Query completed successfully after ${attempts} attempts (${Date.now() - startTime}ms)`);
-            return true;
-        }
-        if (state === "FAILED" || state === "CANCELLED") {
-            log.error(`Query failed with state: ${state} after ${attempts} attempts (${Date.now() - startTime}ms)`);
-            return false;
-        }
-        if (Date.now() - startTime >= maxWaitTimeMs) {
-            log.error(`Query timeout: exceeded maximum wait time of ${maxWaitTimeMs}ms after ${attempts} attempts`);
-            return false;
-        }
-        await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
-    }
-    log.error(`Query timeout: exceeded maximum attempts (${maxAttempts}) after ${Date.now() - startTime}ms`);
-    return false;
-};
-exports.waitForQueryCompletion = waitForQueryCompletion;
-const transformAthenaResults = (resultSet, isNextPage) => {
-    if (!resultSet?.Rows || resultSet.Rows.length < 2) {
-        return [];
-    }
-    const headers = resultSet.ResultSetMetadata?.ColumnInfo?.map((col) => col.Name ?? "") ?? [];
-    return resultSet.Rows.slice(isNextPage ? 0 : 1).map((row) => {
-        const normalizedRow = {};
-        row.Data.forEach((col, index) => {
-            const header = headers?.[index];
-            if (header) {
-                try {
-                    normalizedRow[header] = JSON.parse(col.VarCharValue);
-                }
-                catch (error) {
-                    normalizedRow[header] = col.VarCharValue;
-                }
-            }
-        });
-        return normalizedRow;
-    });
-};
-exports.transformAthenaResults = transformAthenaResults;
-const GLUE_DATABASE_NAME = process.env.ATHENA_GLUE_DATABASE ?? "";
-const GLUE_TABLE_NAME = process.env.ATHENA_GLUE_TABLE ?? "";
-const S3_BUCKET_NAME = process.env.ATHENA_RESULTS_BUCKET ?? "";
-const S3_BUCKET_ATHENA_RESULTS_PREFIX = process.env.ATHENA_RESULTS_PREFIX ?? "athena-results";
-const buildQuery = (request) => {
-    const databaseName = GLUE_DATABASE_NAME;
-    const tableName = GLUE_TABLE_NAME;
-    const { from, to } = request;
-    if (to) {
-        return `
-      SELECT * FROM "${databaseName}"."${tableName}"
-      WHERE "s" BETWEEN ${from} AND ${to}
-      ORDER BY "s" DESC
-    `;
-    }
-    else {
-        return `
-      SELECT * FROM "${databaseName}"."${tableName}"
-      WHERE "s" >= ${from}
-      ORDER BY "s" DESC
-    `;
-    }
-};
-const executeNewQuery = async (query) => {
-    const athenaClient = (0, client_1.getAthenaClient)();
-    const databaseName = GLUE_DATABASE_NAME;
-    const queryExecution = await athenaClient.send(new client_athena_1.StartQueryExecutionCommand({
-        QueryString: query,
-        QueryExecutionContext: {
-            Database: databaseName,
-        },
-        WorkGroup: "primary",
-        ResultConfiguration: {
-            OutputLocation: `s3://${S3_BUCKET_NAME}/${S3_BUCKET_ATHENA_RESULTS_PREFIX}`,
-        },
-    }));
-    if (!queryExecution.QueryExecutionId) {
-        throw new Error("No QueryExecutionId returned");
-    }
-    const queryCompleted = await (0, exports.waitForQueryCompletion)(athenaClient, queryExecution.QueryExecutionId);
-    if (!queryCompleted) {
-        throw new Error(`Query execution failed`);
-    }
-    return queryExecution.QueryExecutionId;
-};
-const handlePagination = async (request) => {
+const transform_1 = require("./transform");
+const query_1 = require("./query");
+// helpers and types moved to separate modules
+const handlePagination = async (request, glueDatabaseName, glueTableName, s3BucketName, s3BucketAthenaResultsPrefix) => {
     const paginationParams = {
         isNextPage: !!request.nextToken && !!request.queryExecutionId,
         queryExecutionId: request.queryExecutionId,
@@ -111,8 +18,8 @@ const handlePagination = async (request) => {
         return request.queryExecutionId;
     }
     else {
-        const query = buildQuery(request);
-        return await executeNewQuery(query);
+        const query = (0, query_1.buildQuery)(request, glueDatabaseName, glueTableName);
+        return await (0, query_1.executeNewQuery)(query, glueDatabaseName, s3BucketName, s3BucketAthenaResultsPrefix);
     }
 };
 exports.handlePagination = handlePagination;
@@ -132,7 +39,7 @@ const fetchQueryResults = async (queryExecutionId, paginationParams, limit) => {
 exports.fetchQueryResults = fetchQueryResults;
 const formatResponse = (resultsResponse, queryExecutionId, paginationParams) => {
     const DataListSchema = zod_1.z.array(zod_1.z.record(zod_1.z.string(), zod_1.z.any()));
-    const data = DataListSchema.parse((0, exports.transformAthenaResults)(resultsResponse.ResultSet, paginationParams.isNextPage));
+    const data = DataListSchema.parse((0, transform_1.transformAthenaResults)(resultsResponse.ResultSet, paginationParams.isNextPage));
     const hasNextPage = !!resultsResponse.NextToken;
     return {
         statusCode: kit_constants_1.StatusCode.OK,

package/dist/resources/athena/query.d.ts

@@ -0,0 +1,4 @@
+import { FetchDataRequest } from "./types";
+export declare const buildQuery: (request: FetchDataRequest, glueDatabaseName: string, glueTableName: string) => string;
+export declare const executeNewQuery: (query: string, glueDatabaseName: string, s3BucketName: string, s3BucketAthenaResultsPrefix: string) => Promise<string>;
+//# sourceMappingURL=query.d.ts.map

package/dist/resources/athena/query.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/resources/athena/query.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,eAAO,MAAM,UAAU,YACZ,gBAAgB,oBACP,MAAM,iBACT,MAAM,KACpB,MAgBF,CAAC;AAEF,eAAO,MAAM,eAAe,UACnB,MAAM,oBACK,MAAM,gBACV,MAAM,+BACS,MAAM,KAClC,OAAO,CAAC,MAAM,CA8BhB,CAAC"}

package/dist/resources/athena/query.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeNewQuery = exports.buildQuery = void 0;
+const client_athena_1 = require("@aws-sdk/client-athena");
+const client_1 = require("./client");
+const wait_1 = require("./wait");
+const buildQuery = (request, glueDatabaseName, glueTableName) => {
+    const { from, to } = request;
+    if (to) {
+        return `
+      SELECT * FROM "${glueDatabaseName}"."${glueTableName}"
+      WHERE "s" BETWEEN ${from} AND ${to}
+      ORDER BY "s" DESC
+    `;
+    }
+    else {
+        return `
+      SELECT * FROM "${glueDatabaseName}"."${glueTableName}"
+      WHERE "s" >= ${from}
+      ORDER BY "s" DESC
+    `;
+    }
+};
+exports.buildQuery = buildQuery;
+const executeNewQuery = async (query, glueDatabaseName, s3BucketName, s3BucketAthenaResultsPrefix) => {
+    const athenaClient = (0, client_1.getAthenaClient)();
+    const queryExecution = await athenaClient.send(new client_athena_1.StartQueryExecutionCommand({
+        QueryString: query,
+        QueryExecutionContext: {
+            Database: glueDatabaseName,
+        },
+        WorkGroup: "primary",
+        ResultConfiguration: {
+            OutputLocation: `s3://${s3BucketName}/${s3BucketAthenaResultsPrefix}`,
+        },
+    }));
+    if (!queryExecution.QueryExecutionId) {
+        throw new Error("No QueryExecutionId returned");
+    }
+    const queryCompleted = await (0, wait_1.waitForQueryCompletion)(athenaClient, queryExecution.QueryExecutionId);
+    if (!queryCompleted) {
+        throw new Error(`Query execution failed`);
+    }
+    return queryExecution.QueryExecutionId;
+};
+exports.executeNewQuery = executeNewQuery;

package/dist/resources/athena/transform.d.ts

@@ -0,0 +1,3 @@
+import { ResultSet } from "@aws-sdk/client-athena";
+export declare const transformAthenaResults: (resultSet: ResultSet | undefined, isNextPage: boolean) => Record<string, any>[];
+//# sourceMappingURL=transform.d.ts.map

package/dist/resources/athena/transform.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/resources/athena/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,eAAO,MAAM,sBAAsB,cACtB,SAAS,GAAG,SAAS,cACpB,OAAO,KAClB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAsBrB,CAAC"}

package/dist/resources/athena/transform.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformAthenaResults = void 0;
+const transformAthenaResults = (resultSet, isNextPage) => {
+    if (!resultSet?.Rows || resultSet.Rows.length < 2) {
+        return [];
+    }
+    const headers = resultSet.ResultSetMetadata?.ColumnInfo?.map((col) => col.Name ?? "") ?? [];
+    return resultSet.Rows.slice(isNextPage ? 0 : 1).map((row) => {
+        const normalizedRow = {};
+        row.Data.forEach((col, index) => {
+            const header = headers?.[index];
+            if (header) {
+                try {
+                    normalizedRow[header] = JSON.parse(col.VarCharValue);
+                }
+                catch (error) {
+                    normalizedRow[header] = col.VarCharValue;
+                }
+            }
+        });
+        return normalizedRow;
+    });
+};
+exports.transformAthenaResults = transformAthenaResults;

package/dist/resources/athena/types.d.ts

@@ -0,0 +1,12 @@
+export interface PaginationParams {
+    isNextPage: boolean;
+    queryExecutionId?: string;
+    nextToken?: string;
+}
+export type FetchDataRequest = {
+    from: number;
+    to?: number;
+    nextToken?: string;
+    queryExecutionId?: string;
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/resources/athena/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/resources/athena/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC"}

package/dist/resources/athena/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/resources/athena/wait.d.ts

@@ -0,0 +1,4 @@
+import { AthenaClient } from "@aws-sdk/client-athena";
+import { XubeLog } from "@xube/kit-log";
+export declare const waitForQueryCompletion: (athena: AthenaClient, queryExecutionId: string, log?: XubeLog, maxWaitTimeMs?: number, pollIntervalMs?: number) => Promise<boolean>;
+//# sourceMappingURL=wait.d.ts.map

package/dist/resources/athena/wait.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/resources/athena/wait.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA4B,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,eAAO,MAAM,sBAAsB,WACzB,YAAY,oBACF,MAAM,QACnB,OAAO,kBACG,MAAM,mBACL,MAAM,KACrB,OAAO,CAAC,OAAO,CAgDjB,CAAC"}

package/dist/resources/athena/wait.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForQueryCompletion = void 0;
+const client_athena_1 = require("@aws-sdk/client-athena");
+const kit_log_1 = require("@xube/kit-log");
+const waitForQueryCompletion = async (athena, queryExecutionId, log = kit_log_1.XubeLog.getInstance(), maxWaitTimeMs = 300000, pollIntervalMs = 500) => {
+    const startTime = Date.now();
+    let attempts = 0;
+    const maxAttempts = Math.ceil(maxWaitTimeMs / pollIntervalMs);
+    while (attempts < maxAttempts) {
+        attempts++;
+        const queryExecution = await athena.send(new client_athena_1.GetQueryExecutionCommand({
+            QueryExecutionId: queryExecutionId,
+        }));
+        const state = queryExecution.QueryExecution?.Status?.State;
+        if (state === "SUCCEEDED") {
+            log.info(`Query completed successfully after ${attempts} attempts (${Date.now() - startTime}ms)`);
+            return true;
+        }
+        if (state === "FAILED" || state === "CANCELLED") {
+            log.error(`Query failed with state: ${state} after ${attempts} attempts (${Date.now() - startTime}ms)`);
+            return false;
+        }
+        if (Date.now() - startTime >= maxWaitTimeMs) {
+            log.error(`Query timeout: exceeded maximum wait time of ${maxWaitTimeMs}ms after ${attempts} attempts`);
+            return false;
+        }
+        await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+    }
+    log.error(`Query timeout: exceeded maximum attempts (${maxAttempts}) after ${Date.now() - startTime}ms`);
+    return false;
+};
+exports.waitForQueryCompletion = waitForQueryCompletion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xube/kit-aws",
-  "version": "0.0.111",
+  "version": "0.0.113",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -18,7 +18,7 @@
   "homepage": "https://github.com/XubeLtd/dev-kit#readme",
   "devDependencies": {
     "@types/aws-lambda": "^8.10.119",
-    "@xube/kit-build": "^0.0.111"
+    "@xube/kit-build": "^0.0.113"
   },
   "dependencies": {
     "@aws-sdk/client-athena": "^3.656.0",
@@ -29,10 +29,10 @@
     "@aws-sdk/client-ssm": "^3.654.0",
     "@aws-sdk/lib-dynamodb": "^3.656.0",
     "@aws-sdk/util-dynamodb": "^3.656.0",
-    "@xube/kit-aws-schema": "^0.0.111",
-    "@xube/kit-log": "^0.0.111",
-    "@xube/kit-request": "^0.0.111",
-    "@xube/kit-schema": "^0.0.111",
+    "@xube/kit-aws-schema": "^0.0.113",
+    "@xube/kit-log": "^0.0.113",
+    "@xube/kit-request": "^0.0.113",
+    "@xube/kit-schema": "^0.0.113",
     "zod": "^3.23.8"
   }
 }

package/src/index.ts

@@ -11,6 +11,10 @@ export * from "./resources/parameter-store/get";
 
 export * from "./resources/athena/client";
 export * from "./resources/athena/get";
+export * from "./resources/athena/query";
+export * from "./resources/athena/transform";
+export * from "./resources/athena/types";
+export * from "./resources/athena/wait";
 
 export * from "./resources/kinesis/client";
 export * from "./resources/kinesis/put";

package/src/resources/athena/get.ts

@@ -1,176 +1,24 @@
 import {
   AthenaClient,
-  GetQueryExecutionCommand,
   GetQueryResultsCommand,
   GetQueryResultsCommandOutput,
-  ResultSet,
-  StartQueryExecutionCommand,
 } from "@aws-sdk/client-athena";
 import { APIGatewayProxyResult } from "aws-lambda";
 import { StatusCode } from "@xube/kit-constants";
-import { XubeLog } from "@xube/kit-log";
 import { z } from "zod";
 import { getAthenaClient } from "./client";
+import { transformAthenaResults } from "./transform";
+import { PaginationParams, FetchDataRequest } from "./types";
+import { buildQuery, executeNewQuery } from "./query";
 
-export const waitForQueryCompletion = async (
-  athena: AthenaClient,
-  queryExecutionId: string,
-  log: XubeLog = XubeLog.getInstance(),
-  maxWaitTimeMs: number = 300000,
-  pollIntervalMs: number = 500
-): Promise<boolean> => {
-  const startTime = Date.now();
-  let attempts = 0;
-  const maxAttempts = Math.ceil(maxWaitTimeMs / pollIntervalMs);
-
-  while (attempts < maxAttempts) {
-    attempts++;
-
-    const queryExecution = await athena.send(
-      new GetQueryExecutionCommand({
-        QueryExecutionId: queryExecutionId,
-      })
-    );
-
-    const state = queryExecution.QueryExecution?.Status?.State;
-    if (state === "SUCCEEDED") {
-      log.info(
-        `Query completed successfully after ${attempts} attempts (${
-          Date.now() - startTime
-        }ms)`
-      );
-      return true;
-    }
-    if (state === "FAILED" || state === "CANCELLED") {
-      log.error(
-        `Query failed with state: ${state} after ${attempts} attempts (${
-          Date.now() - startTime
-        }ms)`
-      );
-      return false;
-    }
-
-    if (Date.now() - startTime >= maxWaitTimeMs) {
-      log.error(
-        `Query timeout: exceeded maximum wait time of ${maxWaitTimeMs}ms after ${attempts} attempts`
-      );
-      return false;
-    }
-
-    await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
-  }
-
-  log.error(
-    `Query timeout: exceeded maximum attempts (${maxAttempts}) after ${
-      Date.now() - startTime
-    }ms`
-  );
-  return false;
-};
-
-export const transformAthenaResults = (
-  resultSet: ResultSet | undefined,
-  isNextPage: boolean
-): Record<string, any>[] => {
-  if (!resultSet?.Rows || resultSet.Rows.length < 2) {
-    return [];
-  }
-
-  const headers =
-    resultSet.ResultSetMetadata?.ColumnInfo?.map((col) => col.Name ?? "") ?? [];
-
-  return resultSet.Rows.slice(isNextPage ? 0 : 1).map((row: any) => {
-    const normalizedRow: Record<string, any> = {};
-    row.Data.forEach((col: any, index: number) => {
-      const header = headers?.[index];
-      if (header) {
-        try {
-          normalizedRow[header] = JSON.parse(col.VarCharValue);
-        } catch (error) {
-          normalizedRow[header] = col.VarCharValue;
-        }
-      }
-    });
-    return normalizedRow;
-  });
-};
-
-interface PaginationParams {
-  isNextPage: boolean;
-  queryExecutionId?: string;
-  nextToken?: string;
-}
-
-type FetchDataRequest = {
-  from: number;
-  to?: number;
-  nextToken?: string;
-  queryExecutionId?: string;
-};
-
-const GLUE_DATABASE_NAME = process.env.ATHENA_GLUE_DATABASE ?? "";
-const GLUE_TABLE_NAME = process.env.ATHENA_GLUE_TABLE ?? "";
-const S3_BUCKET_NAME = process.env.ATHENA_RESULTS_BUCKET ?? "";
-const S3_BUCKET_ATHENA_RESULTS_PREFIX =
-  process.env.ATHENA_RESULTS_PREFIX ?? "athena-results";
-
-const buildQuery = (request: FetchDataRequest): string => {
-  const databaseName = GLUE_DATABASE_NAME;
-  const tableName = GLUE_TABLE_NAME;
-
-  const { from, to } = request;
-
-  if (to) {
-    return `
-      SELECT * FROM "${databaseName}"."${tableName}"
-      WHERE "s" BETWEEN ${from} AND ${to}
-      ORDER BY "s" DESC
-    `;
-  } else {
-    return `
-      SELECT * FROM "${databaseName}"."${tableName}"
-      WHERE "s" >= ${from}
-      ORDER BY "s" DESC
-    `;
-  }
-};
-
-const executeNewQuery = async (query: string): Promise<string> => {
-  const athenaClient = getAthenaClient();
-
-  const databaseName = GLUE_DATABASE_NAME;
-
-  const queryExecution = await athenaClient.send(
-    new StartQueryExecutionCommand({
-      QueryString: query,
-      QueryExecutionContext: {
-        Database: databaseName,
-      },
-      WorkGroup: "primary",
-      ResultConfiguration: {
-        OutputLocation: `s3://${S3_BUCKET_NAME}/${S3_BUCKET_ATHENA_RESULTS_PREFIX}`,
-      },
-    })
-  );
-
-  if (!queryExecution.QueryExecutionId) {
-    throw new Error("No QueryExecutionId returned");
-  }
-
-  const queryCompleted = await waitForQueryCompletion(
-    athenaClient,
-    queryExecution.QueryExecutionId
-  );
-
-  if (!queryCompleted) {
-    throw new Error(`Query execution failed`);
-  }
-
-  return queryExecution.QueryExecutionId;
-};
+// helpers and types moved to separate modules
 
 export const handlePagination = async (
-  request: FetchDataRequest
+  request: FetchDataRequest,
+  glueDatabaseName: string,
+  glueTableName: string,
+  s3BucketName: string,
+  s3BucketAthenaResultsPrefix: string
 ): Promise<string> => {
   const paginationParams: PaginationParams = {
     isNextPage: !!request.nextToken && !!request.queryExecutionId,
@@ -181,8 +29,13 @@ export const handlePagination = async (
   if (paginationParams.isNextPage) {
     return request.queryExecutionId!;
   } else {
-    const query = buildQuery(request);
-    return await executeNewQuery(query);
+    const query = buildQuery(request, glueDatabaseName, glueTableName);
+    return await executeNewQuery(
+      query,
+      glueDatabaseName,
+      s3BucketName,
+      s3BucketAthenaResultsPrefix
+    );
   }
 };
 

package/src/resources/athena/query.ts

@@ -0,0 +1,63 @@
+import { StartQueryExecutionCommand } from "@aws-sdk/client-athena";
+import { getAthenaClient } from "./client";
+import { waitForQueryCompletion } from "./wait";
+import { FetchDataRequest } from "./types";
+
+export const buildQuery = (
+  request: FetchDataRequest,
+  glueDatabaseName: string,
+  glueTableName: string
+): string => {
+  const { from, to } = request;
+
+  if (to) {
+    return `
+      SELECT * FROM "${glueDatabaseName}"."${glueTableName}"
+      WHERE "s" BETWEEN ${from} AND ${to}
+      ORDER BY "s" DESC
+    `;
+  } else {
+    return `
+      SELECT * FROM "${glueDatabaseName}"."${glueTableName}"
+      WHERE "s" >= ${from}
+      ORDER BY "s" DESC
+    `;
+  }
+};
+
+export const executeNewQuery = async (
+  query: string,
+  glueDatabaseName: string,
+  s3BucketName: string,
+  s3BucketAthenaResultsPrefix: string
+): Promise<string> => {
+  const athenaClient = getAthenaClient();
+
+  const queryExecution = await athenaClient.send(
+    new StartQueryExecutionCommand({
+      QueryString: query,
+      QueryExecutionContext: {
+        Database: glueDatabaseName,
+      },
+      WorkGroup: "primary",
+      ResultConfiguration: {
+        OutputLocation: `s3://${s3BucketName}/${s3BucketAthenaResultsPrefix}`,
+      },
+    })
+  );
+
+  if (!queryExecution.QueryExecutionId) {
+    throw new Error("No QueryExecutionId returned");
+  }
+
+  const queryCompleted = await waitForQueryCompletion(
+    athenaClient,
+    queryExecution.QueryExecutionId
+  );
+
+  if (!queryCompleted) {
+    throw new Error(`Query execution failed`);
+  }
+
+  return queryExecution.QueryExecutionId;
+};

package/src/resources/athena/transform.ts

@@ -0,0 +1,28 @@
+import { ResultSet } from "@aws-sdk/client-athena";
+
+export const transformAthenaResults = (
+  resultSet: ResultSet | undefined,
+  isNextPage: boolean
+): Record<string, any>[] => {
+  if (!resultSet?.Rows || resultSet.Rows.length < 2) {
+    return [];
+  }
+
+  const headers =
+    resultSet.ResultSetMetadata?.ColumnInfo?.map((col) => col.Name ?? "") ?? [];
+
+  return resultSet.Rows.slice(isNextPage ? 0 : 1).map((row: any) => {
+    const normalizedRow: Record<string, any> = {};
+    row.Data.forEach((col: any, index: number) => {
+      const header = headers?.[index];
+      if (header) {
+        try {
+          normalizedRow[header] = JSON.parse(col.VarCharValue);
+        } catch (error) {
+          normalizedRow[header] = col.VarCharValue;
+        }
+      }
+    });
+    return normalizedRow;
+  });
+};

package/src/resources/athena/types.ts

@@ -0,0 +1,12 @@
+export interface PaginationParams {
+  isNextPage: boolean;
+  queryExecutionId?: string;
+  nextToken?: string;
+}
+
+export type FetchDataRequest = {
+  from: number;
+  to?: number;
+  nextToken?: string;
+  queryExecutionId?: string;
+};

package/src/resources/athena/wait.ts

@@ -0,0 +1,58 @@
+import { AthenaClient, GetQueryExecutionCommand } from "@aws-sdk/client-athena";
+import { XubeLog } from "@xube/kit-log";
+
+export const waitForQueryCompletion = async (
+  athena: AthenaClient,
+  queryExecutionId: string,
+  log: XubeLog = XubeLog.getInstance(),
+  maxWaitTimeMs: number = 300000,
+  pollIntervalMs: number = 500
+): Promise<boolean> => {
+  const startTime = Date.now();
+  let attempts = 0;
+  const maxAttempts = Math.ceil(maxWaitTimeMs / pollIntervalMs);
+
+  while (attempts < maxAttempts) {
+    attempts++;
+
+    const queryExecution = await athena.send(
+      new GetQueryExecutionCommand({
+        QueryExecutionId: queryExecutionId,
+      })
+    );
+
+    const state = queryExecution.QueryExecution?.Status?.State;
+    if (state === "SUCCEEDED") {
+      log.info(
+        `Query completed successfully after ${attempts} attempts (${
+          Date.now() - startTime
+        }ms)`
+      );
+      return true;
+    }
+    if (state === "FAILED" || state === "CANCELLED") {
+      log.error(
+        `Query failed with state: ${state} after ${attempts} attempts (${
+          Date.now() - startTime
+        }ms)`
+      );
+      return false;
+    }
+
+    if (Date.now() - startTime >= maxWaitTimeMs) {
+      log.error(
+        `Query timeout: exceeded maximum wait time of ${maxWaitTimeMs}ms after ${attempts} attempts`
+      );
+      return false;
+    }
+
+    await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+  }
+
+  log.error(
+    `Query timeout: exceeded maximum attempts (${maxAttempts}) after ${
+      Date.now() - startTime
+    }ms`
+  );
+  return false;
+};