feat: support v2 API for TypeScript (#1478)

* feat: support v2 api with typescript

* fix: resolve some test todos by enabling flags

* chore: prettier

* fix: ensure that all .ts files are transpiled

* fix: make default bundler understand typescript

* refactor: remove join import

src/runtimes/node/bundlers/esbuild/bundler_target.ts

@@ -35,9 +35,17 @@ const getModuleFormat = async (
   }
 
   if (featureFlags.zisi_pure_esm) {
-    const packageJsonFile = await getClosestPackageJson(srcDir)
     const nodeSupport = getNodeSupportMatrix(configVersion)
 
+    if (extension.includes('ts') && nodeSupport.esm) {
+      return {
+        includedFiles: [],
+        moduleFormat: MODULE_FORMAT.ESM,
+      }
+    }
+
+    const packageJsonFile = await getClosestPackageJson(srcDir)
+
     if (packageJsonFile?.contents.type === 'module' && nodeSupport.esm) {
       return {
         includedFiles: [packageJsonFile.path],

src/runtimes/node/bundlers/index.ts

@@ -66,7 +66,15 @@ const getDefaultBundler = async ({
   featureFlags: FeatureFlags
   runtimeAPIVersion: number
 }): Promise<NodeBundlerName> => {
-  if ((extension === MODULE_FILE_EXTENSION.MJS && featureFlags.zisi_pure_esm_mjs) || runtimeAPIVersion === 2) {
+  if (runtimeAPIVersion === 2) {
+    if (ESBUILD_EXTENSIONS.has(extension)) {
+      return NODE_BUNDLER.ESBUILD
+    }
+
+    return NODE_BUNDLER.NFT
+  }
+
+  if (extension === MODULE_FILE_EXTENSION.MJS && featureFlags.zisi_pure_esm_mjs) {
     return NODE_BUNDLER.NFT
   }
 

tests/fixtures/v2-api-ts/ts-function.ts

@@ -0,0 +1,5 @@
+export default async (req: Request) => new Response("<h1>Hello world from Typescript</h1>", {
+  headers: {
+    "content-type": "text/html"
+  }
+})

tests/v2api.test.ts

@@ -1,6 +1,8 @@
 import { version as nodeVersion } from 'process'
+import { promisify } from 'util'
 
 import merge from 'deepmerge'
+import glob from 'glob'
 import semver from 'semver'
 import { afterEach, describe, expect, vi } from 'vitest'
 
@@ -10,6 +12,8 @@ import { invokeLambda, readAsBuffer } from './helpers/lambda.js'
 import { zipFixture, unzipFiles, importFunctionFile } from './helpers/main.js'
 import { testMany } from './helpers/test_many.js'
 
+const pGlob = promisify(glob)
+
 vi.mock('../src/utils/shell.js', () => ({ shellUtils: { runCommand: vi.fn() } }))
 
 describe.runIf(semver.gte(nodeVersion, '18.13.0'))('V2 functions API', () => {
@@ -19,10 +23,12 @@ describe.runIf(semver.gte(nodeVersion, '18.13.0'))('V2 functions API', () => {
 
   testMany(
     'Handles a basic JavaScript function',
-    ['bundler_default', 'todo:bundler_esbuild', 'todo:bundler_esbuild_zisi', 'bundler_default_nft', 'bundler_nft'],
+    ['bundler_default', 'bundler_esbuild', 'bundler_esbuild_zisi', 'bundler_default_nft', 'bundler_nft'],
     async (options) => {
       const { files } = await zipFixture('v2-api', {
-        opts: merge(options, { featureFlags: { zisi_functions_api_v2: true } }),
+        opts: merge(options, {
+          featureFlags: { zisi_functions_api_v2: true, zisi_pure_esm: true, zisi_pure_esm_mjs: true },
+        }),
       })
       const unzippedFunctions = await unzipFiles(files)
 
@@ -38,12 +44,12 @@ describe.runIf(semver.gte(nodeVersion, '18.13.0'))('V2 functions API', () => {
 
   testMany(
     'Handles a basic JavaScript function with archiveFormat set to `none`',
-    ['bundler_default', 'todo:bundler_esbuild', 'todo:bundler_esbuild_zisi', 'bundler_default_nft', 'bundler_nft'],
+    ['bundler_default', 'bundler_esbuild', 'bundler_esbuild_zisi', 'bundler_default_nft', 'bundler_nft'],
     async (options) => {
       const { files, tmpDir } = await zipFixture('v2-api', {
         opts: merge(options, {
           archiveFormat: ARCHIVE_FORMAT.NONE,
-          featureFlags: { zisi_functions_api_v2: true },
+          featureFlags: { zisi_functions_api_v2: true, zisi_pure_esm: true, zisi_pure_esm_mjs: true },
         }),
       })
 
@@ -57,4 +63,30 @@ describe.runIf(semver.gte(nodeVersion, '18.13.0'))('V2 functions API', () => {
       expect(statusCode).toBe(200)
     },
   )
+
+  testMany(
+    'Handles a basic TypeScript function',
+    ['bundler_default', 'bundler_esbuild', 'bundler_esbuild_zisi', 'bundler_default_nft', 'todo:bundler_nft'],
+    async (options) => {
+      const { files, tmpDir } = await zipFixture('v2-api-ts', {
+        opts: merge(options, {
+          archiveFormat: ARCHIVE_FORMAT.NONE,
+          featureFlags: { zisi_pure_esm: true, zisi_functions_api_v2: true },
+        }),
+      })
+
+      const [{ name: archive, entryFilename, path }] = files
+
+      const untranspiledFiles = await pGlob(`${path}/**/*.ts`)
+      expect(untranspiledFiles).toEqual([])
+
+      const func = await importFunctionFile(`${tmpDir}/${archive}/${entryFilename}`)
+      const { body: bodyStream, headers = {}, statusCode } = await invokeLambda(func)
+      const body = await readAsBuffer(bodyStream)
+
+      expect(body).toBe('<h1>Hello world from Typescript</h1>')
+      expect(headers['content-type']).toBe('text/html')
+      expect(statusCode).toBe(200)
+    },
+  )
 })