chore(maintenance): general refactoring

examples/app/functions/commons/powertools/index.ts

@@ -2,9 +2,6 @@
  * We have single entry point for all the powertools modules so that functions that need only one
  * can bundle only that one that they need and keep the bundle size small.
  */
-import { logger } from './logger.js';
-import { metrics } from './metrics.js';
-import { tracer } from './tracer.js';
-
-// We export all three modules for those functions who need to use all of them
-export { logger, metrics, tracer };
+export { logger } from './logger.js';
+export { metrics } from './metrics.js';
+export { tracer } from './tracer.js';

layers/src/layer-publisher-stack.ts

@@ -122,12 +122,12 @@ export class LayerPublisherStack extends Stack {
 
               if (buildFromLocal) {
                 for (const util of utilities) {
-                  // Build latest version of the package
-                  buildCommands.push(`npm run build -w packages/${util}`);
-                  // Pack the package to a .tgz file
-                  buildCommands.push(`npm pack -w packages/${util}`);
-                  // Move the .tgz file to the tmp folder
                   buildCommands.push(
+                    // Build latest version of the package
+                    `npm run build -w packages/${util}`,
+                    // Pack the package to a .tgz file
+                    `npm pack -w packages/${util}`,
+                    // Move the .tgz file to the tmp folder
                     `mv aws-lambda-powertools-${util}-*.tgz ${tmpBuildDir}`
                   );
                 }

layers/tests/e2e/layerPublisher.test.ts

@@ -107,7 +107,7 @@ describe('Layers E2E tests', () => {
     await testStack.deploy();
 
     // Invoke the lambda function once for each output format and collect the logs
-    for await (const outputFormat of cases) {
+    for (const outputFormat of cases) {
       invocationLogsMap.set(
         outputFormat,
         await invokeFunctionOnce({

packages/commons/src/unmarshallDynamoDB.ts

@@ -14,7 +14,7 @@ const typeHandlers: Record<string, (value: any) => unknown> = {
   B: (value) => value,
   BS: (value) => new Set(value),
   SS: (value) => new Set(value),
-  BOOL: (value) => Boolean(value),
+  BOOL: Boolean,
   N: (value) => convertNumber(value),
   NS: (value) => new Set((value as Array<string>).map(convertNumber)),
   L: (value) => (value as Array<AttributeValue>).map(convertAttributeValue),

packages/event-handler/src/appsync-events/RouteHandlerRegistry.ts

@@ -151,8 +151,11 @@ class RouteHandlerRegistry {
    * @param path - The path to be converted to a regex string
    */
   static pathToRegexString(path: string): string {
-    const escapedPath = path.replace(/([.*+?^=!:${}()|[\]/\\])/g, '\\$1');
-    return `^${escapedPath.replace(/\\\*/g, '.*')}$`;
+    const escapedPath = path.replace(
+      /([.*+?^=!:${}()|[\]/\\])/g,
+      String.raw`\$1`
+    );
+    return `^${escapedPath.replaceAll('\\*', '.*')}$`;
   }
 }
 

packages/event-handler/tests/helpers/factories.ts

@@ -1,28 +1,32 @@
-const onPublishEventFactory = (
-  events: Array<{ payload: unknown; id: string }> = [
-    {
-      payload: {
-        event_1: 'data_1',
-      },
-      id: '5f7dfbd1-b8ff-4c20-924e-23b42db467a0',
+const defaultChannel = {
+  path: '/request/channel',
+  segments: ['request', 'channel'],
+};
+
+const defaultEvents = [
+  {
+    payload: {
+      event_1: 'data_1',
     },
-    {
-      payload: {
-        event_2: 'data_2',
-      },
-      id: 'ababdf65-a3e6-4c1d-acd3-87466eab433c',
+    id: '5f7dfbd1-b8ff-4c20-924e-23b42db467a0',
+  },
+  {
+    payload: {
+      event_2: 'data_2',
     },
-    {
-      payload: {
-        event_3: 'data_3',
-      },
-      id: '8bb2983a-0967-45a0-8243-0aeb8c83d80e',
+    id: 'ababdf65-a3e6-4c1d-acd3-87466eab433c',
+  },
+  {
+    payload: {
+      event_3: 'data_3',
     },
-  ],
-  channel = {
-    path: '/request/channel',
-    segments: ['request', 'channel'],
-  }
+    id: '8bb2983a-0967-45a0-8243-0aeb8c83d80e',
+  },
+];
+
+const onPublishEventFactory = (
+  events: Array<{ payload: unknown; id: string }> = defaultEvents,
+  channel = defaultChannel
 ) => ({
   identity: null,
   result: null,
@@ -46,12 +50,7 @@ const onPublishEventFactory = (
   events,
 });
 
-const onSubscribeEventFactory = (
-  channel = {
-    path: '/request/channel',
-    segments: ['request', 'channel'],
-  }
-) => ({
+const onSubscribeEventFactory = (channel = defaultChannel) => ({
   identity: null,
   result: null,
   request: {

packages/idempotency/src/makeIdempotent.ts

@@ -126,7 +126,7 @@ function makeIdempotent<Func extends AnyFunction>(
   options: ItempotentFunctionOptions<Parameters<Func>>
 ): (...args: Parameters<Func>) => ReturnType<Func> {
   const { persistenceStore, config, keyPrefix } = options;
-  const idempotencyConfig = config ? config : new IdempotencyConfig({});
+  const idempotencyConfig = config ?? new IdempotencyConfig({});
 
   if (!idempotencyConfig.isEnabled()) return fn;
 
@@ -140,12 +140,10 @@ function makeIdempotent<Func extends AnyFunction>(
         args[1]?.lambdaContext || args[1]
       );
       functionPayloadToBeHashed = args[0];
+    } else if (isOptionsWithDataIndexArgument(options)) {
+      functionPayloadToBeHashed = args[options.dataIndexArgument];
     } else {
-      if (isOptionsWithDataIndexArgument(options)) {
-        functionPayloadToBeHashed = args[options.dataIndexArgument];
-      } else {
-        functionPayloadToBeHashed = args[0];
-      }
+      functionPayloadToBeHashed = args[0];
     }
 
     const isReplay = args[1]?.durableExecutionMode === 'ReplayMode';

packages/idempotency/src/middleware/makeHandlerIdempotent.ts

@@ -113,9 +113,7 @@ const makeHandlerIdempotent = (
    * @param request - The Middy request object
    */
   const before = (request: MiddyLikeRequest): unknown => {
-    const idempotencyConfig = options.config
-      ? options.config
-      : new IdempotencyConfig({});
+    const idempotencyConfig = options.config ?? new IdempotencyConfig({});
     const persistenceStore = options.persistenceStore;
     const keyPrefix = options.keyPrefix;
     persistenceStore.configure({

packages/idempotency/src/persistence/DynamoDBPersistenceLayer.ts

@@ -155,7 +155,7 @@ class DynamoDBPersistenceLayer extends BasePersistenceLayer {
 
     if (this.isPayloadValidationEnabled() && record.payloadHash !== undefined) {
       item[this.validationKeyAttr] = {
-        S: record.payloadHash as string,
+        S: record.payloadHash,
       };
     }
 

packages/idempotency/tests/e2e/makeIdempotent.test.FunctionCode.ts

@@ -1,3 +1,4 @@
+import { setTimeout } from 'node:timers/promises';
 import { Logger } from '@aws-lambda-powertools/logger';
 import type { Context } from 'aws-lambda';
 import { IdempotencyConfig } from '../../src/IdempotencyConfig.js';
@@ -31,7 +32,8 @@ const logger = new Logger();
  */
 const idempotencyConfig = new IdempotencyConfig({});
 const processIdempotently = makeIdempotent(
-  (record: Record<string, unknown>): string => {
+  async (record: Record<string, unknown>): Promise<string> => {
+    await setTimeout(0);
     logger.info('Got test event', { record });
 
     return `Processing done: ${record.foo}`;
@@ -62,7 +64,11 @@ const idempotencyConfigWithSelection = new IdempotencyConfig({
   payloadValidationJmesPath: 'foo',
 });
 const processIdempotentlyCustomized = makeIdempotent(
-  (baz: number, record: Record<string, unknown>): Record<string, unknown> => {
+  async (
+    baz: number,
+    record: Record<string, unknown>
+  ): Promise<Record<string, unknown>> => {
+    await setTimeout(0);
     logger.info('Got test event', { baz, record });
 
     return record;

packages/jmespath/src/Functions.ts

@@ -197,8 +197,8 @@ class Functions {
     if (isNumber(arg[0])) {
       return Math.max(...(arg as number[]));
     }
-    // local compare function to handle string comparison
-    return arg.reduce((a, b) => (a > b ? a : b));
+    // Math.max doesn't work with strings (returns NaN), so we use reduce for lexicographic comparison
+    return arg.reduce((a, b) => (a > b ? a : b)); // NOSONAR - Math.max only works with numbers
   }
 
   /**
@@ -279,7 +279,8 @@ class Functions {
     if (isNumber(arg[0])) {
       return Math.min(...arg);
     }
-    return arg.reduce((a, b) => (a < b ? a : b));
+    // Math.min doesn't work with strings (returns NaN), so we use reduce for lexicographic comparison
+    return arg.reduce((a, b) => (a < b ? a : b)); // NOSONAR - Math.min only works with numbers
   }
 
   /**

packages/logger/src/Logger.ts

@@ -253,9 +253,7 @@ class Logger extends Utility implements LoggerInterface {
   public constructor(options: ConstructorOptions = {}) {
     super();
     const { customConfigService, ...rest } = options;
-    this.customConfigService = customConfigService
-      ? customConfigService
-      : undefined;
+    this.customConfigService = customConfigService;
     // all logs are buffered until the logger is initialized
     this.setOptions(rest);
     this.#isInitialized = true;
@@ -1098,13 +1096,13 @@ class Logger extends Utility implements LoggerInterface {
    * or as the global node console if the `POWERTOOLS_DEV' env variable is set and has truthy value.
    */
   private setConsole(): void {
-    if (!isDevMode()) {
+    if (isDevMode()) {
+      this.console = console;
+    } else {
       this.console = new Console({
         stdout: process.stdout,
         stderr: process.stderr,
       });
-    } else {
-      this.console = console;
     }
 
     /**
@@ -1159,8 +1157,7 @@ class Logger extends Utility implements LoggerInterface {
       defaultValue: '',
     });
 
-    const logLevelValue =
-      logLevelVariable !== '' ? logLevelVariable : logLevelVariableAlias;
+    const logLevelValue = logLevelVariable || logLevelVariableAlias;
 
     if (this.isValidLogLevel(logLevelValue)) {
       this.logLevel = LogLevelThreshold[logLevelValue];

packages/logger/src/types/Logger.ts

@@ -11,6 +11,8 @@ import type {
   LogKeys,
 } from './logKeys.js';
 
+export type { Environment, LogAttributes } from './logKeys.js';
+
 /**
  * Type definition for the log level.
  *
@@ -276,9 +278,7 @@ type LoggerInterface = {
 export type {
   ConstructorOptions,
   CustomJsonReplacerFn,
-  Environment,
   InjectLambdaContextOptions,
-  LogAttributes,
   LogFunction,
   LoggerInterface,
   LogItemExtraInput,

packages/metrics/src/Metrics.ts

@@ -885,13 +885,13 @@ class Metrics extends Utility implements MetricsInterface {
    * @private
    */
   private setConsole(): void {
-    if (!this.#envConfig.devMode) {
+    if (this.#envConfig.devMode) {
+      this.console = console;
+    } else {
       this.console = new Console({
         stdout: process.stdout,
         stderr: process.stderr,
       });
-    } else {
-      this.console = console;
     }
   }
 
@@ -903,9 +903,7 @@ class Metrics extends Utility implements MetricsInterface {
   private setCustomConfigService(
     customConfigService?: ConfigServiceInterface
   ): void {
-    this.customConfigService = customConfigService
-      ? customConfigService
-      : undefined;
+    this.customConfigService = customConfigService;
   }
 
   /**
@@ -976,7 +974,7 @@ class Metrics extends Utility implements MetricsInterface {
    *
    * @param options - The options to be used
    */
-  private setOptions(options: MetricsOptions): Metrics {
+  private setOptions(options: MetricsOptions): this {
     const {
       customConfigService,
       namespace,

packages/testing/src/helpers.ts

@@ -62,7 +62,7 @@ const generateTestUniqueName = ({
   [
     testPrefix,
     getRuntimeKey().replace(/[nodejsx]/g, ''),
-    getArchitectureKey().replace(/_64/g, ''),
+    getArchitectureKey().replaceAll('_64', ''),
     randomUUID().toString().substring(0, 5),
     testName,
   ]

packages/tracer/src/Tracer.ts

@@ -851,9 +851,7 @@ class Tracer extends Utility implements TracerInterface {
   private setCustomConfigService(
     customConfigService?: ConfigServiceInterface
   ): void {
-    this.customConfigService = customConfigService
-      ? customConfigService
-      : undefined;
+    this.customConfigService = customConfigService;
   }
 
   /**

sonar-project.properties

@@ -0,0 +1,2 @@
+# Exclude generated proto files from Sonar analysis
+sonar.exclusions=packages/kafka/tests/protos/*.generated.js,packages/kafka/tests/protos/*.generated.d.ts