copperflow 0.3.2 → 0.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +39 -0
- package/dist/app/assets/{NewPartDialog-Qb7NwhBb.js → NewPartDialog-C4sKWnGI.js} +38 -38
- package/dist/app/assets/index-BgzJedaB.css +1 -0
- package/dist/app/assets/index-C_U9me2P.js +19 -0
- package/dist/app/index.html +2 -2
- package/dist/cli-commands.d.ts +3 -0
- package/dist/cli-commands.js +74 -8
- package/dist/cli-commands.js.map +1 -1
- package/dist/cli-library.d.ts +5 -0
- package/dist/cli-library.js +58 -0
- package/dist/cli-library.js.map +1 -0
- package/dist/cli-modules.d.ts +6 -0
- package/dist/cli-modules.js +33 -0
- package/dist/cli-modules.js.map +1 -0
- package/dist/cli-studio.d.ts +1 -0
- package/dist/cli-studio.js +27 -0
- package/dist/cli-studio.js.map +1 -0
- package/dist/core/board-import.d.ts +39 -0
- package/dist/core/board-import.js +114 -0
- package/dist/core/board-import.js.map +1 -0
- package/dist/core/board-shape-edit.d.ts +13 -0
- package/dist/core/board-shape-edit.js +134 -0
- package/dist/core/board-shape-edit.js.map +1 -0
- package/dist/core/edit.js +9 -3
- package/dist/core/edit.js.map +1 -1
- package/dist/core/fabrication.d.ts +6 -0
- package/dist/core/fabrication.js +1 -1
- package/dist/core/fabrication.js.map +1 -1
- package/dist/core/git.d.ts +16 -0
- package/dist/core/git.js +51 -0
- package/dist/core/git.js.map +1 -0
- package/dist/core/home.d.ts +2 -0
- package/dist/core/home.js +10 -0
- package/dist/core/home.js.map +1 -0
- package/dist/core/index.d.ts +2 -0
- package/dist/core/index.js +2 -0
- package/dist/core/index.js.map +1 -1
- package/dist/core/instance-copper.d.ts +25 -0
- package/dist/core/instance-copper.js +142 -0
- package/dist/core/instance-copper.js.map +1 -0
- package/dist/core/instance-move.d.ts +23 -0
- package/dist/core/instance-move.js +59 -0
- package/dist/core/instance-move.js.map +1 -0
- package/dist/core/instance-requests.d.ts +3 -2
- package/dist/core/instance-requests.js +17 -3
- package/dist/core/instance-requests.js.map +1 -1
- package/dist/core/library-modules.d.ts +29 -0
- package/dist/core/library-modules.js +324 -0
- package/dist/core/library-modules.js.map +1 -0
- package/dist/core/library-sources.d.ts +33 -0
- package/dist/core/library-sources.js +179 -0
- package/dist/core/library-sources.js.map +1 -0
- package/dist/core/modules.d.ts +44 -0
- package/dist/core/modules.js +284 -0
- package/dist/core/modules.js.map +1 -0
- package/dist/core/new-circuit-sheets.d.ts +11 -2
- package/dist/core/new-circuit-sheets.js +35 -6
- package/dist/core/new-circuit-sheets.js.map +1 -1
- package/dist/core/placement-write.d.ts +2 -0
- package/dist/core/placement-write.js +12 -6
- package/dist/core/placement-write.js.map +1 -1
- package/dist/core/plain-sheet.d.ts +12 -0
- package/dist/core/plain-sheet.js +169 -0
- package/dist/core/plain-sheet.js.map +1 -0
- package/dist/core/render.d.ts +45 -0
- package/dist/core/render.js +57 -0
- package/dist/core/render.js.map +1 -0
- package/dist/core/sheet-card.d.ts +33 -0
- package/dist/core/sheet-card.js +118 -0
- package/dist/core/sheet-card.js.map +1 -0
- package/dist/core/types.d.ts +20 -0
- package/dist/core/workspace.d.ts +4 -0
- package/dist/core/workspace.js +13 -2
- package/dist/core/workspace.js.map +1 -1
- package/dist/engine/checks/drc-parts.js +7 -7
- package/dist/engine/checks/drc-parts.js.map +1 -1
- package/dist/engine/checks/erc.js +35 -3
- package/dist/engine/checks/erc.js.map +1 -1
- package/dist/engine/component.d.ts +2 -0
- package/dist/engine/component.js +18 -1
- package/dist/engine/component.js.map +1 -1
- package/dist/engine/dxf/board.d.ts +42 -0
- package/dist/engine/dxf/board.js +218 -0
- package/dist/engine/dxf/board.js.map +1 -0
- package/dist/engine/dxf/index.d.ts +2 -0
- package/dist/engine/dxf/index.js +3 -0
- package/dist/engine/dxf/index.js.map +1 -0
- package/dist/engine/dxf/reader.d.ts +43 -0
- package/dist/engine/dxf/reader.js +142 -0
- package/dist/engine/dxf/reader.js.map +1 -0
- package/dist/engine/elaborate.js +14 -4
- package/dist/engine/elaborate.js.map +1 -1
- package/dist/engine/fab/designator-places.d.ts +101 -0
- package/dist/engine/fab/designator-places.js +259 -0
- package/dist/engine/fab/designator-places.js.map +1 -0
- package/dist/engine/fab/designators.d.ts +26 -14
- package/dist/engine/fab/designators.js +320 -70
- package/dist/engine/fab/designators.js.map +1 -1
- package/dist/engine/fab/layers.js +6 -6
- package/dist/engine/fab/layers.js.map +1 -1
- package/dist/engine/fab/stroke-font.d.ts +2 -2
- package/dist/engine/fab/stroke-font.js +7 -6
- package/dist/engine/fab/stroke-font.js.map +1 -1
- package/dist/engine/footprints/file.d.ts +33 -0
- package/dist/engine/footprints/file.js +13 -5
- package/dist/engine/footprints/file.js.map +1 -1
- package/dist/engine/model.d.ts +15 -1
- package/dist/engine/model.js.map +1 -1
- package/dist/engine/pcb-place/block-board.d.ts +9 -0
- package/dist/engine/pcb-place/block-board.js +256 -0
- package/dist/engine/pcb-place/block-board.js.map +1 -0
- package/dist/engine/pcb-place/blocks.d.ts +31 -6
- package/dist/engine/pcb-place/blocks.js +37 -8
- package/dist/engine/pcb-place/blocks.js.map +1 -1
- package/dist/engine/pcb-place/constructive.d.ts +3 -2
- package/dist/engine/pcb-place/constructive.js +14 -2
- package/dist/engine/pcb-place/constructive.js.map +1 -1
- package/dist/engine/pcb-place/index.d.ts +8 -0
- package/dist/engine/pcb-place/index.js +7 -0
- package/dist/engine/pcb-place/index.js.map +1 -1
- package/dist/engine/pcb-place/scope.js +6 -1
- package/dist/engine/pcb-place/scope.js.map +1 -1
- package/dist/engine/pcb.d.ts +6 -0
- package/dist/engine/pcb.js +12 -1
- package/dist/engine/pcb.js.map +1 -1
- package/dist/engine/router/replicate.js +4 -0
- package/dist/engine/router/replicate.js.map +1 -1
- package/dist/engine/router/route-board.d.ts +2 -0
- package/dist/engine/router/route-board.js +27 -1
- package/dist/engine/router/route-board.js.map +1 -1
- package/dist/engine/sheet-ports.d.ts +17 -1
- package/dist/engine/sheet-ports.js +38 -1
- package/dist/engine/sheet-ports.js.map +1 -1
- package/dist/mcp/batch.d.ts +2 -2
- package/dist/mcp/batch.js +12 -12
- package/dist/mcp/batch.js.map +1 -1
- package/dist/mcp/board-import-tool.d.ts +25 -0
- package/dist/mcp/board-import-tool.js +25 -0
- package/dist/mcp/board-import-tool.js.map +1 -0
- package/dist/mcp/board-summary.d.ts +1 -1
- package/dist/mcp/board-summary.js +1 -1
- package/dist/mcp/board-summary.js.map +1 -1
- package/dist/mcp/compact.js +17 -5
- package/dist/mcp/compact.js.map +1 -1
- package/dist/mcp/copper-tools.d.ts +4 -4
- package/dist/mcp/copper-tools.js +19 -19
- package/dist/mcp/copper-tools.js.map +1 -1
- package/dist/mcp/create-part.d.ts +4 -4
- package/dist/mcp/create-part.js +12 -10
- package/dist/mcp/create-part.js.map +1 -1
- package/dist/mcp/datasheet-tools.d.ts +1 -1
- package/dist/mcp/datasheet-tools.js +4 -4
- package/dist/mcp/datasheet-tools.js.map +1 -1
- package/dist/mcp/fillet-tools.d.ts +2 -2
- package/dist/mcp/fillet-tools.js +6 -6
- package/dist/mcp/fillet-tools.js.map +1 -1
- package/dist/mcp/guide.d.ts +1 -1
- package/dist/mcp/guide.js +4 -3
- package/dist/mcp/guide.js.map +1 -1
- package/dist/mcp/import-part.d.ts +1 -1
- package/dist/mcp/import-part.js +4 -4
- package/dist/mcp/import-part.js.map +1 -1
- package/dist/mcp/make-sheet.d.ts +1 -1
- package/dist/mcp/make-sheet.js +6 -6
- package/dist/mcp/make-sheet.js.map +1 -1
- package/dist/mcp/module-tools.d.ts +4 -0
- package/dist/mcp/module-tools.js +21 -0
- package/dist/mcp/module-tools.js.map +1 -0
- package/dist/mcp/new-circuit.d.ts +13 -2
- package/dist/mcp/new-circuit.js +30 -28
- package/dist/mcp/new-circuit.js.map +1 -1
- package/dist/mcp/open-studio.d.ts +30 -0
- package/dist/mcp/open-studio.js +97 -0
- package/dist/mcp/open-studio.js.map +1 -0
- package/dist/mcp/place-tools.d.ts +2 -2
- package/dist/mcp/place-tools.js +14 -11
- package/dist/mcp/place-tools.js.map +1 -1
- package/dist/mcp/pour-tools.d.ts +4 -4
- package/dist/mcp/pour-tools.js +18 -18
- package/dist/mcp/pour-tools.js.map +1 -1
- package/dist/mcp/project-tools.d.ts +3 -3
- package/dist/mcp/project-tools.js +8 -8
- package/dist/mcp/project-tools.js.map +1 -1
- package/dist/mcp/render-tool.d.ts +30 -0
- package/dist/mcp/render-tool.js +33 -0
- package/dist/mcp/render-tool.js.map +1 -0
- package/dist/mcp/route-tools.d.ts +2 -2
- package/dist/mcp/route-tools.js +10 -10
- package/dist/mcp/route-tools.js.map +1 -1
- package/dist/mcp/server.d.ts +3 -0
- package/dist/mcp/server.js +49 -31
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/sheet-card-tools.d.ts +28 -0
- package/dist/mcp/sheet-card-tools.js +45 -0
- package/dist/mcp/sheet-card-tools.js.map +1 -0
- package/dist/render/render.js +2060 -0
- package/dist/studio/idle.d.ts +7 -0
- package/dist/studio/idle.js +34 -0
- package/dist/studio/idle.js.map +1 -0
- package/dist/studio/place-runner.js +1 -1
- package/dist/studio/place-runner.js.map +1 -1
- package/dist/studio/run-studio.d.ts +21 -0
- package/dist/studio/run-studio.js +68 -0
- package/dist/studio/run-studio.js.map +1 -0
- package/dist/studio/server.d.ts +5 -0
- package/dist/studio/server.js +24 -2
- package/dist/studio/server.js.map +1 -1
- package/dist/studio/studio-control.d.ts +6 -0
- package/dist/studio/studio-control.js +14 -0
- package/dist/studio/studio-control.js.map +1 -0
- package/dist/studio/studio-note.d.ts +33 -0
- package/dist/studio/studio-note.js +130 -0
- package/dist/studio/studio-note.js.map +1 -0
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/library/modules/CanNode/CanNode.sheet.tsx +65 -0
- package/library/modules/CanNode/module.json +4 -0
- package/library/modules/CanNode/parts/MCP2515-I-SO/MCP2515_I_SO.tsx +10 -0
- package/library/modules/CanNode/parts/MCP2515-I-SO/part.yaml +64 -0
- package/library/modules/CanNode/parts/MCP2515-I-SO/verification.md +42 -0
- package/library/modules/CanNode/parts/TJA1051T-3/TJA1051T_3.tsx +10 -0
- package/library/modules/CanNode/parts/TJA1051T-3/part.yaml +34 -0
- package/library/modules/CanNode/parts/TJA1051T-3/verification.md +28 -0
- package/library/modules/DigitalInput24V/DigitalInput24V.sheet.tsx +24 -0
- package/library/modules/DigitalInput24V/module.json +4 -0
- package/library/modules/RelayDriver/RelayDriver.sheet.tsx +39 -0
- package/library/modules/RelayDriver/module.json +4 -0
- package/library/modules/RelayDriver/parts/AO3400A/AO3400A.tsx +11 -0
- package/library/modules/RelayDriver/parts/AO3400A/part.yaml +21 -0
- package/library/modules/RelayDriver/parts/AO3400A/verification.md +24 -0
- package/library/modules/RelayDriver/parts/SRD-12VDC-SL-C/SRD_12VDC_SL_C.tsx +11 -0
- package/library/modules/RelayDriver/parts/SRD-12VDC-SL-C/footprint.yaml +70 -0
- package/library/modules/RelayDriver/parts/SRD-12VDC-SL-C/part.yaml +31 -0
- package/library/modules/RelayDriver/parts/SRD-12VDC-SL-C/verification.md +37 -0
- package/package.json +6 -2
- package/skills/copperflow/SKILL.md +20 -20
- package/skills/copperflow/references/copper.md +83 -6
- package/skills/copperflow/references/modules.md +80 -0
- package/skills/copperflow/references/planning.md +55 -11
- package/skills/copperflow/references/writing-circuits.md +29 -3
- package/skills/copperflow-plan/SKILL.md +7 -4
- package/dist/app/assets/index-CSWIIMFE.css +0 -1
- package/dist/app/assets/index-C_TXwo-N.js +0 -19
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import type { Point } from "../model.js";
|
|
2
|
+
import { type DxfDrawing, type DxfUnits } from "./reader.js";
|
|
3
|
+
/** Ends closer than this, in mm, meet. */
|
|
4
|
+
export declare const JOIN_TOLERANCE = 0.01;
|
|
5
|
+
/** The largest distance of a straight edge from the arc it stands for, in mm. */
|
|
6
|
+
export declare const ARC_TOLERANCE = 0.02;
|
|
7
|
+
export interface BoardFromDrawingOptions {
|
|
8
|
+
/** Only the entities on this layer may make the outline. */
|
|
9
|
+
layer?: string;
|
|
10
|
+
/** Overrides the header's units. */
|
|
11
|
+
units?: "mm" | "inch";
|
|
12
|
+
/** "keep" leaves the coordinates as drawn; by default the outline's box is centred on the origin. */
|
|
13
|
+
origin?: "centre" | "keep";
|
|
14
|
+
}
|
|
15
|
+
export interface BoardHole {
|
|
16
|
+
x: number;
|
|
17
|
+
y: number;
|
|
18
|
+
diameter: number;
|
|
19
|
+
}
|
|
20
|
+
export interface BoardFromDrawing {
|
|
21
|
+
/** Counter-clockwise, in mm. */
|
|
22
|
+
outline: Point[];
|
|
23
|
+
holes: BoardHole[];
|
|
24
|
+
/** Closed shapes inside the outline, to keep clear. */
|
|
25
|
+
keepouts: Point[][];
|
|
26
|
+
units: {
|
|
27
|
+
name: DxfUnits;
|
|
28
|
+
from: "file" | "asked" | "assumed";
|
|
29
|
+
};
|
|
30
|
+
/** What was added to the drawing's coordinates. */
|
|
31
|
+
offset: Point;
|
|
32
|
+
width: number;
|
|
33
|
+
height: number;
|
|
34
|
+
/** What was not used, e.g. "2 SPLINE", "1 open chain of 3 lines". */
|
|
35
|
+
notUsed: string[];
|
|
36
|
+
}
|
|
37
|
+
/** Points along an arc from `start` radians, turning `sweep` radians (counter-clockwise when positive), ends included. */
|
|
38
|
+
export declare function arcPoints(centre: Point, radius: number, start: number, sweep: number): Point[];
|
|
39
|
+
/** The board a parsed drawing gives; refuses a drawing without a closed shape and one whose largest shape is not clear. */
|
|
40
|
+
export declare function boardFromDrawing(drawing: DxfDrawing, options?: BoardFromDrawingOptions): BoardFromDrawing;
|
|
41
|
+
/** Reads an ASCII DXF and gives the board it draws. */
|
|
42
|
+
export declare function boardFromDxf(text: string, options?: BoardFromDrawingOptions): BoardFromDrawing;
|
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
// The board a mechanical drawing gives: lines, arcs and polylines that meet end to end are joined into closed shapes,
|
|
2
|
+
// the largest is the outline, circles inside it are mounting holes and the other closed shapes inside it are places to
|
|
3
|
+
// keep clear. Arcs and bulges become straight edges at most ARC_TOLERANCE from the true arc. Everything else is counted
|
|
4
|
+
// in `notUsed`. The drawing is moved so the outline's box is centred on the origin, as copperflow's boards are.
|
|
5
|
+
import { pointInPolygon } from "../checks/geometry.js";
|
|
6
|
+
import { DxfError, readDxf } from "./reader.js";
|
|
7
|
+
/** Ends closer than this, in mm, meet. */
|
|
8
|
+
export const JOIN_TOLERANCE = 0.01;
|
|
9
|
+
/** The largest distance of a straight edge from the arc it stands for, in mm. */
|
|
10
|
+
export const ARC_TOLERANCE = 0.02;
|
|
11
|
+
const MM_PER = { mm: 1, cm: 10, m: 1000, inch: 25.4 };
|
|
12
|
+
const tidy = (v) => Math.round(v * 10_000) / 10_000 || 0;
|
|
13
|
+
const distance = (a, b) => Math.hypot(a.x - b.x, a.y - b.y);
|
|
14
|
+
const meets = (a, b) => distance(a, b) <= JOIN_TOLERANCE;
|
|
15
|
+
/** Points along an arc from `start` radians, turning `sweep` radians (counter-clockwise when positive), ends included. */
|
|
16
|
+
export function arcPoints(centre, radius, start, sweep) {
|
|
17
|
+
const ratio = 1 - ARC_TOLERANCE / radius;
|
|
18
|
+
const step = ratio <= 0 ? Math.PI / 2 : Math.min(Math.PI / 2, 2 * Math.acos(ratio));
|
|
19
|
+
const count = Math.max(1, Math.ceil(Math.abs(sweep) / step));
|
|
20
|
+
return Array.from({ length: count + 1 }, (_, i) => {
|
|
21
|
+
const angle = start + (sweep * i) / count;
|
|
22
|
+
return { x: centre.x + radius * Math.cos(angle), y: centre.y + radius * Math.sin(angle) };
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
/** The points from `a` to `b` along the arc a bulge names, `a` left out and `b` included. */
|
|
26
|
+
function bulgePoints(a, b, bulge) {
|
|
27
|
+
if (bulge === 0)
|
|
28
|
+
return [b];
|
|
29
|
+
const sweep = 4 * Math.atan(bulge);
|
|
30
|
+
const chord = distance(a, b);
|
|
31
|
+
if (chord === 0)
|
|
32
|
+
return [b];
|
|
33
|
+
const radius = chord / (2 * Math.abs(Math.sin(sweep / 2)));
|
|
34
|
+
const along = chord / 2 / Math.tan(sweep / 2);
|
|
35
|
+
const centre = { x: (a.x + b.x) / 2 - ((b.y - a.y) / chord) * along, y: (a.y + b.y) / 2 + ((b.x - a.x) / chord) * along };
|
|
36
|
+
const points = arcPoints(centre, radius, Math.atan2(a.y - centre.y, a.x - centre.x), sweep).slice(1);
|
|
37
|
+
points[points.length - 1] = b;
|
|
38
|
+
return points;
|
|
39
|
+
}
|
|
40
|
+
function polylinePoints(vertices, closed) {
|
|
41
|
+
const first = vertices[0];
|
|
42
|
+
if (!first)
|
|
43
|
+
return [];
|
|
44
|
+
const points = [{ x: first.x, y: first.y }];
|
|
45
|
+
const edges = closed ? vertices.length : vertices.length - 1;
|
|
46
|
+
for (let i = 0; i < edges; i++) {
|
|
47
|
+
const from = vertices[i];
|
|
48
|
+
const to = vertices[(i + 1) % vertices.length];
|
|
49
|
+
points.push(...bulgePoints(from, { x: to.x, y: to.y }, from.bulge));
|
|
50
|
+
}
|
|
51
|
+
return points;
|
|
52
|
+
}
|
|
53
|
+
const scaled = (p, k) => ({ x: p.x * k, y: p.y * k });
|
|
54
|
+
/** What each entity is in mm: a piece to join, a closed polyline, or a circle. */
|
|
55
|
+
function shapesOf(entities, k) {
|
|
56
|
+
const pieces = [];
|
|
57
|
+
const closed = [];
|
|
58
|
+
const circles = [];
|
|
59
|
+
for (const entity of entities) {
|
|
60
|
+
const layer = entity.layer;
|
|
61
|
+
if (entity.type === "LINE")
|
|
62
|
+
pieces.push({ points: [scaled(entity.start, k), scaled(entity.end, k)], kind: "line", layer });
|
|
63
|
+
else if (entity.type === "CIRCLE")
|
|
64
|
+
circles.push({ centre: scaled(entity.centre, k), radius: entity.radius * k, layer });
|
|
65
|
+
else if (entity.type === "ARC") {
|
|
66
|
+
const sweep = (((entity.endAngle - entity.startAngle) % 360) + 360) % 360 || 360;
|
|
67
|
+
const points = arcPoints(scaled(entity.centre, k), entity.radius * k, (entity.startAngle * Math.PI) / 180, (sweep * Math.PI) / 180);
|
|
68
|
+
pieces.push({ points, kind: "arc", layer });
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
const vertices = entity.vertices.map((v) => ({ ...scaled(v, k), bulge: v.bulge }));
|
|
72
|
+
const piece = { points: polylinePoints(vertices, entity.closed), kind: "polyline", layer };
|
|
73
|
+
if (piece.points.length >= 2)
|
|
74
|
+
(entity.closed ? closed : pieces).push(piece);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
return { pieces, closed, circles };
|
|
78
|
+
}
|
|
79
|
+
/** Joins pieces end to end, turning them round as needed. */
|
|
80
|
+
function chains(pieces) {
|
|
81
|
+
const left = [...pieces];
|
|
82
|
+
const found = [];
|
|
83
|
+
while (left.length > 0) {
|
|
84
|
+
const first = left.shift();
|
|
85
|
+
const chain = { points: [...first.points], pieces: [first] };
|
|
86
|
+
for (let grown = true; grown;) {
|
|
87
|
+
grown = false;
|
|
88
|
+
for (let i = 0; i < left.length; i++) {
|
|
89
|
+
const piece = left[i];
|
|
90
|
+
const [start, end] = [chain.points[0], chain.points.at(-1)];
|
|
91
|
+
const [a, b] = [piece.points[0], piece.points.at(-1)];
|
|
92
|
+
if (meets(end, a))
|
|
93
|
+
chain.points.push(...piece.points.slice(1));
|
|
94
|
+
else if (meets(end, b))
|
|
95
|
+
chain.points.push(...[...piece.points].reverse().slice(1));
|
|
96
|
+
else if (meets(start, b))
|
|
97
|
+
chain.points.unshift(...piece.points.slice(0, -1));
|
|
98
|
+
else if (meets(start, a))
|
|
99
|
+
chain.points.unshift(...[...piece.points].reverse().slice(0, -1));
|
|
100
|
+
else
|
|
101
|
+
continue;
|
|
102
|
+
chain.pieces.push(piece);
|
|
103
|
+
left.splice(i, 1);
|
|
104
|
+
grown = true;
|
|
105
|
+
break;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
found.push(chain);
|
|
109
|
+
}
|
|
110
|
+
return found;
|
|
111
|
+
}
|
|
112
|
+
const signedArea = (points) => points.reduce((sum, a, i) => {
|
|
113
|
+
const b = points[(i + 1) % points.length];
|
|
114
|
+
return sum + a.x * b.y - b.x * a.y;
|
|
115
|
+
}, 0) / 2;
|
|
116
|
+
/** A closed chain as a loop: its last point (the first again) dropped, counter-clockwise. */
|
|
117
|
+
function loopOf(points, layers) {
|
|
118
|
+
const open = meets(points[0], points.at(-1)) && points.length > 1 ? points.slice(0, -1) : [...points];
|
|
119
|
+
const area = signedArea(open);
|
|
120
|
+
return { points: area < 0 ? open.reverse() : open, layers: new Set(layers), area: Math.abs(area) };
|
|
121
|
+
}
|
|
122
|
+
const isClosed = (chain) => chain.points.length > 3 && meets(chain.points[0], chain.points.at(-1));
|
|
123
|
+
const plural = (n, word) => `${n} ${word}${n === 1 ? "" : "s"}`;
|
|
124
|
+
function chainWords(chain) {
|
|
125
|
+
const counts = ["line", "arc", "polyline"].map((kind) => [kind, chain.pieces.filter((p) => p.kind === kind).length]);
|
|
126
|
+
const words = counts.filter(([, n]) => n > 0).map(([kind, n]) => plural(n, kind));
|
|
127
|
+
return `open chain of ${words.length > 1 ? `${words.slice(0, -1).join(", ")} and ${words.at(-1)}` : words[0]}`;
|
|
128
|
+
}
|
|
129
|
+
/** "1 open chain of 3 lines"; equal ones counted together. */
|
|
130
|
+
function grouped(words) {
|
|
131
|
+
const counts = new Map();
|
|
132
|
+
for (const word of words)
|
|
133
|
+
counts.set(word, (counts.get(word) ?? 0) + 1);
|
|
134
|
+
return [...counts].map(([word, n]) => (n === 1 ? `1 ${word}` : `${n} ${word.replace(/^open chain/, "open chains")}`));
|
|
135
|
+
}
|
|
136
|
+
function circleLoop(circle) {
|
|
137
|
+
const points = arcPoints(circle.centre, circle.radius, 0, 2 * Math.PI).slice(0, -1);
|
|
138
|
+
return { points, layers: new Set([circle.layer]), area: Math.PI * circle.radius ** 2 };
|
|
139
|
+
}
|
|
140
|
+
function unitsFor(drawing, asked) {
|
|
141
|
+
if (asked)
|
|
142
|
+
return { name: asked, from: "asked" };
|
|
143
|
+
if (drawing.otherUnits)
|
|
144
|
+
throw new DxfError(`The drawing's units (${drawing.otherUnits}) are not read; pass units mm or inch`);
|
|
145
|
+
return drawing.units ? { name: drawing.units, from: "file" } : { name: "mm", from: "assumed" };
|
|
146
|
+
}
|
|
147
|
+
/** The outline: the largest closed shape (on `layer` when given); refuses none and a tie. */
|
|
148
|
+
function pickOutline(loops, circles, layer, found) {
|
|
149
|
+
const candidates = [
|
|
150
|
+
...loops.map((loop) => ({ loop })),
|
|
151
|
+
...circles.map((circle) => ({ loop: circleLoop(circle), circle })),
|
|
152
|
+
].filter(({ loop }) => layer === undefined || [...loop.layers].every((name) => name === layer));
|
|
153
|
+
if (candidates.length === 0)
|
|
154
|
+
throw new DxfError(layer === undefined ? `No closed shape was found: ${found()}` : `No closed shape on layer ${layer}; ${found()}`);
|
|
155
|
+
const sorted = [...candidates].sort((a, b) => b.loop.area - a.loop.area);
|
|
156
|
+
const [largest, next] = sorted;
|
|
157
|
+
if (next && largest.loop.area - next.loop.area <= Math.max(1e-6, largest.loop.area * 1e-9)) {
|
|
158
|
+
throw new DxfError(`Two closed shapes have the same largest area (${tidy(largest.loop.area)} mm²), so the outline is not clear; pass layer to choose the outline's layer`);
|
|
159
|
+
}
|
|
160
|
+
return { outline: largest.loop, ...(largest.circle ? { circle: largest.circle } : {}) };
|
|
161
|
+
}
|
|
162
|
+
/** Moves points by `offset` and rounds them; two in a row at the same place become one. */
|
|
163
|
+
function placed(points, offset) {
|
|
164
|
+
const moved = points.map((p) => ({ x: tidy(p.x + offset.x), y: tidy(p.y + offset.y) }));
|
|
165
|
+
return moved.filter((p, i) => {
|
|
166
|
+
const before = moved[(i + moved.length - 1) % moved.length];
|
|
167
|
+
return moved.length === 1 || p.x !== before.x || p.y !== before.y;
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
/** The board a parsed drawing gives; refuses a drawing without a closed shape and one whose largest shape is not clear. */
|
|
171
|
+
export function boardFromDrawing(drawing, options = {}) {
|
|
172
|
+
const units = unitsFor(drawing, options.units);
|
|
173
|
+
const { pieces, closed, circles } = shapesOf(drawing.entities, MM_PER[units.name]);
|
|
174
|
+
const joined = chains(pieces);
|
|
175
|
+
const loops = [...closed.map((piece) => loopOf(piece.points, [piece.layer])), ...joined.filter(isClosed).map((chain) => loopOf(chain.points, chain.pieces.map((p) => p.layer)))];
|
|
176
|
+
const openChains = joined.filter((chain) => !isClosed(chain));
|
|
177
|
+
const skipped = Object.entries(drawing.skipped).map(([type, n]) => `${n} ${type}`);
|
|
178
|
+
const chainLines = grouped(openChains.map(chainWords));
|
|
179
|
+
const layers = [...new Set(drawing.entities.map((e) => e.layer))].sort();
|
|
180
|
+
const found = () => {
|
|
181
|
+
if (options.layer !== undefined)
|
|
182
|
+
return `the layers are ${layers.join(", ") || "none"}`;
|
|
183
|
+
const what = [...skipped, ...chainLines, ...(circles.length > 0 ? [plural(circles.length, "circle")] : [])];
|
|
184
|
+
return what.length > 0 ? what.join(", ") : "the drawing has no lines, arcs, circles or polylines";
|
|
185
|
+
};
|
|
186
|
+
const { outline, circle } = pickOutline(loops, circles, options.layer, found);
|
|
187
|
+
const inside = (p) => pointInPolygon(p, outline.points);
|
|
188
|
+
const otherLoops = loops.filter((loop) => loop !== outline);
|
|
189
|
+
const keepLoops = otherLoops.filter((loop) => loop.points.every(inside));
|
|
190
|
+
const otherCircles = circles.filter((one) => one !== circle);
|
|
191
|
+
const holeCircles = otherCircles.filter((one) => inside(one.centre));
|
|
192
|
+
const xs = outline.points.map((p) => p.x);
|
|
193
|
+
const ys = outline.points.map((p) => p.y);
|
|
194
|
+
const [minX, maxX, minY, maxY] = [Math.min(...xs), Math.max(...xs), Math.min(...ys), Math.max(...ys)];
|
|
195
|
+
const offset = options.origin === "keep" ? { x: 0, y: 0 } : { x: tidy(-(minX + maxX) / 2), y: tidy(-(minY + maxY) / 2) };
|
|
196
|
+
const outsideLoops = otherLoops.length - keepLoops.length;
|
|
197
|
+
const outsideCircles = otherCircles.length - holeCircles.length;
|
|
198
|
+
return {
|
|
199
|
+
outline: placed(outline.points, offset),
|
|
200
|
+
holes: holeCircles.map((one) => ({ x: tidy(one.centre.x + offset.x), y: tidy(one.centre.y + offset.y), diameter: tidy(one.radius * 2) })),
|
|
201
|
+
keepouts: keepLoops.map((loop) => placed(loop.points, offset)),
|
|
202
|
+
units,
|
|
203
|
+
offset,
|
|
204
|
+
width: tidy(maxX - minX),
|
|
205
|
+
height: tidy(maxY - minY),
|
|
206
|
+
notUsed: [
|
|
207
|
+
...skipped,
|
|
208
|
+
...chainLines,
|
|
209
|
+
...(outsideLoops > 0 ? [`${plural(outsideLoops, "closed shape")} outside the outline`] : []),
|
|
210
|
+
...(outsideCircles > 0 ? [`${plural(outsideCircles, "circle")} outside the outline`] : []),
|
|
211
|
+
],
|
|
212
|
+
};
|
|
213
|
+
}
|
|
214
|
+
/** Reads an ASCII DXF and gives the board it draws. */
|
|
215
|
+
export function boardFromDxf(text, options = {}) {
|
|
216
|
+
return boardFromDrawing(readDxf(text), options);
|
|
217
|
+
}
|
|
218
|
+
//# sourceMappingURL=board.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"board.js","sourceRoot":"","sources":["../../../src/engine/dxf/board.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export { DxfError, readDxf, type DxfDrawing, type DxfEntity, type DxfUnits, type DxfVertex } from "./reader.js";
|
|
2
|
+
export { ARC_TOLERANCE, arcPoints, boardFromDrawing, boardFromDxf, JOIN_TOLERANCE, type BoardFromDrawing, type BoardFromDrawingOptions, type BoardHole } from "./board.js";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/engine/dxf/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAkE,MAAM,aAAa,CAAA;AAC/G,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,EAAuE,MAAM,YAAY,CAAA"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import type { Point } from "../model.js";
|
|
2
|
+
/** The units a drawing's $INSUNITS names, among those a board is drawn in. */
|
|
3
|
+
export type DxfUnits = "inch" | "mm" | "cm" | "m";
|
|
4
|
+
export interface DxfVertex extends Point {
|
|
5
|
+
/** tan(θ/4) of the arc from this vertex to the next, θ counter-clockwise; 0 for a straight edge. */
|
|
6
|
+
bulge: number;
|
|
7
|
+
}
|
|
8
|
+
interface Layered {
|
|
9
|
+
layer: string;
|
|
10
|
+
}
|
|
11
|
+
export type DxfEntity = (Layered & {
|
|
12
|
+
type: "LINE";
|
|
13
|
+
start: Point;
|
|
14
|
+
end: Point;
|
|
15
|
+
}) | (Layered & {
|
|
16
|
+
type: "ARC";
|
|
17
|
+
centre: Point;
|
|
18
|
+
radius: number;
|
|
19
|
+
startAngle: number;
|
|
20
|
+
endAngle: number;
|
|
21
|
+
}) | (Layered & {
|
|
22
|
+
type: "CIRCLE";
|
|
23
|
+
centre: Point;
|
|
24
|
+
radius: number;
|
|
25
|
+
}) | (Layered & {
|
|
26
|
+
type: "LWPOLYLINE" | "POLYLINE";
|
|
27
|
+
vertices: DxfVertex[];
|
|
28
|
+
closed: boolean;
|
|
29
|
+
});
|
|
30
|
+
export interface DxfDrawing {
|
|
31
|
+
/** The header's units; undefined when it names none (absent or 0, unitless). */
|
|
32
|
+
units?: DxfUnits;
|
|
33
|
+
/** Units the header names that are not read (feet, mils, ...), as "$INSUNITS 2, feet". */
|
|
34
|
+
otherUnits?: string;
|
|
35
|
+
entities: DxfEntity[];
|
|
36
|
+
/** The entities not read, counted by type, e.g. { SPLINE: 2 }. */
|
|
37
|
+
skipped: Record<string, number>;
|
|
38
|
+
}
|
|
39
|
+
export declare class DxfError extends Error {
|
|
40
|
+
}
|
|
41
|
+
/** Reads an ASCII DXF; refuses a binary one, text that is not a DXF and a file without an ENTITIES section. */
|
|
42
|
+
export declare function readDxf(text: string): DxfDrawing;
|
|
43
|
+
export {};
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
export class DxfError extends Error {
|
|
2
|
+
}
|
|
3
|
+
const UNITS = { 1: "inch", 4: "mm", 5: "cm", 6: "m" };
|
|
4
|
+
const OTHER_UNITS = { 2: "feet", 3: "miles", 7: "km", 8: "microinches", 9: "mils", 10: "yards" };
|
|
5
|
+
function pairsOf(text) {
|
|
6
|
+
const lines = text.split(/\r?\n/);
|
|
7
|
+
const pairs = [];
|
|
8
|
+
for (let i = 0; i + 1 < lines.length; i += 2) {
|
|
9
|
+
const code = Number(lines[i].trim());
|
|
10
|
+
if (!Number.isInteger(code))
|
|
11
|
+
throw new DxfError(`The file is not an ASCII DXF: line ${i + 1} is not a group code`);
|
|
12
|
+
pairs.push({ code, value: lines[i + 1].trim() });
|
|
13
|
+
}
|
|
14
|
+
if (pairs.length === 0)
|
|
15
|
+
throw new DxfError("The file is not an ASCII DXF: it has no group codes");
|
|
16
|
+
return pairs;
|
|
17
|
+
}
|
|
18
|
+
/** The pairs of each section by name, from SECTION to ENDSEC. */
|
|
19
|
+
function sections(pairs) {
|
|
20
|
+
const found = new Map();
|
|
21
|
+
let current;
|
|
22
|
+
for (let i = 0; i < pairs.length; i++) {
|
|
23
|
+
const pair = pairs[i];
|
|
24
|
+
if (pair.code === 0 && pair.value === "SECTION") {
|
|
25
|
+
const name = pairs[i + 1];
|
|
26
|
+
current = [];
|
|
27
|
+
if (name?.code === 2)
|
|
28
|
+
found.set(name.value, current);
|
|
29
|
+
i++;
|
|
30
|
+
}
|
|
31
|
+
else if (pair.code === 0 && pair.value === "ENDSEC")
|
|
32
|
+
current = undefined;
|
|
33
|
+
else
|
|
34
|
+
current?.push(pair);
|
|
35
|
+
}
|
|
36
|
+
return found;
|
|
37
|
+
}
|
|
38
|
+
function unitsOf(header) {
|
|
39
|
+
if (!header)
|
|
40
|
+
return {};
|
|
41
|
+
const at = header.findIndex((pair) => pair.code === 9 && pair.value === "$INSUNITS");
|
|
42
|
+
const value = at === -1 ? undefined : header.slice(at + 1).find((pair) => pair.code === 70)?.value;
|
|
43
|
+
const code = value === undefined ? 0 : Number(value);
|
|
44
|
+
if (code === 0)
|
|
45
|
+
return {};
|
|
46
|
+
const units = UNITS[code];
|
|
47
|
+
return units ? { units } : { otherUnits: `$INSUNITS ${code}${OTHER_UNITS[code] ? `, ${OTHER_UNITS[code]}` : ""}` };
|
|
48
|
+
}
|
|
49
|
+
/** The entities of the section: each a type and its own pairs, up to the next code 0. */
|
|
50
|
+
function groups(pairs) {
|
|
51
|
+
const found = [];
|
|
52
|
+
for (const pair of pairs) {
|
|
53
|
+
if (pair.code === 0)
|
|
54
|
+
found.push({ type: pair.value, pairs: [] });
|
|
55
|
+
else
|
|
56
|
+
found.at(-1)?.pairs.push(pair);
|
|
57
|
+
}
|
|
58
|
+
return found;
|
|
59
|
+
}
|
|
60
|
+
function numberAt(pairs, code, fallback) {
|
|
61
|
+
const value = pairs.find((pair) => pair.code === code)?.value;
|
|
62
|
+
const number = value === undefined ? fallback : Number(value);
|
|
63
|
+
if (number === undefined || !Number.isFinite(number))
|
|
64
|
+
throw new DxfError(`An entity is missing its group code ${code}, or it is not a number`);
|
|
65
|
+
return number;
|
|
66
|
+
}
|
|
67
|
+
const layerOf = (pairs) => pairs.find((pair) => pair.code === 8)?.value ?? "0";
|
|
68
|
+
const pointAt = (pairs, code) => ({ x: numberAt(pairs, code), y: numberAt(pairs, code + 10) });
|
|
69
|
+
const closedFlag = (pairs) => (numberAt(pairs, 70, 0) & 1) === 1;
|
|
70
|
+
/** A LWPOLYLINE's vertices: each 10 starts one, its 20 and an optional 42 follow. */
|
|
71
|
+
function lwVertices(pairs) {
|
|
72
|
+
const vertices = [];
|
|
73
|
+
for (const pair of pairs) {
|
|
74
|
+
const last = vertices.at(-1);
|
|
75
|
+
if (pair.code === 10)
|
|
76
|
+
vertices.push({ x: Number(pair.value), y: Number.NaN, bulge: 0 });
|
|
77
|
+
else if (pair.code === 20 && last)
|
|
78
|
+
last.y = Number(pair.value);
|
|
79
|
+
else if (pair.code === 42 && last)
|
|
80
|
+
last.bulge = Number(pair.value);
|
|
81
|
+
}
|
|
82
|
+
if (vertices.some((v) => !Number.isFinite(v.x) || !Number.isFinite(v.y) || !Number.isFinite(v.bulge)))
|
|
83
|
+
throw new DxfError("A LWPOLYLINE has a vertex that is not a number");
|
|
84
|
+
return vertices;
|
|
85
|
+
}
|
|
86
|
+
function simpleEntity(type, pairs) {
|
|
87
|
+
const layer = layerOf(pairs);
|
|
88
|
+
switch (type) {
|
|
89
|
+
case "LINE":
|
|
90
|
+
return { type, layer, start: pointAt(pairs, 10), end: pointAt(pairs, 11) };
|
|
91
|
+
case "ARC":
|
|
92
|
+
return { type, layer, centre: pointAt(pairs, 10), radius: numberAt(pairs, 40), startAngle: numberAt(pairs, 50), endAngle: numberAt(pairs, 51) };
|
|
93
|
+
case "CIRCLE":
|
|
94
|
+
return { type, layer, centre: pointAt(pairs, 10), radius: numberAt(pairs, 40) };
|
|
95
|
+
case "LWPOLYLINE":
|
|
96
|
+
return { type, layer, vertices: lwVertices(pairs), closed: closedFlag(pairs) };
|
|
97
|
+
default:
|
|
98
|
+
return undefined;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
/** VERTEX flag 16: a spline frame control point, not on the curve. */
|
|
102
|
+
const CONTROL_POINT = 16;
|
|
103
|
+
function readEntities(section) {
|
|
104
|
+
const entities = [];
|
|
105
|
+
const skipped = {};
|
|
106
|
+
let polyline;
|
|
107
|
+
for (const { type, pairs } of groups(section)) {
|
|
108
|
+
if (polyline && type === "VERTEX") {
|
|
109
|
+
if ((numberAt(pairs, 70, 0) & CONTROL_POINT) === 0)
|
|
110
|
+
polyline.vertices.push({ ...pointAt(pairs, 10), bulge: numberAt(pairs, 42, 0) });
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
113
|
+
if (polyline && type === "SEQEND") {
|
|
114
|
+
polyline = undefined;
|
|
115
|
+
continue;
|
|
116
|
+
}
|
|
117
|
+
polyline = undefined;
|
|
118
|
+
if (type === "POLYLINE") {
|
|
119
|
+
const started = { type: "POLYLINE", layer: layerOf(pairs), vertices: [], closed: closedFlag(pairs) };
|
|
120
|
+
polyline = started;
|
|
121
|
+
entities.push(started);
|
|
122
|
+
continue;
|
|
123
|
+
}
|
|
124
|
+
const entity = simpleEntity(type, pairs);
|
|
125
|
+
if (entity)
|
|
126
|
+
entities.push(entity);
|
|
127
|
+
else
|
|
128
|
+
skipped[type] = (skipped[type] ?? 0) + 1;
|
|
129
|
+
}
|
|
130
|
+
return { entities, skipped };
|
|
131
|
+
}
|
|
132
|
+
/** Reads an ASCII DXF; refuses a binary one, text that is not a DXF and a file without an ENTITIES section. */
|
|
133
|
+
export function readDxf(text) {
|
|
134
|
+
if (text.startsWith("AutoCAD Binary DXF"))
|
|
135
|
+
throw new DxfError("The file is a binary DXF; save the drawing as an ASCII DXF");
|
|
136
|
+
const all = sections(pairsOf(text));
|
|
137
|
+
const section = all.get("ENTITIES");
|
|
138
|
+
if (!section)
|
|
139
|
+
throw new DxfError("The DXF has no ENTITIES section, so nothing is drawn in it");
|
|
140
|
+
return { ...unitsOf(all.get("HEADER")), ...readEntities(section) };
|
|
141
|
+
}
|
|
142
|
+
//# sourceMappingURL=reader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reader.js","sourceRoot":"","sources":["../../../src/engine/dxf/reader.ts"],"names":[],"mappings":"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"}
|
package/dist/engine/elaborate.js
CHANGED
|
@@ -16,7 +16,7 @@ import { mergeNets } from "./nets.js";
|
|
|
16
16
|
import { naturalCompare } from "./order.js";
|
|
17
17
|
import { buildPour, resolvePours } from "./pour/build.js";
|
|
18
18
|
import { PropReader } from "./read-props.js";
|
|
19
|
-
import { placePorts, portMembers, readPorts, readSheetSize } from "./sheet-ports.js";
|
|
19
|
+
import { placePorts, portMembers, readPorts, readSheetCard, readSheetSize } from "./sheet-ports.js";
|
|
20
20
|
import { Bases, flatNet, readBase, readConnections, SHEET_FILE, sheetName, traceScope, withBase } from "./sheets.js";
|
|
21
21
|
import { resolveTraces } from "./traces.js";
|
|
22
22
|
/**
|
|
@@ -194,6 +194,8 @@ class Elaboration {
|
|
|
194
194
|
connections: Object.fromEntries(read.connections),
|
|
195
195
|
ports: symbol.ports.map((port) => instancePort(port, scope, read.connections)),
|
|
196
196
|
...(symbol.size ? { size: symbol.size } : {}),
|
|
197
|
+
...(symbol.does ? { does: symbol.does } : {}),
|
|
198
|
+
...(symbol.sources ? { sources: symbol.sources } : {}),
|
|
197
199
|
parts: parts.sort(naturalCompare),
|
|
198
200
|
...placed.record,
|
|
199
201
|
...onPage(frame.page),
|
|
@@ -205,12 +207,20 @@ class Elaboration {
|
|
|
205
207
|
const written = readPorts(body.children, (port) => this.sourceOf(port, frame));
|
|
206
208
|
const placed = placePorts(written.ports, sheet, at);
|
|
207
209
|
const size = readSheetSize(body.props, sheet, at);
|
|
210
|
+
const card = readSheetCard(body.props, sheet, at);
|
|
208
211
|
if (!this.sheetsRead.has(file)) {
|
|
209
212
|
this.sheetsRead.add(file);
|
|
210
|
-
this.diagnostics.push(...written.diagnostics, ...placed.diagnostics, ...size.diagnostics);
|
|
213
|
+
this.diagnostics.push(...written.diagnostics, ...placed.diagnostics, ...size.diagnostics, ...card.diagnostics);
|
|
211
214
|
}
|
|
212
|
-
const ports = placed.ports.map(({ name, side, order, bus
|
|
213
|
-
|
|
215
|
+
const ports = placed.ports.map(({ name, side, order, bus, type, carries }) => ({
|
|
216
|
+
name,
|
|
217
|
+
side,
|
|
218
|
+
order,
|
|
219
|
+
...(bus ? { bus: true } : {}),
|
|
220
|
+
...(type ? { type } : {}),
|
|
221
|
+
...(carries ? { carries } : {}),
|
|
222
|
+
}));
|
|
223
|
+
return { ports, ...(Object.keys(size.size).length > 0 ? { size: size.size } : {}), ...card.card };
|
|
214
224
|
}
|
|
215
225
|
/** A unique path: a second instance of the same name in the same parent is an error and gets "~2", "~3" and so on. */
|
|
216
226
|
instancePath(path, source) {
|