@tscircuit/core 0.0.1014 → 0.0.1016

package/dist/index.js

@@ -472,6 +472,47 @@ var InvalidProps = class extends Error {
 // lib/fiber/create-instance-from-react-element.ts
 import { identity as identity2 } from "transformation-matrix";
 
+// lib/utils/pcbSx/convert-pcb-style-to-pcb-sx.ts
+function convertPcbStyleToPcbSx(pcbStyle) {
+  if (!pcbStyle) return void 0;
+  const sx = {};
+  if (pcbStyle.silkscreenFontSize !== void 0) {
+    sx["& silkscreentext"] = {
+      fontSize: pcbStyle.silkscreenFontSize
+    };
+  }
+  if (Object.keys(sx).length === 0) return void 0;
+  return sx;
+}
+
+// lib/utils/pcbSx/get-resolved-pcb-sx.ts
+function getResolvedPcbSx({
+  parentResolvedPcbSx,
+  pcbStyle,
+  ownPcbSx
+}) {
+  const styleSx = convertPcbStyleToPcbSx(pcbStyle);
+  const result = {};
+  const allKeys = /* @__PURE__ */ new Set();
+  if (parentResolvedPcbSx) {
+    for (const k of Object.keys(parentResolvedPcbSx)) allKeys.add(k);
+  }
+  if (styleSx) {
+    for (const k of Object.keys(styleSx)) allKeys.add(k);
+  }
+  if (ownPcbSx) {
+    for (const k of Object.keys(ownPcbSx)) allKeys.add(k);
+  }
+  for (const key of allKeys) {
+    result[key] = {
+      ...parentResolvedPcbSx?.[key],
+      ...styleSx?.[key],
+      ...ownPcbSx?.[key]
+    };
+  }
+  return result;
+}
+
 // lib/components/base-components/PrimitiveComponent/PrimitiveComponent.ts
 import "debug";
 
@@ -891,6 +932,13 @@ var PrimitiveComponent2 = class extends Renderable {
     const myPropertyObject = this._parsedProps?.[propertyName];
     return { ...parentPropertyObject, ...myPropertyObject };
   }
+  getResolvedPcbSx() {
+    return getResolvedPcbSx({
+      parentResolvedPcbSx: this.parent?.getResolvedPcbSx?.(),
+      pcbStyle: this._parsedProps?.pcbStyle,
+      ownPcbSx: this._parsedProps?.pcbSx
+    });
+  }
   get lowercaseComponentName() {
     return this.componentName.toLowerCase();
   }
@@ -3326,10 +3374,86 @@ function normalizeTextForCircuitJson(text) {
   return text.replace(/\\n/g, "\n");
 }
 
+// lib/utils/pcbSx/resolve-pcb-property.ts
+function parseSegment(seg) {
+  const bracketIdx = seg.indexOf("[");
+  if (bracketIdx === -1) return { tag: seg };
+  const tag = seg.slice(0, bracketIdx);
+  const attrPart = seg.slice(bracketIdx + 1, seg.lastIndexOf("]"));
+  const m = attrPart.match(/^(\w+)(\^=|\$=|=)['"]?(.*?)['"]?$/);
+  if (!m) return { tag };
+  return { tag, attrName: m[1], attrOp: m[2], attrValue: m[3] };
+}
+function componentMatchesSegment(component, seg) {
+  if (component.lowercaseComponentName !== seg.tag) return false;
+  if (!seg.attrName) return true;
+  const attrVal = component.props?.[seg.attrName];
+  if (attrVal === void 0) return false;
+  const valStr = String(attrVal);
+  switch (seg.attrOp) {
+    case "^=":
+      return valStr.startsWith(seg.attrValue);
+    case "$=":
+      return valStr.endsWith(seg.attrValue);
+    case "=":
+      return valStr === seg.attrValue;
+    default:
+      return false;
+  }
+}
+function matchesCompoundSelector(component, segments) {
+  if (!componentMatchesSegment(component, segments[segments.length - 1])) {
+    return false;
+  }
+  let segIdx = segments.length - 2;
+  let current = component.parent;
+  while (segIdx >= 0 && current) {
+    if (componentMatchesSegment(current, segments[segIdx])) {
+      segIdx--;
+    }
+    current = current.parent;
+  }
+  return segIdx < 0;
+}
+function resolvePcbProperty({
+  propertyName,
+  resolvedPcbSx,
+  pathFromAmpersand,
+  component
+}) {
+  if (!resolvedPcbSx) return void 0;
+  let result;
+  let bestSpecificity = 0;
+  for (const [key, entry] of Object.entries(resolvedPcbSx)) {
+    if (!entry || !(propertyName in entry)) continue;
+    const selectorBody = key.startsWith("& ") ? key.slice(2) : key;
+    if (selectorBody === pathFromAmpersand) {
+      const specificity = 1;
+      if (specificity > bestSpecificity) {
+        bestSpecificity = specificity;
+        result = entry[propertyName];
+      }
+      continue;
+    }
+    if (!component) continue;
+    const segments = selectorBody.split(/\s+/).map(parseSegment);
+    if (segments.length < 2) continue;
+    if (matchesCompoundSelector(component, segments)) {
+      const specificity = segments.length;
+      if (specificity > bestSpecificity) {
+        bestSpecificity = specificity;
+        result = entry[propertyName];
+      }
+    }
+  }
+  return result;
+}
+
 // lib/components/primitive-components/SilkscreenText.ts
 var SilkscreenText = class extends PrimitiveComponent2 {
   pcb_silkscreen_text_ids = [];
   isPcbPrimitive = true;
+  _footprinterFontSize;
   get config() {
     return {
       componentName: "SilkscreenText",
@@ -3358,7 +3482,13 @@ var SilkscreenText = class extends PrimitiveComponent2 {
     const uniqueLayers = new Set(props.layers);
     if (props.layer) uniqueLayers.add(props.layer);
     const targetLayers = uniqueLayers.size > 0 ? Array.from(uniqueLayers) : ["top"];
-    const fontSize = props.fontSize ?? this.getInheritedProperty("pcbStyle")?.silkscreenFontSize ?? 1;
+    const resolvedPcbSxFontSize = resolvePcbProperty({
+      propertyName: "fontSize",
+      resolvedPcbSx: this.getResolvedPcbSx(),
+      pathFromAmpersand: "silkscreentext",
+      component: this
+    });
+    const fontSize = props.fontSize ?? resolvedPcbSxFontSize ?? this.getInheritedProperty("pcbStyle")?.silkscreenFontSize ?? this._footprinterFontSize ?? 1;
     for (const layer of targetLayers) {
       const pcb_silkscreen_text = db.pcb_silkscreen_text.insert({
         anchor_alignment: props.anchorAlignment,
@@ -3382,7 +3512,13 @@ var SilkscreenText = class extends PrimitiveComponent2 {
   }
   getPcbSize() {
     const { _parsedProps: props } = this;
-    const fontSize = props.fontSize ?? this.getInheritedProperty("pcbStyle")?.silkscreenFontSize ?? 1;
+    const resolvedPcbSxFontSize = resolvePcbProperty({
+      propertyName: "fontSize",
+      resolvedPcbSx: this.getResolvedPcbSx(),
+      pathFromAmpersand: "silkscreentext",
+      component: this
+    });
+    const fontSize = props.fontSize ?? resolvedPcbSxFontSize ?? this.getInheritedProperty("pcbStyle")?.silkscreenFontSize ?? this._footprinterFontSize ?? 1;
     const text = props.text ?? "";
     const textWidth = text.length * fontSize;
     const textHeight = fontSize;
@@ -3600,15 +3736,16 @@ var createPinrowSilkscreenText = ({
   } else if (typeof pinLabels === "object") {
     label = String(pinLabels[pinNum] ?? pinNum);
   }
-  return new SilkscreenText({
+  const silkscreenText = new SilkscreenText({
     anchorAlignment: anchorAlignment || "center",
     text: label ?? pinNum,
     layer: layer || "top",
-    fontSize: elm.font_size + 0.2,
     pcbX: isNaN(elm.anchor_position.x) ? 0 : elm.anchor_position.x,
     pcbY: elm.anchor_position.y,
     pcbRotation: readableRotation ?? 0
   });
+  silkscreenText._footprinterFontSize = elm.font_size + 0.2;
+  return silkscreenText;
 };
 
 // lib/utils/createComponentsFromCircuitJson.ts
@@ -3853,16 +3990,15 @@ var createComponentsFromCircuitJson = ({
           })
         );
       } else {
-        components.push(
-          new SilkscreenText({
-            anchorAlignment: elm.anchor_alignment || "center",
-            text: componentName || elm.text,
-            fontSize: elm.font_size + 0.2,
-            pcbX: Number.isNaN(elm.anchor_position.x) ? 0 : elm.anchor_position.x,
-            pcbY: elm.anchor_position.y,
-            pcbRotation: ccwRotation ?? 0
-          })
-        );
+        const silkscreenText = new SilkscreenText({
+          anchorAlignment: elm.anchor_alignment || "center",
+          text: componentName || elm.text,
+          pcbX: Number.isNaN(elm.anchor_position.x) ? 0 : elm.anchor_position.x,
+          pcbY: elm.anchor_position.y,
+          pcbRotation: ccwRotation ?? 0
+        });
+        silkscreenText._footprinterFontSize = elm.font_size + 0.2;
+        components.push(silkscreenText);
       }
     } else if (elm.type === "pcb_trace") {
       components.push(
@@ -8484,12 +8620,9 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
       resolverFn = libMap;
     }
     if (!resolverFn) return;
-    const resolvedPcbStyle = component.getInheritedMergedProperty("pcbStyle");
     queueAsyncEffect("load-lib-footprint", async () => {
       try {
-        const result = await resolverFn(libRef.footprintName, {
-          resolvedPcbStyle
-        });
+        const result = await resolverFn(libRef.footprintName);
         let circuitJson = null;
         if (Array.isArray(result)) {
           circuitJson = result;
@@ -8507,7 +8640,9 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
           },
           circuitJson
         );
-        component.addAll(fpComponents);
+        const fpWrapper = new Footprint({ src: footprint });
+        for (const c of fpComponents) fpWrapper.add(c);
+        component.add(fpWrapper);
         if (!Array.isArray(result) && result.cadModel) {
           component._asyncFootprintCadModel = result.cadModel;
         }
@@ -16747,7 +16882,7 @@ var Board = class extends Group6 {
       );
     }
     let outlineTranslation = { x: 0, y: 0 };
-    if (outline && outline.length > 0 && this.parent?.lowercaseComponentName === "panel") {
+    if (outline && outline.length > 0 && (this.parent?.lowercaseComponentName === "panel" || this.parent?.lowercaseComponentName === "subpanel")) {
       const outlineBounds = getBoundsFromPoints4(outline);
       if (outlineBounds) {
         const outlineCenterX = (outlineBounds.minX + outlineBounds.maxX) / 2;
@@ -22093,7 +22228,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1013",
+  version: "0.0.1015",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -22137,7 +22272,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.464",
+    "@tscircuit/props": "^0.0.470",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1014",
+  "version": "0.0.1016",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -45,7 +45,7 @@
     "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.464",
+    "@tscircuit/props": "^0.0.470",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",