cat-a-logs 1.1.5 → 1.1.7

package/client/index.js

@@ -41,8 +41,7 @@ exports.catalog = catalog;
 var logger_1 = require("@aws-lambda-powertools/logger");
 var ajv_1 = require("ajv");
 //cache entries are structured thusly: 'Namespace + Dimensions(Alphabetically)': EMFObject
-var cache = {};
-exports.cache = cache;
+exports.cache = {};
 //catalog(kilos, "kilos" , "lambda-function-metrics", "Kilograms", {'functionVersion': $LATEST, 'testDimension': derp});
 function catalog(trackedVariable_1, metricName_1, metricNamespace_1) {
     return __awaiter(this, arguments, void 0, function (trackedVariable, metricName, metricNamespace, metricUnitLabel, CustomerDefinedDimension, resolution, deploy) {
@@ -54,7 +53,7 @@ function catalog(trackedVariable_1, metricName_1, metricNamespace_1) {
         if (deploy === void 0) { deploy = false; }
         return __generator(this, function (_b) {
             //Check for any errors & validate inputs based on documentations
-            if (!cache)
+            if (!exports.cache)
                 throw new Error('cache is not found, please import cache from cat-a-log');
             if (Object.keys(CustomerDefinedDimension).concat([metricName.toLowerCase()]).filter(function (el) { return el === "level" || "message" || "sampling_rate" || "service" || "timestamp" || "xray_trace_id"; }).length > 0)
                 throw new Error("metricName, or Dimension names cannot be the same as these native logger keys: level || message || sampling_rate || service || timestamp || xray_trace_id");
@@ -66,7 +65,7 @@ function catalog(trackedVariable_1, metricName_1, metricNamespace_1) {
                 throw new Error('EMF has a limit of 30 user defined dimension keys per log');
             }
             logger = new logger_1.Logger({ serviceName: 'serverlessAirline' });
-            ajv = new ajv_1.default();
+            ajv = new ajv_1.Ajv();
             emfSchema = {
                 type: 'object',
                 title: 'Root Node',
@@ -173,10 +172,10 @@ function catalog(trackedVariable_1, metricName_1, metricNamespace_1) {
                 sortedDimensions[Object.keys(CustomerDefinedDimension).sort()[i]] =
                     CustomerDefinedDimension[Object.keys(CustomerDefinedDimension).sort()[i]];
             }
-            check = cache["".concat(metricNamespace).concat(sortedDimensions)];
+            check = exports.cache["".concat(metricNamespace).concat(sortedDimensions)];
             if (check != undefined) {
                 //push the metrics object to Metrics array
-                cache["".concat(metricNamespace).concat(sortedDimensions)]['_aws']['CloudWatchMetrics'][0]['Metrics'].push({
+                exports.cache["".concat(metricNamespace).concat(sortedDimensions)]['_aws']['CloudWatchMetrics'][0]['Metrics'].push({
                     Name: metricName,
                     Unit: metricUnitLabel,
                     StorageResolution: resolution,
@@ -218,23 +217,24 @@ function catalog(trackedVariable_1, metricName_1, metricNamespace_1) {
                     throw new Error("Supplied/Proposed structured log does not comply with EMF schema");
                 }
                 // If it passes then add to cache object
-                cache["".concat(metricNamespace).concat(sortedDimensions)] = newEmfLog;
+                exports.cache["".concat(metricNamespace).concat(sortedDimensions)] = newEmfLog;
             }
             if (deploy) {
                 //after last catalog function is invoked, send all cached logs with logger at once
-                for (i = 0; i < Object.keys(cache).length; i++) {
-                    logger.info("Your EMF compliant Structured Metrics Log ".concat(i + 1), cache[Object.keys(cache)[i]]);
+                for (i = 0; i < Object.keys(exports.cache).length; i++) {
+                    logger.info("Your EMF compliant Structured Metrics Log ".concat(i + 1), exports.cache[Object.keys(exports.cache)[i]]);
                 }
                 //clear cache
-                console.log("BEFORE:", cache);
-                for (member in cache)
-                    delete cache[member];
-                console.log("AFTER:", cache);
+                console.log("BEFORE:", exports.cache);
+                for (member in exports.cache)
+                    delete exports.cache[member];
+                console.log("AFTER:", exports.cache);
             }
             return [2 /*return*/];
         });
     });
 }
+// export { cache, catalog };
 /*Current Working logger invocation
 logger.info("Your EMF compliant Structured Metrics Log",
   Object.assign({

package/client/index.ts

@@ -1,13 +1,12 @@
 import { Logger } from '@aws-lambda-powertools/logger';
-import { LogItemExtraInput } from '@aws-lambda-powertools/logger/lib/cjs/types/Logger';
-import Ajv from 'ajv';
+import { Ajv } from 'ajv';
 
 
 
 //cache entries are structured thusly: 'Namespace + Dimensions(Alphabetically)': EMFObject
-const cache: { [key: string]: any } = {};
+export const cache: { [key: string]: any } = {};
 //catalog(kilos, "kilos" , "lambda-function-metrics", "Kilograms", {'functionVersion': $LATEST, 'testDimension': derp});
-async function catalog(
+export async function catalog(
   trackedVariable: number | Array<number>,
   metricName: string,
   metricNamespace: string,
@@ -219,11 +218,7 @@ const validateEmf = ajv.compile(emfSchema);
     console.log("AFTER:", cache);
   }
 }
-
-export {
-  cache,
-  catalog,
-};
+// export { cache, catalog };
 
 /*Current Working logger invocation
 logger.info("Your EMF compliant Structured Metrics Log",

package/lambda-nodejs22.x/hello-world/app.mjs

@@ -14,8 +14,7 @@
 import { Logger } from '@aws-lambda-powertools/logger';
 const logger = new Logger({ serviceName: 'serverlessAirline' });
 import Ajv from 'ajv';
-// import {cache} from "cat-a-logs/index";
-import {cache, catalog} from "cat-a-logs/index.js";
+import catalog from "cat-a-logs/index.js";
 
 export const lambdaHandler = async (event, context) => {
   const response = {

package/lambda-nodejs22.x/hello-world/package.json

@@ -12,7 +12,7 @@
     "@aws-lambda-powertools/metrics": "^2.11.0",
     "lambda-log": "^3.1.0",
     "ajv": "^8.17.1",
-    "cat-a-logs": "^1.1.4"
+    "cat-a-logs": "^1.1.6"
   },
   "scripts": {
     "test": "mocha tests/unit/"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cat-a-logs",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Create & send structured logs to AWS Cloudwatch logs",
   "main": "index.js",
   "exports":{

package/tsconfig.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ES2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
@@ -25,9 +25,9 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
+    "module": "NodeNext",                                /* Specify what module code is generated. */
     "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
+    "moduleResolution": "NodeNext",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
@@ -51,14 +51,14 @@
     // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
 
     /* Emit */
-    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+    "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
     // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
     // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
     "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. -BMA: enabled for jest support */
     "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+     "outDir": "./dist",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */