aws-powertools · dreamorosi · Oct 23, 2023 · Oct 21, 2023 · Oct 23, 2023 · Oct 23, 2023
diff --git a/.gitignore b/.gitignore
@@ -49,5 +49,4 @@ site
 tmp
 
 # TS build files
-tsconfig.tsbuildinfo
-tsconfig.esm.tsbuildinfo
+*.tsbuildinfo
diff --git a/layers/tests/e2e/layerPublisher.class.test.functionCode.ts b/layers/tests/e2e/layerPublisher.class.test.functionCode.ts
@@ -81,11 +81,22 @@ const getVersionFromModule = async (moduleName: string): Promise<string> => {
 
 export const handler = async (): Promise<void> => {
   // Check that the packages version matches the expected one
-  for (const moduleName of ['commons', 'logger', 'metrics', 'tracer']) {
+  for (const moduleName of [
+    'commons',
+    'logger',
+    'metrics',
+    'tracer',
+    'parameters',
+    'idempotency',
+    'batch',
+  ]) {
     const moduleVersion = await getVersionFromModule(moduleName);
-    if (moduleVersion != expectedVersion) {
+    // TODO: remove this check once v2 becomes GA
+    // if (moduleVersion != expectedVersion) {
+    if (!moduleVersion.startsWith(expectedVersion)) {
       throw new Error(
-        `Package version mismatch (${moduleName}): ${moduleVersion} != ${expectedVersion}`
+        // `Package version mismatch (${moduleName}): ${moduleVersion} != ${expectedVersion}`
+        `Package version mismatch (${moduleName}): ${moduleVersion} does not start with ${expectedVersion}`
       );
     }
   }

diff --git a/packages/batch/package.json b/packages/batch/package.json
@@ -17,13 +17,12 @@
     "test:e2e:nodejs18x": "echo 'Not Implemented'",
     "test:e2e": "echo 'Not Implemented'",
     "watch": "jest --watch",
-    "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json",
-    "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json",
+    "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json",
+    "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json",
     "build": "npm run build:esm & npm run build:cjs",
     "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .",
     "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .",
-    "prebuild": "rimraf ./lib",
-    "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ."
+    "prepack": "node ../../.github/scripts/release_patch_package_json.js ."
   },
   "lint-staged": {
     "*.{js,ts}": "npm run lint-fix"

diff --git a/packages/batch/tsconfig.esm.json b/packages/batch/tsconfig.esm.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "./lib/esm",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "tsBuildInfoFile": ".tsbuildinfo/esm.json"
   },
   "include": [
     "./src/**/*"

diff --git a/packages/batch/tsconfig.json b/packages/batch/tsconfig.json
@@ -3,6 +3,7 @@
     "compilerOptions": {
         "outDir": "./lib/cjs/",
         "rootDir": "./src",
+        "tsBuildInfoFile": ".tsbuildinfo/cjs.json"
     },
     "include": [
         "./src/**/*"

diff --git a/packages/commons/package.json b/packages/commons/package.json
@@ -16,12 +16,12 @@
     "test:e2e": "echo 'Not Applicable'",
     "watch": "jest --watch",
     "generateVersionFile": "echo \"// this file is auto generated, do not modify\nexport const PT_VERSION = '$(jq -r '.version' package.json)';\" > src/version.ts",
-    "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json",
-    "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json",
+    "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json",
+    "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json",
     "build": "npm run build:esm & npm run build:cjs",
     "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .",
     "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .",
-    "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ."
+    "prepack": "node ../../.github/scripts/release_patch_package_json.js ."
   },
   "lint-staged": {
     "*.{js,ts}": "npm run lint-fix"

diff --git a/packages/commons/src/types/LambdaInterface.ts b/packages/commons/src/types/LambdaInterface.ts
@@ -1,12 +1,12 @@
 import type { Handler } from 'aws-lambda';
 
-export type SyncHandler<T extends Handler> = (
+type SyncHandler<T extends Handler> = (
   event: Parameters<T>[0],
   context: Parameters<T>[1],
   callback: Parameters<T>[2]
 ) => void;
 
-export type AsyncHandler<T extends Handler> = (
+type AsyncHandler<T extends Handler> = (
   event: Parameters<T>[0],
   context: Parameters<T>[1]
 ) => Promise<NonNullable<Parameters<Parameters<T>[2]>[1]>>;
@@ -23,4 +23,9 @@ type HandlerMethodDecorator = (
     | TypedPropertyDescriptor<AsyncHandler<Handler>>
 ) => void;
 
-export { LambdaInterface, HandlerMethodDecorator };
+export type {
+  AsyncHandler,
+  SyncHandler,
+  LambdaInterface,
+  HandlerMethodDecorator,
+};
diff --git a/packages/commons/src/types/awsSdk.ts b/packages/commons/src/types/awsSdk.ts
@@ -19,4 +19,4 @@ interface SdkClient {
  */
 type MiddlewareArgsLike = { request: { headers: { [key: string]: string } } };
 
-export { SdkClient, MiddlewareArgsLike };
+export type { SdkClient, MiddlewareArgsLike };
diff --git a/packages/commons/src/types/index.ts b/packages/commons/src/types/index.ts
@@ -1,11 +1,16 @@
-export {
+export type {
   MiddlewareLikeObj,
   MiddyLikeRequest,
   CleanupFunction,
 } from './middy.js';
-export { SdkClient, MiddlewareArgsLike } from './awsSdk.js';
-export { JSONPrimitive, JSONValue, JSONObject, JSONArray } from './json.js';
-export {
+export type { SdkClient, MiddlewareArgsLike } from './awsSdk.js';
+export type {
+  JSONPrimitive,
+  JSONValue,
+  JSONObject,
+  JSONArray,
+} from './json.js';
+export type {
   SyncHandler,
   AsyncHandler,
   LambdaInterface,

diff --git a/packages/commons/src/types/middy.ts b/packages/commons/src/types/middy.ts
@@ -57,4 +57,4 @@ type MiddyLikeRequest = {
  */
 type CleanupFunction = (request: MiddyLikeRequest) => Promise<void>;
 
-export { MiddlewareLikeObj, MiddyLikeRequest, CleanupFunction };
+export type { MiddlewareLikeObj, MiddyLikeRequest, CleanupFunction };
diff --git a/packages/commons/tsconfig.esm.json b/packages/commons/tsconfig.esm.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "./lib/esm",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "tsBuildInfoFile": ".tsbuildinfo/esm.json"
   },
   "include": [
     "./src/**/*"

diff --git a/packages/commons/tsconfig.json b/packages/commons/tsconfig.json
@@ -3,6 +3,7 @@
     "compilerOptions": {
         "outDir": "./lib/cjs/",
         "rootDir": "./src",
+        "tsBuildInfoFile": ".tsbuildinfo/cjs.json"
     },
     "include": [
         "./src/**/*"

diff --git a/packages/idempotency/package.json b/packages/idempotency/package.json
@@ -17,13 +17,12 @@
     "test:e2e:nodejs18x": "RUNTIME=nodejs18x jest --group=e2e",
     "test:e2e": "jest --group=e2e",
     "watch": "jest --watch",
-    "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json",
-    "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json",
+    "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json",
+    "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json",
     "build": "npm run build:esm & npm run build:cjs",
     "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .",
     "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .",
-    "prebuild": "rimraf ./lib",
-    "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ."
+    "prepack": "node ../../.github/scripts/release_patch_package_json.js ."
   },
   "lint-staged": {
     "*.{js,ts}": "npm run lint-fix"
@@ -136,4 +135,4 @@
     "aws-sdk-client-mock": "^3.0.0",
     "aws-sdk-client-mock-jest": "^3.0.0"
   }
-}
+}
diff --git a/packages/idempotency/src/types/BasePersistenceLayer.ts b/packages/idempotency/src/types/BasePersistenceLayer.ts
@@ -15,4 +15,4 @@ interface BasePersistenceLayerInterface {
   getRecord(data: unknown): Promise<IdempotencyRecord>;
 }
 
-export { BasePersistenceLayerOptions, BasePersistenceLayerInterface };
+export type { BasePersistenceLayerOptions, BasePersistenceLayerInterface };
diff --git a/packages/idempotency/src/types/ConfigServiceInterface.ts b/packages/idempotency/src/types/ConfigServiceInterface.ts
@@ -8,4 +8,4 @@ interface ConfigServiceInterface {
   getIdempotencyEnabled(): boolean;
 }
 
-export { ConfigServiceInterface };
+export type { ConfigServiceInterface };
diff --git a/packages/idempotency/src/types/IdempotencyOptions.ts b/packages/idempotency/src/types/IdempotencyOptions.ts
@@ -179,7 +179,7 @@ type IdempotencyConfigOptions = {
   lambdaContext?: Context;
 };
 
-export {
+export type {
   AnyFunction,
   IdempotencyConfigOptions,
   ItempotentFunctionOptions,

diff --git a/packages/idempotency/src/types/IdempotencyRecord.ts b/packages/idempotency/src/types/IdempotencyRecord.ts
@@ -13,4 +13,4 @@ type IdempotencyRecordOptions = {
   payloadHash?: string;
 };
 
-export { IdempotencyRecordStatusValue, IdempotencyRecordOptions };
+export type { IdempotencyRecordStatusValue, IdempotencyRecordOptions };
diff --git a/packages/idempotency/src/types/LRUCache.ts b/packages/idempotency/src/types/LRUCache.ts
@@ -5,4 +5,4 @@ type LRUCacheOptions = {
   maxSize: number;
 };
 
-export { LRUCacheOptions };
+export type { LRUCacheOptions };
diff --git a/packages/idempotency/src/types/index.ts b/packages/idempotency/src/types/index.ts
@@ -1,12 +1,12 @@
-export {
+export type {
   IdempotencyRecordOptions,
   IdempotencyRecordStatusValue,
 } from './IdempotencyRecord.js';
-export {
+export type {
   BasePersistenceLayerInterface,
   BasePersistenceLayerOptions,
 } from './BasePersistenceLayer.js';
-export {
+export type {
   IdempotencyConfigOptions,
   IdempotencyLambdaHandlerOptions,
   IdempotencyHandlerOptions,

diff --git a/packages/idempotency/tsconfig.esm.json b/packages/idempotency/tsconfig.esm.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "./lib/esm",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "tsBuildInfoFile": ".tsbuildinfo/esm.json"
   },
   "include": [
     "./src/**/*"

diff --git a/packages/idempotency/tsconfig.json b/packages/idempotency/tsconfig.json
@@ -3,6 +3,7 @@
     "compilerOptions": {
         "outDir": "./lib/cjs",
         "rootDir": "./src",
+        "tsBuildInfoFile": ".tsbuildinfo/cjs.json"
     },
     "include": [
         "./src/**/*"

diff --git a/packages/logger/package.json b/packages/logger/package.json
@@ -17,13 +17,12 @@
     "test:e2e:nodejs18x": "RUNTIME=nodejs18x jest --group=e2e",
     "test:e2e": "jest --group=e2e",
     "watch": "jest --watch --group=unit",
-    "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json",
-    "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json",
+    "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json",
+    "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json",
     "build": "npm run build:esm & npm run build:cjs",
     "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .",
     "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .",
-    "prebuild": "rimraf ./lib",
-    "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ."
+    "prepack": "node ../../.github/scripts/release_patch_package_json.js ."
   },
   "lint-staged": {
     "*.{js,ts}": "npm run lint-fix"

diff --git a/packages/logger/src/types/ConfigServiceInterface.ts b/packages/logger/src/types/ConfigServiceInterface.ts
@@ -65,4 +65,4 @@ interface ConfigServiceInterface {
   isValueTrue(value: string): boolean;
 }
 
-export { ConfigServiceInterface };
+export type { ConfigServiceInterface };
diff --git a/packages/logger/src/types/Logger.ts b/packages/logger/src/types/Logger.ts
@@ -86,7 +86,7 @@ type LoggerInterface = {
   warn(input: LogItemMessage, ...extraInput: LogItemExtraInput): void;
 };
 
-export {
+export type {
   LogFunction,
   LoggerInterface,
   LogItemMessage,

diff --git a/packages/logger/src/types/index.ts b/packages/logger/src/types/index.ts
@@ -6,7 +6,6 @@ export type {
   LogAttributes,
   LogLevel,
 } from './Log.js';
-
 export type {
   LogItemMessage,
   LogItemExtraInput,

diff --git a/packages/logger/tsconfig.esm.json b/packages/logger/tsconfig.esm.json
@@ -3,7 +3,10 @@
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "./lib/esm",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "tsBuildInfoFile": ".tsbuildinfo/esm.json"
   },
-  "include": ["./src/**/*"]
-}
+  "include": [
+    "./src/**/*"
+  ]
+}
diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json
@@ -2,7 +2,10 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "./lib/cjs/",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "tsBuildInfoFile": ".tsbuildinfo/cjs.json"
   },
-  "include": ["./src/**/*"]
-}
+  "include": [
+    "./src/**/*"
+  ]
+}
diff --git a/packages/metrics/package.json b/packages/metrics/package.json
@@ -17,13 +17,12 @@
     "test:e2e:nodejs18x": "RUNTIME=nodejs18x jest --group=e2e",
     "test:e2e": "jest --group=e2e",
     "watch": "jest --group=unit --watch ",
-    "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json",
-    "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json",
+    "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json",
+    "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json",
     "build": "npm run build:esm & npm run build:cjs",
     "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .",
     "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .",
-    "prebuild": "rimraf ./lib",
-    "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ."
+    "prepack": "node ../../.github/scripts/release_patch_package_json.js ."
   },
   "lint-staged": {
     "*.{js,ts}": "npm run lint-fix"

diff --git a/packages/metrics/src/types/ConfigServiceInterface.ts b/packages/metrics/src/types/ConfigServiceInterface.ts
@@ -4,4 +4,4 @@ interface ConfigServiceInterface {
   getServiceName(): string;
 }
 
-export { ConfigServiceInterface };
+export type { ConfigServiceInterface };
diff --git a/packages/metrics/src/types/Metrics.ts b/packages/metrics/src/types/Metrics.ts
@@ -68,7 +68,7 @@ type MetricDefinition = {
   StorageResolution?: MetricResolution;
 };
 
-export {
+export type {
   MetricsOptions,
   Dimensions,
   EmfOutput,

diff --git a/packages/metrics/src/types/MetricsInterface.ts b/packages/metrics/src/types/MetricsInterface.ts
@@ -29,4 +29,4 @@ interface MetricsInterface {
   singleMetric(): Metrics;
 }
 
-export { MetricsInterface };
+export type { MetricsInterface };
diff --git a/packages/metrics/src/types/index.ts b/packages/metrics/src/types/index.ts
@@ -1,4 +1,4 @@
-export {
+export type {
   MetricsOptions,
   Dimensions,
   EmfOutput,
@@ -9,5 +9,5 @@ export {
   MetricResolution,
   MetricUnit,
 } from './Metrics.js';
-export { ConfigServiceInterface } from './ConfigServiceInterface.js';
-export { MetricsInterface } from './MetricsInterface.js';
+export type { ConfigServiceInterface } from './ConfigServiceInterface.js';
+export type { MetricsInterface } from './MetricsInterface.js';
diff --git a/packages/metrics/tsconfig.esm.json b/packages/metrics/tsconfig.esm.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "./lib/esm",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "tsBuildInfoFile": ".tsbuildinfo/esm.json"
   },
   "include": [
     "./src/**/*"

diff --git a/packages/metrics/tsconfig.json b/packages/metrics/tsconfig.json
@@ -3,6 +3,7 @@
     "compilerOptions": {
         "outDir": "./lib/cjs",
         "rootDir": "./src",
+        "tsBuildInfoFile": ".tsbuildinfo/cjs.json"
     },
     "include": [
         "./src/**/*"