@tscircuit/core 0.0.612 → 0.0.614

package/dist/index.d.ts

@@ -967,6 +967,7 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
     initPorts(opts?: {
         additionalAliases?: Record<`pin${number}`, string[]>;
         pinCount?: number;
+        ignoreSymbolPorts?: boolean;
     }): void;
     _getImpliedFootprintString(): string | null;
     _isFootprintUrl(s: string): boolean;

package/dist/index.js

@@ -314,7 +314,24 @@ var InvalidProps = class extends Error {
     const propsWithError = Object.keys(formattedError).filter(
       (k) => k !== "_errors"
     );
+    const invalidPinLabelMessages = [];
+    const pinLabels = originalProps.pinLabels;
+    if (pinLabels) {
+      for (const [pin, labelOrLabels] of Object.entries(pinLabels)) {
+        const labels = Array.isArray(labelOrLabels) ? labelOrLabels : [labelOrLabels];
+        for (const label of labels) {
+          if (typeof label === "string" && (label.startsWith(" ") || label.endsWith(" "))) {
+            invalidPinLabelMessages.push(
+              `pinLabels.${pin} ("${label}" has leading or trailing spaces)`
+            );
+          }
+        }
+      }
+    }
     const propMessage = propsWithError.map((k) => {
+      if (k === "pinLabels" && invalidPinLabelMessages.length > 0) {
+        return invalidPinLabelMessages.join(", ");
+      }
       if (formattedError[k]._errors[0]) {
         return `${k} (${formattedError[k]._errors[0]})`;
       }
@@ -6175,7 +6192,7 @@ var NormalComponent = class extends PrimitiveComponent2 {
         }
       }
     }
-    if (config.schematicSymbolName) {
+    if (config.schematicSymbolName && !opts.ignoreSymbolPorts) {
       const sym = symbols2[this._getSchematicSymbolNameOrThrow()];
       if (!sym) return;
       for (const symPort of sym.ports) {
@@ -6211,9 +6228,18 @@ var NormalComponent = class extends PrimitiveComponent2 {
         }
       }
     }
-    for (let pn = 1; pn <= (opts.pinCount ?? this._getPinCount()); pn++) {
-      if (!schPortArrangement) continue;
+    const requiredPinCount = opts.pinCount ?? this._getPinCount() ?? 0;
+    for (let pn = 1; pn <= requiredPinCount; pn++) {
       if (portsToCreate.find((p) => p._parsedProps.pinNumber === pn)) continue;
+      if (!schPortArrangement) {
+        portsToCreate.push(
+          new Port({
+            pinNumber: pn,
+            aliases: opts.additionalAliases?.[`pin${pn}`] ?? []
+          })
+        );
+        continue;
+      }
       let explicitlyListedPinNumbersInSchPortArrangement = [
         ...schPortArrangement.leftSide?.pins ?? [],
         ...schPortArrangement.rightSide?.pins ?? [],
@@ -10900,6 +10926,7 @@ var Potentiometer = class extends NormalComponent {
 
 // lib/components/normal-components/PushButton.ts
 import { pushButtonProps } from "@tscircuit/props";
+import { symbols as symbols3 } from "schematic-symbols";
 var PushButton = class extends NormalComponent {
   get config() {
     return {
@@ -10910,19 +10937,44 @@ var PushButton = class extends NormalComponent {
     };
   }
   get defaultInternallyConnectedPinNames() {
-    return [
-      ["pin1", "pin4"],
-      ["pin2", "pin3"]
-    ];
+    return [];
   }
   initPorts() {
     super.initPorts({
-      pinCount: 4,
-      additionalAliases: {
-        pin1: ["side1"],
-        pin3: ["side2"]
-      }
+      pinCount: 2,
+      ignoreSymbolPorts: true
     });
+    const symbol = symbols3[this._getSchematicSymbolNameOrThrow()];
+    const symPort1 = symbol.ports.find((p) => p.labels.includes("1"));
+    const symPort2 = symbol.ports.find((p) => p.labels.includes("2"));
+    const ports = this.selectAll("port");
+    const pin1Port = ports.find((p) => p.props.pinNumber === 1);
+    const pin2Port = ports.find((p) => p.props.pinNumber === 2);
+    const pin3Port = ports.find((p) => p.props.pinNumber === 3);
+    const pin4Port = ports.find((p) => p.props.pinNumber === 4);
+    const { internallyConnectedPins } = this._parsedProps;
+    pin1Port.schematicSymbolPortDef = symPort1;
+    if (!internallyConnectedPins || internallyConnectedPins.length === 0) {
+      pin2Port.schematicSymbolPortDef = symPort2;
+    }
+    for (const [pn, port] of [
+      [2, pin2Port],
+      [3, pin3Port],
+      [4, pin4Port]
+    ]) {
+      const internallyConnectedRow = internallyConnectedPins?.find(
+        ([pin1, pin2]) => pin1 === `pin${pn}` || pin2 === `pin${pn}`
+      );
+      if (!internallyConnectedRow) {
+        port.schematicSymbolPortDef = symPort2;
+        break;
+      }
+      const internallyConnectedTo = internallyConnectedRow?.[0] === `pin${pn}` ? internallyConnectedRow[1] : internallyConnectedRow?.[0];
+      if (internallyConnectedTo === "pin1") {
+        continue;
+      }
+      port.schematicSymbolPortDef = symPort2;
+    }
   }
   doInitialSourceRender() {
     const { db } = this.root;
@@ -11595,7 +11647,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.611",
+  version: "0.0.613",
   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.612",
+  "version": "0.0.614",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",