refactor: break apart util, move form_data to commons

application.test.ts

@@ -28,7 +28,8 @@ import type {
   ServerRequest,
   ServeTlsOptions,
 } from "./types.ts";
-import { createPromiseWithResolvers, isNode } from "./util.ts";
+import { isNode } from "./utils/type_guards.ts";
+import { createPromiseWithResolvers } from "./utils/create_promise_with_resolvers.ts";
 
 let optionsStack: Array<ListenOptions | ListenOptionsTls> = [];
 let serverClosed = false;

application.ts

@@ -38,12 +38,8 @@ import type {
   ServerConstructor,
   ServerRequest,
 } from "./types.ts";
-import {
-  createPromiseWithResolvers,
-  isBun,
-  isNetAddr,
-  isNode,
-} from "./util.ts";
+import { isBun, isNetAddr, isNode } from "./utils/type_guards.ts";
+import { createPromiseWithResolvers } from "./utils/create_promise_with_resolvers.ts";
 
 /** Base interface for application listening options. */
 export interface ListenOptionsBase {

body.ts

@@ -8,8 +8,7 @@
  * @module
  */
 
-import { createHttpError, matches, Status } from "./deps.ts";
-import { parse } from "./form_data.ts";
+import { createHttpError, matches, parseFormData, Status } from "./deps.ts";
 import type { ServerRequest } from "./types.ts";
 
 type JsonReviver = (key: string, value: unknown) => unknown;
@@ -125,7 +124,7 @@ export class Body {
     if (this.#body && this.#headers) {
       const contentType = this.#headers.get("content-type");
       if (contentType) {
-        return parse(contentType, this.#body);
+        return parseFormData(contentType, this.#body);
       }
     }
     throw createHttpError(Status.BadRequest, "Missing content type.");

context.test.ts

@@ -12,7 +12,8 @@ import { Request as OakRequest } from "./request.ts";
 import { Response as OakResponse } from "./response.ts";
 import { cloneState } from "./structured_clone.ts";
 import type { UpgradeWebSocketFn, UpgradeWebSocketOptions } from "./types.ts";
-import { createPromiseWithResolvers, isNode } from "./util.ts";
+import { isNode } from "./utils/type_guards.ts";
+import { createPromiseWithResolvers } from "./utils/create_promise_with_resolvers.ts";
 
 function createMockApp<S extends State = Record<string, any>>(
   state = {} as S,

deno.json

@@ -7,7 +7,6 @@
     "./body": "./body.ts",
     "./context": "./context.ts",
     "./etag": "./etag.ts",
-    "./form_data": "./form_data.ts",
     "./helpers": "./helpers.ts",
     "./http_server_bun": "./http_server_bun.ts",
     "./http_server_native": "./http_server_native.ts",

deps.ts

@@ -9,7 +9,6 @@ export { concat } from "jsr:@std/bytes@0.222/concat";
 export { copy as copyBytes } from "jsr:@std/bytes@0.222/copy";
 export { timingSafeEqual } from "jsr:@std/crypto@0.222/timing-safe-equal";
 export { KeyStack } from "jsr:@std/crypto@0.222/unstable-keystack";
-export { encodeBase64 } from "jsr:@std/encoding@0.222/base64";
 export {
   calculate,
   type ETagOptions,
@@ -44,36 +43,37 @@ export {
   SecureCookieMap,
   type SecureCookieMapGetOptions,
   type SecureCookieMapSetDeleteOptions,
-} from "jsr:@oak/commons@0.9/cookie_map";
+} from "jsr:@oak/commons@0.10/cookie_map";
+export { parse as parseFormData } from "jsr:@oak/commons@0.10/form_data";
 export {
   createHttpError,
   errors,
   HttpError,
   type HttpErrorOptions,
   isHttpError,
-} from "jsr:@oak/commons@0.9/http_errors";
-export { matches } from "jsr:@oak/commons@0.9/media_types";
-export { type HttpMethod as HTTPMethods } from "jsr:@oak/commons@0.9/method";
+} from "jsr:@oak/commons@0.10/http_errors";
+export { matches } from "jsr:@oak/commons@0.10/media_types";
+export { type HttpMethod as HTTPMethods } from "jsr:@oak/commons@0.10/method";
 export {
   type ByteRange,
   range,
   responseRange,
-} from "jsr:@oak/commons@0.9/range";
+} from "jsr:@oak/commons@0.10/range";
 export {
   ServerSentEvent,
   type ServerSentEventInit,
   ServerSentEventStreamTarget,
   type ServerSentEventTarget,
   type ServerSentEventTargetOptions,
-} from "jsr:@oak/commons@0.9/server_sent_event";
+} from "jsr:@oak/commons@0.10/server_sent_event";
 export {
   type ErrorStatus,
   isErrorStatus,
   isRedirectStatus,
   type RedirectStatus,
   Status,
   STATUS_TEXT,
-} from "jsr:@oak/commons@0.9/status";
+} from "jsr:@oak/commons@0.10/status";
 
 export {
   compile,

etag.ts

@@ -10,7 +10,8 @@ import type { State } from "./application.ts";
 import type { Context } from "./context.ts";
 import { calculate, type ETagOptions } from "./deps.ts";
 import type { Middleware } from "./middleware.ts";
-import { BODY_TYPES, isAsyncIterable, isReader } from "./util.ts";
+import { BODY_TYPES } from "./utils/consts.ts";
+import { isAsyncIterable, isReader } from "./utils/type_guards.ts";
 
 // re-exports to maintain backwards compatibility
 export {