spiceflow 1.6.1 → 1.6.2

package/src/openapi.test.ts

@@ -243,7 +243,7 @@ test('openapi response', async () => {
               "content": {
                 "application/json": {
                   "schema": {
-                    "additionalProperties": false,
+                    "additionalProperties": true,
                     "properties": {
                       "name": {
                         "type": "string",
@@ -456,7 +456,7 @@ test('openapi response', async () => {
               "content": {
                 "application/json": {
                   "schema": {
-                    "additionalProperties": false,
+                    "additionalProperties": true,
                     "properties": {
                       "name": {
                         "type": "string",

package/src/openapi.ts

@@ -351,11 +351,6 @@ const registerSchemaPath = ({
   }
 }
 
-/**
- * Plugin for [elysia](https://github.com/elysiajs/elysia) that auto-generate Swagger page.
- *
- * @see https://github.com/elysiajs/elysia-swagger
- */
 export const openapi = <Path extends string = '/openapi'>({
   path = '/openapi' as Path,
   ...additional

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.js'
+import { bfs, cloneDeep, Spiceflow } from './spiceflow.js'
 import { z } from 'zod'
 import { createSpiceflowClient } from './client/index.js'
 
@@ -11,6 +11,25 @@ test('works', async () => {
   expect(res.status).toBe(200)
   expect(await res.json()).toEqual('hi')
 })
+
+describe('cloneDeep', () => {
+  test('works on promises', async () => {
+    const obj = {
+      promise: Promise.resolve({ value: 'hi' }),
+    }
+    const res = cloneDeep(obj)
+    expect(res.promise).toBeInstanceOf(Promise)
+    expect(await res.promise).toEqual({ value: 'hi' })
+    // expect(await res.promise).not.toBe(await obj.promise)
+    expect(res).toMatchInlineSnapshot(`
+      {
+        "promise": Promise {},
+      }
+    `)
+  })
+})
+
+
 test('can encode superjson types', async () => {
   const app = new Spiceflow().post('/superjson', () => {
     const item = {

package/src/spiceflow.ts

@@ -1,4 +1,6 @@
 import addFormats from 'ajv-formats'
+import lodashCloneDeep from 'lodash.clonedeep'
+
 import superjson from 'superjson'
 import {
   ComposeSpiceflowResponse,
@@ -249,7 +251,7 @@ export class Spiceflow<
 
   state<const Name extends string | number | symbol, Value>(
     name: Name,
-    value: Value,
+    value?: Value,
   ): Spiceflow<
     BasePath,
     Scoped,
@@ -739,7 +741,7 @@ export class Spiceflow<
     } = route
     const middlewares = appsInScope.flatMap((x) => x.middlewares)
 
-    let state = structuredClone(defaultState)
+    let state = cloneDeep(defaultState)
 
     let content = route?.internalRoute?.hooks?.content
 
@@ -1031,7 +1033,18 @@ export class Spiceflow<
     if (init instanceof Promise) init = await init
 
     if (init?.done) {
-      return await turnHandlerResultIntoResponse(init.value, route)
+      return new Response(
+        'event: message\ndata: ' +
+          superjsonSerialize(init.value, false) +
+          '\n\n' +
+          'event: done\n\n',
+        {
+          headers: {
+            'Content-Type': 'text/event-stream',
+            'Cache-Control': 'no-cache',
+          },
+        },
+      )
     }
 
     let self = this
@@ -1339,7 +1352,6 @@ function getValidateFunction(schema: TypeSchema) {
   if (isZodSchema(schema)) {
     let jsonSchema = zodToJsonSchema(schema, {
       removeAdditionalStrategy: 'strict',
-      
     })
     return ajv.compile(jsonSchema)
   }
@@ -1379,3 +1391,7 @@ function parseQuery(queryString: string) {
   }
   return paramsObject
 }
+
+export function cloneDeep(x) {
+  return lodashCloneDeep(x)
+}

package/src/stream.test.ts

@@ -285,10 +285,16 @@ describe('Stream', () => {
       app.handle(req('/json')),
     ])
 
-    expect(await response[0].text()).toBe('"hello"')
-    expect(await response[1].json()).toEqual({
-      hello: 'world',
-    })
+    const text = await response[0].text()
+    expect(text).toMatchInlineSnapshot(`
+      "event: message
+      data: "hello"
+
+      event: done
+
+      "
+    `)
+    expect(parseTextEventStreamItem(text)).toMatchInlineSnapshot(`"hello"`)
   })
 
   it('return async value if not yield', async () => {
@@ -305,10 +311,17 @@ describe('Stream', () => {
       app.handle(req('/json')),
     ])
 
-    expect(await response[0].text()).toBe('"hello"')
-    expect(await response[1].json()).toEqual({
-      hello: 'world',
-    })
+    const text = await response[0].text()
+    expect(text).toMatchInlineSnapshot(`
+      "event: message
+      data: "hello"
+
+      event: done
+
+      "
+    `)
+    expect(parseTextEventStreamItem(text)).toMatchInlineSnapshot(`"hello"`)
+    
   })
 
   it('handle object and array', async () => {

package/src/types.ts

@@ -15,7 +15,7 @@ import type { OpenAPIV3 } from 'openapi-types'
 import { ZodObject, ZodTypeAny } from 'zod'
 import type { Context, ErrorContext, MiddlewareContext } from './context.js'
 import {
-  ELYSIA_RESPONSE,
+  SPICEFLOW_RESPONSE,
   InternalServerError,
   ParseError,
   ValidationError,
@@ -363,7 +363,7 @@ export type InlineHandler<
             | {
                 [Status in keyof Route['response']]: {
                   _type: Record<Status, Route['response'][Status]>
-                  [ELYSIA_RESPONSE]: Status
+                  [SPICEFLOW_RESPONSE]: Status
                 }
               }[keyof Route['response']]
     >
@@ -645,13 +645,13 @@ export type ComposeSpiceflowResponse<Response, Handle> = Handle extends (
 type _ComposeSpiceflowResponse<Response, Handle> = Prettify<
   {} extends Response
     ? {
-        200: Exclude<Handle, { [ELYSIA_RESPONSE]: any }>
+        200: Exclude<Handle, { [SPICEFLOW_RESPONSE]: any }>
       } & {
         [ErrorResponse in Extract<
           Handle,
           { response: any }
         > as ErrorResponse extends {
-          [ELYSIA_RESPONSE]: infer Status extends number
+          [SPICEFLOW_RESPONSE]: infer Status extends number
         }
           ? Status
           : never]: ErrorResponse['response']