@spytecgps/lambda-utils 0.9.8 → 0.9.10

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import { APIGatewayProxyWithLambdaAuthorizerEvent, SQSEvent, SQSRecord } from 'aws-lambda';
+import { APIGatewayProxyEvent, APIGatewayProxyWithLambdaAuthorizerEvent, SQSEvent, SQSRecord } from 'aws-lambda';
 import { ObjectSchema } from 'joi';
 import { APIGatewayProxyEventBase } from 'aws-lambda/trigger/api-gateway-proxy';
 import * as Joi from 'joi';
@@ -16,7 +16,7 @@ export interface SpytecAuthContext {
 }
 export declare type BaseAPIGatewayEvent = Omit<APIGatewayProxyEventBase<SpytecAuthContext>, 'pathParameters' | 'queryStringParameters' | 'body'>;
 export interface WrapperArgs<E, R> {
-    event: APIGatewayProxyWithLambdaAuthorizerEvent<SpytecAuthContext>;
+    event: APIGatewayProxyWithLambdaAuthorizerEvent<SpytecAuthContext> | APIGatewayProxyEvent;
     schema?: ObjectSchema<E>;
     handler: Handler<E, R>;
 }

package/dist/validation/custom.d.ts

@@ -1,5 +1,15 @@
 import * as Joi from 'joi';
+import { ArraySchema, ObjectSchema, SchemaMap, StringSchema } from 'joi';
 export declare const json: any;
 export declare const urlEncoded: any;
 export declare const imeiSchema: Joi.StringSchema;
 export declare const iccidSchema: Joi.StringSchema;
+interface SpytecJoi extends Joi.Root {
+    urlEncodedObject<TSchema = any, T = TSchema>(schema?: SchemaMap<T>): ObjectSchema<TSchema>;
+    jsonObject<TSchema = any, T = TSchema>(schema?: SchemaMap<T>): ObjectSchema<TSchema>;
+    imei(): StringSchema;
+    iccid(): StringSchema;
+    delimitedArray(): ArraySchema;
+}
+export declare const SpytecJoi: SpytecJoi;
+export {};

package/dist/validation/custom.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.iccidSchema = exports.imeiSchema = exports.urlEncoded = exports.json = void 0;
+exports.SpytecJoi = exports.iccidSchema = exports.imeiSchema = exports.urlEncoded = exports.json = void 0;
 var Joi = require("joi");
 var qs = require("qs");
 exports.json = Joi.extend(function (joi) {
@@ -41,3 +41,48 @@ exports.imeiSchema = Joi.string()
 exports.iccidSchema = Joi.string()
     .regex(/^[0-9A-Za-z]{18,22}$/)
     .error(new Error('Invalid ICCID'));
+exports.SpytecJoi = Joi.extend(function (joi) { return ({
+    type: 'imei',
+    base: joi
+        .string()
+        .regex(/^\d{15,16}$/)
+        .error(new Error('Invalid IMEI')),
+}); }, function (joi) { return ({
+    type: 'iccid',
+    base: joi
+        .string()
+        .regex(/^[0-9A-Za-z]{18,22}$/)
+        .error(new Error('Invalid ICCID')),
+}); }, function (joi) { return ({
+    type: 'urlEncodedObject',
+    base: joi.object(),
+    coerce: function (value) {
+        return { value: qs.parse(value) };
+    },
+}); }, function (joi) { return ({
+    type: 'jsonObject',
+    base: joi.object(),
+    messages: {
+        'json.valid': 'must be valid JSON',
+    },
+    coerce: function (value) {
+        try {
+            return { value: JSON.parse(value) };
+        }
+        catch (err) {
+            return null;
+        }
+    },
+    validate: function (value, helpers) {
+        if (!value) {
+            return { value: value, errors: helpers.error('json.valid') };
+        }
+        return { value: value };
+    },
+}); }, function (joi) { return ({
+    type: 'delimitedArray',
+    base: joi.array().default([]),
+    coerce: function (value) { return ({
+        value: value.split ? value.split(',') : value,
+    }); },
+}); });

package/dist/wrappers/apiGatewayEventWrapper.js

@@ -38,6 +38,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var validation_1 = require("../validation");
 var response_1 = require("./response");
+var logEvent = function (e) { return ({
+    resource: e.resource,
+    httpMethod: e.httpMethod,
+    queryStringParameters: e.queryStringParameters,
+    pathParameters: e.pathParameters,
+    body: e.body,
+}); };
 var apiGatewayEventWrapper = function (_a) {
     var event = _a.event, schema = _a.schema, handler = _a.handler;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -45,7 +52,7 @@ var apiGatewayEventWrapper = function (_a) {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    console.log("apiGatewayWrapper - got event", event);
+                    console.log("apiGatewayWrapper - got event", logEvent(event));
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 3, , 4]);
@@ -53,7 +60,7 @@ var apiGatewayEventWrapper = function (_a) {
                     return [4 /*yield*/, handler(validatedEvent)];
                 case 2:
                     result = _b.sent();
-                    console.log("apiGwWrapper - finished", result);
+                    console.log("apiGatewayWrapper - finished", result);
                     return [2 /*return*/, response_1.buildProxyResult(result)];
                 case 3:
                     err_1 = _b.sent();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spytecgps/lambda-utils",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "description": "Lambda Utils",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",