@tscircuit/eval 0.0.298 → 0.0.300

package/lib/runner/resolveFilePath.ts

@@ -51,7 +51,7 @@ export const resolveFilePath = (
   }
 
   // Search for file with a set of different extensions
-  const extension = ["tsx", "ts", "json", "js", "jsx"]
+  const extension = ["tsx", "ts", "json", "js", "jsx", "obj"]
   for (const ext of extension) {
     const possibleFilePath = `${normalizedResolvedPath}.${ext}`
     if (normalizedFilePathMap.has(possibleFilePath)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/eval",
   "main": "dist/lib/index.js",
-  "version": "0.0.298",
+  "version": "0.0.300",
   "type": "module",
   "scripts": {
     "build": "bun run build:lib && bun run build:webworker && bun run build:blob-url && bun run build:runner && bun run build:worker-wrapper",
@@ -57,20 +57,20 @@
     "@tscircuit/checks": "^0.0.71",
     "@tscircuit/circuit-json-flex": "^0.0.3",
     "@tscircuit/circuit-json-util": "^0.0.67",
-    "@tscircuit/core": "^0.0.686",
+    "@tscircuit/core": "^0.0.699",
     "@tscircuit/footprinter": "^0.0.208",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
     "@tscircuit/layout": "^0.0.28",
     "@tscircuit/log-soup": "^1.0.2",
-    "@tscircuit/matchpack": "^0.0.9",
-    "@tscircuit/math-utils": "^0.0.18",
+    "@tscircuit/matchpack": "^0.0.16",
+    "@tscircuit/math-utils": "^0.0.21",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/parts-engine": "^0.0.8",
-    "@tscircuit/props": "0.0.296",
+    "@tscircuit/props": "0.0.298",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
-    "@tscircuit/schematic-trace-solver": "^0.0.23",
+    "@tscircuit/schematic-trace-solver": "^0.0.34",
     "@tscircuit/simple-3d-svg": "^0.0.38",
     "@types/babel__standalone": "^7.1.9",
     "@types/bun": "^1.2.16",
@@ -80,13 +80,13 @@
     "@types/react-reconciler": "^0.28.9",
     "bpc-graph": "^0.0.57",
     "bun-match-svg": "0.0.12",
-    "calculate-elbow": "^0.0.9",
+    "calculate-elbow": "^0.0.11",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.236",
+    "circuit-json": "^0.0.245",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.6",
-    "circuit-to-svg": "^0.0.174",
+    "circuit-to-svg": "^0.0.185",
     "comlink": "^4.4.2",
     "concurrently": "^9.1.2",
     "debug": "^4.3.6",
@@ -101,7 +101,8 @@
     "ts-expect": "^1.3.0",
     "tsup": "^8.2.4",
     "minicssgrid": "^0.0.9",
-    "connectivity-map": "^1.0.0"
+    "connectivity-map": "^1.0.0",
+    "flatbush": "^4.5.0"
   },
   "peerDependencies": {
     "typescript": "^5.0.0",

package/tests/features/import-obj-file.test.tsx

@@ -0,0 +1,49 @@
+import { expect, test } from "bun:test"
+import type {
+  AnyCircuitElement,
+  AnySourceComponent,
+  CadComponent,
+} from "circuit-json"
+import { CircuitRunner } from "lib/runner/CircuitRunner"
+
+test("should support importing .obj files", async () => {
+  const runner = new CircuitRunner()
+
+  const fsMap = {
+    "my-model.obj": `v 1.0 1.0 0.0`, // some dummy obj content
+    "user-code.tsx": `
+        import myObjUrl from "./my-model.obj"
+
+        export default () => (
+            <chip
+                name="C1"
+                cadModel={{
+                    objUrl: myObjUrl,
+                }}
+            />
+        )
+    `,
+  }
+
+  await runner.executeWithFsMap({
+    fsMap,
+    mainComponentPath: "user-code.tsx",
+  })
+
+  await runner.renderUntilSettled()
+  const circuitJson = await runner.getCircuitJson()
+
+  const chip =
+    (circuitJson.find(
+      (elm) => elm.type === "source_component" && elm.name === "C1",
+    ) as AnyCircuitElement) || undefined
+  const cadModel =
+    (circuitJson.find((elm) => elm.type === "cad_component") as CadComponent) ||
+    undefined
+
+  expect(chip).toBeDefined()
+  expect(cadModel?.model_obj_url).toBeString()
+  expect(cadModel?.model_obj_url).toStartWith("blob:")
+
+  await runner.kill()
+})

package/webworker/import-local-file.ts

@@ -34,6 +34,13 @@ export const importLocalFile = async (
       __esModule: true,
       default: jsonData,
     }
+  } else if (fsPath.endsWith(".obj")) {
+    const objBlob = new Blob([fileContent], { type: "model/obj" })
+    const objUrl = URL.createObjectURL(objBlob)
+    preSuppliedImports[fsPath] = {
+      __esModule: true,
+      default: objUrl,
+    }
   } else if (fsPath.endsWith(".tsx") || fsPath.endsWith(".ts")) {
     const importNames = getImportsFromCode(fileContent)