Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: remove builder #82

Merged
merged 5 commits into from
Oct 21, 2024
Merged

refactor: remove builder #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bacd04a
refactor: removed builder
imrishabh18 Oct 21, 2024
b96cebc
update test
imrishabh18 Oct 21, 2024
7a9aea9
test fixed
imrishabh18 Oct 21, 2024
2bc2f5b
type fix
imrishabh18 Oct 21, 2024
ad65e96
format update
imrishabh18 Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions algos/infinite-grid-ijump-astar/tests/fixtures/get-debug-svg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
import { getSimpleRouteJson, type SimplifiedPcbTrace } from "solver-utils"
import { test, expect } from "bun:test"
import { circuitJsonToPcbSvg } from "circuit-to-svg"
import { Circuit } from "@tscircuit/core"
import { transformPCBElements } from "@tscircuit/soup-util"
import { translate } from "transformation-matrix"
import type {
AnyCircuitElement,
AnyCircuitElement as AnySoupElement,
} from "circuit-json"
import type { GeneralizedAstarAutorouter } from "algos/infinite-grid-ijump-astar/v2/lib/GeneralizedAstar"
import type { AnyCircuitElement } from "circuit-json"
import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
import { type SimplifiedPcbTrace } from "solver-utils"
import { translate } from "transformation-matrix"

