@tscircuit/fake-snippets 0.0.66 → 0.0.68

package/bun-tests/fake-snippets-api/fixtures/get-circuit-json.ts

@@ -1,148 +1,10 @@
-import * as React from "react"
-import { getImportsFromCode } from "@tscircuit/prompt-benchmarks/code-runner-utils"
-import * as tscircuitCore from "@tscircuit/core"
-import * as jscadFiber from "jscad-fiber"
 import type { AnyCircuitElement } from "circuit-json"
-import { safeCompileTsx } from "@/hooks/use-compiled-tsx"
-import { evalCompiledJs } from "@/hooks/use-run-tsx/eval-compiled-js"
-import { constructCircuit } from "@/hooks/use-run-tsx/construct-circuit"
-
-type GenerateCircuitJson = {
-  code: string
-  type: "board" | "footprint" | "package" | "model"
-  compiled_js: string
-}
-
-// Keeping track of processed imports to avoid circular dependencies
-const processedImports = new Set<string>()
-
-async function processImport(
-  importName: string,
-  preSuppliedImports: Record<string, any>,
-  depth = 0,
-  code: string,
-  compiled_js: string,
-): Promise<void> {
-  if (!importName.startsWith("@tsci/")) return
-  if (preSuppliedImports[importName]) return
-  if (processedImports.has(importName)) return
-  if (depth > 5) {
-    throw new Error(
-      `Max depth for imports reached when processing ${importName}`,
-    )
-  }
-
-  processedImports.add(importName)
-
-  try {
-    // Process nested imports first
-    const nestedImports = getImportsFromCode(code)
-
-    // Filter out already processed imports and non-@tsci imports
-    const validNestedImports = nestedImports.filter(
-      (imp) =>
-        imp.startsWith("@tsci/") &&
-        !processedImports.has(imp) &&
-        !preSuppliedImports[imp],
-    )
-
-    // Process each valid nested import
-    for (const nestedImport of validNestedImports) {
-      await processImport(
-        nestedImport,
-        preSuppliedImports,
-        depth + 1,
-        code,
-        compiled_js,
-      )
-    }
-    // Set React in the global scope before evaluation
-    ;(globalThis as any).React = React
-    const exports = evalCompiledJs(compiled_js).exports
-
-    // Only set the import if we successfully evaluated it
-    if (exports) {
-      preSuppliedImports[importName] = exports
-    }
-  } catch (e) {
-    processedImports.delete(importName) // Clean up on error
-  }
-}
+import { runTscircuitCode } from "@tscircuit/eval"
 
 export const generateCircuitJson = async ({
   code,
-  type,
-  compiled_js,
-}: GenerateCircuitJson): Promise<AnyCircuitElement[]> => {
-  // Clear the processed imports set at the start of each generation
-  processedImports.clear()
-
-  // Set up pre-supplied imports
-  const preSuppliedImports: Record<string, any> = {
-    "@tscircuit/core": tscircuitCore,
-    react: React,
-    "jscad-fiber": jscadFiber,
-  }
-  ;(globalThis as any).React = React
-  ;(globalThis as any).createElement = React.createElement
-
-  try {
-    // Process all @tsci imports
-    const tsciImports = getImportsFromCode(code).filter((imp) =>
-      imp.startsWith("@tsci/"),
-    )
-    for (const importName of tsciImports) {
-      await processImport(importName, preSuppliedImports, 0, code, compiled_js)
-    }
-
-    // Create require function for imports
-    const __tscircuit_require = (name: string) => {
-      if (!preSuppliedImports[name]) {
-        throw new Error(
-          `Import "${name}" not found (available imports: ${Object.keys(preSuppliedImports).join(", ")})`,
-        )
-      }
-      return preSuppliedImports[name]
-    }
-    ;(globalThis as any).__tscircuit_require = __tscircuit_require
-
-    // Add a custom JSX runtime
-    ;(globalThis as any).jsx = React.createElement
-    ;(globalThis as any).jsxs = React.createElement
-
-    const { success, compiledTsx, error } = safeCompileTsx(code)
-    if (!success || !compiledTsx) {
-      throw new Error(
-        `Compile Error: ${error?.message || "Unknown compilation error"}`,
-      )
-    }
-
-    const module = evalCompiledJs(compiledTsx)
-    const componentExportKeys = Object.keys(module.exports).filter(
-      (key) => !key.startsWith("use"),
-    )
-
-    if (componentExportKeys.length > 1) {
-      throw new Error(
-        `Too many exports, only export one component. Exports: ${JSON.stringify(componentExportKeys)}`,
-      )
-    }
-
-    const primaryKey = componentExportKeys[0]
-
-    // Create the user element with explicit React scope
-    const UserElm = function (props: any) {
-      return React.createElement(module.exports[primaryKey], props)
-    }
-
-    // Construct and render the circuit
-    const circuit = constructCircuit({ UserElm, type })
-
-    // Wait for the circuit to settle
-    await circuit.renderUntilSettled()
-
-    return circuit.getCircuitJson() as AnyCircuitElement[]
-  } catch (e) {
-    throw new Error("Circuit generation failed!")
-  }
+}: {
+  code: string
+}): Promise<AnyCircuitElement[]> => {
+  return (await runTscircuitCode(code)) as any
 }

