@tscircuit/core 0.0.694 → 0.0.696

package/dist/index.d.ts

@@ -54,6 +54,7 @@ declare abstract class Renderable implements IRenderable {
     protected _emitRenderLifecycleEvent(phase: RenderPhase, startOrEnd: "start" | "end"): void;
     getString(): string;
     _hasIncompleteAsyncEffects(): boolean;
+    private _hasIncompleteAsyncEffectsInSubtreeForPhase;
     getCurrentRenderPhase(): RenderPhase | null;
     getRenderGraph(): Record<string, any>;
     runRenderCycle(): void;
@@ -965,6 +966,7 @@ declare class Port extends PrimitiveComponent<typeof portProps> {
     doInitialSourceRender(): void;
     doInitialSourceParentAttachment(): void;
     doInitialPcbPortRender(): void;
+    updatePcbPortRender(): void;
     doInitialSchematicPortRender(): void;
     _getSubcircuitConnectivityKey(): string | undefined;
     _setPositionFromLayout(newCenter: {

package/dist/index.js

@@ -126,6 +126,9 @@ var orderedRenderPhases = [
   "CadModelRender",
   "PartsEngineRender"
 ];
+var asyncPhaseDependencies = {
+  PcbTraceRender: ["PcbFootprintStringRender"]
+};
 var globalRenderCounter = 0;
 var Renderable = class {
   renderPhaseStates;
@@ -227,6 +230,17 @@ ${error.stack}`
   _hasIncompleteAsyncEffects() {
     return this._asyncEffects.some((effect) => !effect.complete);
   }
+  _hasIncompleteAsyncEffectsInSubtreeForPhase(phase) {
+    for (const e of this._asyncEffects) {
+      if (!e.complete && e.phase === phase) return true;
+    }
+    for (const child of this.children) {
+      const renderableChild = child;
+      if (renderableChild._hasIncompleteAsyncEffectsInSubtreeForPhase(phase))
+        return true;
+    }
+    return false;
+  }
   getCurrentRenderPhase() {
     return this._currentRenderPhase;
   }
@@ -274,6 +288,10 @@ ${error.stack}`
       const hasIncompleteEffects = this._asyncEffects.filter((e) => e.phase === prevPhase).some((e) => !e.complete);
       if (hasIncompleteEffects) return;
     }
+    const deps = asyncPhaseDependencies[phase] || [];
+    for (const depPhase of deps) {
+      if (this._hasIncompleteAsyncEffectsInSubtreeForPhase(depPhase)) return;
+    }
     this._emitRenderLifecycleEvent(phase, "start");
     if (isInitialized) {
       if (isDirty) {
@@ -3280,6 +3298,36 @@ var Port = class extends PrimitiveComponent2 {
       );
     }
   }
+  updatePcbPortRender() {
+    if (this.root?.pcbDisabled) return;
+    const { db } = this.root;
+    if (this.pcb_port_id) return;
+    const pcbMatches = this.matchedComponents.filter((c) => c.isPcbPrimitive);
+    if (pcbMatches.length === 0) return;
+    let matchCenter = null;
+    if (pcbMatches.length === 1) {
+      matchCenter = pcbMatches[0]._getPcbCircuitJsonBounds().center;
+    }
+    if (pcbMatches.length > 1) {
+      try {
+        if (areAllPcbPrimitivesOverlapping(pcbMatches)) {
+          matchCenter = getCenterOfPcbPrimitives(pcbMatches);
+        }
+      } catch {
+      }
+    }
+    if (!matchCenter) return;
+    const subcircuit = this.getSubcircuit();
+    const pcb_port = db.pcb_port.insert({
+      pcb_component_id: this.parent?.pcb_component_id,
+      layers: this.getAvailablePcbLayers(),
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+      pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0,
+      ...matchCenter,
+      source_port_id: this.source_port_id
+    });
+    this.pcb_port_id = pcb_port.pcb_port_id;
+  }
   doInitialSchematicPortRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
@@ -6339,11 +6387,69 @@ var shouldCheckPortForMissingTrace = (component, port) => {
   return true;
 };
 
-// lib/components/base-components/NormalComponent/NormalComponent_doInitialSilkscreenOverlapAdjustment.ts
-import { getBoundingBox } from "@tscircuit/math-utils";
-function doBoundsIntersect(bounds1, bounds2) {
-  return !(bounds1.maxX <= bounds2.minX || bounds2.maxX <= bounds1.minX || bounds1.maxY <= bounds2.minY || bounds2.maxY <= bounds1.minY);
+// lib/components/base-components/NormalComponent/utils/getPcbTextBounds.ts
+function getPcbTextBounds(text) {
+  const fontSize = text.font_size;
+  const textWidth = text.text.length * fontSize * 0.6;
+  const textHeight = fontSize;
+  const anchorAlignment = text.anchor_alignment || "center";
+  let centerX = text.anchor_position.x;
+  let centerY = text.anchor_position.y;
+  switch (anchorAlignment) {
+    case "top_left":
+      centerX = text.anchor_position.x + textWidth / 2;
+      centerY = text.anchor_position.y + textHeight / 2;
+      break;
+    case "top_center":
+      centerX = text.anchor_position.x;
+      centerY = text.anchor_position.y + textHeight / 2;
+      break;
+    case "top_right":
+      centerX = text.anchor_position.x - textWidth / 2;
+      centerY = text.anchor_position.y + textHeight / 2;
+      break;
+    case "center_left":
+      centerX = text.anchor_position.x + textWidth / 2;
+      centerY = text.anchor_position.y;
+      break;
+    case "center":
+      centerX = text.anchor_position.x;
+      centerY = text.anchor_position.y;
+      break;
+    case "center_right":
+      centerX = text.anchor_position.x - textWidth / 2;
+      centerY = text.anchor_position.y;
+      break;
+    case "bottom_left":
+      centerX = text.anchor_position.x + textWidth / 2;
+      centerY = text.anchor_position.y - textHeight / 2;
+      break;
+    case "bottom_center":
+      centerX = text.anchor_position.x;
+      centerY = text.anchor_position.y - textHeight / 2;
+      break;
+    case "bottom_right":
+      centerX = text.anchor_position.x - textWidth / 2;
+      centerY = text.anchor_position.y - textHeight / 2;
+      break;
+    default:
+      centerX = text.anchor_position.x;
+      centerY = text.anchor_position.y;
+      break;
+  }
+  return {
+    x: centerX - textWidth / 2,
+    y: centerY - textHeight / 2,
+    width: textWidth,
+    height: textHeight
+  };
 }
+
+// lib/components/base-components/NormalComponent/NormalComponent_doInitialSilkscreenOverlapAdjustment.ts
+import {
+  getBoundingBox,
+  doBoundsOverlap
+} from "@tscircuit/math-utils";
 function NormalComponent_doInitialSilkscreenOverlapAdjustment(component) {
   if (!component._adjustSilkscreenTextAutomatically) {
     return;
@@ -6373,33 +6479,34 @@ function NormalComponent_doInitialSilkscreenOverlapAdjustment(component) {
   });
   for (const silkscreenText of silkscreenTexts) {
     const currentPosition = silkscreenText.anchor_position;
-    const fontSize = silkscreenText.font_size;
-    const textWidth = silkscreenText.text.length * fontSize * 0.6;
-    const textHeight = fontSize;
+    const textBounds = getPcbTextBounds(silkscreenText);
     const textBox = {
-      center: currentPosition,
-      width: textWidth,
-      height: textHeight
+      center: {
+        x: textBounds.x + textBounds.width / 2,
+        y: textBounds.y + textBounds.height / 2
+      },
+      width: textBounds.width,
+      height: textBounds.height
     };
-    const textBounds = getBoundingBox(textBox);
-    const hasIntersection = obstacleBounds.some(
-      (obstacle) => doBoundsIntersect(textBounds, obstacle)
+    const textBoundsBox = getBoundingBox(textBox);
+    const hasOverlap = obstacleBounds.some(
+      (obstacle) => doBoundsOverlap(textBoundsBox, obstacle)
     );
-    if (!hasIntersection) {
+    if (!hasOverlap) {
       continue;
     }
     const flippedX = 2 * componentCenter.x - currentPosition.x;
     const flippedY = 2 * componentCenter.y - currentPosition.y;
     const flippedTextBox = {
       center: { x: flippedX, y: flippedY },
-      width: textWidth,
-      height: textHeight
+      width: textBounds.width,
+      height: textBounds.height
     };
     const flippedTextBounds = getBoundingBox(flippedTextBox);
-    const flippedHasIntersection = obstacleBounds.some(
-      (obstacle) => doBoundsIntersect(flippedTextBounds, obstacle)
+    const flippedHasOverlap = obstacleBounds.some(
+      (obstacle) => doBoundsOverlap(flippedTextBounds, obstacle)
     );
-    if (!flippedHasIntersection) {
+    if (!flippedHasOverlap) {
       db.pcb_silkscreen_text.update(silkscreenText.pcb_silkscreen_text_id, {
         anchor_position: {
           x: flippedX,
@@ -6527,6 +6634,11 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
         circuitJson
       );
       component.addAll(fpComponents);
+      for (const child of component.children) {
+        if (child.componentName === "Port") {
+          child._markDirty?.("PcbPortRender");
+        }
+      }
       component._markDirty("InitializePortsFromChildren");
     });
     return;
@@ -14184,7 +14296,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.693",
+  version: "0.0.695",
   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.694",
+  "version": "0.0.696",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",