@tscircuit/core 0.0.678 → 0.0.680

package/dist/index.d.ts

@@ -12,7 +12,7 @@ import { CircuitJsonUtilObjects } from '@tscircuit/circuit-json-util';
 import { ConnectivityMap } from 'circuit-json-to-connectivity-map';
 import { GraphicsObject } from 'graphics-debug';
 
-declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "PcbFootprintStringRender", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SchematicPrimitiveRender", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbLayout", "PcbBoardAutoSize", "PcbTraceHintRender", "PcbManualTraceRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbDesignRuleChecks", "CadModelRender", "PartsEngineRender"];
+declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "PcbFootprintStringRender", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SchematicPrimitiveRender", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbLayout", "PcbBoardAutoSize", "PcbTraceHintRender", "PcbManualTraceRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
@@ -1016,6 +1016,10 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
     pcb_missing_footprint_error_id?: string;
     _hasStartedFootprintUrlLoad: boolean;
     private _invalidPinLabelMessages;
+    /**
+     * Set to true to enable automatic silkscreen text adjustment when it overlaps with other components
+     */
+    _adjustSilkscreenTextAutomatically: boolean;
     /**
      * Override this property for component defaults
      */
@@ -1121,6 +1125,7 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
         x: number;
         y: number;
     }): void;
+    doInitialSilkscreenOverlapAdjustment(): void;
 }
 
 declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps> extends NormalComponent<Props> implements ISubcircuit {
@@ -2281,6 +2286,7 @@ declare class Board extends Group<typeof boardProps> {
 }
 
 declare class Capacitor extends NormalComponent<typeof capacitorProps, PolarizedPassivePorts> {
+    _adjustSilkscreenTextAutomatically: boolean;
     get config(): {
         componentName: string;
         schematicSymbolName: string;
@@ -8516,6 +8522,7 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
 }
 
 declare class Resistor extends NormalComponent<typeof resistorProps, PassivePorts> {
+    _adjustSilkscreenTextAutomatically: boolean;
     get config(): {
         componentName: string;
         schematicSymbolName: string;
@@ -12902,6 +12909,7 @@ declare class Resonator extends NormalComponent<typeof resonatorProps> {
 }
 
 declare class Inductor extends NormalComponent<typeof inductorProps, PassivePorts> {
+    _adjustSilkscreenTextAutomatically: boolean;
     get config(): {
         componentName: string;
         schematicSymbolName: BaseSymbolName;

package/dist/index.js

@@ -120,6 +120,7 @@ var orderedRenderPhases = [
   "PcbTraceRender",
   "PcbRouteNetIslands",
   "PcbDesignRuleChecks",
+  "SilkscreenOverlapAdjustment",
   "CadModelRender",
   "PartsEngineRender"
 ];
@@ -6306,6 +6307,77 @@ 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);
+}
+function NormalComponent_doInitialSilkscreenOverlapAdjustment(component) {
+  if (!component._adjustSilkscreenTextAutomatically) {
+    return;
+  }
+  if (component.root?.pcbDisabled || !component.pcb_component_id) {
+    return;
+  }
+  const { db } = component.root;
+  const componentBounds = component._getPcbCircuitJsonBounds();
+  const componentCenter = componentBounds.center;
+  let silkscreenTexts = db.pcb_silkscreen_text.list({
+    pcb_component_id: component.pcb_component_id
+  }).filter((text) => text.text === component.name);
+  if (silkscreenTexts.length === 0) {
+    return;
+  }
+  const subcircuit = component.getSubcircuit();
+  const allNormalComponents = subcircuit.selectAll("[_isNormalComponent=true]").filter((comp) => comp !== component && comp.pcb_component_id);
+  const obstacleBounds = allNormalComponents.map((comp) => {
+    const bounds = comp._getPcbCircuitJsonBounds();
+    const box = {
+      center: bounds.center,
+      width: bounds.width,
+      height: bounds.height
+    };
+    return getBoundingBox(box);
+  });
+  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 textBox = {
+      center: currentPosition,
+      width: textWidth,
+      height: textHeight
+    };
+    const textBounds = getBoundingBox(textBox);
+    const hasIntersection = obstacleBounds.some(
+      (obstacle) => doBoundsIntersect(textBounds, obstacle)
+    );
+    if (!hasIntersection) {
+      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
+    };
+    const flippedTextBounds = getBoundingBox(flippedTextBox);
+    const flippedHasIntersection = obstacleBounds.some(
+      (obstacle) => doBoundsIntersect(flippedTextBounds, obstacle)
+    );
+    if (!flippedHasIntersection) {
+      db.pcb_silkscreen_text.update(silkscreenText.pcb_silkscreen_text_id, {
+        anchor_position: {
+          x: flippedX,
+          y: flippedY
+        }
+      });
+    }
+  }
+}
+
 // lib/utils/filterPinLabels.ts
 import { chipProps } from "@tscircuit/props";
 function filterPinLabels(pinLabels) {
@@ -6373,6 +6445,10 @@ var NormalComponent = class extends PrimitiveComponent2 {
   pcb_missing_footprint_error_id;
   _hasStartedFootprintUrlLoad = false;
   _invalidPinLabelMessages = [];
+  /**
+   * Set to true to enable automatic silkscreen text adjustment when it overlaps with other components
+   */
+  _adjustSilkscreenTextAutomatically = false;
   /**
    * Override this property for component defaults
    */
@@ -7273,6 +7349,9 @@ var NormalComponent = class extends PrimitiveComponent2 {
   _repositionOnPcb(position) {
     return NormalComponent__repositionOnPcb(this, position);
   }
+  doInitialSilkscreenOverlapAdjustment() {
+    return NormalComponent_doInitialSilkscreenOverlapAdjustment(this);
+  }
 };
 
 // lib/components/normal-components/Board.ts
@@ -8534,7 +8613,12 @@ function Group_doInitialSchematicLayoutMatchPack(group) {
   }
   debug5("Converting circuit tree to InputProblem...");
   const inputProblem = convertTreeToInputProblem(tree, db, group);
-  debug5("InputProblem:", JSON.stringify(inputProblem, null, 2));
+  if (debug5.enabled) {
+    global.debugOutputs?.add(
+      `matchpack-input-problem-${group.name}`,
+      JSON.stringify(inputProblem, null, 2)
+    );
+  }
   const solver = new LayoutPipelineSolver(inputProblem);
   debug5("Starting LayoutPipelineSolver...");
   if (debug5.enabled && global.debugGraphics) {
@@ -11480,6 +11564,7 @@ var FTYPE = stringProxy;
 // lib/components/normal-components/Capacitor.ts
 import { formatSiUnit } from "format-si-unit";
 var Capacitor = class extends NormalComponent {
+  _adjustSilkscreenTextAutomatically = true;
   // @ts-ignore (cause the symbolName is string and not fixed)
   get config() {
     return {
@@ -12206,6 +12291,7 @@ var VoltageSource = class extends NormalComponent {
 import { resistorProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit3 } from "format-si-unit";
 var Resistor = class extends NormalComponent {
+  _adjustSilkscreenTextAutomatically = true;
   get config() {
     return {
       componentName: "Resistor",
@@ -13121,6 +13207,7 @@ var Resonator = class extends NormalComponent {
 import { inductorProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit5 } from "format-si-unit";
 var Inductor = class extends NormalComponent {
+  _adjustSilkscreenTextAutomatically = true;
   get config() {
     return {
       componentName: "Inductor",
@@ -13913,7 +14000,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.677",
+  version: "0.0.679",
   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.678",
+  "version": "0.0.680",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",