@tscircuit/core 0.0.992 → 0.0.993

package/dist/index.d.ts

@@ -123664,7 +123664,7 @@ declare class SchematicPath extends PrimitiveComponent<typeof schematicPathProps
     get config(): {
         componentName: string;
         zodProps: zod.ZodObject<{
-            points: zod.ZodArray<zod.ZodObject<{
+            points: zod.ZodOptional<zod.ZodArray<zod.ZodObject<{
                 x: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
                 y: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
             }, "strip", zod.ZodTypeAny, {
@@ -123673,28 +123673,28 @@ declare class SchematicPath extends PrimitiveComponent<typeof schematicPathProps
             }, {
                 x: string | number;
                 y: string | number;
-            }>, "many">;
+            }>, "many">>;
             svgPath: zod.ZodOptional<zod.ZodString>;
             strokeWidth: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             strokeColor: zod.ZodOptional<zod.ZodString>;
             isFilled: zod.ZodDefault<zod.ZodOptional<zod.ZodBoolean>>;
             fillColor: zod.ZodOptional<zod.ZodEnum<["red", "blue"]>>;
         }, "strip", zod.ZodTypeAny, {
-            points: {
-                x: number;
-                y: number;
-            }[];
             isFilled: boolean;
             strokeWidth?: number | undefined;
+            points?: {
+                x: number;
+                y: number;
+            }[] | undefined;
             fillColor?: "red" | "blue" | undefined;
             svgPath?: string | undefined;
             strokeColor?: string | undefined;
         }, {
-            points: {
+            strokeWidth?: string | number | undefined;
+            points?: {
                 x: string | number;
                 y: string | number;
-            }[];
-            strokeWidth?: string | number | undefined;
+            }[] | undefined;
             isFilled?: boolean | undefined;
             fillColor?: "red" | "blue" | undefined;
             svgPath?: string | undefined;

package/dist/index.js

@@ -20340,6 +20340,136 @@ var SchematicCircle = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/SchematicPath.ts
 import { schematicPathProps } from "@tscircuit/props";
+
+// lib/utils/schematic/svgPathToPoints.ts
+import SVGPathCommander from "svg-path-commander";
+function sampleCurveSegment(segmentPath, samplesPerUnit) {
+  const commander = new SVGPathCommander(segmentPath);
+  const length7 = commander.getTotalLength();
+  const numSamples = Math.max(2, Math.ceil(length7 * samplesPerUnit));
+  const points = [];
+  for (let i = 1; i <= numSamples; i++) {
+    const t = i / numSamples * length7;
+    const point6 = commander.getPointAtLength(t);
+    points.push({ x: point6.x, y: point6.y });
+  }
+  return points;
+}
+function svgPathToPoints(svgPath, samplesPerUnit = 10) {
+  const pathCommander = new SVGPathCommander(svgPath);
+  pathCommander.toAbsolute();
+  const segments = pathCommander.segments;
+  const result = [];
+  let currentPoints = [];
+  let currentX = 0;
+  let currentY = 0;
+  let subpathStartX = 0;
+  let subpathStartY = 0;
+  for (const segment2 of segments) {
+    const cmd = segment2[0];
+    switch (cmd) {
+      case "M": {
+        if (currentPoints.length > 0) {
+          result.push(currentPoints);
+        }
+        currentX = segment2[1];
+        currentY = segment2[2];
+        subpathStartX = currentX;
+        subpathStartY = currentY;
+        currentPoints = [{ x: currentX, y: currentY }];
+        break;
+      }
+      case "L": {
+        currentX = segment2[1];
+        currentY = segment2[2];
+        currentPoints.push({ x: currentX, y: currentY });
+        break;
+      }
+      case "H": {
+        currentX = segment2[1];
+        currentPoints.push({ x: currentX, y: currentY });
+        break;
+      }
+      case "V": {
+        currentY = segment2[1];
+        currentPoints.push({ x: currentX, y: currentY });
+        break;
+      }
+      case "Z": {
+        if (currentX !== subpathStartX || currentY !== subpathStartY) {
+          currentPoints.push({ x: subpathStartX, y: subpathStartY });
+        }
+        currentX = subpathStartX;
+        currentY = subpathStartY;
+        break;
+      }
+      case "C": {
+        const endX = segment2[5];
+        const endY = segment2[6];
+        const segmentPath = `M ${currentX} ${currentY} C ${segment2[1]} ${segment2[2]} ${segment2[3]} ${segment2[4]} ${endX} ${endY}`;
+        const sampledPoints = sampleCurveSegment(segmentPath, samplesPerUnit);
+        currentPoints.push(...sampledPoints);
+        currentX = endX;
+        currentY = endY;
+        break;
+      }
+      case "S": {
+        const endX = segment2[3];
+        const endY = segment2[4];
+        const segmentPath = `M ${currentX} ${currentY} S ${segment2[1]} ${segment2[2]} ${endX} ${endY}`;
+        const sampledPoints = sampleCurveSegment(segmentPath, samplesPerUnit);
+        currentPoints.push(...sampledPoints);
+        currentX = endX;
+        currentY = endY;
+        break;
+      }
+      case "Q": {
+        const endX = segment2[3];
+        const endY = segment2[4];
+        const segmentPath = `M ${currentX} ${currentY} Q ${segment2[1]} ${segment2[2]} ${endX} ${endY}`;
+        const sampledPoints = sampleCurveSegment(segmentPath, samplesPerUnit);
+        currentPoints.push(...sampledPoints);
+        currentX = endX;
+        currentY = endY;
+        break;
+      }
+      case "T": {
+        const endX = segment2[1];
+        const endY = segment2[2];
+        const segmentPath = `M ${currentX} ${currentY} T ${endX} ${endY}`;
+        const sampledPoints = sampleCurveSegment(segmentPath, samplesPerUnit);
+        currentPoints.push(...sampledPoints);
+        currentX = endX;
+        currentY = endY;
+        break;
+      }
+      case "A": {
+        const endX = segment2[6];
+        const endY = segment2[7];
+        const segmentPath = `M ${currentX} ${currentY} A ${segment2[1]} ${segment2[2]} ${segment2[3]} ${segment2[4]} ${segment2[5]} ${endX} ${endY}`;
+        const sampledPoints = sampleCurveSegment(segmentPath, samplesPerUnit);
+        currentPoints.push(...sampledPoints);
+        currentX = endX;
+        currentY = endY;
+        break;
+      }
+    }
+  }
+  if (currentPoints.length > 0) {
+    result.push(currentPoints);
+  }
+  return result.map((points) => {
+    const deduped = [];
+    for (const point6 of points) {
+      if (deduped.length === 0 || Math.abs(deduped[deduped.length - 1].x - point6.x) > 1e-9 || Math.abs(deduped[deduped.length - 1].y - point6.y) > 1e-9) {
+        deduped.push(point6);
+      }
+    }
+    return deduped;
+  });
+}
+
+// lib/components/primitive-components/SchematicPath.ts
 var SchematicPath = class extends PrimitiveComponent2 {
   isSchematicPrimitive = true;
   get config() {
@@ -20354,19 +20484,37 @@ var SchematicPath = class extends PrimitiveComponent2 {
     const { _parsedProps: props } = this;
     const globalPos = this._getGlobalSchematicPositionBeforeLayout();
     const schematic_component_id = this.getPrimitiveContainer()?.parent?.schematic_component_id;
-    db.schematic_path.insert({
-      schematic_component_id,
-      points: props.points.map((point6) => ({
-        x: point6.x + globalPos.x,
-        y: point6.y + globalPos.y
-      })),
-      is_filled: props.isFilled,
-      fill_color: props.fillColor,
-      stroke_color: props.strokeColor,
-      stroke_width: props.strokeWidth,
-      svg_path: props.svgPath,
-      subcircuit_id: this.getSubcircuit().subcircuit_id ?? void 0
-    });
+    const subcircuit_id = this.getSubcircuit().subcircuit_id ?? void 0;
+    if (props.svgPath) {
+      const subpaths = svgPathToPoints(props.svgPath);
+      for (const subpathPoints of subpaths) {
+        db.schematic_path.insert({
+          schematic_component_id,
+          points: subpathPoints.map((point6) => ({
+            x: point6.x + globalPos.x,
+            y: point6.y + globalPos.y
+          })),
+          is_filled: props.isFilled,
+          fill_color: props.fillColor,
+          stroke_color: props.strokeColor,
+          stroke_width: props.strokeWidth,
+          subcircuit_id
+        });
+      }
+    } else if (props.points && props.points.length > 0) {
+      db.schematic_path.insert({
+        schematic_component_id,
+        points: props.points.map((point6) => ({
+          x: point6.x + globalPos.x,
+          y: point6.y + globalPos.y
+        })),
+        is_filled: props.isFilled,
+        fill_color: props.fillColor,
+        stroke_color: props.strokeColor,
+        stroke_width: props.strokeWidth,
+        subcircuit_id
+      });
+    }
   }
 };
 
@@ -21036,7 +21184,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.991",
+  version: "0.0.992",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -21079,7 +21227,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.455",
+    "@tscircuit/props": "^0.0.456",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",
@@ -21092,7 +21240,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.363",
+    "circuit-json": "^0.0.364",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.31",
@@ -21145,6 +21293,7 @@ var package_default = {
     nanoid: "^5.0.7",
     "performance-now": "^2.1.0",
     "react-reconciler": "^0.32.0",
+    "svg-path-commander": "^2.1.11",
     "transformation-matrix": "^2.16.1",
     zod: "^3.25.67"
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.992",
+  "version": "0.0.993",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -44,7 +44,7 @@
     "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.455",
+    "@tscircuit/props": "^0.0.456",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",
@@ -57,7 +57,7 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.363",
+    "circuit-json": "^0.0.364",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.31",
@@ -110,6 +110,7 @@
     "nanoid": "^5.0.7",
     "performance-now": "^2.1.0",
     "react-reconciler": "^0.32.0",
+    "svg-path-commander": "^2.1.11",
     "transformation-matrix": "^2.16.1",
     "zod": "^3.25.67"
   }