Update types

Author: ije

server/response.ts

@@ -1,6 +1,5 @@
 import { APIResponse as IResponse } from '../types.ts'
 import log from '../shared/log.ts'
-import { getContentType } from './mime.ts'
 import compress from './compress.ts'
 
 export class APIResponse implements IResponse {
@@ -29,32 +28,9 @@ export class APIResponse implements IResponse {
     return this
   }
 
-  content(data: string | Uint8Array | ArrayBuffer | ReadableStream<Uint8Array>, contentType?: string): this {
-    this.body = data
-    if (contentType) {
-      this.setHeader('Content-Type', contentType)
-    }
-    return this
-  }
-
   json(data: any, space?: string | number): this {
-    this.content(JSON.stringify(data, undefined, space), 'application/json; charset=utf-8')
-    return this
-  }
-
-  async file(path: string): Promise<this> {
-    this.body = await Deno.readFile(path)
-    this.setHeader('Content-Type', getContentType(path))
-    return this
-  }
-
-  async proxy(url: string): Promise<this> {
-    const resp = await fetch(url)
-    if (resp.body) {
-      this.body = resp.body
-    }
-    this.headers = resp.headers
-    this.status = resp.status
+    this.setHeader('Content-Type', 'application/json; charset=utf-8')
+    this.body = JSON.stringify(data, undefined, space)
     return this
   }
 

server/server.ts

@@ -10,6 +10,7 @@ import { VERSION } from '../version.ts'
 import { APIContext } from '../types.ts'
 import { Aleph } from './aleph.ts'
 import compress from './compress.ts'
+import { getContentType } from './mime.ts'
 import { APIResponse } from './response.ts'
 
 /** The Aleph server class. */
@@ -112,7 +113,9 @@ export class Server {
 
         const relPath = util.trimPrefix(pathname, '/_aleph')
         if (relPath == '/main.js') {
-          resp.content(app.createMainJS(false), 'application/javascript; charset=utf-8').writeTo(e)
+          resp.body = app.createMainJS(false)
+          resp.setHeader('Content-Type', 'application/javascript; charset=utf-8')
+          resp.writeTo(e)
           return
         }
 
@@ -138,6 +141,8 @@ export class Server {
               }
 
               resp.setHeader('ETag', etag)
+              resp.setHeader('Content-Type', 'application/javascript; charset=utf-8')
+
               if (app.isDev && app.isHMRable(specifier)) {
                 let code = new TextDecoder().decode(content)
                 if (module.denoHooks?.length || module.ssrPropsFn || module.ssgPathsFn) {
@@ -161,10 +166,11 @@ export class Server {
                   '',
                   'import.meta.hot.accept();'
                 ].join('\n')
-                resp.content(code, 'application/javascript; charset=utf-8').writeTo(e)
+                resp.body = code
               } else {
-                resp.content(content, 'application/javascript; charset=utf-8').writeTo(e)
+                resp.body = content
               }
+              resp.writeTo(e)
               return
             }
           }
@@ -179,11 +185,15 @@ export class Server {
             return
           }
 
-          (await resp.setHeader('Last-Modified', lastModified).file(filePath)).writeTo(e)
+          resp.body = await Deno.readFile(filePath)
+          resp.setHeader('Last-Modified', lastModified)
+          resp.setHeader('Content-Type', getContentType(filePath))
+          resp.writeTo(e)
           return
         }
 
-        resp.content('file not found').writeTo(e, 404)
+        resp.body = 'file not found'
+        resp.writeTo(e, 404)
         return
       }
 
@@ -197,7 +207,10 @@ export class Server {
           return
         }
 
-        (await resp.setHeader('Last-Modified', lastModified).file(filePath)).writeTo(e)
+        resp.body = await Deno.readFile(filePath)
+        resp.setHeader('Last-Modified', lastModified)
+        resp.setHeader('Content-Type', getContentType(filePath))
+        resp.writeTo(e)
         return
       }
 
@@ -273,9 +286,12 @@ export class Server {
         pathname,
         search: Array.from(url.searchParams.keys()).length > 0 ? '?' + url.searchParams.toString() : ''
       })
-      resp.content(html, 'text/html; charset=utf-8').writeTo(e, status)
+      resp.body = html
+      resp.setHeader('Content-Type', 'text/html; charset=utf-8')
+      resp.writeTo(e, status)
     } catch (err) {
       try {
+        // todo: custom error page
         e.respondWith(new Response(
           [
             `<!DOCTYPE html>`,

types.ts

@@ -93,7 +93,7 @@ export type LoaderOutput = {
 /**
  * The built target of esbuild.
  */
-export type BuildTarget = 'es2015' | 'es2016' | 'es2017' | 'es2018' | 'es2019' | 'es2020' | 'esnext'
+export type BuildTarget = 'es2015' | 'es2016' | 'es2017' | 'es2018' | 'es2019' | 'es2020' | 'es2021' | 'esnext'
 
 /**
  * The supported borwser name of esbuild.
@@ -208,7 +208,7 @@ export interface APIContext extends Deno.RequestEvent {
 }
 
 /**
- * An interface that aligns to the parts of the `Aleph`.
+ * An interface that aligns to the parts of the `Response`.
  */
 export interface APIResponse {
   status: number
@@ -228,14 +228,8 @@ export interface APIResponse {
   removeHeader(key: string): this
   /** `redirect` replies to redirect the client to another URL with optional response `status` defaulting to 302. */
   redirect(url: string, status?: number): this
-  /** `content` replies to the request with a raw content. */
-  content(data: string | Uint8Array | ArrayBuffer | ReadableStream<Uint8Array>, contentType?: string): this
   /** `json` replies to the request with a json content. */
   json(data: any, space?: string | number): this
-  /** `file` reads the file content and sets `content-type` header by the file name. */
-  file(name: string): Promise<this>
-  /** `proxy` proxies the http request. */
-  proxy(url: string): Promise<this>
 }
 
 /**