@bifravst/aws-cdk-lambda-helpers 1.2.3 → 1.2.4

package/dist/layers/baseLayer/nodejs/package-lock.json

@@ -16,7 +16,7 @@
       },
       "devDependencies": {
         "@aws-sdk/client-cloudformation": "3.549.0",
-        "@bifravst/eslint-config-typescript": "6.0.19",
+        "@bifravst/eslint-config-typescript": "6.0.20",
         "@bifravst/prettier-config": "1.0.0",
         "@commitlint/config-conventional": "19.1.0",
         "@nordicsemiconductor/cloudformation-helpers": "^9.0.3",
@@ -34,7 +34,7 @@
         "npm": ">=9"
       },
       "peerDependencies": {
-        "aws-cdk-lib": "^2.135.0",
+        "aws-cdk-lib": "^2.136.0",
         "constructs": "^10.3.0"
       }
     },
@@ -745,9 +745,9 @@
       }
     },
     "node_modules/@bifravst/eslint-config-typescript": {
-      "version": "6.0.19",
-      "resolved": "https://registry.npmjs.org/@bifravst/eslint-config-typescript/-/eslint-config-typescript-6.0.19.tgz",
-      "integrity": "sha512-KeI4JESxHPKxpGt3X2B9GPh6vbQNbzHLUM8k87zn78uBE7mZYctiaIYf2i+sFuPV1CDLIf0L+Lgbh39RPtb10g==",
+      "version": "6.0.20",
+      "resolved": "https://registry.npmjs.org/@bifravst/eslint-config-typescript/-/eslint-config-typescript-6.0.20.tgz",
+      "integrity": "sha512-yaaBpMQPtcN0WbEloCg5tWPICoE7VnD0Cg+KpeZAk2FCXm6I/svvRtmeIvnQPq5BOvCN5eqV9DO+7Z6bg+4PLA==",
       "dev": true,
       "dependencies": {
         "@eslint/js": "8.57.0",
@@ -2653,9 +2653,9 @@
       }
     },
     "node_modules/aws-cdk-lib": {
-      "version": "2.135.0",
-      "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.135.0.tgz",
-      "integrity": "sha512-0RcmhPqJyMFgXqjESv+LilL7TfOQ7uZ4G125hp5/sSoaM7IFz/L3KDAUKVW/01rrebOQo0NZR9M7WIU3JJ7ezQ==",
+      "version": "2.136.0",
+      "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.136.0.tgz",
+      "integrity": "sha512-zdkWNe91mvZH6ESghUoIxB8ORoreExg2wowTLEVfy3vWY1a6n69crxk8mkCG+vn6GhXEnEPpovoG1QV8BpXTpA==",
       "bundleDependencies": [
         "@balena/dockerignore",
         "case",

package/dist/src/module-folder-named-like-handler-bug.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/module-folder-named-like-handler-bug.spec.js

@@ -0,0 +1,15 @@
+import assert from 'node:assert/strict';
+import { it, describe } from 'node:test';
+import { ImportFromFolderNameError, packLambda } from './packLambda.js';
+import path, { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+const tmpDir = os.tmpdir();
+void describe('packLambda()', () => {
+    // See https://github.com/aws/aws-lambda-nodejs-runtime-interface-client/issues/93#issuecomment-2042201321
+    void it('should fail if it imports from a folder that has the same name as the handler module', async () => assert.rejects(async () => packLambda({
+        sourceFile: path.join(dirname(fileURLToPath(import.meta.url)), 'test-data', 'module-folder-named-like-handler-bug', 'acme.ts'),
+        zipFile: path.join(await fs.mkdtemp(`${tmpDir}${path.sep}`), 'acme.zip'),
+    }), ImportFromFolderNameError));
+});

package/dist/src/packLambda.d.ts

@@ -16,3 +16,10 @@ export declare const packLambda: ({ sourceFile, zipFile, debug, progress, }: {
     handler: string;
     hash: string;
 }>;
+/**
+ * @see https://github.com/aws/aws-lambda-nodejs-runtime-interface-client/issues/93#issuecomment-2042201321
+ */
+export declare class ImportFromFolderNameError extends Error {
+    readonly folderName: string;
+    constructor(folderName: string);
+}

package/dist/src/packLambda.js

@@ -6,6 +6,7 @@ import { checkSumOfFiles } from './checksumOfFiles.js';
 import { commonParent } from './commonParent.js';
 import { findDependencies } from './findDependencies.js';
 import { fileURLToPath } from 'node:url';
+import path from 'node:path';
 const removeCommonAncestor = (parentDir) => (file) => {
     const p = parse(file);
     const jsFileName = [
@@ -21,9 +22,16 @@ const removeCommonAncestor = (parentDir) => (file) => {
  * In the bundle we only include code that's not in the layer.
  */
 export const packLambda = async ({ sourceFile, zipFile, debug, progress, }) => {
-    const lambdaFiles = [sourceFile, ...findDependencies(sourceFile)];
+    const deps = findDependencies(sourceFile);
+    const lambdaFiles = [sourceFile, ...deps];
     const zipfile = new yazl.ZipFile();
     const stripCommon = removeCommonAncestor(commonParent(lambdaFiles));
+    const handler = stripCommon(sourceFile);
+    const folderNames = new Set(deps.map(stripCommon).map((s) => s.split('/')[0]));
+    const handlerName = path.parse(handler).name;
+    if (folderNames.has(handlerName)) {
+        throw new ImportFromFolderNameError(handlerName);
+    }
     for (const file of lambdaFiles) {
         const compiled = (await swc.transformFile(file, {
             jsc: {
@@ -54,3 +62,14 @@ export const packLambda = async ({ sourceFile, zipFile, debug, progress, }) => {
     progress?.(`written`, zipFile);
     return { handler: stripCommon(sourceFile), hash };
 };
+/**
+ * @see https://github.com/aws/aws-lambda-nodejs-runtime-interface-client/issues/93#issuecomment-2042201321
+ */
+export class ImportFromFolderNameError extends Error {
+    folderName;
+    constructor(folderName) {
+        super(`Import from folder with same name as handler ("${folderName}") not allowed!`);
+        this.name = 'ImportFromFolderNameError';
+        this.folderName = folderName;
+    }
+}

package/dist/src/test-data/module-folder-named-like-handler-bug/acme/lib.d.ts

@@ -0,0 +1 @@
+export declare const hello: () => string;

package/dist/src/test-data/module-folder-named-like-handler-bug/acme/lib.js

@@ -0,0 +1 @@
+export const hello = () => 'Hello World!';

package/dist/src/test-data/module-folder-named-like-handler-bug/acme.d.ts

@@ -0,0 +1 @@
+export declare const handler: () => string;

package/dist/src/test-data/module-folder-named-like-handler-bug/acme.js

@@ -0,0 +1,2 @@
+import { hello } from './acme/lib.js';
+export const handler = () => hello();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bifravst/aws-cdk-lambda-helpers",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Helper functions which simplify working with TypeScript lambdas for AWS CDK.",
   "exports": {
     ".": {
@@ -52,7 +52,7 @@
   "license": "BSD-3-Clause",
   "devDependencies": {
     "@aws-sdk/client-cloudformation": "3.549.0",
-    "@bifravst/eslint-config-typescript": "6.0.19",
+    "@bifravst/eslint-config-typescript": "6.0.20",
     "@bifravst/prettier-config": "1.0.0",
     "@commitlint/config-conventional": "19.1.0",
     "@nordicsemiconductor/cloudformation-helpers": "^9.0.3",
@@ -117,7 +117,7 @@
     "yazl": "2.5.1"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.135.0",
+    "aws-cdk-lib": "^2.136.0",
     "constructs": "^10.3.0"
   }
 }