package/bun-tests/fake-snippets-api/fixtures/get-test-server.ts

@@ -2,7 +2,6 @@ import { afterEach } from "bun:test"
 import defaultAxios from "redaxios"
 import { startServer } from "./start-server"
 import { DbClient } from "fake-snippets-api/lib/db/db-client"
-import getPort from "get-port"
 
 process.env.BUN_TEST = "true"
 interface TestFixture {
@@ -16,12 +15,10 @@ interface TestFixture {
 }
 
 export const getTestServer = async (): Promise<TestFixture> => {
-  const port = await getPort()
   const testInstanceId = Math.random().toString(36).substring(2, 15)
   const testDbName = `testdb${testInstanceId}`
 
-  const { server, db } = await startServer({
-    port,
+  const { server, db, port } = await startServer({
     testDbName,
   })
 

package/bun-tests/fake-snippets-api/fixtures/start-server.ts

@@ -11,7 +11,7 @@ import { createDatabase } from "fake-snippets-api/lib/db/db-client"
 export const startServer = async ({
   port,
   testDbName,
-}: { port: number; testDbName: string }) => {
+}: { port?: number; testDbName: string }) => {
   const winterspecBundle = await createWinterSpecBundleFromDir(
     join(import.meta.dir, "../../../fake-snippets-api/routes"),
   )
@@ -37,8 +37,12 @@ export const startServer = async ({
         middleware,
       })
     },
-    port,
+    port: port ?? 0,
   })
 
-  return { server: { ...server, stop: () => server.stop() }, db }
+  return {
+    server: { ...server, stop: () => server.stop() },
+    db,
+    port: server.port,
+  }
 }

package/bun-tests/fake-snippets-api/routes/order_quotes/create.test.ts

@@ -1,69 +1,33 @@
 import { getTestServer } from "bun-tests/fake-snippets-api/fixtures/get-test-server"
 import { test, expect } from "bun:test"
 
