@tscircuit/core 0.0.835 → 0.0.837

package/dist/index.js

@@ -3019,12 +3019,12 @@ var calculateCcwRotation = (componentRotationStr, elementCcwRotation) => {
 var createComponentsFromCircuitJson = ({
   componentName,
   componentRotation,
-  footprint,
+  footprinterString,
   pinLabels,
   pcbPinLabels
-}, soup) => {
+}, circuitJson) => {
   const components = [];
-  for (const elm of soup) {
+  for (const elm of circuitJson) {
     if (elm.type === "pcb_smtpad" && elm.shape === "rect") {
       components.push(
         new SmtPad({
@@ -3209,11 +3209,11 @@ var createComponentsFromCircuitJson = ({
         componentRotation,
         elm.ccw_rotation
       );
-      if (footprint.includes("pinrow") && elm.text.includes("PIN")) {
+      if (footprinterString?.includes("pinrow") && elm.text.includes("PIN")) {
         components.push(
           createPinrowSilkscreenText({
             elm,
-            pinLabels: pcbPinLabels ?? pinLabels,
+            pinLabels: pcbPinLabels ?? pinLabels ?? {},
             layer: elm.layer,
             readableRotation: ccwRotation,
             anchorAlignment: elm.anchor_alignment
@@ -7378,7 +7378,7 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
           {
             componentName: component.name,
             componentRotation: pcbRotation,
-            footprint: footprintUrl,
+            footprinterString: footprintUrl,
             pinLabels,
             pcbPinLabels
           },
@@ -7422,7 +7422,7 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
           {
             componentName: component.name,
             componentRotation: pcbRotation,
-            footprint: url,
+            footprinterString: url,
             pinLabels,
             pcbPinLabels
           },
@@ -7477,7 +7477,7 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
           {
             componentName: component.name,
             componentRotation: pcbRotation,
-            footprint,
+            footprinterString: footprint,
             pinLabels,
             pcbPinLabels
           },
@@ -7523,7 +7523,7 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
         {
           componentName: component.name,
           componentRotation: pcbRotation,
-          footprint: "",
+          footprinterString: "",
           pinLabels,
           pcbPinLabels
         },
@@ -7912,7 +7912,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
         {
           componentName: this.name ?? this.componentName,
           componentRotation: pcbRotation,
-          footprint,
+          footprinterString: footprint,
           pinLabels,
           pcbPinLabels
         },
@@ -15469,21 +15469,93 @@ var PcbNoteDimension = class extends PrimitiveComponent2 {
 import "@tscircuit/props";
 import { cju } from "@tscircuit/circuit-json-util";
 
+// lib/components/primitive-components/Group/Subcircuit/inflators/inflatePcbComponent.ts
+var inflatePcbComponent = (pcbElm, inflatorContext) => {
+  const { injectionDb, normalComponent } = inflatorContext;
+  if (!normalComponent) return;
+  const components = createComponentsFromCircuitJson(
+    {
+      componentName: normalComponent.name,
+      componentRotation: "0deg"
+    },
+    injectionDb.toArray().filter(
+      (elm) => "pcb_component_id" in elm && elm.pcb_component_id === pcbElm.pcb_component_id
+    )
+  );
+  normalComponent.addAll(components);
+};
+
 // lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourceResistor.ts
-function inflateSourceResistor(sourceElm, context) {
-  const { injectionDb, subcircuit } = context;
+function inflateSourceResistor(sourceElm, inflatorContext) {
+  const { injectionDb, subcircuit, groupsMap } = inflatorContext;
   const pcbElm = injectionDb.pcb_component.getWhere({
-    name: sourceElm.name
+    source_component_id: sourceElm.source_component_id
   });
   const cadElm = injectionDb.cad_component.getWhere({
-    name: sourceElm.name
+    source_component_id: sourceElm.source_component_id
   });
   const resistor = new Resistor({
     name: sourceElm.name,
-    resistance: sourceElm.resistance,
-    footprint: cadElm?.footprinter_string
+    resistance: sourceElm.resistance
   });
-  subcircuit.add(resistor);
+  if (pcbElm) {
+    inflatePcbComponent(pcbElm, {
+      ...inflatorContext,
+      normalComponent: resistor
+    });
+  }
+  if (sourceElm.source_group_id && groupsMap?.has(sourceElm.source_group_id)) {
+    const group = groupsMap.get(sourceElm.source_group_id);
+    group.add(resistor);
+  } else {
+    subcircuit.add(resistor);
+  }
+}
+
+// lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourcePort.ts
+function inflateSourcePort(sourcePort, inflatorContext) {
+  const { injectionDb, subcircuit } = inflatorContext;
+  if (sourcePort.source_component_id !== null) {
+    return;
+  }
+  const pcbPortFromInjection = injectionDb.pcb_port.getWhere({
+    source_port_id: sourcePort.source_port_id
+  });
+  const port = new Port({
+    name: sourcePort.name,
+    pinNumber: sourcePort.pin_number
+  });
+  subcircuit.add(port);
+  port.source_port_id = sourcePort.source_port_id;
+  const root = subcircuit.root;
+  if (root && pcbPortFromInjection) {
+    const { db } = root;
+    const pcb_port = db.pcb_port.insert({
+      pcb_component_id: void 0,
+      layers: pcbPortFromInjection.layers,
+      subcircuit_id: subcircuit.subcircuit_id ?? void 0,
+      pcb_group_id: subcircuit.getGroup()?.pcb_group_id ?? void 0,
+      x: pcbPortFromInjection.x,
+      y: pcbPortFromInjection.y,
+      source_port_id: sourcePort.source_port_id,
+      is_board_pinout: false
+    });
+    port.pcb_port_id = pcb_port.pcb_port_id;
+  }
+}
+
+// lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourceGroup.ts
+function inflateSourceGroup(sourceGroup, inflatorContext) {
+  const { subcircuit, groupsMap } = inflatorContext;
+  const group = new Group6({
+    name: sourceGroup.name
+  });
+  group.source_group_id = sourceGroup.source_group_id;
+  subcircuit.add(group);
+  if (groupsMap) {
+    groupsMap.set(sourceGroup.source_group_id, group);
+  }
+  return group;
 }
 
 // lib/components/primitive-components/Group/Subcircuit/Subcircuit.ts
@@ -15509,17 +15581,23 @@ var Subcircuit = class extends Group6 {
    * - Add components to groups in the appropriate hierarchy
    */
   doInitialInflateSubcircuitCircuitJson() {
-    const { circuitJson, children } = this._parsedProps;
-    if (!circuitJson) return;
-    const { db } = this.root;
-    if (circuitJson && children?.length > 0) {
+    const { circuitJson: injectionCircuitJson, children } = this._parsedProps;
+    if (!injectionCircuitJson) return;
+    const injectionDb = cju(injectionCircuitJson);
+    if (injectionCircuitJson && children?.length > 0) {
       throw new Error("Subcircuit cannot have both circuitJson and children");
     }
-    const sourceComponents = cju(circuitJson).source_component.list();
+    const groupsMap = /* @__PURE__ */ new Map();
     const inflationCtx = {
-      injectionDb: db,
-      subcircuit: this
+      injectionDb,
+      subcircuit: this,
+      groupsMap
     };
+    const sourceGroups = injectionDb.source_group.list();
+    for (const sourceGroup of sourceGroups) {
+      inflateSourceGroup(sourceGroup, inflationCtx);
+    }
+    const sourceComponents = injectionDb.source_component.list();
     for (const sourceComponent of sourceComponents) {
       switch (sourceComponent.ftype) {
         case "simple_resistor":
@@ -15531,6 +15609,10 @@ var Subcircuit = class extends Group6 {
           );
       }
     }
+    const sourcePorts = injectionDb.source_port.list();
+    for (const sourcePort of sourcePorts) {
+      inflateSourcePort(sourcePort, inflationCtx);
+    }
   }
 };
 
@@ -17544,7 +17626,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.834",
+  version: "0.0.836",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.835",
+  "version": "0.0.837",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",