export const getDebugSvg = ({
inputCircuitJson,
Expand All @@ -20,7 +15,7 @@ export const getDebugSvg = ({
}: {
inputCircuitJson: AnyCircuitElement[]
autorouter: GeneralizedAstarAutorouter
solution?: AnySoupElement[] | SimplifiedPcbTrace[]
solution?: AnyCircuitElement[] | SimplifiedPcbTrace[]
rowHeight?: number
colWidth?: number
colCount?: number
Expand Down Expand Up @@ -79,5 +74,5 @@ export const getDebugSvg = ({
) as any),
)

return circuitJsonToPcbSvg(aggCircuitJson)
return convertCircuitJsonToPcbSvg(aggCircuitJson as any)
}
11 changes: 4 additions & 7 deletions algos/infinite-grid-ijump-astar/tests/get-debug-svg.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { Circuit } from "@tscircuit/core"
import { expect, test } from "bun:test"
import type { AnyCircuitElement } from "circuit-json"
import { getSimpleRouteJson } from "solver-utils"
import { test, expect } from "bun:test"
import { circuitJsonToPcbSvg } from "circuit-to-svg"
import { IJumpAutorouter } from "../v2"
import { Circuit } from "@tscircuit/core"
import { transformPCBElements } from "@tscircuit/soup-util"
import { translate } from "transformation-matrix"
import type { AnyCircuitElement as AnySoupElement } from "circuit-json"
import { getDebugSvg } from "./fixtures/get-debug-svg"

test("ijump-astar: intersection with margin", () => {
Expand All @@ -21,7 +18,7 @@ test("ijump-astar: intersection with margin", () => {

const inputCircuitJson = circuit.getCircuitJson()

const input = getSimpleRouteJson(inputCircuitJson)
const input = getSimpleRouteJson(inputCircuitJson as AnyCircuitElement[])

const autorouter = new IJumpAutorouter({
input,
Expand Down
14 changes: 5 additions & 9 deletions algos/infinite-grid-ijump-astar/tests/multimargin-bga.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
import { getSimpleRouteJson } from "solver-utils"
import { test, expect } from "bun:test"
import { circuitJsonToPcbSvg } from "circuit-to-svg"
import { IJumpAutorouter } from "../v2"
import { Circuit } from "@tscircuit/core"
import { transformPCBElements } from "@tscircuit/soup-util"
import { translate } from "transformation-matrix"
import type { AnyCircuitElement as AnySoupElement } from "circuit-json"
import { getDebugSvg } from "./fixtures/get-debug-svg"
import { expect, test } from "bun:test"
import type { AnyCircuitElement } from "circuit-json"
import { getSimpleRouteJson } from "solver-utils"
import { IJumpMultiMarginAutorouter } from "../v2/lib/IJumpMultiMarginAutorouter"
import { getDebugSvg } from "./fixtures/get-debug-svg"

const OneByOnePad = (props: { name: string; pcbX?: number; pcbY?: number }) => (
<chip name={props.name} pcbX={props.pcbX} pcbY={props.pcbY}>
Expand Down Expand Up @@ -36,7 +32,7 @@ test("multimargin-ijump-astar: bga9", () => {

const inputCircuitJson = circuit.getCircuitJson()

const input = getSimpleRouteJson(inputCircuitJson)
const input = getSimpleRouteJson(inputCircuitJson as AnyCircuitElement[])

const autorouter = new IJumpMultiMarginAutorouter({
input,
Expand Down
2 changes: 1 addition & 1 deletion algos/multi-layer-ijump/tests/__snapshots__/multi-layer-keyboard7.snap.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions algos/multi-layer-ijump/tests/multi-layer-keyboard2.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { getSimpleRouteJson } from "solver-utils"
import { getKeyboardGenerator } from "autorouting-dataset/lib/generators/keyboards"
import { test, expect } from "bun:test"
import { expect, test } from "bun:test"
import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
import { getSimpleRouteJson } from "solver-utils"
import { MultilayerIjump } from "../MultilayerIjump"
import { circuitJsonToPcbSvg } from "circuit-to-svg"

test("multi-layer ijump keyboard", async () => {
const soup = await getKeyboardGenerator().getExample({ seed: 2 })
Expand All @@ -15,7 +15,7 @@ test("multi-layer ijump keyboard", async () => {

const result = autorouter.solveAndMapToTraces()

expect(circuitJsonToPcbSvg(soup.concat(result as any))).toMatchSvgSnapshot(
import.meta.path,
)
expect(
convertCircuitJsonToPcbSvg(soup.concat(result as any) as any),
).toMatchSvgSnapshot(import.meta.path)
})
14 changes: 7 additions & 7 deletions algos/multi-layer-ijump/tests/multi-layer-keyboard7.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { getSimpleRouteJson } from "solver-utils"
import { getKeyboardGenerator } from "autorouting-dataset/lib/generators/keyboards"
import { test, expect } from "bun:test"
import { MultilayerIjump } from "../MultilayerIjump"
import { circuitJsonToPcbSvg } from "circuit-to-svg"
import { expect, test } from "bun:test"
import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map"
import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
import { getSimpleRouteJson } from "solver-utils"
import { MultilayerIjump } from "../MultilayerIjump"

test("multi-layer ijump keyboard", async () => {
const soup = await getKeyboardGenerator().getExample({ seed: 7 })
Expand All @@ -18,7 +18,7 @@ test("multi-layer ijump keyboard", async () => {

const result = autorouter.solveAndMapToTraces()

expect(circuitJsonToPcbSvg(soup.concat(result as any))).toMatchSvgSnapshot(
import.meta.path,
)
expect(
convertCircuitJsonToPcbSvg(soup.concat(result as any) as any),
).toMatchSvgSnapshot(import.meta.path)
})
20 changes: 8 additions & 12 deletions algos/multi-layer-ijump/tests/same-net-many-pads.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
import { getSimpleRouteJson } from "solver-utils"
import { test, expect } from "bun:test"
import { circuitJsonToPcbSvg } from "circuit-to-svg"
import { Circuit } from "@tscircuit/core"
import { transformPCBElements } from "@tscircuit/soup-util"
import { translate } from "transformation-matrix"
import type { AnyCircuitElement as AnySoupElement } from "circuit-json"
import { getDebugSvg } from "../../infinite-grid-ijump-astar/tests/fixtures/get-debug-svg"
import { MultilayerIjump } from "../MultilayerIjump"
import { expect, test } from "bun:test"
import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map"
import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
import { getSimpleRouteJson } from "solver-utils"
import { MultilayerIjump } from "../MultilayerIjump"

test("multimargin-ijump-astar simple", () => {
const circuit = new Circuit()
Expand All @@ -29,15 +25,15 @@ test("multimargin-ijump-astar simple", () => {
<trace from={`.R0 > .pin1`} to={`.R0 > .pin2`} />
{Array.from({ length: 9 }).map((_, i) => [
<trace
// @ts-ignore
key={`t1_${i}`}
// @ts-ignore
name={`U${i}`}
from={`.R0 > .pin1`}
to={`.R${i + 1} > .pin1`}
/>,
<trace
// @ts-ignore
key={`t2_${i}`}
// @ts-ignore
name={`U${i}`}
from={`.R${i} > .pin2`}
to={`.R${i + 1} > .pin2`}
Expand Down Expand Up @@ -66,8 +62,8 @@ test("multimargin-ijump-astar simple", () => {
const solution = autorouter.solveAndMapToTraces()

expect(
circuitJsonToPcbSvg(
inputCircuitJson.concat(solution as any),
convertCircuitJsonToPcbSvg(
inputCircuitJson.concat(solution as any) as any,
// .map((a) => (a.type === "pcb_smtpad" ? { ...a, layer: "bottom" } : a)),
),
).toMatchSvgSnapshot(import.meta.path)
Expand Down
Binary file modified bun.lockb
View file
Open in desktop
Binary file not shown.
15 changes: 7 additions & 8 deletions module/lib/generator-utils/renderCircuitToSoup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import type { AnyCircuitElement as AnySoupElement } from "circuit-json"
import { createRoot } from "@tscircuit/react-fiber"
import { createProjectBuilder } from "@tscircuit/builder"
import { Circuit } from "@tscircuit/core"
import type { AnyCircuitElement } from "circuit-json"

export const renderCircuitToSoup = (
export const renderCircuitToSoup = async (
circuitReact: any,
): Promise<AnySoupElement[]> => {
const project = createProjectBuilder()

return createRoot().render(circuitReact, project) as any
): Promise<AnyCircuitElement[]> => {
const circuit = new Circuit()
circuit.add(circuitReact)
return circuit.getCircuitJson() as AnyCircuitElement[]
}
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
"devDependencies": {
"@biomejs/biome": "^1.8.3",
"@timohausmann/quadtree-ts": "^2.2.2",
"@tscircuit/builder": "1.11.2",
"@tscircuit/core": "^0.0.107",
"@tscircuit/core": "^0.0.125",
"@tscircuit/pcb-viewer": "1.4.5",
"@tscircuit/props": "^0.0.63",
"@tscircuit/soup": "^0.0.68",
Expand Down Expand Up @@ -53,7 +52,7 @@
"@dagrejs/graphlib": "^2.2.3",
"@tscircuit/checks": "0.0.26",
"@tscircuit/math-utils": "^0.0.4",
"circuit-json": "^0.0.85",
"circuit-json": "^0.0.86",
"circuit-json-to-connectivity-map": "^0.0.17",
"commander": "^12.1.0",
"kleur": "^4.1.5",
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@
"server": ["./module/lib/server"],
"algos/*": ["./algos/*"]
}
}
},
"exclude": ["node_modules"]
}
Loading