-test("create order_quote with only circuit_json (✅)", async () => {
-  const {
-    axios,
-    seed: { order },
-  } = await getTestServer()
-
-  const response = await axios.post("/api/order_quotes/create", {
-    vendor_name: "jlcpcb",
-    circuit_json: order.circuit_json,
-  })
+test("create order_quote with only package_release_id (✅)", async () => {
+  const { axios, jane_axios } = await getTestServer()
 
-  expect(response.status).toBe(200)
-  expect(response.data.order_quote_id).toBeDefined()
-})
+  const pkg = await jane_axios
+    .post("/api/packages/create", {
+      name: "jane/test-package",
+    })
+    .then((res) => res.data.package)
 
-test("create order_quote with only package_release_id (✅)", async () => {
-  const {
-    axios,
-    seed: { packageRelease },
-  } = await getTestServer()
+  const packageRelease = await jane_axios
+    .post("/api/package_releases/create", {
+      package_id: pkg.package_id,
+      version: "1.0.0",
+      is_latest: true,
+    })
+    .then((res) => res.data.package_release)
 
+  await jane_axios.post(`/api/package_files/create`, {
+    package_release_id: packageRelease.package_release_id,
+    file_path: "/dist/index.js",
+    content_text: "console.log('Hello, world!');",
+  })
   const response = await axios.post("/api/order_quotes/create", {
     vendor_name: "jlcpcb",
-    package_release_id: packageRelease!.package_release_id,
+    package_release_id: packageRelease.package_release_id,
   })
 
   expect(response.status).toBe(200)
   expect(response.data.order_quote_id).toBeDefined()
 })
-
-test("create order_quote with both circuit_json and package_release_id (✅)", async () => {
-  const {
-    axios,
-    seed: { order, packageRelease },
-  } = await getTestServer()
-
-  const response = await axios
-    .post("/api/order_quotes/create", {
-      vendor_name: "jlcpcb",
-      circuit_json: order.circuit_json,
-      package_release_id: packageRelease!.package_release_id,
-    })
-    .catch((error) => error) // Capture response even on error
-
-  // Expecting backend to fail with 400
-  expect(response?.status).toBe(400)
-  expect(response?.data.message).toContain(
-    "You must provide either circuit_json or package_release_id, but not both.",
-  )
-})
-
-test("create order_quote with neither circuit_json nor package_release_id (✅)", async () => {
-  const { axios } = await getTestServer()
-
-  const response = await axios
-    .post("/api/order_quotes/create", {
-      vendor_name: "jlcpcb",
-    })
-    .catch((error) => error) // Capture response even on error
-
-  // Expecting backend to fail with 400
-  expect(response?.status).toBe(400)
-  expect(response?.data.message).toContain(
-    "You must provide either circuit_json or package_release_id.",
-  )
-})

package/bun-tests/fake-snippets-api/routes/package_files/create_or_update.test.ts

@@ -398,7 +398,7 @@ test("create_or_update - 404 for npm_pack_output without is_release_tarball", as
   }
 })
 
-test("update package file with content_base64", async () => {
+test.skip("update package file with content_base64", async () => {
   const { axios } = await getTestServer()
 
   const packageResponse = await axios.post("/api/packages/create", {
@@ -506,7 +506,7 @@ test("create_or_update detects correct content mimetype", async () => {
   }
 })
 
-test("create_or_update respects provided content_mimetype", async () => {
+test.skip("create_or_update respects provided content_mimetype", async () => {
   const { axios } = await getTestServer()
 
   const packageResponse = await axios.post("/api/packages/create", {

package/bun-tests/fake-snippets-api/routes/package_releases/update.test.ts

@@ -69,7 +69,7 @@ test("update package release using package_name_with_version", async () => {
   expect(updatedRelease?.is_locked).toBe(true)
 })
 
-test("update package release - handle is_latest flag", async () => {
+test.skip("update package release - handle is_latest flag", async () => {
   const { axios, db } = await getTestServer()
 
   // Create a package

package/bun-tests/fake-snippets-api/routes/packages/images.test.ts

@@ -27,17 +27,6 @@ export default () => (
     <A555Timer name="U1" />
   </board>
 )`.trim(),
-    type: "board",
-    compiled_js: `
-  "use strict";
-  Object.defineProperty(exports, "__esModule", { value: true });
-  exports.A555Timer = void 0;
-  const A555Timer = ({ name }) => /*#__PURE__*/React.createElement("chip", {
-    name: name,
-    footprint: "dip8"
-  });
-  exports.A555Timer = A555Timer;
-  `.trim(),
   })
   // create a package file
   const pkg_file = await axios.post("/api/package_files/create", {