@tscircuit/core 0.0.118 → 0.0.120

package/dist/index.d.ts

@@ -552,6 +552,7 @@ declare class Port extends PrimitiveComponent<typeof portProps> {
     schematicSymbolPortDef: SchSymbol["ports"][number] | null;
     matchedComponents: PrimitiveComponent[];
     facingDirection: "up" | "down" | "left" | "right" | null;
+    originDescription: string | null;
     get config(): {
         componentName: string;
         zodProps: z.ZodObject<{
@@ -568,7 +569,9 @@ declare class Port extends PrimitiveComponent<typeof portProps> {
             aliases?: string[] | undefined;
         }>;
     };
-    constructor(props: z.input<typeof portProps>);
+    constructor(props: z.input<typeof portProps>, opts?: {
+        originDescription?: string;
+    });
     _getGlobalPcbPositionBeforeLayout(): {
         x: number;
         y: number;
@@ -1046,6 +1049,8 @@ declare class Capacitor extends NormalComponent<typeof capacitorProps, PassivePo
             }>]>>;
             children: zod.ZodOptional<zod.ZodAny>;
             symbolName: zod.ZodOptional<zod.ZodString>;
+            width: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            height: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
         }>, {
             capacitance: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
             decouplingFor: zod.ZodOptional<zod.ZodString>;
@@ -1120,6 +1125,8 @@ declare class Capacitor extends NormalComponent<typeof capacitorProps, PassivePo
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: number | undefined;
+            height?: number | undefined;
             decouplingFor?: string | undefined;
             decouplingTo?: string | undefined;
             bypassFor?: string | undefined;
@@ -1194,6 +1201,8 @@ declare class Capacitor extends NormalComponent<typeof capacitorProps, PassivePo
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: string | number | undefined;
+            height?: string | number | undefined;
             decouplingFor?: string | undefined;
             decouplingTo?: string | undefined;
             bypassFor?: string | undefined;
@@ -1493,9 +1502,11 @@ declare class Chip<PinLabels extends string = never> extends NormalComponent<typ
             }>]>>;
             children: zod.ZodOptional<zod.ZodAny>;
             symbolName: zod.ZodOptional<zod.ZodString>;
+            width: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            height: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
         }>, {
             manufacturerPartNumber: zod.ZodOptional<zod.ZodString>;
-            pinLabels: zod.ZodOptional<zod.ZodRecord<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>, zod.ZodString>>;
+            pinLabels: zod.ZodOptional<zod.ZodRecord<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>, zod.ZodUnion<[zod.ZodString, zod.ZodArray<zod.ZodString, "many">]>>>;
             schPortArrangement: zod.ZodOptional<zod.ZodObject<{
                 leftSize: zod.ZodOptional<zod.ZodNumber>;
                 topSize: zod.ZodOptional<zod.ZodNumber>;
@@ -1682,8 +1693,10 @@ declare class Chip<PinLabels extends string = never> extends NormalComponent<typ
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: number | undefined;
+            height?: number | undefined;
             manufacturerPartNumber?: string | undefined;
-            pinLabels?: Record<string | number, string> | undefined;
+            pinLabels?: Record<string | number, string | string[]> | undefined;
             schPortArrangement?: {
                 leftSize?: number | undefined;
                 topSize?: number | undefined;
@@ -1788,8 +1801,10 @@ declare class Chip<PinLabels extends string = never> extends NormalComponent<typ
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: string | number | undefined;
+            height?: string | number | undefined;
             manufacturerPartNumber?: string | undefined;
-            pinLabels?: Record<string | number, string> | undefined;
+            pinLabels?: Record<string | number, string | string[]> | undefined;
             schPortArrangement?: {
                 leftSize?: number | undefined;
                 topSize?: number | undefined;
@@ -2092,6 +2107,8 @@ declare class Diode extends NormalComponent<typeof diodeProps, PolarizedPassiveP
             }>]>>;
             children: zod.ZodOptional<zod.ZodAny>;
             symbolName: zod.ZodOptional<zod.ZodString>;
+            width: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            height: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
         }>, {}>, "strip", zod.ZodTypeAny, {
             name: string;
             pcbX?: number | undefined;
@@ -2159,6 +2176,8 @@ declare class Diode extends NormalComponent<typeof diodeProps, PolarizedPassiveP
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: number | undefined;
+            height?: number | undefined;
         }, {
             name: string;
             pcbX?: string | number | undefined;
@@ -2228,6 +2247,8 @@ declare class Diode extends NormalComponent<typeof diodeProps, PolarizedPassiveP
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: string | number | undefined;
+            height?: string | number | undefined;
         }>;
         sourceFtype: Ftype;
     };
