fix: ensure directories are created before writing files (#816)

src/runtimes/node/utils/zip.ts

@@ -12,6 +12,7 @@ import pMap from 'p-map'
 import unixify from 'unixify'
 
 import { startZip, addZipFile, addZipContent, endZip, ZipArchive } from '../../../archive'
+import { mkdirAndWriteFile } from '../../../utils/fs'
 
 const pStat = promisify(fs.stat)
 const pWriteFile = promisify(fs.writeFile)
@@ -79,7 +80,7 @@ const createDirectory = async function ({
       const absoluteDestPath = join(functionFolder, normalizedDestPath)
 
       if (rewrites.has(srcFile)) {
-        return pWriteFile(absoluteDestPath, rewrites.get(srcFile) as string)
+        return mkdirAndWriteFile(absoluteDestPath, rewrites.get(srcFile) as string)
       }
 
       return copyFile(srcFile, absoluteDestPath)

src/utils/fs.ts

@@ -1,7 +1,9 @@
 import { lstat, readdir, readFile, stat, unlink, writeFile } from 'fs'
-import { format, join, parse, resolve } from 'path'
+import { dirname, format, join, parse, resolve } from 'path'
 import { promisify } from 'util'
 
+import makeDir from 'make-dir'
+
 import { nonNullable } from './non_nullable'
 
 const pLstat = promisify(lstat)
@@ -86,6 +88,16 @@ const resolveFunctionsDirectories = (input: string | string[]) => {
   return absoluteDirectories
 }
 
+const mkdirAndWriteFile: typeof pWriteFile = async (path, ...params) => {
+  if (typeof path === 'string') {
+    const directory = dirname(path)
+
+    await makeDir(directory)
+  }
+
+  return pWriteFile(path, ...params)
+}
+
 export {
   cachedLstat,
   cachedReaddir,
@@ -99,5 +111,6 @@ export {
   pStat as stat,
   pWriteFile as writeFile,
   pReadFile as readFile,
+  mkdirAndWriteFile,
 }
 export type { FsCache }

tests/main.js

@@ -470,6 +470,46 @@ testMany(
   },
 )
 
+testMany(
+  'Can bundle functions with `.js` extension using ES Modules when `archiveType` is `none`',
+  ['bundler_esbuild', 'bundler_nft', 'bundler_nft_transpile'],
+  async (options, t, variation) => {
+    const length = 4
+    const fixtureName = 'local-require-esm'
+    const opts = merge(options, {
+      archiveFormat: 'none',
+      basePath: `${FIXTURES_DIR}/${fixtureName}`,
+      featureFlags: { defaultEsModulesToEsbuild: false },
+    })
+    const { tmpDir } = await zipFixture(t, 'local-require-esm', {
+      length,
+      opts,
+    })
+
+    const func1 = () => require(join(tmpDir, 'function', 'function.js'))
+    const func2 = () => require(join(tmpDir, 'function_cjs', 'function_cjs.js'))
+    const func3 = () => require(join(tmpDir, 'function_export_only', 'function_export_only.js'))
+    const func4 = () => require(join(tmpDir, 'function_import_only', 'function_import_only.js'))
+
+    // Dynamic imports are not supported in Node <13.2.0.
+    if (semver.gte(nodeVersion, '13.2.0')) {
+      t.is(await func2()(), 0)
+    }
+
+    if (variation === 'bundler_nft') {
+      t.throws(func1)
+      t.throws(func3)
+      t.throws(func4)
+
+      return
+    }
+
+    t.is(func1().ZERO, 0)
+    t.is(typeof func3().howdy, 'string')
+    t.deepEqual(func4(), {})
+  },
+)
+
 testMany(
   'Can bundle CJS functions that import ESM files with an `import()` expression',
   ['bundler_esbuild', 'bundler_nft', 'bundler_nft_transpile'],
@@ -1809,7 +1849,7 @@ test('The dynamic import runtime shim handles files in nested directories', asyn
   t.throws(() => func('fr'))
 })
 
-test('The dynamic import runtime shim handles files in nested directories when using `archiveType: "none"`', async (t) => {
+test('The dynamic import runtime shim handles files in nested directories when using `archiveFormat: "none"`', async (t) => {
   const fixtureName = 'node-module-dynamic-import-4'
   const { tmpDir } = await zipNode(t, fixtureName, {
     opts: {