spiceflow 1.0.3 → 1.0.5

package/src/client/index.ts

@@ -1,16 +1,16 @@
 /* eslint-disable no-extra-semi */
 /* eslint-disable no-case-declarations */
 /* eslint-disable prefer-const */
-import type { Spiceflow } from '../spiceflow'
+import type { Spiceflow } from '../spiceflow.js'
 import { EventSourceParserStream } from 'eventsource-parser/stream'
 
-import type { SpiceflowClient } from './types'
+import type { SpiceflowClient } from './types.js'
 
 export { SpiceflowClient }
 
-import { EdenFetchError } from './errors'
+import { EdenFetchError } from './errors.js'
 // import { EdenWS } from './ws'
-import { parseStringifiedValue } from './utils'
+import { parseStringifiedValue } from './utils.js'
 
 const method = [
 	'get',
@@ -21,10 +21,10 @@ const method = [
 	'options',
 	'head',
 	'connect',
-	'subscribe'
+	'subscribe',
 ] as const
 
-const locals = ['localhost', '127.0.0.1', '0.0.0.0']
+
 
 const isServer = typeof FileList === 'undefined'
 
@@ -57,7 +57,7 @@ const createNewFile = (v: File) =>
 				reader.onload = () => {
 					const file = new File([reader.result!], v.name, {
 						lastModified: v.lastModified,
-						type: v.type
+						type: v.type,
 					})
 					resolve(file)
 				}
@@ -69,7 +69,7 @@ const processHeaders = (
 	h: SpiceflowClient.Config['headers'],
 	path: string,
 	options: RequestInit = {},
-	headers: Record<string, string> = {}
+	headers: Record<string, string> = {},
 ): Record<string, string> => {
 	if (Array.isArray(h)) {
 		for (const value of h)
@@ -91,7 +91,7 @@ const processHeaders = (
 
 	switch (typeof h) {
 		case 'function':
-			if (h instanceof Headers)
+			if (typeof Headers !== 'undefined' && h instanceof Headers)
 				return processHeaders(h, path, options, headers)
 
 			const v = h(path, options)
@@ -99,7 +99,7 @@ const processHeaders = (
 			return headers
 
 		case 'object':
-			if (h instanceof Headers) {
+			if (typeof Headers !== 'undefined' && h instanceof Headers) {
 				h.forEach((value, key) => {
 					headers[key.toLowerCase()] = value
 				})
@@ -126,12 +126,12 @@ export class TextDecoderStream extends TransformStream<Uint8Array, string> {
 	constructor() {
 		const decoder = new TextDecoder('utf-8', {
 			fatal: true,
-			ignoreBOM: true
+			ignoreBOM: true,
 		})
 		super({
 			transform(
 				chunk: Uint8Array,
-				controller: TransformStreamDefaultController<string>
+				controller: TransformStreamDefaultController<string>,
 			) {
 				const decoded = decoder.decode(chunk, { stream: true })
 				if (decoded.length > 0) {
@@ -143,13 +143,13 @@ export class TextDecoderStream extends TransformStream<Uint8Array, string> {
 				if (output.length > 0) {
 					controller.enqueue(output)
 				}
-			}
+			},
 		})
 	}
 }
 
 export async function* streamSSEResponse(
-	response: Response
+	response: Response,
 ): AsyncGenerator<SSEEvent> {
 	const body = response.body
 	if (!body) return
@@ -183,7 +183,7 @@ const createProxy = (
 	domain: string,
 	config: SpiceflowClient.Config,
 	paths: string[] = [],
-	instance?: Spiceflow<any, any, any, any, any, any>
+	instance?: Spiceflow<any, any, any, any, any, any>,
 ): any =>
 	new Proxy(() => {}, {
 		get(_, param: string): any {
@@ -191,7 +191,7 @@ const createProxy = (
 				domain,
 				config,
 				param === 'index' ? paths : [...paths, param],
-				instance
+				instance,
 			)
 		},
 		apply(_, __, [body, options]) {
@@ -206,11 +206,10 @@ const createProxy = (
 				const path = '/' + methodPaths.join('/')
 
 				let {
-					fetcher = fetch,
+					fetch: fetcher = fetch,
 					headers,
 					onRequest,
 					onResponse,
-					fetch: conf
 				} = config
 
 				const isGetOrHead =
@@ -231,7 +230,7 @@ const createProxy = (
 						q +=
 							(q ? '&' : '?') +
 							`${encodeURIComponent(key)}=${encodeURIComponent(
-								value
+								value,
 							)}`
 					}
 
@@ -274,8 +273,8 @@ const createProxy = (
 					let fetchInit = {
 						method: method?.toUpperCase(),
 						body,
-						...conf,
-						headers
+						// ...conf,
+						headers,
 					} satisfies RequestInit
 
 					fetchInit.headers = {
@@ -284,8 +283,8 @@ const createProxy = (
 							// For GET and HEAD, options is moved to body (1st param)
 							isGetOrHead ? body?.headers : options?.headers,
 							path,
-							fetchInit
-						)
+							fetchInit,
+						),
 					}
 
 					const fetchOpts =
@@ -295,7 +294,7 @@ const createProxy = (
 
 					fetchInit = {
 						...fetchInit,
-						...fetchOpts
+						...fetchOpts,
 					}
 
 					if (isGetOrHead) delete fetchInit.body
@@ -315,9 +314,9 @@ const createProxy = (
 										...processHeaders(
 											temp.headers,
 											path,
-											fetchInit
-										)
-									}
+											fetchInit,
+										),
+									},
 								}
 						}
 					}
@@ -330,7 +329,7 @@ const createProxy = (
 
 						// FormData is 1 level deep
 						for (const [key, field] of Object.entries(
-							fetchInit.body
+							fetchInit.body,
 						)) {
 							if (isServer) {
 								formData.append(key, field as any)
@@ -341,7 +340,7 @@ const createProxy = (
 							if (field instanceof File) {
 								formData.append(
 									key,
-									await createNewFile(field as any)
+									await createNewFile(field as any),
 								)
 
 								continue
@@ -351,7 +350,7 @@ const createProxy = (
 								for (let i = 0; i < field.length; i++)
 									formData.append(
 										key as any,
-										await createNewFile((field as any)[i])
+										await createNewFile((field as any)[i]),
 									)
 
 								continue
@@ -365,7 +364,7 @@ const createProxy = (
 										key as any,
 										value instanceof File
 											? await createNewFile(value)
-											: value
+											: value,
 									)
 								}
 
@@ -407,16 +406,16 @@ const createProxy = (
 										...processHeaders(
 											temp.headers,
 											path,
-											fetchInit
-										)
-									} as Record<string, string>
+											fetchInit,
+										),
+									} as Record<string, string>,
 								}
 						}
 					}
 
 					const url = domain + path + q
 					const response = await (instance?.handle(
-						new Request(url, fetchInit)
+						new Request(url, fetchInit),
 					) ?? fetcher!(url, fetchInit))
 
 					let data = null as any
@@ -448,7 +447,7 @@ const createProxy = (
 							error,
 							response,
 							status: response.status,
-							headers: response.headers
+							headers: response.headers,
 						}
 					}
 
@@ -493,7 +492,7 @@ const createProxy = (
 						error,
 						response,
 						status: response.status,
-						headers: response.headers
+						headers: response.headers,
 					}
 				})()
 			}
@@ -503,36 +502,28 @@ const createProxy = (
 					domain,
 					config,
 					[...paths, Object.values(body)[0] as string],
-					instance
+					instance,
 				)
 
 			return createProxy(domain, config, paths)
-		}
+		},
 	}) as any
 
 export const createSpiceflowClient = <
-	const App extends Spiceflow<any, any, any, any, any, any, any, any>
+	const App extends Spiceflow<any, any, any, any, any, any, any, any>,
 >(
 	domain: string | App,
-	config: SpiceflowClient.Config = {}
+	config: SpiceflowClient.Config = {},
 ): SpiceflowClient.Create<App> => {
 	if (typeof domain === 'string') {
-		if (!config.keepDomain) {
-			if (!domain.includes('://'))
-				domain =
-					(locals.find((v) => (domain as string).includes(v))
-						? 'http://'
-						: 'https://') + domain
-
-			if (domain.endsWith('/')) domain = domain.slice(0, -1)
-		}
+		if (domain.endsWith('/')) domain = domain.slice(0, -1)
 
 		return createProxy(domain, config)
 	}
 
 	if (typeof window !== 'undefined')
 		console.warn(
-			'Spiceflow instance server found on client side, this is not recommended for security reason. Use generic type instead.'
+			'Spiceflow instance server found on client side, this is not recommended for security reason. Use generic type instead.',
 		)
 
 	return createProxy('http://e.ly', config, [], domain)

package/src/client/types.ts

@@ -1,9 +1,9 @@
 /// <reference lib="dom" />
-import type { Spiceflow } from '../spiceflow'
+import type { Spiceflow } from '../spiceflow.js'
 // import { EdenWS } from './ws'
 // import type { IsNever, Not, Prettify } from '../types'
-import { EdenFetchError } from './errors'
-import { EdenWS } from './ws'
+import { EdenFetchError } from './errors.js'
+import { EdenWS } from './ws.js'
 
 export type Prettify<T> = {
 	[K in keyof T]: T[K]
@@ -168,8 +168,8 @@ export namespace SpiceflowClient {
 		: never
 
 	export interface Config {
-		fetch?: Omit<RequestInit, 'headers' | 'method'>
-		fetcher?: typeof fetch
+		// fetch?: Omit<RequestInit, 'headers' | 'method'>
+		fetch?: typeof fetch
 		headers?: MaybeArray<
 			| RequestInit['headers']
 			| ((
@@ -184,7 +184,7 @@ export namespace SpiceflowClient {
 			) => MaybePromise<RequestInit | void>
 		>
 		onResponse?: MaybeArray<(response: Response) => MaybePromise<unknown>>
-		keepDomain?: boolean
+		// keepDomain?: boolean
 	}
 
 	// type UnwrapAwaited<T extends Record<number, unknown>> = {

package/src/client/ws.ts

@@ -1,6 +1,6 @@
-import type { InputSchema } from '../elysia-fork/types'
-import type { SpiceflowClient } from './types'
-import { parseStringifiedValue } from './utils'
+import type { InputSchema } from '../elysia-fork/types.js'
+import type { SpiceflowClient } from './types.js'
+import { parseStringifiedValue } from './utils.js'
 
 export class EdenWS<in out Schema extends InputSchema<any> = {}> {
 	ws: WebSocket

package/src/client.test.ts

@@ -1,5 +1,5 @@
-import { createSpiceflowClient } from './client'
-import { Spiceflow, t } from './spiceflow'
+import { createSpiceflowClient } from './client/index.js'
+import { Spiceflow, t } from './spiceflow.js'
 
 import { describe, expect, it } from 'vitest'
 

package/src/elysia-fork/types.ts

@@ -16,15 +16,15 @@ import type { BunFile, Server } from 'bun'
 
 import type { OpenAPIV3 } from 'openapi-types'
 
-import { Spiceflow } from '../spiceflow'
-import type { Context, ErrorContext, PreContext } from './context'
+import { Spiceflow } from '../spiceflow.js'
+import type { Context, ErrorContext, PreContext } from './context.js'
 import {
 	ELYSIA_RESPONSE,
 	InternalServerError,
 	NotFoundError,
 	ParseError,
 	ValidationError,
-} from './error'
+} from './error.js'
 import { ZodTypeAny, ZodObject } from 'zod'
 
 export type MaybeArray<T> = T | T[]

package/src/openapi.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { JSONSchemaType } from 'ajv'
-import { InternalRoute, isZodSchema, Spiceflow } from './spiceflow'
+import { InternalRoute, isZodSchema, Spiceflow } from './spiceflow.js'
 import { ZodType } from 'zod'
 
 import type { OpenAPIV3 } from 'openapi-types'
@@ -8,7 +8,7 @@ import type { OpenAPIV3 } from 'openapi-types'
 let excludeMethods = ['OPTIONS']
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import type { HTTPMethod, LocalHook, TypeSchema } from './elysia-fork/types'
+import type { HTTPMethod, LocalHook, TypeSchema } from './elysia-fork/types.js'
 
 import { Kind, type TSchema } from '@sinclair/typebox'
 
@@ -418,7 +418,8 @@ export const openapi = <Path extends string = '/openapi'>({
 
 function getJsonSchema(schema: TypeSchema): JSONSchemaType<any> {
 	if (isZodSchema(schema)) {
-		let jsonSchema = zodToJsonSchema(schema, {})
+		let fn = zodToJsonSchema.default ?? zodToJsonSchema
+		let jsonSchema = fn(schema, {})
 		return jsonSchema as any
 	}
 

package/src/spiceflow.test.ts

@@ -1,6 +1,6 @@
 import { test, describe, expect } from 'vitest'
 import { Type } from '@sinclair/typebox'
-import { bfs, Spiceflow } from './spiceflow'
+import { bfs, Spiceflow } from './spiceflow.js'
 import { z } from 'zod'
 
 test('works', async () => {

package/src/spiceflow.ts

@@ -44,22 +44,25 @@ import { ValidationError } from './elysia-fork/error.js'
 import { zodToJsonSchema } from 'zod-to-json-schema'
 import { z, ZodType } from 'zod'
 
-const ajv = addFormats(new Ajv({ useDefaults: true }), [
-	'date-time',
-	'time',
-	'date',
-	'email',
-	'hostname',
-	'ipv4',
-	'ipv6',
-	'uri',
-	'uri-reference',
-	'uuid',
-	'uri-template',
-	'json-pointer',
-	'relative-json-pointer',
-	'regex',
-])
+const ajv = (addFormats.default || addFormats)(
+	new (Ajv.default || Ajv)({ useDefaults: true }),
+	[
+		'date-time',
+		'time',
+		'date',
+		'email',
+		'hostname',
+		'ipv4',
+		'ipv6',
+		'uri',
+		'uri-reference',
+		'uuid',
+		'uri-template',
+		'json-pointer',
+		'relative-json-pointer',
+		'regex',
+	],
+)
 
 // Should be exported from `hono/router`
 

package/src/stream.test.ts

@@ -2,9 +2,9 @@ import { describe, it, expect } from 'vitest'
 
 import { createParser } from 'eventsource-parser'
 
-import { Spiceflow } from './spiceflow'
+import { Spiceflow } from './spiceflow.js'
 
-import { req, sleep } from './utils'
+import { req, sleep } from './utils.js'
 
 function textEventStream(items: string[]) {
 	return items

package/src/zod.test.ts

@@ -1,7 +1,7 @@
 import { test, describe, expect } from 'vitest'
 import { Type } from '@sinclair/typebox'
-import { Spiceflow } from './spiceflow'
-import { req } from './utils'
+import { Spiceflow } from './spiceflow.js'
+import { req } from './utils.js'
 import { z } from 'zod'
 
 test('body is parsed as json', async () => {