schematic-symbols 0.0.100 → 0.0.102

package/drawing/arc.ts

@@ -12,7 +12,7 @@ export function approximateArc(
 ): Point[] {
   // This is a simplified approximation. For a more accurate representation,
   // you might want to use a dedicated SVG path library.
-  const steps = 30
+  const steps = 40
   const points: Point[] = []
   for (let i = 1; i < steps; i++) {
     const t = i / steps

package/drawing/cubicBezierCurveArc.ts

@@ -0,0 +1,28 @@
+import type { Point } from "./types"
+
+export function approximateBezier(
+  p0: Point,
+  p1: Point,
+  p2: Point,
+  p3: Point,
+): Point[] {
+  const points: Point[] = []
+  const steps = 30
+  for (let t = 0; t <= 1; t += 1 / steps) {
+    const x =
+      Math.pow(1 - t, 3) * p0.x +
+      3 * Math.pow(1 - t, 2) * t * p1.x +
+      3 * (1 - t) * Math.pow(t, 2) * p2.x +
+      Math.pow(t, 3) * p3.x
+
+    const y =
+      Math.pow(1 - t, 3) * p0.y +
+      3 * Math.pow(1 - t, 2) * t * p1.y +
+      3 * (1 - t) * Math.pow(t, 2) * p2.y +
+      Math.pow(t, 3) * p3.y
+
+    points.push({ x, y })
+  }
+
+  return points
+}

package/drawing/modify-symbol/modify-symbol.ts

@@ -0,0 +1,91 @@
+import { NinePointAnchor, SchSymbol } from "drawing/types"
+import { rotateRightFacingSymbol } from "drawing/rotateSymbol"
+
+interface ModifySymbolBuilder {
+  changeTextAnchor(
+    text: "{REF}" | "{VAL}" | string,
+    newAnchor: NinePointAnchor,
+  ): ModifySymbolBuilder
+  rotateRightFacingSymbol(
+    newOrientation: "up" | "down" | "left" | "right",
+  ): ModifySymbolBuilder
+  labelPort(currentLabel: string, newLabels: string[]): ModifySymbolBuilder
+  build(): SchSymbol
+}
+
+class SymbolModifier implements ModifySymbolBuilder {
+  private symbol: SchSymbol
+
+  constructor(symbol: SchSymbol) {
+    this.symbol = JSON.parse(JSON.stringify(symbol))
+  }
+
+  changeTextAnchor(
+    text: "{REF}" | "{VAL}" | string,
+    newAnchor: NinePointAnchor,
+  ): ModifySymbolBuilder {
+    this.symbol = {
+      ...this.symbol,
+      primitives: this.symbol.primitives.map((primitive) => {
+        if (primitive.type === "text" && primitive.text === text) {
+          return {
+            ...primitive,
+            anchor: newAnchor,
+          }
+        }
+        return primitive
+      }),
+    }
+    return this
+  }
+
+  labelPort(currentLabel: string, newLabels: string[]): ModifySymbolBuilder {
+    this.symbol = {
+      ...this.symbol,
+      ports: this.symbol.ports.map((port) => {
+        return port.labels.includes(currentLabel)
+          ? { ...port, labels: newLabels }
+          : port
+      }),
+    }
+    return this
+  }
+
+  rotateRightFacingSymbol(
+    newOrientation: "up" | "down" | "left" | "right",
+  ): ModifySymbolBuilder {
+    this.symbol = rotateRightFacingSymbol(this.symbol, {
+      newOrientation,
+    })
+    return this
+  }
+
+  build(): SchSymbol {
+    return this.symbol
+  }
+}
+
+export const modifySymbol = (symbol: any): ModifySymbolBuilder => {
+  return new SymbolModifier({
+    ...symbol,
+    primitives: symbol.primitives ?? [
+      ...Object.values(symbol.paths ?? {}),
+      ...Object.values(symbol.texts ?? {}),
+      ...Object.values(symbol.circles ?? {}),
+      ...Object.values(symbol.rects ?? {}),
+    ],
+    ports:
+      symbol.ports ??
+      Object.entries(symbol.refblocks).flatMap(([key, refblock]) => {
+        return [{ ...(refblock as object), labels: [key] }]
+      }),
+    center: symbol.center ?? {
+      x: symbol.bounds.centerX,
+      y: symbol.bounds.centerY,
+    },
+    size: symbol.size ?? {
+      width: symbol.bounds.width,
+      height: symbol.bounds.height,
+    },
+  })
+}

package/drawing/svgPathToPoints.ts

@@ -1,5 +1,6 @@
 import type { Point } from "./types"
 import { approximateArc } from "./arc"
+import { approximateBezier } from "./cubicBezierCurveArc"
 
 export function svgPathToPoints(pathString: string): Point[] {
   const points: Point[] = []
@@ -35,12 +36,21 @@ export function svgPathToPoints(pathString: string): Point[] {
       case "V":
         addPoint(currentX, args[0])
         break
-      case "C":
-        // For C command, we add both control points and the end point
-        points.push({ x: args[0], y: args[1] }) // First control point
-        points.push({ x: args[2], y: args[3] }) // Second control point
-        addPoint(args[4], args[5]) // End point
+      case "C": {
+        const [x1, y1, x2, y2, x, y] = args
+
+        // Approximate the cubic Bézier curve
+        const bezierPoints = approximateBezier(
+          { x: currentX, y: currentY }, // Start point
+          { x: x1, y: y1 }, // Control point 1
+          { x: x2, y: y2 }, // Control point 2
+          { x, y }, // End point
+        )
+
+        points.push(...bezierPoints)
+        addPoint(x, y) // Update the current position
         break
+      }
       case "Q":
         // For Q command, we add both the control point and the end point
         points.push({ x: args[0], y: args[1] }) // Control point

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "schematic-symbols",
   "main": "./dist/index.js",
-  "version": "0.0.100",
+  "version": "0.0.102",
   "type": "module",
   "files": [
     "dist",

package/symbols/capacitor_polarized_down.ts

@@ -0,0 +1,10 @@
+import { modifySymbol } from "../drawing/modify-symbol/modify-symbol"
+import svgJson from "./capacitor_polarized_right"
+
+export default modifySymbol(svgJson)
+  .changeTextAnchor("{VAL}", "middle_top")
+  .rotateRightFacingSymbol("down")
+  .labelPort("left1", ["1"])
+  .labelPort("right1", ["2"])
+  .changeTextAnchor("{REF}", "middle_left")
+  .build()

package/symbols/capacitor_polarized_left.ts

@@ -0,0 +1,10 @@
+import { modifySymbol } from "../drawing/modify-symbol/modify-symbol"
+import svgJson from "./capacitor_polarized_right"
+
+export default modifySymbol(svgJson)
+  .changeTextAnchor("{VAL}", "middle_top")
+  .rotateRightFacingSymbol("left")
+  .labelPort("left1", ["1"])
+  .labelPort("right1", ["2"])
+  .changeTextAnchor("{REF}", "middle_top")
+  .build()

package/symbols/capacitor_polarized_right.ts

@@ -0,0 +1,10 @@
+import { modifySymbol } from "../drawing/modify-symbol/modify-symbol"
+import svgJson from "assets/generated/capacitor_polarized.json"
+
+export default modifySymbol(svgJson)
+  .changeTextAnchor("{VAL}", "middle_top")
+  .rotateRightFacingSymbol("right")
+  .labelPort("left1", ["1"])
+  .labelPort("right1", ["2"])
+  .changeTextAnchor("{REF}", "middle_bottom")
+  .build()

package/symbols/capacitor_polarized_up.ts

@@ -0,0 +1,10 @@
+import { modifySymbol } from "../drawing/modify-symbol/modify-symbol"
+import svgJson from "./capacitor_polarized_right"
+
+export default modifySymbol(svgJson)
+  .changeTextAnchor("{VAL}", "middle_top")
+  .rotateRightFacingSymbol("up")
+  .labelPort("left1", ["1"])
+  .labelPort("right1", ["2"])
+  .changeTextAnchor("{REF}", "middle_right")
+  .build()

package/symbols/diode_right.ts

@@ -1,6 +1,6 @@
 import { defineSymbol } from "drawing/defineSymbol"
 import svgJson from "assets/generated/diode.json"
-import { modifySymbol } from "scripts/lib/modify-symbol/modify-symbol"
+import { modifySymbol } from "drawing/modify-symbol/modify-symbol"
 
 export default modifySymbol(svgJson)
   .labelPort("left1", ["1", "pos"])

package/symbols/ground_vert.ts

@@ -2,6 +2,6 @@ import { defineSymbol } from "drawing/defineSymbol"
 import svgJson from "assets/generated/ground.json"
 import { Primitive } from "drawing/types"
 import groundHorz from "./ground_horz"
-import { modifySymbol } from "scripts/lib/modify-symbol/modify-symbol"
+import { modifySymbol } from "drawing/modify-symbol/modify-symbol"
 
 export default modifySymbol(groundHorz).rotateRightFacingSymbol("down").build()

package/symbols/schottky_diode_horz.ts

@@ -1,6 +1,6 @@
 import { defineSymbol } from "drawing/defineSymbol"
 import svgJson from "assets/generated/schottky_diode.json"
-import { modifySymbol } from "scripts/lib/modify-symbol/modify-symbol"
+import { modifySymbol } from "drawing/modify-symbol/modify-symbol"
 
 export default modifySymbol(svgJson)
   .labelPort("left1", ["1", "pos"])