@aesop-fables/triginta 0.9.3 → 0.10.5

package/lib/Bootstrapping.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTrigintaApp = exports.useAwsServices = exports.useTriginta = void 0;
+/* eslint-disable no-case-declarations */
 /* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-empty-object-type */
 const containr_1 = require("@aesop-fables/containr");
 const http_1 = require("./http");
 const HttpLambda_1 = require("./http/HttpLambda");

package/lib/Decorators.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMiddleware = exports.useMiddleware = exports.middlewareMetadataKey = exports.httpPost = exports.httpDelete = exports.httpPut = exports.httpGet = exports.getRoute = exports.endpointMetadataKey = void 0;
 const RouteRegistry_1 = __importDefault(require("./RouteRegistry"));
-/* eslint-disable @typescript-eslint/ban-types */
+/* eslint-disable @typescript-eslint/no-unsafe-function-type */
 exports.endpointMetadataKey = Symbol('@endpointMetadataKey');
 function defineEndpointMetadata(method, route) {
     return (target) => {

package/lib/TrigintaMiddleware.js

@@ -40,7 +40,7 @@ function trigintaMiddlware(options) {
 exports.trigintaMiddlware = trigintaMiddlware;
 function trigintafy(handler, middlewareMetadata, options) {
     let midHandler = (0, core_1.default)(handler).use(trigintaMiddlware(options));
-    // eslint-disable-next-line @typescript-eslint/ban-types
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
     middlewareMetadata.forEach((midFunc) => {
         midHandler = midHandler.use(midFunc());
     });

package/lib/http/HttpLambda.js

@@ -22,7 +22,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBootstrappedHttpLambdaContext = exports.useTrigintaHttp = exports.HttpLambdaFactory = exports.HttpResponseGenerator = void 0;
-/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const containr_1 = require("@aesop-fables/containr");

package/lib/http/invokeHttpHandler.d.ts

@@ -1,4 +1,4 @@
-import { APIGatewayProxyEventPathParameters, APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2 } from 'aws-lambda';
+import { APIGatewayProxyEventPathParameters, APIGatewayProxyEventV2, APIGatewayProxyStructuredResultV2, Context } from 'aws-lambda';
 import { IServiceContainer } from '@aesop-fables/containr';
 import { IConfiguredRoute } from './IConfiguredRoute';
 declare type InvocableEvent = Omit<APIGatewayProxyEventV2, 'body'> & {
@@ -17,5 +17,5 @@ export declare function createApiGatewayEvent(context: EventGenerationContext):
  * @param context
  * @returns
  */
-export declare function invokeHttpHandler<Output>(context: InvocationContext): Promise<APIGatewayProxyStructuredResultV2>;
+export declare function invokeHttpHandler<Output>(context: InvocationContext, handlerContext?: Context): Promise<APIGatewayProxyStructuredResultV2>;
 export {};

package/lib/http/invokeHttpHandler.js

@@ -120,40 +120,40 @@ function createApiGatewayEvent(context) {
     return event;
 }
 exports.createApiGatewayEvent = createApiGatewayEvent;
+const defaultHandlerContext = {
+    callbackWaitsForEmptyEventLoop: false,
+    functionName: 'httpLambda',
+    functionVersion: '0.1',
+    invokedFunctionArn: 'arn::test',
+    memoryLimitInMB: '128',
+    awsRequestId: '1234',
+    logGroupName: 'test-group',
+    logStreamName: 'test-stream',
+    getRemainingTimeInMillis: function () {
+        return 1000;
+    },
+    done: function (error, result) {
+        throw new Error('Function not implemented.');
+    },
+    fail: function (error) {
+        throw new Error('Function not implemented.');
+    },
+    succeed: function (messageOrObject) {
+        throw new Error('Function not implemented.');
+    },
+};
 /**
  * Invokes a lambda by constructing it from the specified container
  * @param context
  * @returns
  */
-function invokeHttpHandler(context) {
+function invokeHttpHandler(context, handlerContext) {
     return __awaiter(this, void 0, void 0, function* () {
         const { container } = context;
         const factory = container.get(HttpLambdaServices_1.HttpLambdaServices.HttpLambdaFactory);
         const configuredHandler = factory.createHandler(context.configuredRoute.constructor);
         const event = createApiGatewayEvent(context);
-        const handlerContext = {
-            callbackWaitsForEmptyEventLoop: false,
-            functionName: 'httpLambda',
-            functionVersion: '0.1',
-            invokedFunctionArn: 'arn::test',
-            memoryLimitInMB: '128',
-            awsRequestId: '1234',
-            logGroupName: 'test-group',
-            logStreamName: 'test-stream',
-            getRemainingTimeInMillis: function () {
-                return 1000;
-            },
-            done: function (error, result) {
-                throw new Error('Function not implemented.');
-            },
-            fail: function (error) {
-                throw new Error('Function not implemented.');
-            },
-            succeed: function (messageOrObject) {
-                throw new Error('Function not implemented.');
-            },
-        };
-        const response = yield configuredHandler(event, handlerContext);
+        const response = yield configuredHandler(event, handlerContext !== null && handlerContext !== void 0 ? handlerContext : defaultHandlerContext);
         return response;
     });
 }

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export * from './Decorators';
 export * from './IHandler';
 export * from './ITrigintaRuntime';
 export * from './ITrigintaRuntimeFactory';
+export * from './http';
 export * from './http/IConfiguredRoute';
 export * from './http/IHttpEndpoint';
 export * from './http/HttpLambda';
@@ -42,5 +43,5 @@ export declare const TestUtils: {
     parseRouteParams(route: string, path: string): import("aws-lambda").APIGatewayProxyEventPathParameters;
     parsePathParameters(context: httpUtils.EventGenerationContext): Partial<import("aws-lambda").APIGatewayProxyEventV2>;
     createApiGatewayEvent(context: httpUtils.EventGenerationContext): Partial<import("aws-lambda").APIGatewayProxyEventV2>;
-    invokeHttpHandler<Output>(context: httpUtils.InvocationContext): Promise<import("aws-lambda").APIGatewayProxyStructuredResultV2>;
+    invokeHttpHandler<Output>(context: httpUtils.InvocationContext, handlerContext?: import("aws-lambda").Context | undefined): Promise<import("aws-lambda").APIGatewayProxyStructuredResultV2>;
 };

package/lib/index.js

@@ -38,6 +38,7 @@ __exportStar(require("./Decorators"), exports);
 __exportStar(require("./IHandler"), exports);
 __exportStar(require("./ITrigintaRuntime"), exports);
 __exportStar(require("./ITrigintaRuntimeFactory"), exports);
+__exportStar(require("./http"), exports);
 __exportStar(require("./http/IConfiguredRoute"), exports);
 __exportStar(require("./http/IHttpEndpoint"), exports);
 __exportStar(require("./http/HttpLambda"), exports);

package/lib/s3/S3Lambda.js

@@ -22,8 +22,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBootstrappedS3LambdaContext = exports.S3LambdaFactory = exports.useTrigintaS3 = void 0;
-/* eslint-disable @typescript-eslint/ban-types */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const containr_1 = require("@aesop-fables/containr");
 const Decorators_1 = require("../Decorators");

package/lib/sqs/IQueue.d.ts

@@ -1,4 +1,4 @@
-import { CreateQueueRequest } from 'aws-sdk/clients/sqs';
+import { CreateQueueRequest } from '@aws-sdk/client-sqs';
 import { SettingsExpression } from '../resolveEnvironmentSettings';
 export interface IQueue extends CreateQueueRequest {
     toEnvExpression(): SettingsExpression<string>;

package/lib/sqs/MessagePublisher.d.ts

@@ -1,9 +1,10 @@
-import { MessageBodyAttributeMap, SendMessageRequest, SendMessageResult } from 'aws-sdk/clients/sqs';
 import { ISqsPublisher } from './SqsPublisher';
 import { SQSMessageAttributes } from 'aws-lambda';
 import { ISqsMessage } from './ISqsMessage';
 import { LoggingLevel } from '../logging';
+import { MessageAttributeValue, SendMessageRequest, SendMessageResult } from '@aws-sdk/client-sqs';
 declare type ConfigureSqsDelegate = (params: SendMessageRequest) => Promise<void>;
+declare type MessageBodyAttributeMap = Record<string, MessageAttributeValue>;
 export interface IMessagePublisher {
     publish(event: ISqsMessage, defaultAttributes?: SQSMessageAttributes, configure?: ConfigureSqsDelegate): Promise<SendMessageResult>;
 }

package/lib/sqs/MessagePublisher.js

@@ -27,7 +27,6 @@ const SqsLambdaServices_1 = require("./SqsLambdaServices");
 const logging_1 = require("../logging");
 const TrigintaHeaders_1 = require("../TrigintaHeaders");
 let MessagePublisher = class MessagePublisher {
-    // eslint-disable-next-line prettier/prettier
     constructor(sqsPublisher, levels) {
         this.sqsPublisher = sqsPublisher;
         this.levels = levels;

package/lib/sqs/RecordMatchers.js

@@ -34,6 +34,7 @@ const jsonSafeParse = (text) => {
         return text;
     try {
         return JSON.parse(text);
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars, no-empty
     }
     catch (e) { }
     return text;
@@ -83,9 +84,7 @@ SqsMessageDeserializer = __decorate([
 ], SqsMessageDeserializer);
 exports.SqsMessageDeserializer = SqsMessageDeserializer;
 // Test coverage in SqsLambda.test.ts
-function createMatcher(
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-configuration) {
+function createMatcher(configuration) {
     const { attributes: attributeMap, constructUsing, type } = configuration;
     const defaultMatcher = new DefaultSqsRecordMatcher();
     return {

package/lib/sqs/SqsLambda.js

@@ -22,8 +22,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBootstrappedSqsLambdaContext = exports.useTrigintaSqs = exports.SqsLambdaFactory = void 0;
-/* eslint-disable @typescript-eslint/ban-types */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const containr_1 = require("@aesop-fables/containr");
 const Decorators_1 = require("../Decorators");
@@ -61,6 +59,7 @@ let SqsLambdaFactory = class SqsLambdaFactory {
             };
             for (let i = 0; i < event.Records.length; i++) {
                 const record = event.Records[i];
+                // eslint-disable-next-line no-useless-catch
                 try {
                     const { container } = (0, TrigintaMiddleware_1.resolveTrigintaRuntime)(context);
                     if (!container) {

package/lib/sqs/SqsPublisher.d.ts

@@ -1,6 +1,6 @@
-import { SendMessageRequest, SendMessageResult } from 'aws-sdk/clients/sqs';
 import { SqsSettings } from './SqsSettings';
 import { ILogger } from '../logging/ILogger';
+import { SendMessageRequest, SendMessageResult } from '@aws-sdk/client-sqs';
 export interface ISqsPublisher {
     sendMessage(message: SendMessageRequest): Promise<SendMessageResult>;
 }

package/lib/sqs/SqsPublisher.js

@@ -20,26 +20,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqsPublisher = void 0;
 const containr_1 = require("@aesop-fables/containr");
-const aws_sdk_1 = __importDefault(require("aws-sdk"));
 const SqsLambdaServices_1 = require("./SqsLambdaServices");
 const logging_1 = require("../logging");
+const client_sqs_1 = require("@aws-sdk/client-sqs");
 let SqsPublisher = class SqsPublisher {
     constructor(settings, logger) {
         this.settings = settings;
         this.logger = logger;
         this.logger.debug(JSON.stringify(this.settings, null, 2));
-        this.sqs = new aws_sdk_1.default.SQS(this.settings);
+        this.sqs = new client_sqs_1.SQS(this.settings);
     }
     sendMessage(message) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.debug(JSON.stringify(message, null, 2));
-            const response = this.sqs.sendMessage(message).promise();
+            const response = this.sqs.sendMessage(message);
             if (!response) {
                 throw new Error(`${response}`);
             }

package/lib/sqs/SqsSettings.d.ts

@@ -1,2 +1,2 @@
-import AWS from 'aws-sdk';
-export declare type SqsSettings = AWS.SQS.ClientConfiguration;
+import { SQSClientConfig } from '@aws-sdk/client-sqs';
+export declare type SqsSettings = SQSClientConfig;

package/lib/validation/RuleParser.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRules = void 0;
 const ArrayContinuationRule_1 = require("./ArrayContinuationRule");
 const RequiredRule_1 = require("./RequiredRule");
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function parseRules(schema) {
     const rules = [];
     Object.keys(schema).forEach((field) => {

package/lib/validation/ValidationError.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValidationError = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
 class ValidationError extends Error {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     constructor(message, errors) {
         super(message);
         this.errors = errors;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aesop-fables/triginta",
-  "version": "0.9.3",
+  "version": "0.10.5",
   "description": "A lightweight framework that wraps the basic infrastructure usages of AWS Lambda (SQS, Kinesis, etc.).",
   "type": "commonjs",
   "exports": {
@@ -12,20 +12,23 @@
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
-    "build": "yarn run lint && rimraf ./lib && tsc --p ./tsconfig.build.json",
+    "build": "yarn run lint && rm -rf ./lib && tsc --p ./tsconfig.build.json",
     "format": "prettier --write \"src/**/*.(js|ts)\"",
-    "lint": "eslint src --ext .js,.ts",
-    "lint:fix": "eslint src --fix --ext .js,.ts",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix",
     "test": "jest --config jest.config.js --runInBand",
+    "test:ci": "jest --config jest.config.js --ci",
     "test:watch": "jest --config jest.config.js --watch",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
-    "version": "npm run format && git add -A src",
+    "version": "0.10.5",
     "postversion": "git push && git push --tags"
   },
   "devDependencies": {
-    "@aesop-fables/containr": "^0.3.4",
+    "@aesop-fables/containr": "^0.6.1",
     "@aesop-fables/containr-testing": "^0.3.0",
+    "@aws-sdk/client-sqs": "^3.987.0",
+    "@eslint/js": "^9.17.0",
     "@middy/core": "^4.5.1",
     "@middy/http-error-handler": "^4.5.1",
     "@middy/http-json-body-parser": "^4.5.1",
@@ -33,30 +36,31 @@
     "@types/aws-lambda": "^8.10.109",
     "@types/jest": "^29.5.0",
     "@types/node": "^18.16.17",
-    "@typescript-eslint/eslint-plugin": "^5.59.11",
-    "@typescript-eslint/parser": "5.59.11",
-    "aws-sdk": "^2.1386.0",
-    "esbuild": "^0.18.16",
-    "eslint": "8.42.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-jest": "27.2.3",
-    "eslint-plugin-prettier": "^4.2.1",
-    "jest": "29.6.1",
+    "@typescript-eslint/eslint-plugin": "^8.55.0",
+    "@typescript-eslint/parser": "^8.55.0",
+    "esbuild": "^0.27.3",
+    "eslint": "^9.0.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-jest": "^29.13.0",
+    "eslint-plugin-prettier": "^5.5.5",
+    "jest": "^29.0.0",
+    "jest-junit": "^16.0.0",
     "jest-mock-extended": "^3.0.1",
-    "prettier": "^2.8.1",
+    "prettier": "^3.0.0",
     "reflect-metadata": "^0.1.13",
-    "ts-jest": "29.1.0",
-    "typescript": "4.9.5"
+    "ts-jest": "^29.4.6",
+    "typescript": "4.9.5",
+    "typescript-eslint": "^8.55.0"
   },
   "files": [
     "lib/**/*"
   ],
   "peerDependencies": {
-    "@aesop-fables/containr": "0.3.x",
+    "@aesop-fables/containr": "0.5.x",
+    "@aws-sdk/client-sqs": "3.x",
     "@middy/core": "4.x",
     "@middy/http-error-handler": "4.x",
     "@middy/http-json-body-parser": "4.x",
-    "aws-sdk": "2.x",
     "reflect-metadata": "0.1.x"
   },
   "repository": {
@@ -65,5 +69,14 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "jest-junit": {
+    "outputDirectory": "reports",
+    "outputName": "jest-junit.xml",
+    "ancestorSeparator": " › ",
+    "uniqueOutputName": "false",
+    "suiteNameTemplate": "{filepath}",
+    "classNameTemplate": "{classname}",
+    "titleTemplate": "{title}"
   }
 }