Merge pull request #268 from ShiboSoftwareDev/main

Added capacitor, inductor, diode and led schRotation support

lib/components/base-components/PrimitiveComponent.ts

@@ -283,7 +283,6 @@ export abstract class PrimitiveComponent<
     const symbol_name_horz = `${base_symbol_name}_horz` as keyof typeof symbols
     const symbol_name_vert = `${base_symbol_name}_vert` as keyof typeof symbols
 
-    if (base_symbol_name in symbols) return base_symbol_name
     if (symbol_name_horz in symbols) {
       if (props.schRotation === 0 || props.schRotation === undefined)
         return symbol_name_horz
@@ -293,6 +292,7 @@ export abstract class PrimitiveComponent<
       if (props.schRotation === 90) return symbol_name_vert
       if (props.schRotation === 270) return symbol_name_vert
     }
+    if (base_symbol_name in symbols) return base_symbol_name
 
     return undefined
   }

lib/components/normal-components/Capacitor.ts

@@ -19,27 +19,19 @@ export class Capacitor extends NormalComponent<
     return {
       componentName: "Capacitor",
       schematicSymbolName:
-        this.props.symbolName ?? ("capacitor_horz" as BaseSymbolName),
+        this.props.symbolName ?? ("capacitor" as BaseSymbolName),
       zodProps: capacitorProps,
       sourceFtype: FTYPE.simple_capacitor,
     }
   }
 
   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(): string | undefined {

lib/components/normal-components/Diode.ts

@@ -14,29 +14,20 @@ export class Diode extends NormalComponent<
   // @ts-ignore
   get config() {
     return {
-      schematicSymbolName:
-        this.props.symbolName ?? ("diode_horz" as BaseSymbolName),
+      schematicSymbolName: this.props.symbolName ?? ("diode" as BaseSymbolName),
       componentName: "Diode",
       zodProps: diodeProps,
       sourceFtype: "simple_diode" as Ftype,
     }
   }
 
   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"],
+      },
+    })
   }
 
   pos = this.portMap.pin1

lib/components/normal-components/Inductor.ts

@@ -23,20 +23,12 @@ export class Inductor extends NormalComponent<
   }
 
   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"],
+      },
+    })
   }
 
   doInitialSourceRender() {

lib/components/normal-components/Led.ts

@@ -15,28 +15,19 @@ export class Led extends NormalComponent<
   get config() {
     return {
       componentName: "Led",
-      schematicSymbolName:
-        this.props.symbolName ?? ("led_horz" as BaseSymbolName),
+      schematicSymbolName: this.props.symbolName ?? ("led" as BaseSymbolName),
       zodProps: ledProps,
       sourceFtype: "simple_diode" as Ftype,
     }
   }
 
   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"],
+      },
+    })
   }
 
   pos = this.portMap.pin1

package.json

@@ -51,7 +51,7 @@
     "performance-now": "^2.1.0",
     "react": "^18.3.1",
     "react-reconciler": "^0.29.2",
-    "schematic-symbols": "0.0.90",
+    "schematic-symbols": "^0.0.92",
     "transformation-matrix": "^2.16.1",
     "zod": "^3.23.8"
   }

tests/components/normal-components/rotated-components.test.tsx

@@ -0,0 +1,48 @@
+import { test, expect } from "bun:test"
+import { getTestFixture } from "tests/fixtures/get-test-fixture"
+
+test("rotated resistor/diode/inductor/led/capacitor schematic", () => {
+  const { circuit } = getTestFixture()
+
+  circuit.add(
+    <board width="10mm" height="10mm">
+      <resistor
+        name="R1"
+        schY={0}
+        schX={0}
+        resistance="10k"
+        schRotation="90deg"
+      />
+      <led name="L1" schY={0} schX={2} schRotation="90deg" />
+      <inductor
+        name="I1"
+        schY={0}
+        schX={4}
+        inductance="10k"
+        schRotation="90deg"
+      />
+      <capacitor
+        name="C1"
+        schY={0}
+        schX={6}
+        capacitance="10k"
+        schRotation="90deg"
+      />
+      <diode name="D1" schY={0} schX={8} schRotation="90deg" />
+    </board>,
+  )
+
+  circuit.render()
+
+  const symbolNames = circuit.db.schematic_component
+    .list()
+    .map((elm) => elm.symbol_name)
+
+  expect(symbolNames.includes("capacitor_vert")).toBeTruthy()
+  expect(symbolNames.includes("inductor_vert")).toBeTruthy()
+  expect(symbolNames.includes("led_vert")).toBeTruthy()
+  expect(symbolNames.includes("boxresistor_vert")).toBeTruthy()
+  expect(symbolNames.includes("diode_vert")).toBeTruthy()
+
+  expect(circuit).toMatchSchematicSnapshot(import.meta.path)
+})