@tscircuit/core 0.0.1010 → 0.0.1012

package/dist/index.d.ts

@@ -371,6 +371,7 @@ interface ISubcircuit extends PrimitiveComponent {
     _getSubcircuitLayerCount(): number;
     subcircuit_id: string | null;
     getNormalComponentNameMap?: () => Map<string, NormalComponent[]>;
+    _isInflatedFromCircuitJson: boolean;
 }
 
 interface SchematicSymbolBounds {
@@ -1653,6 +1654,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     schematic_group_id: string | null;
     subcircuit_id: string | null;
     _hasStartedAsyncAutorouting: boolean;
+    _isInflatedFromCircuitJson: boolean;
     private _normalComponentNameMap;
     /**
      * Returns a cached map of component names to NormalComponent instances within this subcircuit.

package/dist/index.js

@@ -2088,6 +2088,7 @@ var Net = class extends PrimitiveComponent2 {
   doInitialPcbRouteNetIslands() {
     if (this.root?.pcbDisabled) return;
     if (this.getSubcircuit()._parsedProps.routingDisabled) return;
+    if (this.getSubcircuit()._isInflatedFromCircuitJson) return;
     if (this.getSubcircuit()._getAutorouterConfig().groupMode !== "sequential-trace")
       return;
     const { db } = this.root;
@@ -4681,7 +4682,7 @@ function getPortFromHints(hints, opts) {
   const pinNumber = getPinNumberFromLabels(hints);
   if (!pinNumber) return null;
   const aliasesFromHints = hints.filter(
-    (p) => p.toString() !== pinNumber.toString() && p !== `pin${pinNumber}`
+    (p) => p.toString() !== pinNumber.toString() && p !== `pin${pinNumber}` && p.trim() !== ""
   );
   const aliases = [
     ...aliasesFromHints,
@@ -7013,6 +7014,9 @@ function Trace_doInitialPcbTraceRender(trace) {
   if (subcircuit._parsedProps.routingDisabled) {
     return;
   }
+  if (subcircuit._isInflatedFromCircuitJson) {
+    return;
+  }
   const cachedRoute = subcircuit._parsedProps.pcbRouteCache?.pcbTraces;
   if (cachedRoute) {
     const pcb_trace2 = db.pcb_trace.insert({
@@ -9400,7 +9404,11 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       const newPorts2 = [];
       for (const fpChild of fp2.children) {
         if (!fpChild.props.portHints) continue;
-        let portHintsList = fpChild.props.portHints;
+        const filteredPortHints = fpChild.props.portHints.filter(
+          (hint) => hint && hint.trim() !== ""
+        );
+        if (filteredPortHints.length === 0) continue;
+        let portHintsList = filteredPortHints;
         const hasPinPrefix = portHintsList.some(
           (hint) => hint.startsWith("pin")
         );
@@ -14471,6 +14479,7 @@ var Group6 = class extends NormalComponent3 {
   schematic_group_id = null;
   subcircuit_id = null;
   _hasStartedAsyncAutorouting = false;
+  _isInflatedFromCircuitJson = false;
   _normalComponentNameMap = null;
   /**
    * Returns a cached map of component names to NormalComponent instances within this subcircuit.
@@ -14965,6 +14974,7 @@ var Group6 = class extends NormalComponent3 {
     if (!this.isSubcircuit) return;
     if (this.root?.pcbDisabled) return;
     if (this.getInheritedProperty("routingDisabled")) return;
+    if (this._isInflatedFromCircuitJson) return;
     if (this._shouldUseTraceByTraceRouting()) return;
     if (!this._areChildSubcircuitsRouted()) {
       debug11(
@@ -14985,6 +14995,7 @@ var Group6 = class extends NormalComponent3 {
     const debug11 = Debug13("tscircuit:core:updatePcbTraceRender");
     debug11(`[${this.getString()}] updating...`);
     if (!this.isSubcircuit) return;
+    if (this._isInflatedFromCircuitJson) return;
     if (this._shouldRouteAsync() && this._hasTracesToRoute() && !this._hasStartedAsyncAutorouting) {
       if (this._areChildSubcircuitsRouted()) {
         debug11(
@@ -15156,6 +15167,7 @@ var Group6 = class extends NormalComponent3 {
   }
   _getPcbLayoutMode() {
     const props = this._parsedProps;
+    if (this._isInflatedFromCircuitJson) return "none";
     if (props.pcbRelative) return "none";
     if (props.pcbLayout?.matchAdapt) return "match-adapt";
     if (props.pcbLayout?.flex) return "flex";
@@ -15527,22 +15539,24 @@ var Capacitor = class extends NormalComponent3 {
   }
 };
 
-// lib/components/primitive-components/Group/Subcircuit/inflators/inflatePcbComponent.ts
-import { compose as compose5, translate as translate6, rotate as rotate3, inverse } from "transformation-matrix";
+// lib/utils/extractPcbPrimitivesFromCircuitJson.ts
 import { transformPCBElements as transformPCBElements2 } from "@tscircuit/circuit-json-util";
-var inflatePcbComponent = (pcbElm, inflatorContext) => {
-  const { injectionDb, normalComponent } = inflatorContext;
-  if (!normalComponent) return;
-  const componentCenter = pcbElm.center || { x: 0, y: 0 };
-  const componentRotation = pcbElm.rotation || 0;
+import { compose as compose5, inverse, rotate as rotate3, translate as translate6 } from "transformation-matrix";
+var extractPcbPrimitivesFromCircuitJson = ({
+  pcbComponent,
+  db,
+  componentName
+}) => {
+  const componentCenter = pcbComponent.center || { x: 0, y: 0 };
+  const componentRotation = pcbComponent.rotation || 0;
   const absoluteToComponentRelativeTransform = inverse(
     compose5(
       translate6(componentCenter.x, componentCenter.y),
       rotate3(componentRotation * Math.PI / 180)
     )
   );
-  const relativeElements = injectionDb.toArray().filter(
-    (elm) => "pcb_component_id" in elm && elm.pcb_component_id === pcbElm.pcb_component_id
+  const relativeElements = db.toArray().filter(
+    (elm) => "pcb_component_id" in elm && elm.pcb_component_id === pcbComponent.pcb_component_id
   );
   const clonedRelativeElements = structuredClone(relativeElements);
   transformPCBElements2(
@@ -15551,11 +15565,23 @@ var inflatePcbComponent = (pcbElm, inflatorContext) => {
   );
   const components = createComponentsFromCircuitJson(
     {
-      componentName: normalComponent.name,
+      componentName,
       componentRotation: "0deg"
     },
     clonedRelativeElements
   );
+  return components;
+};
+
+// lib/components/primitive-components/Group/Subcircuit/inflators/inflatePcbComponent.ts
+var inflatePcbComponent = (pcbElm, inflatorContext) => {
+  const { injectionDb, normalComponent } = inflatorContext;
+  if (!normalComponent) return;
+  const components = extractPcbPrimitivesFromCircuitJson({
+    pcbComponent: pcbElm,
+    db: injectionDb,
+    componentName: normalComponent.name
+  });
   normalComponent.addAll(components);
 };
 
@@ -15757,6 +15783,21 @@ var Chip = class extends NormalComponent3 {
   }
 };
 
+// lib/components/primitive-components/Group/Subcircuit/inflators/inflateFootprintComponent.ts
+var inflateFootprintComponent = (pcbElm, inflatorContext) => {
+  const { injectionDb, normalComponent } = inflatorContext;
+  if (!normalComponent) return null;
+  const primitives = extractPcbPrimitivesFromCircuitJson({
+    pcbComponent: pcbElm,
+    db: injectionDb,
+    componentName: normalComponent.name
+  });
+  if (primitives.length === 0) return null;
+  const footprint = new Footprint({});
+  footprint.addAll(primitives);
+  return footprint;
+};
+
 // lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourceChip.ts
 var mapInternallyConnectedSourcePortIdsToPinLabels = (sourcePortIds, inflatorContext) => {
   if (!sourcePortIds || sourcePortIds.length === 0) return void 0;
@@ -15790,6 +15831,7 @@ var inflateSourceChip = (sourceElm, inflatorContext) => {
     sourceElm.internally_connected_source_port_ids,
     inflatorContext
   );
+  const footprinterString = cadElm?.footprinter_string ?? null;
   const chip = new Chip({
     name: sourceElm.name,
     manufacturerPartNumber: sourceElm.manufacturer_part_number,
@@ -15808,20 +15850,18 @@ var inflateSourceChip = (sourceElm, inflatorContext) => {
     obstructsWithinBounds: pcbElm?.obstructs_within_bounds,
     internallyConnectedPins
   });
-  const footprint = cadElm?.footprinter_string ?? null;
-  if (footprint) {
-    Object.assign(chip.props, { footprint });
-    Object.assign(chip._parsedProps, { footprint });
-    if (!cadElm) {
-      ;
-      chip._addChildrenFromStringFootprint?.();
-    }
+  if (footprinterString) {
+    Object.assign(chip.props, { footprint: footprinterString });
+    Object.assign(chip._parsedProps, { footprint: footprinterString });
   }
   if (pcbElm) {
-    inflatePcbComponent(pcbElm, {
+    const footprint = inflateFootprintComponent(pcbElm, {
       ...inflatorContext,
       normalComponent: chip
     });
+    if (footprint) {
+      chip.add(footprint);
+    }
   }
   if (sourceElm.source_group_id && groupsMap?.has(sourceElm.source_group_id)) {
     const group = groupsMap.get(sourceElm.source_group_id);
@@ -16628,6 +16668,9 @@ var Board = class extends Group6 {
   }
   doInitialInflateSubcircuitCircuitJson() {
     const { circuitJson, children } = this._parsedProps;
+    if (circuitJson) {
+      this._isInflatedFromCircuitJson = true;
+    }
     inflateCircuitJson(this, circuitJson, children);
   }
   doInitialPcbComponentRender() {
@@ -19012,6 +19055,9 @@ var Subcircuit = class extends Group6 {
    */
   doInitialInflateSubcircuitCircuitJson() {
     const { circuitJson, children } = this._parsedProps;
+    if (circuitJson) {
+      this._isInflatedFromCircuitJson = true;
+    }
     inflateCircuitJson(this, circuitJson, children);
   }
 };
@@ -21914,7 +21960,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1009",
+  version: "0.0.1011",
   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.1010",
+  "version": "0.0.1012",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",