@digitraffic/common 2023.10.18-1 → 2023.11.21-1

package/dist/aws/infra/stack/monitoredfunction.js

@@ -1,12 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MonitoredDBFunction = exports.MonitoredFunction = void 0;
 const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
 const aws_cloudwatch_actions_1 = require("aws-cdk-lib/aws-cloudwatch-actions");
 const aws_cloudwatch_1 = require("aws-cdk-lib/aws-cloudwatch");
 const lambda_configs_1 = require("../stack/lambda-configs");
-const change_case_1 = require("change-case");
 const subscription_1 = require("../stack/subscription");
+const lodash_1 = __importDefault(require("lodash"));
 /**
  * Creates a Lambda function that monitors default CloudWatch Lambda metrics with CloudWatch Alarms.
  */
@@ -40,7 +43,11 @@ class MonitoredFunction extends aws_lambda_1.Function {
      */
     static createV2(stack, name, environment, functionParameters) {
         const functionName = functionParameters?.functionName ??
-            `${stack.configuration.shortName}-${(0, change_case_1.pascalCase)(name)}`;
+            `${stack.configuration.shortName}-${lodash_1.default.chain(name)
+                .camelCase()
+                .startCase()
+                .replace(/\s/g, "")
+                .value()}`;
         const functionProps = (0, lambda_configs_1.databaseFunctionProps)(stack, environment, functionName, name, functionParameters);
         return MonitoredFunction.create(stack, functionName, functionProps, functionParameters);
     }
@@ -130,7 +137,11 @@ class MonitoredDBFunction {
      */
     static create(stack, name, environment, functionParameters) {
         const functionName = functionParameters?.functionName ??
-            `${stack.configuration.shortName}-${(0, change_case_1.pascalCase)(name)}`;
+            `${stack.configuration.shortName}-${lodash_1.default.chain(name)
+                .camelCase()
+                .startCase()
+                .replace(/\s/g, "")
+                .value()}`;
         const env = environment ? environment : stack.createLambdaEnvironment();
         const functionProps = (0, lambda_configs_1.databaseFunctionProps)(stack, env, functionName, name, functionParameters);
         const mf = MonitoredFunction.create(stack, functionName, functionProps, functionParameters);

package/dist/aws/infra/stack/rest_apis.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createIpRestrictionPolicyDocument = exports.createDefaultPolicyDocument = exports.createRestApi = exports.setReturnCodeForMissingAuthenticationToken = exports.add401Support = exports.add404Support = exports.DigitrafficRestApi = void 0;
 const aws_apigateway_1 = require("aws-cdk-lib/aws-apigateway");
@@ -6,7 +9,7 @@ const aws_iam_1 = require("aws-cdk-lib/aws-iam");
 const api_model_1 = require("../../../utils/api-model");
 const mediatypes_1 = require("../../types/mediatypes");
 const usage_plans_1 = require("../usage-plans");
-const R = require("ramda");
+const lodash_1 = __importDefault(require("lodash"));
 class DigitrafficRestApi extends aws_apigateway_1.RestApi {
     constructor(stack, apiId, apiName, allowFromIpAddresses, config) {
         const policyDocument = allowFromIpAddresses == null
@@ -58,7 +61,7 @@ class DigitrafficRestApi extends aws_apigateway_1.RestApi {
         }));
     }
     getModelWithReference(model) {
-        return R.assoc("modelReference", (0, api_model_1.getModelReference)(model.modelId, this.restApiId), model);
+        return lodash_1.default.set(model, "modelReference", (0, api_model_1.getModelReference)(model.modelId, this.restApiId));
     }
     addDocumentationPart(resource, parameterName, resourceName, type, properties) {
         const location = {

package/dist/aws/infra/stack/stack-checking-aspect.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StackCheckingAspect = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
@@ -6,9 +9,10 @@ const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
 const aws_s3_1 = require("aws-cdk-lib/aws-s3");
 const stack_1 = require("./stack");
 const aws_apigateway_1 = require("aws-cdk-lib/aws-apigateway");
-const change_case_1 = require("change-case");
 const aws_sqs_1 = require("aws-cdk-lib/aws-sqs");
 const aws_logs_1 = require("aws-cdk-lib/aws-logs");
+const change_case_1 = require("change-case");
+const lodash_1 = __importDefault(require("lodash"));
 const MAX_CONCURRENCY_LIMIT = 100;
 const NODE_RUNTIMES = [aws_lambda_1.Runtime.NODEJS_16_X.name, aws_lambda_1.Runtime.NODEJS_18_X.name];
 var ResourceType;
@@ -130,7 +134,7 @@ class StackCheckingAspect {
         return (0, change_case_1.paramCase)(path) === path;
     }
     static isValidQueryString(name) {
-        return (0, change_case_1.snakeCase)(name) === name;
+        return lodash_1.default.snakeCase(name) === name;
     }
     checkResourceCasing(node) {
         if (node instanceof aws_apigateway_1.CfnResource) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2023.10.18-1",
+  "version": "2023.11.21-1",
   "description": "",
   "repository": {
     "type": "git",
@@ -17,11 +17,11 @@
     "src/**/*.ts"
   ],
   "peerDependencies": {
-    "@types/geojson": "^7946.0.11",
-    "aws-cdk-lib": "^2.101.1",
-    "aws-sdk": "^2.1474.0",
+    "@types/geojson": "^7946.0.12",
+    "aws-cdk-lib": "^2.103.0",
+    "aws-sdk": "^2.1481.0",
     "axios": "^1.5.1",
-    "change-case": "^4.1.2",
+    "change-case": "4.1.2",
     "constructs": "^10.3.0",
     "date-fns-tz": "~2.0.0",
     "date-fns": "~2.30.0",
@@ -29,44 +29,42 @@
     "geojson-validation": "^1.0.2",
     "node-ttl": "^0.2.0",
     "pg-native": "^3.0.1",
-    "pg-promise": "^11.5.0"
+    "pg-promise": "^11.5.4"
   },
   "devDependencies": {
-    "@types/aws-lambda": "~8.10.119",
-    "@types/geojson": "^7946.0.11",
-    "@types/etag": "^1.8.1",
-    "@types/jest": "^29.5.5",
-    "@types/lodash": "^4.14.199",
-    "@types/node": "20.8.4",
-    "@types/ramda": "~0.29.1",
-    "@types/sinon": "10.0.15",
-    "@typescript-eslint/eslint-plugin": "~6.7.5",
-    "@typescript-eslint/parser": "^6.0.0",
-    "aws-cdk-lib": "~2.101.1",
-    "aws-sdk": "~2.1474.0",
-    "axios": "^1.5.1",
-    "change-case": "^4.1.2",
+    "@types/aws-lambda": "8.10.125",
+    "@types/geojson": "7946.0.12",
+    "@types/etag": "1.8.2",
+    "@types/jest": "29.5.6",
+    "@types/lodash": "4.14.200",
+    "@types/node": "20.8.9",
+    "@types/sinon": "10.0.20",
+    "@typescript-eslint/eslint-plugin": "~6.9.0",
+    "@typescript-eslint/parser": "^6.9.0",
+    "aws-cdk-lib": "~2.103.1",
+    "aws-sdk": "~2.1482.0",
+    "axios": "^1.6.0",
+    "change-case": "4.1.2",
     "constructs": "10.3.0",
     "date-fns-tz": "~2.0.0",
     "date-fns": "~2.30.0",
-    "eslint": "~8.51.0",
-    "eslint-config-prettier": "^8.8.0",
+    "eslint": "~8.52.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-deprecation": "~2.0.0",
     "etag": "^1.8.1",
     "geojson-validation": "^1.0.2",
     "husky": "^8.0.3",
-    "jest": "^29.5.0",
+    "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
-    "lint-staged": "^13.2.2",
-    "lodash": "^4.17.21",
+    "lint-staged": "^15.0.2",
+    "lodash": "~4.17.21",
     "node-ttl": "^0.2.0",
     "pg-native": "^3.0.1",
-    "pg-promise": "^11.5.0",
+    "pg-promise": "^11.5.4",
     "prettier": "^2.8.8",
-    "ramda": "~0.29.0",
-    "rimraf": "^5.0.1",
-    "sinon": "15.2.0",
-    "ts-jest": "^29.1.0",
+    "rimraf": "^5.0.5",
+    "sinon": "17.0.0",
+    "ts-jest": "^29.1.1",
     "typescript": "~4.9.5",
     "velocityjs": "2.0.6"
   },

package/src/aws/infra/stack/monitoredfunction.ts

@@ -9,10 +9,11 @@ import {
     LambdaEnvironment,
     MonitoredFunctionParameters,
 } from "../stack/lambda-configs";
-import { pascalCase } from "change-case";
 import { DigitrafficLogSubscriptions } from "../stack/subscription";
 import { TrafficType } from "../../../types/traffictype";
 
+import _ from "lodash";
+
 /**
  * Allows customization of CloudWatch Alarm properties
  */
@@ -117,7 +118,11 @@ export class MonitoredFunction extends Function {
     ): MonitoredFunction {
         const functionName =
             functionParameters?.functionName ??
-            `${stack.configuration.shortName}-${pascalCase(name)}`;
+            `${stack.configuration.shortName}-${_.chain(name)
+                .camelCase()
+                .startCase()
+                .replace(/\s/g, "")
+                .value()}`;
         const functionProps = databaseFunctionProps(
             stack,
             environment,
@@ -315,7 +320,11 @@ export class MonitoredDBFunction {
     ): MonitoredFunction {
         const functionName =
             functionParameters?.functionName ??
-            `${stack.configuration.shortName}-${pascalCase(name)}`;
+            `${stack.configuration.shortName}-${_.chain(name)
+                .camelCase()
+                .startCase()
+                .replace(/\s/g, "")
+                .value()}`;
         const env = environment ? environment : stack.createLambdaEnvironment();
         const functionProps = databaseFunctionProps(
             stack,

package/src/aws/infra/stack/rest_apis.ts

@@ -26,7 +26,7 @@ import { DocumentationPart, DocumentationProperties } from "../documentation";
 import { createDefaultUsagePlan, createUsagePlan } from "../usage-plans";
 import { DigitrafficStack } from "./stack";
 
-import R = require("ramda");
+import _ from "lodash";
 
 export class DigitrafficRestApi extends RestApi {
     readonly apiKeyIds: string[];
@@ -109,10 +109,10 @@ export class DigitrafficRestApi extends RestApi {
     }
 
     private getModelWithReference(model: Model): ModelWithReference {
-        return R.assoc(
+        return _.set(
+            model,
             "modelReference",
-            getModelReference(model.modelId, this.restApiId),
-            model
+            getModelReference(model.modelId, this.restApiId)
         ) as ModelWithReference;
     }
 

package/src/aws/infra/stack/stack-checking-aspect.ts

@@ -4,9 +4,10 @@ import { CfnBucket } from "aws-cdk-lib/aws-s3";
 import { DigitrafficStack, SOLUTION_KEY } from "./stack";
 import { IConstruct } from "constructs";
 import { CfnMethod, CfnResource } from "aws-cdk-lib/aws-apigateway";
-import { paramCase, snakeCase } from "change-case";
 import { CfnQueue } from "aws-cdk-lib/aws-sqs";
 import { LogRetention } from "aws-cdk-lib/aws-logs";
+import { paramCase } from "change-case";
+import _ from "lodash";
 import IntegrationProperty = CfnMethod.IntegrationProperty;
 
 const MAX_CONCURRENCY_LIMIT = 100;
@@ -214,7 +215,7 @@ export class StackCheckingAspect implements IAspect {
     }
 
     private static isValidQueryString(name: string) {
-        return snakeCase(name) === name;
+        return _.snakeCase(name) === name;
     }
 
     private checkResourceCasing(node: IConstruct) {