@@ -2498,6 +2519,8 @@ declare class Jumper<PinLabels extends string = never> extends NormalComponent<t
             }>]>>;
             children: zod.ZodOptional<zod.ZodAny>;
             symbolName: zod.ZodOptional<zod.ZodString>;
+            width: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            height: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
         }>, {
             manufacturerPartNumber: zod.ZodOptional<zod.ZodString>;
             pinLabels: zod.ZodOptional<zod.ZodRecord<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>, zod.ZodString>>;
@@ -2688,6 +2711,8 @@ declare class Jumper<PinLabels extends string = never> extends NormalComponent<t
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: number | undefined;
+            height?: number | undefined;
             manufacturerPartNumber?: string | undefined;
             pinLabels?: Record<string | number, string> | undefined;
             schPortArrangement?: {
@@ -2795,6 +2820,8 @@ declare class Jumper<PinLabels extends string = never> extends NormalComponent<t
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: string | number | undefined;
+            height?: string | number | undefined;
             manufacturerPartNumber?: string | undefined;
             pinLabels?: Record<string | number, string> | undefined;
             schPortArrangement?: {
@@ -3100,6 +3127,8 @@ declare class Led extends NormalComponent<typeof ledProps, PolarizedPassivePorts
             }>]>>;
             children: zod.ZodOptional<zod.ZodAny>;
             symbolName: zod.ZodOptional<zod.ZodString>;
+            width: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            height: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
         }>, {
             color: zod.ZodOptional<zod.ZodString>;
         }>, "strip", zod.ZodTypeAny, {
@@ -3169,6 +3198,8 @@ declare class Led extends NormalComponent<typeof ledProps, PolarizedPassivePorts
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: number | undefined;
+            height?: number | undefined;
             color?: string | undefined;
         }, {
             name: string;
@@ -3239,6 +3270,8 @@ declare class Led extends NormalComponent<typeof ledProps, PolarizedPassivePorts
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: string | number | undefined;
+            height?: string | number | undefined;
             color?: string | undefined;
         }>;
         sourceFtype: Ftype;
@@ -3510,6 +3543,8 @@ declare class PowerSource extends NormalComponent<typeof powerSourceProps, Polar
             }>]>>;
             children: zod.ZodOptional<zod.ZodAny>;
             symbolName: zod.ZodOptional<zod.ZodString>;
+            width: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            height: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
         }>, {
             voltage: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
         }>, "strip", zod.ZodTypeAny, {
@@ -3580,6 +3615,8 @@ declare class PowerSource extends NormalComponent<typeof powerSourceProps, Polar
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: number | undefined;
+            height?: number | undefined;
         }, {
             name: string;
             voltage: string | number;
@@ -3650,6 +3687,8 @@ declare class PowerSource extends NormalComponent<typeof powerSourceProps, Polar
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: string | number | undefined;
+            height?: string | number | undefined;
         }>;
         sourceFtype: Ftype;
     };
@@ -3920,6 +3959,8 @@ declare class Resistor extends NormalComponent<typeof resistorProps, PassivePort
             }>]>>;
             children: zod.ZodOptional<zod.ZodAny>;
             symbolName: zod.ZodOptional<zod.ZodString>;
