@tscircuit/core 0.0.378 → 0.0.379

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export { createElement } from 'react';
 import * as zod from 'zod';
 import { z, ZodType } from 'zod';
 import { symbols, SchSymbol, BaseSymbolName } from 'schematic-symbols';
-import { PcbTraceError, PcbPlacementError, PcbManualEditConflictError, LayerRef, AnyCircuitElement, AnySourceComponent, PcbTraceRoutePoint, PcbTrace, PcbVia, RouteHintPoint, CircuitJson } from 'circuit-json';
+import { PcbTraceError, PcbPlacementError, PcbManualEditConflictWarning, LayerRef, AnyCircuitElement, AnySourceComponent, PcbTraceRoutePoint, PcbTrace, PcbVia, RouteHintPoint, CircuitJson } from 'circuit-json';
 import { Matrix } from 'transformation-matrix';
 import { CircuitJsonUtilObjects } from '@tscircuit/circuit-json-util';
 import * as _tscircuit_layout from '@tscircuit/layout';
@@ -66,7 +66,7 @@ declare abstract class Renderable implements IRenderable {
      */
     runRenderPhase(phase: RenderPhase): void;
     runRenderPhaseForChildren(phase: RenderPhase): void;
-    renderError(message: string | Omit<PcbTraceError, "pcb_error_id"> | Omit<PcbPlacementError, "pcb_error_id"> | Omit<PcbManualEditConflictError, "pcb_error_id">): void;
+    renderError(message: string | Omit<PcbTraceError, "pcb_error_id"> | Omit<PcbPlacementError, "pcb_error_id"> | Omit<PcbManualEditConflictWarning, "pcb_error_id">): void;
 }
 
 /**
@@ -392,6 +392,10 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
         x: number;
         y: number;
     } | null;
+    _getSchematicManualPlacementForComponent(component: PrimitiveComponent): {
+        x: number;
+        y: number;
+    } | null;
     _getSchematicGlobalManualPlacementTransform(component: PrimitiveComponent): Matrix | null;
     _getGlobalPcbPositionBeforeLayout(): {
         x: number;

package/dist/index.js

@@ -53,7 +53,12 @@ __export(components_exports, {
 
 // lib/components/base-components/NormalComponent/NormalComponent.ts
 import { fp } from "@tscircuit/footprinter";
-import { point3, rotation } from "circuit-json";
+import {
+  pcb_manual_edit_conflict_warning,
+  point3,
+  rotation,
+  schematic_manual_edit_conflict_warning
+} from "circuit-json";
 import Debug4 from "debug";
 
 // lib/fiber/create-instance-from-react-element.ts
@@ -1009,6 +1014,23 @@ var PrimitiveComponent2 = class extends Renderable {
     }
     return null;
   }
+  _getSchematicManualPlacementForComponent(component) {
+    if (!this.isSubcircuit) return null;
+    const manualEdits = this.props.manualEdits;
+    if (!manualEdits) return null;
+    const placementConfigPositions = manualEdits.schematic_placements;
+    if (!placementConfigPositions) return null;
+    for (const position of placementConfigPositions) {
+      if (isMatchingSelector(component, position.selector) || component.props.name === position.selector) {
+        const center = applyToPoint(
+          this.computeSchematicGlobalTransform(),
+          position.center
+        );
+        return center;
+      }
+    }
+    return null;
+  }
   _getSchematicGlobalManualPlacementTransform(component) {
     const manualEdits = this.getSubcircuit()?._parsedProps.manualEdits;
     if (!manualEdits) return null;
@@ -4866,13 +4888,30 @@ var NormalComponent = class extends PrimitiveComponent2 {
    */
   doInitialSchematicComponentRender() {
     if (this.root?.schematicDisabled) return;
+    const { db } = this.root;
     const { schematicSymbolName } = this.config;
     if (schematicSymbolName) {
-      return this._doInitialSchematicComponentRenderWithSymbol();
+      this._doInitialSchematicComponentRenderWithSymbol();
+    } else {
+      const dimensions = this._getSchematicBoxDimensions();
+      if (dimensions) {
+        this._doInitialSchematicComponentRenderWithSchematicBoxDimensions();
+      }
     }
-    const dimensions = this._getSchematicBoxDimensions();
-    if (dimensions) {
-      return this._doInitialSchematicComponentRenderWithSchematicBoxDimensions();
+    const manualPlacement = this.getSubcircuit()?._getSchematicManualPlacementForComponent(this);
+    if (this.schematic_component_id && this.props.schX !== void 0 && this.props.schY !== void 0 && manualPlacement) {
+      if (!this.schematic_component_id) {
+        return;
+      }
+      const warning = schematic_manual_edit_conflict_warning.parse({
+        type: "schematic_manual_edit_conflict_warning",
+        schematic_manual_edit_conflict_warning_id: `schematic_manual_edit_conflict_${this.source_component_id}`,
+        message: `${this.getString()} has both manual placement and prop coordinates. schX and schY will be used. Remove schX/schY or clear the manual placement.`,
+        schematic_component_id: this.schematic_component_id,
+        source_component_id: this.source_component_id,
+        subcircuit_id: this.getSubcircuit()?.subcircuit_id
+      });
+      db.schematic_manual_edit_conflict_warning.insert(warning);
     }
   }
   _getSchematicSymbolDisplayValue() {
@@ -4993,12 +5032,15 @@ var NormalComponent = class extends PrimitiveComponent2 {
     this.pcb_component_id = pcb_component.pcb_component_id;
     const manualPlacement = this.getSubcircuit()._getPcbManualPlacementForComponent(this);
     if (this.props.pcbX !== void 0 && this.props.pcbY !== void 0 && manualPlacement) {
-      this.renderError({
-        type: "pcb_manual_edit_conflict_error",
-        message: `${this.getString()} has both manual placement and explicit coordinates. pcbX and pcbY will be used. Remove pcbX/pcbY or clear the manual placement.`,
+      const warning = pcb_manual_edit_conflict_warning.parse({
+        type: "pcb_manual_edit_conflict_warning",
+        pcb_manual_edit_conflict_warning_id: `pcb_manual_edit_conflict_${this.source_component_id}`,
+        message: `${this.getString()} has both manual placement and prop coordinates. pcbX and pcbY will be used. Remove pcbX/pcbY or clear the manual placement.`,
         pcb_component_id: this.pcb_component_id,
-        source_component_id: this.source_component_id
+        source_component_id: this.source_component_id,
+        subcircuit_id: subcircuit.subcircuit_id ?? void 0
       });
+      db.pcb_manual_edit_conflict_warning.insert(warning);
     }
   }
   /**
@@ -7668,7 +7710,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.377",
+  version: "0.0.378",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -7727,11 +7769,11 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.14",
     "@tscircuit/props": "^0.0.172",
     "@tscircuit/schematic-autolayout": "^0.0.6",
-    "circuit-json": "^0.0.154",
+    "circuit-json": "0.0.158",
     "circuit-json-to-connectivity-map": "^0.0.20",
+    "css-select": "^5.1.0",
     "format-si-unit": "^0.0.3",
     nanoid: "^5.0.7",
-    "css-select": "^5.1.0",
     "performance-now": "^2.1.0",
     "react-reconciler": "^0.31.0",
     "react-reconciler-18": "npm:react-reconciler@0.29.2",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.378",
+  "version": "0.0.379",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -60,11 +60,11 @@
     "@tscircuit/math-utils": "^0.0.14",
     "@tscircuit/props": "^0.0.172",
     "@tscircuit/schematic-autolayout": "^0.0.6",
-    "circuit-json": "^0.0.154",
+    "circuit-json": "0.0.158",
     "circuit-json-to-connectivity-map": "^0.0.20",
+    "css-select": "^5.1.0",
     "format-si-unit": "^0.0.3",
     "nanoid": "^5.0.7",
-    "css-select": "^5.1.0",
     "performance-now": "^2.1.0",
     "react-reconciler": "^0.31.0",
     "react-reconciler-18": "npm:react-reconciler@0.29.2",