@tscircuit/core 0.0.160 → 0.0.161

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { traceProps, SchematicPortArrangement, groupProps, boardProps, capacitor
 import React, { ReactElement } from 'react';
 import * as zod from 'zod';
 import { ZodType, z } from 'zod';
-import { SchSymbol, BaseSymbolName } from 'schematic-symbols';
+import { symbols, SchSymbol, BaseSymbolName } from 'schematic-symbols';
 import { PcbTraceError, PcbPlacementError, LayerRef, AnyCircuitElement, AnySourceComponent, RouteHintPoint } from 'circuit-json';
 import { Matrix } from 'transformation-matrix';
 import { SoupUtilObjects } from '@tscircuit/soup-util';
@@ -130,7 +130,7 @@ interface ISubcircuit extends PrimitiveComponent {
 
 interface BaseComponentConfig {
     componentName: string;
-    schematicSymbolName?: BaseSymbolName | null;
+    schematicSymbolName?: string | null;
     zodProps: ZodType;
     sourceFtype?: AnySourceComponent["ftype"] | null;
     shouldRenderAsSchematicBox?: boolean;
@@ -238,6 +238,8 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
      * component
      */
     computeSchematicGlobalTransform(): Matrix;
+    _getSchematicSymbolName(): keyof typeof symbols | undefined;
+    _getSchematicSymbolNameOrThrow(): keyof typeof symbols;
     getSchematicSymbol(): SchSymbol | null;
     /**
      * Subcircuit groups have a prop called "layout" that can include manual
@@ -281,12 +283,12 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     doesSelectorMatch(selector: string): boolean;
     getSubcircuit(): ISubcircuit;
     selectAll(selector: string): PrimitiveComponent[];
-    selectOne(selector: string, options?: {
+    selectOne<T = PrimitiveComponent>(selector: string, options?: {
         type?: string;
         port?: boolean;
         pcbPrimitive?: boolean;
         schematicPrimitive?: boolean;
-    }): PrimitiveComponent | null;
+    }): T | null;
     getAvailablePcbLayers(): string[];
     getDescendants(): PrimitiveComponent[];
     /**
@@ -722,7 +724,9 @@ declare class NormalComponent<ZodProps extends ZodType = any, PortNames extends
      * 2. `props.footprint`
      *
      */
-    initPorts(): void;
+    initPorts(opts?: {
+        additionalAliases?: Record<`pin${number}`, string[]>;
+    }): void;
     _getImpliedFootprintString(): string | null;
     _addChildrenFromStringFootprint(): void;
     get portMap(): PortMap<PortNames>;
@@ -3787,7 +3791,7 @@ declare class PowerSource extends NormalComponent<typeof powerSourceProps, Polar
 declare class Resistor extends NormalComponent<typeof resistorProps, PassivePorts> {
     get config(): {
         componentName: string;
-        schematicSymbolName: BaseSymbolName;
+        schematicSymbolName: string;
         zodProps: zod.ZodObject<zod.objectUtil.extendShape<zod.objectUtil.extendShape<zod.objectUtil.extendShape<{
             pcbX: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             pcbY: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;

package/dist/index.js

@@ -545,7 +545,7 @@ var PrimitiveComponent = class extends Renderable {
       newProps,
       changedProps: Object.keys(props)
     });
-    this.parent?.onChildChanged(this);
+    this.parent?.onChildChanged?.(this);
   }
   /**
    * Computes a transformation matrix from the props of this component for PCB
@@ -664,10 +664,36 @@ var PrimitiveComponent = class extends Renderable {
       this.computeSchematicPropsTransform()
     );
   }
+  _getSchematicSymbolName() {
+    const { _parsedProps: props } = this;
+    const base_symbol_name = this.config.schematicSymbolName;
+    const symbol_name_horz = `${base_symbol_name}_horz`;
+    const symbol_name_vert = `${base_symbol_name}_vert`;
+    if (base_symbol_name in symbols) return base_symbol_name;
+    if (symbol_name_horz in symbols) {
+      if (props.schRotation === 0 || props.schRotation === void 0)
+        return symbol_name_horz;
+      if (props.schRotation === 180) return symbol_name_vert;
+    }
+    if (symbol_name_vert in symbols) {
+      if (props.schRotation === 90) return symbol_name_vert;
+      if (props.schRotation === 270) return symbol_name_vert;
+    }
+    return void 0;
+  }
+  _getSchematicSymbolNameOrThrow() {
+    const symbol_name = this._getSchematicSymbolName();
+    if (!symbol_name) {
+      throw new Error(
+        `No schematic symbol found (given: "${this.config.schematicSymbolName}")`
+      );
+    }
+    return symbol_name;
+  }
   getSchematicSymbol() {
-    const { config } = this;
-    if (!config.schematicSymbolName) return null;
-    return symbols[`${config.schematicSymbolName}`] ?? null;
+    const symbol_name = this._getSchematicSymbolName();
+    if (!symbol_name) return null;
+    return symbols[symbol_name] ?? null;
   }
   /**
    * Subcircuit groups have a prop called "layout" that can include manual
@@ -712,7 +738,7 @@ var PrimitiveComponent = class extends Renderable {
   onPropsChange(params) {
   }
   onChildChanged(child) {
-    this.parent?.onChildChanged(child);
+    this.parent?.onChildChanged?.(child);
   }
   add(component) {
     component.onAddToParent(this);
@@ -1727,9 +1753,9 @@ var Port = class extends PrimitiveComponent {
     return Array.from(
       /* @__PURE__ */ new Set([
         ...props.aliases ?? [],
-        props.name,
+        ...props.name ? [props.name] : [],
         ...typeof props.pinNumber === "number" ? [`pin${props.pinNumber}`, props.pinNumber.toString()] : [],
-        ...this.externallyAddedAliases
+        ...this.externallyAddedAliases ?? []
       ])
     );
   }
@@ -1867,12 +1893,19 @@ var Port = class extends PrimitiveComponent {
 };
 
 // lib/utils/getPortFromHints.ts
+var getPinNumberFromLabels = (labels) => {
+  const pinNumber = labels.find((p) => /^(pin)?\d+$/.test(p));
+  if (!pinNumber) return null;
+  return Number.parseInt(pinNumber.replace(/^pin/, ""));
+};
 function getPortFromHints(hints) {
-  const pinNumber = hints.find((p) => /^(pin)?\d+$/.test(p));
+  const pinNumber = getPinNumberFromLabels(hints);
   if (!pinNumber) return null;
   return new Port({
-    pinNumber: Number.parseInt(pinNumber.replace(/^pin/, "")),
-    aliases: hints.filter((p) => p !== pinNumber)
+    pinNumber,
+    aliases: hints.filter(
+      (p) => p.toString() !== pinNumber.toString() && p !== `pin${pinNumber}`
+    )
   });
 }
 
@@ -2365,7 +2398,7 @@ var NormalComponent = class extends PrimitiveComponent {
    * 2. `props.footprint`
    *
    */
-  initPorts() {
+  initPorts(opts = {}) {
     const { config } = this;
     const portsToCreate = [];
     const schPortArrangement = this._parsedProps.schPortArrangement;
@@ -2377,7 +2410,8 @@ var NormalComponent = class extends PrimitiveComponent {
             portsToCreate.push(
               new Port(
                 {
-                  pinNumber
+                  pinNumber,
+                  aliases: opts.additionalAliases?.[`pin${pinNumber}`] ?? []
                 },
                 {
                   originDescription: `schPortArrangement:${side}`
@@ -2395,7 +2429,8 @@ var NormalComponent = class extends PrimitiveComponent {
           portsToCreate.push(
             new Port(
               {
-                pinNumber: pinNum++
+                pinNumber: pinNum++,
+                aliases: opts.additionalAliases?.[`pin${pinNum}`] ?? []
               },
               {
                 originDescription: `schPortArrangement:${side}`
@@ -2419,7 +2454,10 @@ var NormalComponent = class extends PrimitiveComponent {
             {
               pinNumber: parseInt(pinNumber),
               name: primaryLabel,
-              aliases: otherLabels
+              aliases: [
+                ...otherLabels,
+                ...opts.additionalAliases?.[`pin${parseInt(pinNumber)}`] ?? []
+              ]
             },
             {
               originDescription: `pinLabels:pin${pinNumber}`
@@ -2433,10 +2471,16 @@ var NormalComponent = class extends PrimitiveComponent {
       }
     }
     if (config.schematicSymbolName) {
-      const sym = symbols2[`${config.schematicSymbolName}_horz`];
+      const sym = symbols2[this._getSchematicSymbolNameOrThrow()];
       if (!sym) return;
       for (const symPort of sym.ports) {
-        const port = getPortFromHints(symPort.labels);
+        const pinNumber = getPinNumberFromLabels(symPort.labels);
+        if (!pinNumber) continue;
+        const port = getPortFromHints(
+          symPort.labels.concat(
+            opts.additionalAliases?.[`pin${pinNumber}`] ?? []
+          )
+        );
         if (port) {
           port.originDescription = `schematicSymbol:labels[0]:${symPort.labels[0]}`;
           port.schematicSymbolPortDef = symPort;
@@ -2533,21 +2577,7 @@ var NormalComponent = class extends PrimitiveComponent {
   _doInitialSchematicComponentRenderWithSymbol() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
-    const base_symbol_name = this.config.schematicSymbolName;
-    const symbol_name_horz = `${base_symbol_name}_horz`;
-    let symbol_name;
-    if (!base_symbol_name) {
-      throw new Error(
-        "No schematic symbol defined (schematicSymbolName not provided)"
-      );
-    }
-    if (base_symbol_name in symbols2) {
-      symbol_name = base_symbol_name;
-    } else if (symbol_name_horz in symbols2) {
-      symbol_name = symbol_name_horz;
-    } else {
-      throw new Error(`Could not find schematic-symbol: "${base_symbol_name}"`);
-    }
+    const symbol_name = this._getSchematicSymbolNameOrThrow();
     const symbol = symbols2[symbol_name];
     if (symbol) {
       const schematic_component2 = db.schematic_component.insert({
@@ -4369,26 +4399,18 @@ var Resistor = class extends NormalComponent {
   get config() {
     return {
       componentName: "Resistor",
-      schematicSymbolName: this.props.symbolName ?? "boxresistor_horz",
+      schematicSymbolName: this.props.symbolName ?? "boxresistor",
       zodProps: resistorProps,
       sourceFtype: "simple_resistor"
     };
   }
   initPorts() {
-    this.add(
-      new Port({
-        name: "pin1",
-        pinNumber: 1,
-        aliases: ["anode", "pos", "left"]
-      })
-    );
-    this.add(
-      new Port({
-        name: "pin2",
-        pinNumber: 2,
-        aliases: ["cathode", "neg", "right"]
-      })
-    );
+    super.initPorts({
+      additionalAliases: {
+        pin1: ["anode", "pos", "left"],
+        pin2: ["cathode", "neg", "right"]
+      }
+    });
   }
   _getSchematicSymbolDisplayValue() {
     return `${formatSiUnit2(this._parsedProps.resistance)}\u03A9`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.160",
+  "version": "0.0.161",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -45,7 +45,7 @@
     "@tscircuit/soup-util": "^0.0.33",
     "circuit-json": "^0.0.99",
     "circuit-json-to-connectivity-map": "^0.0.17",
-    "circuit-to-svg": "^0.0.67",
+    "circuit-to-svg": "^0.0.71",
     "format-si-unit": "^0.0.2",
     "nanoid": "^5.0.7",
     "performance-now": "^2.1.0",