@tscircuit/core 0.0.1327 → 0.0.1329

package/dist/index.d.ts

@@ -467,7 +467,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
     source_trace_id: string | null;
     pcb_trace_id: string | null;
     schematic_trace_id: string | null;
-    _inflatedPcbTrace?: PcbTrace$1;
+    _inflatedPcbTraces?: PcbTrace$1[];
     _inflatedPcbVias?: PcbVia$1[];
     _portsRoutedOnPcb: Port[];
     subcircuit_connectivity_map_key: string | null;

package/dist/index.js

@@ -4676,8 +4676,9 @@ function Trace_doInitialPcbManualTraceRender(trace) {
   const subcircuit = trace.getSubcircuit();
   const hasPcbPath = props.pcbPath !== void 0;
   const wantsStraightLine = Boolean(props.pcbStraightLine);
-  const inflatedPcbTrace = trace._inflatedPcbTrace;
-  if (!hasPcbPath && !wantsStraightLine && !inflatedPcbTrace) return;
+  const inflatedPcbTraces = trace._inflatedPcbTraces ?? [];
+  if (!hasPcbPath && !wantsStraightLine && inflatedPcbTraces.length === 0)
+    return;
   let allPortsFound;
   let ports;
   let portsWithSelectors;
@@ -4730,86 +4731,94 @@ function Trace_doInitialPcbManualTraceRender(trace) {
     return;
   }
   const width = trace._getExplicitTraceThickness() ?? trace.getSubcircuit()._parsedProps.minTraceWidth ?? jlcMinTolerances.min_trace_width;
-  if (inflatedPcbTrace) {
+  if (inflatedPcbTraces.length > 0) {
     const { maybeFlipLayer } = trace._getPcbPrimitiveFlippedHelpers();
     const transform2 = trace._computePcbGlobalTransformBeforeLayout();
-    const transformedRoute = inflatedPcbTrace.route.map((point6) => {
-      if (point6.route_type === "wire") {
-        const { x, y, ...restOfPoint } = point6;
-        const transformedPoint = applyToPoint2(transform2, { x, y });
-        return {
-          ...restOfPoint,
-          ...transformedPoint,
-          layer: maybeFlipLayer(point6.layer)
-        };
-      }
-      if (point6.route_type === "via") {
-        const { x, y, ...restOfPoint } = point6;
-        const transformedPoint = applyToPoint2(transform2, { x, y });
+    const insertedRoutes = [];
+    for (const inflatedPcbTrace of inflatedPcbTraces) {
+      const transformedRoute = inflatedPcbTrace.route.map((point6) => {
+        if (point6.route_type === "wire") {
+          const { x, y, ...restOfPoint } = point6;
+          const transformedPoint = applyToPoint2(transform2, { x, y });
+          return {
+            ...restOfPoint,
+            ...transformedPoint,
+            layer: maybeFlipLayer(point6.layer)
+          };
+        }
+        if (point6.route_type === "via") {
+          const { x, y, ...restOfPoint } = point6;
+          const transformedPoint = applyToPoint2(transform2, { x, y });
+          return {
+            ...restOfPoint,
+            ...transformedPoint,
+            from_layer: maybeFlipLayer(point6.from_layer),
+            to_layer: maybeFlipLayer(point6.to_layer)
+          };
+        }
         return {
-          ...restOfPoint,
-          ...transformedPoint,
-          from_layer: maybeFlipLayer(point6.from_layer),
-          to_layer: maybeFlipLayer(point6.to_layer)
+          ...point6,
+          start: applyToPoint2(transform2, point6.start),
+          end: applyToPoint2(transform2, point6.end),
+          start_layer: maybeFlipLayer(point6.start_layer),
+          end_layer: maybeFlipLayer(point6.end_layer)
         };
+      });
+      const pcb_trace2 = db.pcb_trace.insert({
+        ...inflatedPcbTrace,
+        route: transformedRoute,
+        source_trace_id: trace.source_trace_id,
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: trace.getGroup()?.pcb_group_id ?? void 0
+      });
+      const pcbStyle2 = trace.getInheritedMergedProperty("pcbStyle");
+      const { holeDiameter: holeDiameter2, padDiameter: padDiameter2 } = getViaDiameterDefaults(pcbStyle2);
+      for (let index = 0; index < transformedRoute.length; index++) {
+        const point6 = transformedRoute[index];
+        if (point6.route_type === "via") {
+          const originalPoint = inflatedPcbTrace.route[index];
+          const inflatedPcbVia = findInflatedPcbViaForPoint(
+            trace._inflatedPcbVias,
+            originalPoint
+          );
+          const routePointViaDiameter = getViaDiameterFromRoutePoint(point6);
+          const fromLayer = maybeFlipLayer(
+            inflatedPcbVia?.from_layer ?? point6.from_layer
+          );
+          const toLayer = maybeFlipLayer(
+            inflatedPcbVia?.to_layer ?? point6.to_layer
+          );
+          const layers = (inflatedPcbVia?.layers ?? [
+            point6.from_layer,
+            point6.to_layer
+          ]).map((layer2) => maybeFlipLayer(layer2));
+          db.pcb_via.insert({
+            pcb_trace_id: pcb_trace2.pcb_trace_id,
+            x: point6.x,
+            y: point6.y,
+            hole_diameter: inflatedPcbVia?.hole_diameter ?? routePointViaDiameter.holeDiameter ?? holeDiameter2,
+            outer_diameter: inflatedPcbVia?.outer_diameter ?? routePointViaDiameter.outerDiameter ?? padDiameter2,
+            layers,
+            from_layer: fromLayer,
+            to_layer: toLayer,
+            subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+            pcb_group_id: trace.getGroup()?.pcb_group_id ?? void 0,
+            subcircuit_connectivity_map_key: inflatedPcbVia?.subcircuit_connectivity_map_key,
+            net_is_assignable: inflatedPcbVia?.net_is_assignable,
+            net_assigned: inflatedPcbVia?.net_assigned,
+            is_tented: inflatedPcbVia?.is_tented
+          });
+        }
       }
-      return {
-        ...point6,
-        start: applyToPoint2(transform2, point6.start),
-        end: applyToPoint2(transform2, point6.end),
-        start_layer: maybeFlipLayer(point6.start_layer),
-        end_layer: maybeFlipLayer(point6.end_layer)
-      };
-    });
-    const pcb_trace2 = db.pcb_trace.insert({
-      ...inflatedPcbTrace,
-      route: transformedRoute,
-      source_trace_id: trace.source_trace_id,
-      subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
-      pcb_group_id: trace.getGroup()?.pcb_group_id ?? void 0
-    });
-    const pcbStyle2 = trace.getInheritedMergedProperty("pcbStyle");
-    const { holeDiameter: holeDiameter2, padDiameter: padDiameter2 } = getViaDiameterDefaults(pcbStyle2);
-    for (let index = 0; index < transformedRoute.length; index++) {
-      const point6 = transformedRoute[index];
-      if (point6.route_type === "via") {
-        const originalPoint = inflatedPcbTrace.route[index];
-        const inflatedPcbVia = findInflatedPcbViaForPoint(
-          trace._inflatedPcbVias,
-          originalPoint
-        );
-        const routePointViaDiameter = getViaDiameterFromRoutePoint(point6);
-        const fromLayer = maybeFlipLayer(
-          inflatedPcbVia?.from_layer ?? point6.from_layer
-        );
-        const toLayer = maybeFlipLayer(
-          inflatedPcbVia?.to_layer ?? point6.to_layer
-        );
-        const layers = (inflatedPcbVia?.layers ?? [
-          point6.from_layer,
-          point6.to_layer
-        ]).map((layer2) => maybeFlipLayer(layer2));
-        db.pcb_via.insert({
-          pcb_trace_id: pcb_trace2.pcb_trace_id,
-          x: point6.x,
-          y: point6.y,
-          hole_diameter: inflatedPcbVia?.hole_diameter ?? routePointViaDiameter.holeDiameter ?? holeDiameter2,
-          outer_diameter: inflatedPcbVia?.outer_diameter ?? routePointViaDiameter.outerDiameter ?? padDiameter2,
-          layers,
-          from_layer: fromLayer,
-          to_layer: toLayer,
-          subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
-          pcb_group_id: trace.getGroup()?.pcb_group_id ?? void 0,
-          subcircuit_connectivity_map_key: inflatedPcbVia?.subcircuit_connectivity_map_key,
-          net_is_assignable: inflatedPcbVia?.net_is_assignable,
-          net_assigned: inflatedPcbVia?.net_assigned,
-          is_tented: inflatedPcbVia?.is_tented
-        });
+      if (!trace.pcb_trace_id) {
+        trace.pcb_trace_id = pcb_trace2.pcb_trace_id;
       }
+      insertedRoutes.push(pcb_trace2.route);
+    }
+    for (const route2 of insertedRoutes) {
+      trace._insertErrorIfTraceIsOutsideBoard(route2, ports);
     }
     trace._portsRoutedOnPcb = ports;
-    trace.pcb_trace_id = pcb_trace2.pcb_trace_id;
-    trace._insertErrorIfTraceIsOutsideBoard(pcb_trace2.route, ports);
     return;
   }
   if (wantsStraightLine && !hasPcbPath) {
@@ -5178,7 +5187,7 @@ var Trace3 = class extends PrimitiveComponent2 {
   source_trace_id = null;
   pcb_trace_id = null;
   schematic_trace_id = null;
-  _inflatedPcbTrace;
+  _inflatedPcbTraces;
   _inflatedPcbVias;
   _portsRoutedOnPcb;
   subcircuit_connectivity_map_key = null;
@@ -14752,6 +14761,55 @@ function inflateSourceDiode(sourceElm, inflatorContext) {
   }
 }
 
+// lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourceFiducial.ts
+import { fiducialProps } from "@tscircuit/props";
+var InflatedFiducial = class extends NormalComponent3 {
+  get config() {
+    return {
+      componentName: "Fiducial",
+      zodProps: fiducialProps,
+      sourceFtype: "simple_fiducial"
+    };
+  }
+  doInitialSchematicComponentRender() {
+  }
+};
+function inflateSourceFiducial(sourceElm, inflatorContext) {
+  const { injectionDb, subcircuit, groupsMap } = inflatorContext;
+  const pcbElm = injectionDb.pcb_component.getWhere({
+    source_component_id: sourceElm.source_component_id
+  });
+  const { pcbX, pcbY } = getInflatedPcbPlacement({
+    pcbComponent: pcbElm,
+    sourceGroupId: sourceElm.source_group_id,
+    inflatorContext
+  });
+  const fiducial = new InflatedFiducial({
+    name: sourceElm.name,
+    layer: pcbElm?.layer,
+    pcbX,
+    pcbY,
+    pcbRotation: pcbElm?.rotation,
+    doNotPlace: pcbElm?.do_not_place,
+    obstructsWithinBounds: pcbElm?.obstructs_within_bounds
+  });
+  if (pcbElm) {
+    const footprint = inflateFootprintComponent(pcbElm, {
+      ...inflatorContext,
+      normalComponent: fiducial
+    });
+    if (footprint) {
+      fiducial.add(footprint);
+    }
+  }
+  if (sourceElm.source_group_id && groupsMap?.has(sourceElm.source_group_id)) {
+    const group = groupsMap.get(sourceElm.source_group_id);
+    group.add(fiducial);
+  } else {
+    subcircuit.add(fiducial);
+  }
+}
+
 // lib/components/primitive-components/Group/Group.ts
 import {
   convertSrjToGraphicsObject,
@@ -22732,6 +22790,103 @@ function inflateSourceInductor(sourceElm, inflatorContext) {
   }
 }
 
+// lib/components/normal-components/Led.ts
+import { ledProps } from "@tscircuit/props";
+var Led = class extends NormalComponent3 {
+  get config() {
+    const symbolMap = {
+      laser: "laser_diode"
+    };
+    const variantSymbol = this.props.laser ? "laser" : null;
+    return {
+      schematicSymbolName: variantSymbol ? symbolMap[variantSymbol] : this.props.symbolName ?? "led",
+      componentName: "Led",
+      zodProps: ledProps,
+      sourceFtype: "simple_led"
+    };
+  }
+  initPorts() {
+    super.initPorts({
+      additionalAliases: {
+        pin1: ["anode", "pos", "left"],
+        pin2: ["cathode", "neg", "right"]
+      }
+    });
+  }
+  _getSchematicSymbolDisplayValue() {
+    return this._parsedProps.schDisplayValue || this._parsedProps.color || void 0;
+  }
+  getFootprinterString() {
+    const baseFootprint = super.getFootprinterString();
+    if (baseFootprint && this.props.color) {
+      return `${baseFootprint}_color(${this.props.color})`;
+    }
+    return baseFootprint;
+  }
+  doInitialSourceRender() {
+    const { db } = this.root;
+    const { _parsedProps: props } = this;
+    const source_component = db.source_component.insert({
+      ftype: "simple_led",
+      name: this.name,
+      wave_length: props.wavelength,
+      color: props.color,
+      symbol_display_value: this._getSchematicSymbolDisplayValue(),
+      manufacturer_part_number: props.manufacturerPartNumber ?? props.mfn,
+      supplier_part_numbers: props.supplierPartNumbers,
+      are_pins_interchangeable: false,
+      display_name: props.displayName
+    });
+    this.source_component_id = source_component.source_component_id;
+  }
+  pos = this.portMap.pin1;
+  anode = this.portMap.pin1;
+  neg = this.portMap.pin2;
+  cathode = this.portMap.pin2;
+};
+
+// lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourceLed.ts
+function inflateSourceLed(sourceElm, inflatorContext) {
+  const { injectionDb, subcircuit, groupsMap } = inflatorContext;
+  const pcbElm = injectionDb.pcb_component.getWhere({
+    source_component_id: sourceElm.source_component_id
+  });
+  const cadElm = injectionDb.cad_component.getWhere({
+    source_component_id: sourceElm.source_component_id
+  });
+  const { pcbX, pcbY } = getInflatedPcbPlacement({
+    pcbComponent: pcbElm,
+    sourceGroupId: sourceElm.source_group_id,
+    inflatorContext
+  });
+  const led = new Led({
+    name: sourceElm.name,
+    color: sourceElm.color,
+    wavelength: sourceElm.wavelength ?? sourceElm.wave_length,
+    layer: pcbElm?.layer,
+    pcbX,
+    pcbY,
+    pcbRotation: pcbElm?.rotation,
+    doNotPlace: pcbElm?.do_not_place,
+    obstructsWithinBounds: pcbElm?.obstructs_within_bounds
+  });
+  if (pcbElm) {
+    const footprint = inflateFootprintComponent(pcbElm, {
+      ...inflatorContext,
+      normalComponent: led
+    });
+    if (footprint) {
+      led.add(footprint);
+    }
+  }
+  if (sourceElm.source_group_id && groupsMap?.has(sourceElm.source_group_id)) {
+    const group = groupsMap.get(sourceElm.source_group_id);
+    group.add(led);
+  } else {
+    subcircuit.add(led);
+  }
+}
+
 // lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourcePort.ts
 function inflateSourcePort(sourcePort, inflatorContext) {
   const { injectionDb, subcircuit } = inflatorContext;
@@ -23076,9 +23231,8 @@ function inflateSourceTrace(sourceTrace, inflatorContext) {
   if (connectedSelectors.length < 2) {
     return;
   }
-  const pcbTrace = injectionDb.pcb_trace.getWhere({
-    source_trace_id: sourceTrace.source_trace_id
-  });
+  const pcbTraces = injectionDb.pcb_trace.list().filter((trace2) => trace2.source_trace_id === sourceTrace.source_trace_id);
+  const pcbTrace = pcbTraces[0];
   let pcbPath;
   if (pcbTrace) {
     pcbPath = pcbTraceRouteToPcbPath(pcbTrace.route);
@@ -23102,8 +23256,10 @@ function inflateSourceTrace(sourceTrace, inflatorContext) {
     traceProps2.pcbStraightLine = true;
   }
   const trace = new Trace3(traceProps2);
-  trace._inflatedPcbTrace = pcbTrace ?? void 0;
-  trace._inflatedPcbVias = pcbTrace ? injectionDb.pcb_via.list().filter((via) => via.pcb_trace_id === pcbTrace.pcb_trace_id) : void 0;
+  trace._inflatedPcbTraces = pcbTraces.length > 0 ? pcbTraces : void 0;
+  trace._inflatedPcbVias = pcbTrace ? injectionDb.pcb_via.list().filter(
+    (via) => pcbTraces.some((trace2) => via.pcb_trace_id === trace2.pcb_trace_id)
+  ) : void 0;
   subcircuit.add(trace);
 }
 
@@ -23288,6 +23444,12 @@ var inflateCircuitJson = (target, circuitJson, children) => {
       case "simple_diode":
         inflateSourceDiode(sourceComponent, inflationCtx);
         break;
+      case "simple_fiducial":
+        inflateSourceFiducial(sourceComponent, inflationCtx);
+        break;
+      case "simple_led":
+        inflateSourceLed(sourceComponent, inflationCtx);
+        break;
       case "simple_chip":
         inflateSourceChip(sourceComponent, inflationCtx);
         break;
@@ -23566,7 +23728,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1326",
+  version: "0.0.1328",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -23638,11 +23800,12 @@ var package_default = {
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",
     debug: "^4.3.6",
+    "@tscircuit/eecircuit-engine": "https://jscdn.tscircuit.com/@tscircuit/eecircuit-engine/1.7.4.tgz",
     flatbush: "^4.5.0",
     "graphics-debug": "^0.0.95",
     howfat: "^0.3.8",
-    "kicad-to-circuit-json": "^0.0.60",
-    kicadts: "^0.0.35",
+    "kicad-to-circuit-json": "^0.0.97",
+    kicadts: "^0.0.47",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",
     minicssgrid: "^0.0.9",
@@ -26005,61 +26168,6 @@ var SolderJumper = class extends NormalComponent3 {
   }
 };
 
-// lib/components/normal-components/Led.ts
-import { ledProps } from "@tscircuit/props";
-var Led = class extends NormalComponent3 {
-  get config() {
-    const symbolMap = {
-      laser: "laser_diode"
-    };
-    const variantSymbol = this.props.laser ? "laser" : null;
-    return {
-      schematicSymbolName: variantSymbol ? symbolMap[variantSymbol] : this.props.symbolName ?? "led",
-      componentName: "Led",
-      zodProps: ledProps,
-      sourceFtype: "simple_led"
-    };
-  }
-  initPorts() {
-    super.initPorts({
-      additionalAliases: {
-        pin1: ["anode", "pos", "left"],
-        pin2: ["cathode", "neg", "right"]
-      }
-    });
-  }
-  _getSchematicSymbolDisplayValue() {
-    return this._parsedProps.schDisplayValue || this._parsedProps.color || void 0;
-  }
-  getFootprinterString() {
-    const baseFootprint = super.getFootprinterString();
-    if (baseFootprint && this.props.color) {
-      return `${baseFootprint}_color(${this.props.color})`;
-    }
-    return baseFootprint;
-  }
-  doInitialSourceRender() {
-    const { db } = this.root;
-    const { _parsedProps: props } = this;
-    const source_component = db.source_component.insert({
-      ftype: "simple_led",
-      name: this.name,
-      wave_length: props.wavelength,
-      color: props.color,
-      symbol_display_value: this._getSchematicSymbolDisplayValue(),
-      manufacturer_part_number: props.manufacturerPartNumber ?? props.mfn,
-      supplier_part_numbers: props.supplierPartNumbers,
-      are_pins_interchangeable: false,
-      display_name: props.displayName
-    });
-    this.source_component_id = source_component.source_component_id;
-  }
-  pos = this.portMap.pin1;
-  anode = this.portMap.pin1;
-  neg = this.portMap.pin2;
-  cathode = this.portMap.pin2;
-};
-
 // lib/components/normal-components/PowerSource.ts
 import { powerSourceProps } from "@tscircuit/props";
 var PowerSource = class extends NormalComponent3 {
@@ -27900,14 +28008,14 @@ var NetLabel = class extends PrimitiveComponent2 {
 // lib/components/primitive-components/Fiducial.ts
 import "zod";
 import { distance as distance18 } from "circuit-json";
-import { fiducialProps } from "@tscircuit/props";
+import { fiducialProps as fiducialProps2 } from "@tscircuit/props";
 var Fiducial = class extends PrimitiveComponent2 {
   pcb_smtpad_id = null;
   isPcbPrimitive = true;
   get config() {
     return {
       componentName: "Fiducial",
-      zodProps: fiducialProps,
+      zodProps: fiducialProps2,
       sourceFtype: "simple_fiducial"
     };
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1327",
+  "version": "0.0.1329",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -73,11 +73,12 @@
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",
     "debug": "^4.3.6",
+    "@tscircuit/eecircuit-engine": "https://jscdn.tscircuit.com/@tscircuit/eecircuit-engine/1.7.4.tgz",
     "flatbush": "^4.5.0",
     "graphics-debug": "^0.0.95",
     "howfat": "^0.3.8",
-    "kicad-to-circuit-json": "^0.0.60",
-    "kicadts": "^0.0.35",
+    "kicad-to-circuit-json": "^0.0.97",
+    "kicadts": "^0.0.47",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",
     "minicssgrid": "^0.0.9",