fix import cycle

Author: remorses

website/src/lib/spiceflow-public-api.ts

@@ -9,9 +9,24 @@ import { assetsFromFilesList, syncSite } from './sync'
 import { defaultDocsJsonComments } from 'docs-website/src/lib/docs-json-examples'
 import { DocsJsonType } from 'docs-website/src/lib/docs-json'
 import { CloudflareClient, getZoneIdForDomain } from './cloudflare'
-import { filesSchema } from './spiceflow'
+
 import { client as searchApi } from 'docs-website/src/lib/search-api'
 
+// Export schemas for reuse
+export const filesSchema = z.array(
+  z.object({
+    relativePath: z.string(),
+    contents: z.string(),
+    downloadUrl: z.string().optional(),
+    metadata: z
+      .object({
+        width: z.number().optional(),
+        height: z.number().optional(),
+      })
+      .optional(),
+  }),
+)
+
 export const publicApiApp = new Spiceflow({ basePath: '/api/v1' })
   .state('apiKey', '')
   .state('userId', '')
@@ -20,7 +35,7 @@ export const publicApiApp = new Spiceflow({ basePath: '/api/v1' })
   .use(openapi())
   .use(async ({ request, state }, next) => {
     const apiKey = request.headers.get('x-api-key')
-    
+
     if (!apiKey) {
       return new Response(JSON.stringify({ error: 'API key required' }), {
         status: 401,
@@ -76,7 +91,7 @@ export const publicApiApp = new Spiceflow({ basePath: '/api/v1' })
     async handler({ request, state }) {
       const body = await request.json()
       const { name, orgId, files, githubOwner, githubRepo, githubRepoId, githubBranch, githubFolder } = body
-      
+
       const userOrgAccess = await prisma.orgsUsers.findFirst({
         where: {
           userId: state.userId,
@@ -555,18 +570,18 @@ export const publicApiApp = new Spiceflow({ basePath: '/api/v1' })
   })
   .onError(({ error, request }) => {
     notifyError(error, `Public API error: ${request.method} ${request.url}`)
-    
+
     if (error instanceof AppError) {
       return new Response(JSON.stringify({ error: error.message }), {
         status: 400,
         headers: { 'Content-Type': 'application/json' }
       })
     }
-    
+
     return new Response(JSON.stringify({ error: 'Internal server error' }), {
       status: 500,
       headers: { 'Content-Type': 'application/json' }
     })
   })
 
-export type PublicApiApp = typeof publicApiApp
+export type PublicApiApp = typeof publicApiApp

website/src/lib/spiceflow.ts

@@ -22,22 +22,9 @@ import { DocsJsonType } from 'docs-website/src/lib/docs-json'
 import { openai } from '@ai-sdk/openai'
 import { experimental_transcribe as transcribe } from 'ai'
 import { applyJsonCComments } from './json-c-comments'
-import { publicApiApp } from './spiceflow-public-api'
-
-// Export schemas for reuse
-export const filesSchema = z.array(
-  z.object({
-    relativePath: z.string(),
-    contents: z.string(),
-    downloadUrl: z.string().optional(),
-    metadata: z
-      .object({
-        width: z.number().optional(),
-        height: z.number().optional(),
-      })
-      .optional(),
-  }),
-)
+import { filesSchema, publicApiApp } from './spiceflow-public-api'
+
+
 
 // Utility to get client IP from request, handling Cloudflare proxy headers
 function getClientIp(request: Request): string {
@@ -985,13 +972,13 @@ export const app = new Spiceflow({ basePath: '/api' })
           githubBranch: githubBranch || 'main',
           files, // Pass the files directly
         })
-        
+
         finalSiteId = result.siteId
         finalBranchId = result.branchId
       }
 
       let pageCount: number
-      
+
       // For updates (existing sites), we need to sync again
       if (siteId) {
         // Fetch the branch's latest docsJson
@@ -1000,7 +987,7 @@ export const app = new Spiceflow({ basePath: '/api' })
         })
         const docsJson = branch?.docsJson as DocsJsonType
         const docsJsonComments = branch?.docsJsonComments as any
-        
+
         // Convert files to pages format
         const assets = assetsFromFilesList({
           files,
@@ -1063,7 +1050,7 @@ export const app = new Spiceflow({ basePath: '/api' })
 
       // Get docsJsonComments from the branch
       const branchDocsJsonComments = (branch?.docsJsonComments || {}) as any
-      
+
       const docsJsonWithComments = applyJsonCComments(branch?.docsJson || {}, {
         ...defaultDocsJsonComments,
         ...branchDocsJsonComments,