Add support for .mjs extension

Author: doteric

.github/workflows/test.yml

@@ -77,4 +77,4 @@ jobs:
           key: ${{ runner.OS }}-cache-${{ hashFiles('**/package-lock.json') }}
       - name: Jest
         working-directory: .
-        run: npm run jest
+        run: npm run jest -- --coverage

example/test.ts example/example.tsexample/test.ts renamed to example/example.ts

@@ -4,7 +4,7 @@
       "zip": true
     },
     "functions": {
-      "test": "./example/test.ts"
+      "test": "./example/example.ts"
     }
   }
 }

example/package.json

@@ -1,5 +1,4 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
-  testMatch: ['**/src/**/*.test.*'],
 };

jest.config.js

@@ -7,7 +7,7 @@ import generatePackageJson from './parts/generatePackageJson';
 import { error } from './utils/messages';
 import zipDirectory from './parts/zipDirectory';
 
-const OUTPUT_FILE_NAME = 'index.js';
+const OUTPUT_FILE_NAME = 'index';
 
 const buildFunction = async (
   name: string,
@@ -23,23 +23,26 @@ const buildFunction = async (
   const buildResult = await useEsbuild(
     entrypoint,
     functionOutputDir,
-    OUTPUT_FILE_NAME.replace('.js', ''),
+    OUTPUT_FILE_NAME,
     esbuildConfig
   );
 
+  // Get output file extension in case it was changed from the default (.js)
+  const outputExtension = esbuildConfig.outExtension?.['.js'] || '.js';
+
   // Generate package.json
   const metafile = buildResult.metafile;
   if (!metafile) {
     error('Missing metafile in esbuild result!');
     return false;
   }
-  const outputFilePath = join(outputDir, name, OUTPUT_FILE_NAME);
-  generatePackageJson(
-    metafile,
-    packageObject,
-    outputFilePath,
-    OUTPUT_FILE_NAME
+
+  const outputFilePath = join(
+    outputDir,
+    name,
+    `${OUTPUT_FILE_NAME}${outputExtension}`
   );
+  generatePackageJson(metafile, packageObject, outputFilePath);
 
   // Zip functions
   const shouldZip = packageObject.funpack.settings.zip;

src/bulidFunction.ts

@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`funpack builds correctly 1`] = `
+Object {
+  "dependencies": Object {
+    "rimraf": "3.0.2",
+  },
+  "main": "index.js",
+  "repository": Object {
+    "type": "git",
+    "url": "https://example.com/test/repo.git",
+  },
+  "version": "0.0.0-dev",
+}
+`;

src/packTests/__snapshots__/basic.test.ts.snap

@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`funpack builds correctly 1`] = `
+Object {
+  "dependencies": Object {
+    "rimraf": "3.0.2",
+  },
+  "main": "index.mjs",
+  "version": "0.0.0-dev",
+}
+`;

src/packTests/__snapshots__/splitting.test.ts.snap

@@ -1,4 +1,5 @@
 import { join } from 'path';
+import { readFileSync } from 'fs';
 
 import funpack from '../index';
 
@@ -23,7 +24,7 @@ jest.mock('../utils/getPackageJsonObject', () =>
         },
       },
       functions: {
-        testfunc: './example/test.ts',
+        testfunc: './example/example.ts',
         second: './example/second.ts',
       },
     },
@@ -34,11 +35,16 @@ describe('funpack', () => {
   console.log = jest.fn();
   it('builds correctly', async () => {
     await funpack();
+    const firstPackageJson = JSON.parse(
+      readFileSync('example/dist/testfunc/package.json').toString()
+    );
+    expect(firstPackageJson).toMatchSnapshot();
+
     expect(console.log).toHaveBeenCalledTimes(2);
     expect(console.log).toBeCalledWith(
       join('example', 'dist', 'testfunc.zip'),
       '-',
-      21113,
+      21114,
       'total bytes'
     );
     expect(console.log).toBeCalledWith(

src/packTests/basic.test.ts

@@ -1,4 +1,5 @@
 import { join } from 'path';
+import { readFileSync } from 'fs';
 
 import funpack from '../index';
 
@@ -13,18 +14,21 @@ jest.mock('../utils/getPackageJsonObject', () =>
     funpack: {
       settings: {
         outputDir: 'example/dist-splitting',
-        packageFieldsToCopy: ['version', 'type'],
+        packageFieldsToCopy: ['version'],
         cleanupOutputDir: true,
         zip: true,
         esbuildConfigOverride: {
           format: 'esm',
           target: 'node16',
           splitting: true,
           sourcemap: true,
+          outExtension: {
+            '.js': '.mjs',
+          },
         },
       },
       functions: {
-        firstSplit: './example/test.ts',
+        firstSplit: './example/example.ts',
         secondSplit: './example/second.ts',
       },
     },
@@ -35,6 +39,12 @@ describe('funpack', () => {
   console.log = jest.fn();
   it('builds correctly', async () => {
     await funpack();
+
+    const firstPackageJson = JSON.parse(
+      readFileSync('example/dist-splitting/firstSplit/package.json').toString()
+    );
+    expect(firstPackageJson).toMatchSnapshot();
+
     // TODO: Improve test case to check for files?
     expect(console.log).toHaveBeenCalledTimes(2);
     const logMock = console.log as jest.Mock;
@@ -47,6 +57,6 @@ describe('funpack', () => {
     expect(logMock.mock.calls[1][0]).toBe(
       join('example', 'dist-splitting', 'firstSplit.zip')
     );
-    expect(logMock.mock.calls[1][2]).toBeCloseTo(69275, -2);
+    expect(logMock.mock.calls[1][2]).toBeCloseTo(69327, -2);
   });
 });

src/packTests/splitting.test.ts

@@ -40,12 +40,7 @@ describe('generatePackageJson', () => {
   };
 
   it('calls writeFileSync with correct parameters', () => {
-    generatePackageJson(
-      metafileMock,
-      packageObjectMock,
-      'test/path/index.js',
-      'index.js'
-    );
+    generatePackageJson(metafileMock, packageObjectMock, 'test/path/index.js');
     expect(writeFileSync).toBeCalledWith(
       join('test', 'path', 'package.json'),
       JSON.stringify(
@@ -63,8 +58,7 @@ describe('generatePackageJson', () => {
     generatePackageJson(
       metafileMock,
       packageObjectMock,
-      'test\\path\\index.js',
-      'index.js'
+      'test\\path\\index.js'
     );
     expect(writeFileSync).toBeCalledWith(
       join('test', 'path', 'package.json'),