@tscircuit/cli 0.0.60 → 0.0.62

package/dev-server-api/routes/api/export_requests/create.ts

@@ -1,6 +1,8 @@
 import { withEdgeSpec } from "src/with-edge-spec"
 import { NotFoundError } from "edgespec/middleware"
 import { z } from "zod"
+import { export_request } from "src/lib/zod/export_request"
+import { publicMapExportRequest } from "src/lib/public-mapping/public-map-export-request"
 
 export default withEdgeSpec({
   methods: ["POST"],
@@ -17,51 +19,23 @@ export default withEdgeSpec({
     }),
   }),
   jsonResponse: z.object({
-    export_request: z.object({
-      export_request_id: z.coerce.number(),
-      created_at: z.string(),
-      file_summary: z.array(
-        z.object({
-          file_name: z.string(),
-          is_complete: z.boolean(),
-        })
-      ),
-    }),
+    export_request,
   }),
   auth: "none",
 })(async (req, ctx) => {
-  // const tscircuit_soup = req.jsonBody.tscircuit_soup
-  //   ? JSON.stringify(req.jsonBody.tscircuit_soup)
-  //   : undefined
-  // const dev_package_example = await ctx.db
-  //   .insertInto("dev_package_example")
-  //   .values({
-  //     file_path: req.jsonBody.file_path,
-  //     export_name: req.jsonBody.export_name,
-  //     error: req.jsonBody.error,
-  //     tscircuit_soup,
-  //     is_loading: req.jsonBody.is_loading ? 1 : 0,
-  //     last_updated_at: new Date().toISOString(),
-  //   })
-  //   .onConflict((oc) =>
-  //     oc.columns(["file_path"]).doUpdateSet({
-  //       export_name: req.jsonBody.export_name,
-  //       error: req.jsonBody.error,
-  //       tscircuit_soup,
-  //       is_loading: req.jsonBody.is_loading ? 1 : 0,
-  //       last_updated_at: new Date().toISOString(),
-  //     })
-  //   )
-  //   .returningAll()
-  //   .executeTakeFirstOrThrow()
-
-  const export_request = {
-    export_request_id: 1,
-    created_at: new Date().toISOString(),
-    file_summary: [],
-  }
+  const db_export_request = await ctx.db
+    .insertInto("export_request")
+    .values({
+      example_file_path: req.jsonBody.example_file_path,
+      export_parameters: JSON.stringify(req.jsonBody.export_parameters),
+      export_name: req.jsonBody.export_name ?? "default",
+      is_complete: 0,
+      created_at: new Date().toISOString(),
+    })
+    .returningAll()
+    .executeTakeFirstOrThrow()
 
   return ctx.json({
-    export_request,
+    export_request: publicMapExportRequest(db_export_request),
   })
 })

package/dev-server-api/src/db/create-schema.ts

@@ -20,7 +20,7 @@ export const createSchema = async (db: DbClient) => {
       col.primaryKey().autoIncrement()
     )
     .addColumn("example_file_path", "text")
-    .addColumn("export_parameters", "jsonb")
+    .addColumn("export_parameters", "json")
     .addColumn("export_name", "text")
     .addColumn("is_complete", "boolean", (col) => col.defaultTo(0).notNull())
     .addColumn("created_at", "text")

package/dev-server-api/src/db/get-db.ts

@@ -3,7 +3,7 @@ import { createSchema } from "./create-schema"
 import { mkdirSync } from "fs"
 import * as Path from "path"
 
-interface DevPackageExample {
+export interface DevPackageExample {
   dev_package_example_id: Generated<number>
   tscircuit_soup: any
   file_path: string
@@ -13,15 +13,16 @@ interface DevPackageExample {
   last_updated_at: string
 }
 
-interface ExportRequest {
+export interface ExportRequest {
   export_request_id: Generated<number>
   example_file_path: string
+  export_parameters: string
   export_name: string
   is_complete: 1 | 0
   created_at: string
 }
 
-interface ExportFile {
+export interface ExportFile {
   export_file_id: Generated<number>
   file_name: string
   file_content: Buffer

package/dev-server-api/src/lib/public-mapping/public-map-export-request.ts

@@ -0,0 +1,19 @@
+import type { ExportRequest } from "src/db/get-db"
+import { export_request } from "src/lib/zod/export_request"
+import { z } from "zod"
+
+export const publicMapExportRequest = (db_export_request: {
+  export_request_id: number
+  example_file_path: string
+  export_parameters: string
+  export_name: string
+  is_complete: 1 | 0
+  created_at: string
+}): z.infer<typeof export_request> => {
+  return {
+    export_request_id: db_export_request.export_request_id as any,
+    is_completed: db_export_request.is_complete === 1,
+    created_at: db_export_request.created_at,
+    file_summary: [],
+  }
+}

package/dev-server-api/src/lib/zod/export_request.ts

@@ -0,0 +1,13 @@
+import { z } from "zod"
+
+export const export_request = z.object({
+  export_request_id: z.coerce.number(),
+  is_completed: z.boolean(),
+  created_at: z.string(),
+  file_summary: z.array(
+    z.object({
+      file_name: z.string(),
+      is_complete: z.boolean(),
+    })
+  ),
+})