+            width: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            height: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
         }>, {
             resistance: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
             pullupFor: zod.ZodOptional<zod.ZodString>;
@@ -3994,6 +4035,8 @@ declare class Resistor extends NormalComponent<typeof resistorProps, PassivePort
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: number | undefined;
+            height?: number | undefined;
             pullupFor?: string | undefined;
             pullupTo?: string | undefined;
             pulldownFor?: string | undefined;
@@ -4068,6 +4111,8 @@ declare class Resistor extends NormalComponent<typeof resistorProps, PassivePort
             } | undefined;
             children?: any;
             symbolName?: string | undefined;
+            width?: string | number | undefined;
+            height?: string | number | undefined;
             pullupFor?: string | undefined;
             pullupTo?: string | undefined;
             pulldownFor?: string | undefined;

package/dist/index.js

@@ -739,6 +739,9 @@ var PrimitiveComponent = class extends Renderable {
   }
   getString() {
     const { lowercaseComponentName: cname, _parsedProps: props, parent } = this;
+    if (props?.pinNumber !== void 0 && parent?.props?.name && props?.name) {
+      return `<${cname}#${this._renderId}(pin:${props.pinNumber} .${parent?.props.name}>.${props.name}) />`;
+    }
     if (parent?.props?.name && props?.name) {
       return `<${cname}#${this._renderId}(.${parent?.props.name}>.${props?.name}) />`;
     }
@@ -974,7 +977,7 @@ var SmtPad = class extends PrimitiveComponent {
     const decomposedMat = decomposeTSR(
       this._computePcbGlobalTransformBeforeLayout()
     );
-    const isRotated90 = Math.abs(decomposedMat.rotation.angle * (180 / Math.PI) - 90) < 0.01;
+    const isRotated90 = Math.abs(decomposedMat.rotation.angle * (180 / Math.PI) - 90) % 180 < 0.01;
     const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
     let pcb_smtpad = null;
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id;
@@ -1239,7 +1242,7 @@ var Keepout = class extends PrimitiveComponent {
     const decomposedMat = decomposeTSR2(
       this._computePcbGlobalTransformBeforeLayout()
     );
-    const isRotated90 = Math.abs(decomposedMat.rotation.angle * (180 / Math.PI) - 90) < 0.01;
+    const isRotated90 = Math.abs(decomposedMat.rotation.angle * (180 / Math.PI) - 90) % 180 < 0.01;
     let pcb_keepout = null;
     if (props.shape === "circle") {
       pcb_keepout = db.pcb_keepout.insert({
@@ -1465,18 +1468,22 @@ var Port = class extends PrimitiveComponent {
   schematicSymbolPortDef = null;
   matchedComponents;
   facingDirection = null;
+  originDescription = null;
   get config() {
     return {
       componentName: "Port",
       zodProps: portProps
     };
   }
-  constructor(props) {
+  constructor(props, opts = {}) {
     if (!props.name && props.pinNumber) props.name = `pin${props.pinNumber}`;
     if (!props.name) {
       throw new Error("Port must have a name or a pinNumber");
     }
     super(props);
+    if (opts.originDescription) {
+      this.originDescription = opts.originDescription;
+    }
     this.matchedComponents = [];
   }
   _getGlobalPcbPositionBeforeLayout() {
@@ -1879,6 +1886,8 @@ var Footprint = class extends PrimitiveComponent {
 };
 
 // lib/components/base-components/NormalComponent.ts
+import Debug2 from "debug";
+var debug2 = Debug2("tscircuit:core");
 var rotation3 = z4.object({
   x: rotation,
   y: rotation,
@@ -1915,7 +1924,16 @@ var NormalComponent = class extends PrimitiveComponent {
         const pins = schPortArrangement[side].pins;
         if (Array.isArray(pins)) {
           for (const pinNumber of pins) {
-            portsToCreate.push(new Port({ pinNumber }));
+            portsToCreate.push(
+              new Port(
+                {
+                  pinNumber
+                },
+                {
+                  originDescription: `schPortArrangement:${side}`
+                }
+              )
+            );
           }
         }
       }
@@ -1927,15 +1945,23 @@ var NormalComponent = class extends PrimitiveComponent {
         let existingPort = portsToCreate.find(
           (p) => p._parsedProps.pinNumber === Number(pinNumber)
         );
+        const primaryLabel = Array.isArray(label) ? label[0] : label;
+        const otherLabels = Array.isArray(label) ? label.slice(1) : [];
         if (!existingPort) {
-          existingPort = new Port({
-            pinNumber: parseInt(pinNumber),
-            name: label
-          });
+          existingPort = new Port(
+            {
+              pinNumber: parseInt(pinNumber),
+              name: primaryLabel,
+              aliases: otherLabels
+            },
+            {
+              originDescription: `pinLabels:pin${pinNumber}`
+            }
+          );
           portsToCreate.push(existingPort);
         } else {
-          existingPort.externallyAddedAliases.push(label);
-          existingPort.props.name = label;
+          existingPort.externallyAddedAliases.push(primaryLabel, ...otherLabels);
+          existingPort.props.name = primaryLabel;
         }
       }
     }
@@ -1945,6 +1971,7 @@ var NormalComponent = class extends PrimitiveComponent {
       for (const symPort of sym.ports) {
         const port = getPortFromHints(symPort.labels);
         if (port) {
+          port.originDescription = `schematicSymbol:labels[0]:${symPort.labels[0]}`;
           port.schematicSymbolPortDef = symPort;
           portsToCreate.push(port);
         }
@@ -2107,8 +2134,8 @@ var NormalComponent = class extends PrimitiveComponent {
         (p) => p.isMatchingAnyOf(component.getNameAndAliases())
       );
       if (conflictingPort) {
-        throw new Error(
-          `Conflicting ports added. Port 1: ${conflictingPort}, Port 2: ${component}`
+        debug2(
+          `Similar ports added. Port 1: ${conflictingPort}, Port 2: ${component}`
         );
       }
     }
@@ -2126,6 +2153,7 @@ var NormalComponent = class extends PrimitiveComponent {
         if ("port_hints" in elm && elm.port_hints) {
           const newPort = getPortFromHints(elm.port_hints);
           if (!newPort) continue;
+          newPort.originDescription = `footprint:string:${footprint}:port_hints[0]:${elm.port_hints[0]}`;
           newPorts2.push(newPort);
         }
       }
@@ -2137,6 +2165,7 @@ var NormalComponent = class extends PrimitiveComponent {
       for (const fpChild of fp2.children) {
         const newPort = getPortFromHints(fpChild.props.portHints ?? []);
         if (!newPort) continue;
+        newPort.originDescription = `footprint:${footprint}`;
         newPorts2.push(newPort);
       }
       return newPorts2;
@@ -3437,6 +3466,10 @@ var Chip = class extends NormalComponent {
       schPortArrangement: props.schPortArrangement
     });
     this.schematicDimensions = dimensions;
+    const primaryPortLabels = {};
+    for (const [port, label] of Object.entries(props.pinLabels ?? {})) {
+      primaryPortLabels[port] = Array.isArray(label) ? label[0] : label;
+    }
     const schematic_component2 = db.schematic_component.insert({
       center: { x: props.schX ?? 0, y: props.schY ?? 0 },
       rotation: props.schRotation ?? 0,
@@ -3447,7 +3480,7 @@ var Chip = class extends NormalComponent {
       pin_spacing: pinSpacing,
       // @ts-ignore soup needs to support distance for pin_styles
       pin_styles: underscorifyPinStyles(props.schPinStyle),
-      port_labels: props.pinLabels,
+      port_labels: primaryPortLabels,
       source_component_id: this.source_component_id
     });
     this.schematic_component_id = schematic_component2.schematic_component_id;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.118",
+  "version": "0.0.120",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -39,7 +39,7 @@
     "@tscircuit/footprinter": "^0.0.71",
     "@tscircuit/infgrid-ijump-astar": "^0.0.21",
     "@tscircuit/math-utils": "^0.0.4",
-    "@tscircuit/props": "^0.0.68",
+    "@tscircuit/props": "^0.0.70",
     "@tscircuit/soup-util": "^0.0.33",
     "circuit-json": "^0.0.85",
     "circuit-json-to-connectivity-map": "^0.0.17",