refactor: small editorial changes to versioning

cheetah.ts

@@ -294,7 +294,7 @@ export class cheetah extends base<cheetah>() {
 
           const options = typeof r[3][0] !== 'function' ? r[3][0] : null
 
-          if (options?.versionRange !== undefined) {
+          if (options?.gateway !== undefined) {
             const result = pathname.match(r[2])
 
             if (!result) {
@@ -303,7 +303,7 @@ export class cheetah extends base<cheetah>() {
 
             const gateway = isVersionWithinRange(
               version as Version,
-              options.versionRange as VersionRange,
+              options.gateway as VersionRange,
             )
 
             if (!gateway) {

context.ts

@@ -89,10 +89,6 @@ export class Context<
     return this.#a
   }
 
-  get gateway(): number {
-    return this.#a.gateway ?? -1
-  }
-
   get dev(): boolean {
     return this.runtime === 'deno' && Deno.env.get('DEV') === 'true'
   }

handler.ts

@@ -91,7 +91,7 @@ export function handler<T>() {
         transform?: boolean // TODO remove at v2.0
         cors?: string
         params?: Partial<Record<keyof ExtractParams<Pathname>, ZodType>>
-        versionRange?: VersionRange
+        gateway?: VersionRange
       })
       | Handler<
         Pathname,
@@ -141,7 +141,7 @@ export function bodylessHandler<T>() {
         query?: ValidatedQuery
         cors?: string
         params?: Partial<Record<keyof ExtractParams<Pathname>, ZodType>>
-        versionRange?: VersionRange
+        gateway?: VersionRange
       }
       | BodylessHandler<
         Pathname,
@@ -166,7 +166,7 @@ export type HandlerOrSchema =
     transform?: boolean // TODO remove at v2.0
     cors?: string
     params?: Record<string, ZodType>
-    versionRange?: VersionRange
+    gateway?: VersionRange
   }
   | Handler<unknown>
   | BodylessHandler<unknown>

request_context.ts

@@ -53,6 +53,10 @@ export class RequestContext<
     this.#e = e
   }
 
+  get gateway(): number {
+    return this.#a.gateway ?? -1
+  }
+
   get ip(): string {
     return this.#a.ip
   }

test/routing/versioning.test.ts

@@ -20,7 +20,7 @@ Deno.test('versioning', async (t) => {
 
     // unspecified
 
-    app.get('/1', (c) => `hello from v${c.gateway}`)
+    app.get('/1', (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/1'), 'hello from v1')
     assertEquals(await get('/v2/1'), 'hello from v2')
@@ -30,7 +30,7 @@ Deno.test('versioning', async (t) => {
 
     // exact
 
-    app.get('/2', { versionRange: 'v3' }, (c) => `hello from v${c.gateway}`)
+    app.get('/2', { gateway: 'v3' }, (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/2') !== 'hello from v1', true)
     assertEquals(await get('/v2/2') !== 'hello from v2', true)
@@ -39,7 +39,7 @@ Deno.test('versioning', async (t) => {
 
     // smaller than
 
-    app.get('/3', { versionRange: '< v3' }, (c) => `hello from v${c.gateway}`)
+    app.get('/3', { gateway: '< v3' }, (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/3'), 'hello from v1')
     assertEquals(await get('/v2/3'), 'hello from v2')
@@ -48,7 +48,7 @@ Deno.test('versioning', async (t) => {
 
     // smaller than or equal to
 
-    app.get('/4', { versionRange: '<= v3' }, (c) => `hello from v${c.gateway}`)
+    app.get('/4', { gateway: '<= v3' }, (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/4'), 'hello from v1')
     assertEquals(await get('/v2/4'), 'hello from v2')
@@ -57,7 +57,7 @@ Deno.test('versioning', async (t) => {
 
     // greater than
 
-    app.get('/5', { versionRange: '> v3' }, (c) => `hello from v${c.gateway}`)
+    app.get('/5', { gateway: '> v3' }, (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/5') !== 'hello from v1', true)
     assertEquals(await get('/v2/5') !== 'hello from v2', true)
@@ -66,7 +66,7 @@ Deno.test('versioning', async (t) => {
 
     // greater than or equal
 
-    app.get('/6', { versionRange: '>= v3' }, (c) => `hello from v${c.gateway}`)
+    app.get('/6', { gateway: '>= v3' }, (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/6') !== 'hello from v1', true)
     assertEquals(await get('/v2/6') !== 'hello from v2', true)
@@ -77,8 +77,8 @@ Deno.test('versioning', async (t) => {
 
     app.get(
       '/7',
-      { versionRange: 'v2...v3' },
-      (c) => `hello from v${c.gateway}`,
+      { gateway: 'v2...v3' },
+      (c) => `hello from v${c.req.gateway}`,
     )
 
     assertEquals(await get('/v1/7') !== 'hello from v1', true)
@@ -114,7 +114,7 @@ Deno.test('versioning', async (t) => {
 
     // unspecified
 
-    app.get('/1', (c) => `hello from v${c.gateway}`)
+    app.get('/1', (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/1'), 'hello from v1')
     assertEquals(await get('/v2/1'), 'hello from v2')
@@ -124,7 +124,7 @@ Deno.test('versioning', async (t) => {
 
     // exact
 
-    app.get('/2', { versionRange: 'v3' }, (c) => `hello from v${c.gateway}`)
+    app.get('/2', { gateway: 'v3' }, (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/2') !== 'hello from v1', true)
     assertEquals(await get('/v2/2') !== 'hello from v2', true)
@@ -133,7 +133,7 @@ Deno.test('versioning', async (t) => {
 
     // smaller than
 
-    app.get('/3', { versionRange: '< v3' }, (c) => `hello from v${c.gateway}`)
+    app.get('/3', { gateway: '< v3' }, (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/3'), 'hello from v1')
     assertEquals(await get('/v2/3'), 'hello from v2')
@@ -142,7 +142,7 @@ Deno.test('versioning', async (t) => {
 
     // smaller than or equal to
 
-    app.get('/4', { versionRange: '<= v3' }, (c) => `hello from v${c.gateway}`)
+    app.get('/4', { gateway: '<= v3' }, (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/4'), 'hello from v1')
     assertEquals(await get('/v2/4'), 'hello from v2')
@@ -151,7 +151,7 @@ Deno.test('versioning', async (t) => {
 
     // greater than
 
-    app.get('/5', { versionRange: '> v3' }, (c) => `hello from v${c.gateway}`)
+    app.get('/5', { gateway: '> v3' }, (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/5') !== 'hello from v1', true)
     assertEquals(await get('/v2/5') !== 'hello from v2', true)
@@ -160,7 +160,7 @@ Deno.test('versioning', async (t) => {
 
     // greater than or equal
 
-    app.get('/6', { versionRange: '>= v3' }, (c) => `hello from v${c.gateway}`)
+    app.get('/6', { gateway: '>= v3' }, (c) => `hello from v${c.req.gateway}`)
 
     assertEquals(await get('/v1/6') !== 'hello from v1', true)
     assertEquals(await get('/v2/6') !== 'hello from v2', true)
@@ -171,8 +171,8 @@ Deno.test('versioning', async (t) => {
 
     app.get(
       '/7',
-      { versionRange: 'v2...v3' },
-      (c) => `hello from v${c.gateway}`,
+      { gateway: 'v2...v3' },
+      (c) => `hello from v${c.req.gateway}`,
     )
 
     assertEquals(await get('/v1/7') !== 'hello from v1', true)