@tscircuit/core 0.0.718 → 0.0.719

package/dist/index.js

@@ -11,6 +11,8 @@ __export(components_exports, {
   Board: () => Board,
   Breakout: () => Breakout,
   BreakoutPoint: () => BreakoutPoint,
+  CadAssembly: () => CadAssembly,
+  CadModel: () => CadModel,
   Capacitor: () => Capacitor,
   Chip: () => Chip,
   Constraint: () => Constraint3,
@@ -69,8 +71,8 @@ __export(components_exports, {
 import { fp } from "@tscircuit/footprinter";
 import {
   pcb_manual_edit_conflict_warning,
-  point3,
-  rotation,
+  point3 as point32,
+  rotation as rotation2,
   schematic_manual_edit_conflict_warning
 } from "circuit-json";
 import Debug4 from "debug";
@@ -699,10 +701,10 @@ var PrimitiveComponent2 = class extends Renderable {
    */
   computePcbPropsTransform() {
     const { _parsedProps: props } = this;
-    const rotation4 = this._getPcbRotationBeforeLayout() ?? 0;
+    const rotation5 = this._getPcbRotationBeforeLayout() ?? 0;
     const matrix = compose(
       translate(props.pcbX ?? 0, props.pcbY ?? 0),
-      rotate(rotation4 * Math.PI / 180)
+      rotate(rotation5 * Math.PI / 180)
     );
     return matrix;
   }
@@ -716,12 +718,12 @@ var PrimitiveComponent2 = class extends Renderable {
   _computePcbGlobalTransformBeforeLayout() {
     const manualPlacement = this.getSubcircuit()._getPcbManualPlacementForComponent(this);
     if (manualPlacement && this.props.pcbX === void 0 && this.props.pcbY === void 0) {
-      const rotation4 = this._getPcbRotationBeforeLayout() ?? 0;
+      const rotation5 = this._getPcbRotationBeforeLayout() ?? 0;
       return compose(
         this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(),
         compose(
           translate(manualPlacement.x, manualPlacement.y),
-          rotate(rotation4 * Math.PI / 180)
+          rotate(rotation5 * Math.PI / 180)
         )
       );
     }
@@ -3761,7 +3763,7 @@ import {
   isValidElement
 } from "react";
 import { symbols as symbols2 } from "schematic-symbols";
-import { z as z8 } from "zod";
+import { z as z9 } from "zod";
 
 // lib/components/primitive-components/Footprint.ts
 import { footprintProps } from "@tscircuit/props";
@@ -3973,6 +3975,101 @@ var Footprint = class extends PrimitiveComponent2 {
   }
 };
 
+// lib/components/primitive-components/CadModel.ts
+import { cadmodelProps, point3 } from "@tscircuit/props";
+import { z as z7 } from "zod";
+var rotation = z7.union([z7.number(), z7.string()]);
+var rotation3 = z7.object({ x: rotation, y: rotation, z: rotation });
+var CadModel = class extends PrimitiveComponent2 {
+  get config() {
+    return {
+      componentName: "CadModel",
+      zodProps: cadmodelProps
+    };
+  }
+  doInitialCadModelRender() {
+    const parent = this._findParentWithPcbComponent();
+    if (!parent) return;
+    if (!parent.pcb_component_id) return;
+    const { db } = this.root;
+    const { boardThickness = 0 } = this.root?._getBoard() ?? {};
+    const bounds = parent._getPcbCircuitJsonBounds();
+    const pcb_component = db.pcb_component.get(parent.pcb_component_id);
+    const props = this._parsedProps;
+    if (!props || typeof props.modelUrl !== "string") return;
+    const rotationOffset = rotation3.parse({ x: 0, y: 0, z: 0 });
+    if (typeof props.rotationOffset === "number") {
+      rotationOffset.z = Number(props.rotationOffset);
+    } else if (typeof props.rotationOffset === "object") {
+      const parsed = rotation3.parse(props.rotationOffset);
+      rotationOffset.x = Number(parsed.x);
+      rotationOffset.y = Number(parsed.y);
+      rotationOffset.z = Number(parsed.z);
+    }
+    const positionOffset = point3.parse({
+      x: props.pcbX ?? 0,
+      y: props.pcbY ?? 0,
+      z: props.pcbZ ?? 0,
+      ...typeof props.positionOffset === "object" ? props.positionOffset : {}
+    });
+    const layer = parent.props.layer === "bottom" ? "bottom" : "top";
+    const ext = new URL(props.modelUrl).pathname.split(".").pop()?.toLowerCase();
+    const urlProps = {};
+    if (ext === "stl")
+      urlProps.model_stl_url = this._addCachebustToModelUrl(props.modelUrl);
+    else if (ext === "obj")
+      urlProps.model_obj_url = this._addCachebustToModelUrl(props.modelUrl);
+    else if (ext === "gltf")
+      urlProps.model_gltf_url = this._addCachebustToModelUrl(props.modelUrl);
+    else if (ext === "glb")
+      urlProps.model_glb_url = this._addCachebustToModelUrl(props.modelUrl);
+    else if (ext === "step" || ext === "stp")
+      urlProps.model_step_url = this._addCachebustToModelUrl(props.modelUrl);
+    else if (ext === "wrl" || ext === "vrml")
+      urlProps.model_wrl_url = this._addCachebustToModelUrl(props.modelUrl);
+    else urlProps.model_stl_url = this._addCachebustToModelUrl(props.modelUrl);
+    const cad = db.cad_component.insert({
+      position: {
+        x: bounds.center.x + Number(positionOffset.x),
+        y: bounds.center.y + Number(positionOffset.y),
+        z: (layer === "bottom" ? -boardThickness / 2 : boardThickness / 2) + Number(positionOffset.z)
+      },
+      rotation: {
+        x: Number(rotationOffset.x),
+        y: (layer === "top" ? 0 : 180) + Number(rotationOffset.y),
+        z: layer === "bottom" ? -((pcb_component?.rotation ?? 0) + Number(rotationOffset.z)) + 180 : (pcb_component?.rotation ?? 0) + Number(rotationOffset.z)
+      },
+      pcb_component_id: parent.pcb_component_id,
+      source_component_id: parent.source_component_id,
+      model_unit_to_mm_scale_factor: typeof props.modelUnitToMmScale === "number" ? props.modelUnitToMmScale : void 0,
+      ...urlProps
+    });
+    this.cad_component_id = cad.cad_component_id;
+  }
+  _findParentWithPcbComponent() {
+    let p = this.parent;
+    while (p && !p.pcb_component_id) p = p.parent;
+    return p;
+  }
+  _addCachebustToModelUrl(url) {
+    if (!url || !url.includes("modelcdn.tscircuit.com")) return url;
+    const origin = this.root?.getClientOrigin() ?? "";
+    return `${url}${url.includes("?") ? "&" : "?"}cachebust_origin=${encodeURIComponent(origin)}`;
+  }
+};
+
+// lib/components/primitive-components/CadAssembly.ts
+import { cadassemblyProps } from "@tscircuit/props";
+var CadAssembly = class extends PrimitiveComponent2 {
+  isPrimitiveContainer = true;
+  get config() {
+    return {
+      componentName: "CadAssembly",
+      zodProps: cadassemblyProps
+    };
+  }
+};
+
 // lib/utils/schematic/getNumericSchPinStyle.ts
 var getNumericSchPinStyle = (pinStyles, pinLabels) => {
   if (!pinStyles) return void 0;
@@ -4388,12 +4485,12 @@ var getObstaclesFromRoute = (route, source_trace_id, { viaDiameter = 0.5 } = {})
 
 // lib/utils/obstacles/generateApproximatingRects.ts
 function generateApproximatingRects(rotatedRect, numRects = 4) {
-  const { center, width, height, rotation: rotation4 } = rotatedRect;
+  const { center, width, height, rotation: rotation5 } = rotatedRect;
   const rects = [];
-  const angleRad = rotation4 * Math.PI / 180;
+  const angleRad = rotation5 * Math.PI / 180;
   const cosAngle = Math.cos(angleRad);
   const sinAngle = Math.sin(angleRad);
-  const normalizedRotation = (rotation4 % 360 + 360) % 360;
+  const normalizedRotation = (rotation5 % 360 + 360) % 360;
   const sliceAlongWidth = height <= width ? normalizedRotation >= 45 && normalizedRotation < 135 || normalizedRotation >= 225 && normalizedRotation < 315 : normalizedRotation >= 135 && normalizedRotation < 225 || normalizedRotation >= 315 || normalizedRotation < 45;
   if (sliceAlongWidth) {
     const sliceWidth = width / numRects;
@@ -6705,13 +6802,6 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
     });
     return;
   }
-  if (isReactElement(footprint)) {
-    if (component.reactSubtrees.some((rs) => rs.element === footprint)) return;
-    const subtree = component._renderReactSubtree(footprint);
-    component.reactSubtrees.push(subtree);
-    component.add(subtree.component);
-    return;
-  }
   if (!isReactElement(footprint) && footprint.componentName === "Footprint") {
     component.add(footprint);
   }
@@ -6719,10 +6809,10 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
 
 // lib/components/base-components/NormalComponent/NormalComponent.ts
 var debug3 = Debug4("tscircuit:core");
-var rotation3 = z8.object({
-  x: rotation,
-  y: rotation,
-  z: rotation
+var rotation32 = z9.object({
+  x: rotation2,
+  y: rotation2,
+  z: rotation2
 });
 var NormalComponent2 = class extends PrimitiveComponent2 {
   reactSubtrees = [];
@@ -6737,6 +6827,7 @@ var NormalComponent2 = class extends PrimitiveComponent2 {
   };
   _asyncSupplierPartNumbers;
   _asyncFootprintCadModel;
+  _isCadModelChild;
   pcb_missing_footprint_error_id;
   _hasStartedFootprintUrlLoad = false;
   _invalidPinLabelMessages = [];
@@ -7250,15 +7341,38 @@ var NormalComponent2 = class extends PrimitiveComponent2 {
     this.doInitialPcbComponentSizeCalculation();
   }
   _renderReactSubtree(element) {
+    const component = createInstanceFromReactElement(element);
     return {
       element,
-      component: createInstanceFromReactElement(element)
+      component
     };
   }
   doInitialInitializePortsFromChildren() {
     this.initPorts();
   }
   doInitialReactSubtreesRender() {
+    const fpElm = this.props.footprint;
+    if (isValidElement(fpElm)) {
+      const hasFootprintChild = this.children.some(
+        (c) => c.componentName === "Footprint"
+      );
+      if (!hasFootprintChild) {
+        this.add(fpElm);
+      }
+    }
+    const cmElm = this.props.cadModel;
+    if (isValidElement(cmElm)) {
+      this._isCadModelChild = true;
+      const hasCadAssemblyChild = this.children.some(
+        (c) => c.componentName === "CadAssembly"
+      );
+      const hasCadModelChild = this.children.some(
+        (c) => c.componentName === "CadModel"
+      );
+      if (!hasCadAssemblyChild && !hasCadModelChild) {
+        this.add(cmElm);
+      }
+    }
   }
   doInitialPcbFootprintStringRender() {
     NormalComponent_doInitialPcbFootprintStringRender(
@@ -7470,6 +7584,7 @@ var NormalComponent2 = class extends PrimitiveComponent2 {
     return dimensions;
   }
   doInitialCadModelRender() {
+    if (this._isCadModelChild) return;
     const { db } = this.root;
     const { boardThickness = 0 } = this.root?._getBoard() ?? {};
     const cadModelProp = this._parsedProps.cadModel;
@@ -7483,13 +7598,13 @@ var NormalComponent2 = class extends PrimitiveComponent2 {
     if (typeof cadModel === "string") {
       throw new Error("String cadModel not yet implemented");
     }
-    const rotationOffset = rotation3.parse({
+    const rotationOffset = rotation32.parse({
       x: 0,
       y: 0,
       z: typeof cadModel?.rotationOffset === "number" ? cadModel.rotationOffset : 0,
       ...typeof cadModel?.rotationOffset === "object" ? cadModel.rotationOffset ?? {} : {}
     });
-    const positionOffset = point3.parse({
+    const positionOffset = point32.parse({
       x: 0,
       y: 0,
       z: 0,
@@ -12939,18 +13054,18 @@ var PowerSource = class extends NormalComponent2 {
 };
 
 // lib/components/normal-components/VoltageSource.ts
-import { frequency, rotation as rotation2, voltage } from "circuit-json";
+import { frequency, rotation as rotation4, voltage } from "circuit-json";
 import {
   commonComponentProps
 } from "@tscircuit/props";
-import { z as z12 } from "zod";
+import { z as z13 } from "zod";
 var voltageSourceProps = commonComponentProps.extend({
   voltage: voltage.optional(),
   frequency: frequency.optional(),
   peakToPeakVoltage: voltage.optional(),
-  waveShape: z12.enum(["sinewave", "square", "triangle", "sawtooth"]).optional(),
-  phase: rotation2.optional(),
-  dutyCycle: z12.number().optional()
+  waveShape: z13.enum(["sinewave", "square", "triangle", "sawtooth"]).optional(),
+  phase: rotation4.optional(),
+  dutyCycle: z13.number().optional()
 });
 var VoltageSource = class extends NormalComponent2 {
   get config() {
@@ -14794,7 +14909,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.717",
+  version: "0.0.718",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -14833,11 +14948,11 @@ var package_default = {
     "@tscircuit/matchpack": "^0.0.16",
     "@tscircuit/math-utils": "^0.0.21",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "0.0.315",
+    "@tscircuit/props": "0.0.319",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.36",
-    "@tscircuit/simple-3d-svg": "^0.0.38",
+    "@tscircuit/simple-3d-svg": "^0.0.41",
     "@types/bun": "^1.2.16",
     "@types/debug": "^4.1.12",
     "@types/react": "^19.1.8",
@@ -14850,7 +14965,7 @@ var package_default = {
     "circuit-json": "^0.0.250",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
-    "circuit-json-to-simple-3d": "^0.0.6",
+    "circuit-json-to-simple-3d": "^0.0.8",
     "circuit-to-svg": "^0.0.189",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",
@@ -15301,6 +15416,8 @@ export {
   Board,
   Breakout,
   BreakoutPoint,
+  CadAssembly,
+  CadModel,
   Capacitor,
   Chip,
   Circuit,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.718",
+  "version": "0.0.719",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -40,11 +40,11 @@
     "@tscircuit/matchpack": "^0.0.16",
     "@tscircuit/math-utils": "^0.0.21",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "0.0.315",
+    "@tscircuit/props": "0.0.319",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.36",
-    "@tscircuit/simple-3d-svg": "^0.0.38",
+    "@tscircuit/simple-3d-svg": "^0.0.41",
     "@types/bun": "^1.2.16",
     "@types/debug": "^4.1.12",
     "@types/react": "^19.1.8",
@@ -57,7 +57,7 @@
     "circuit-json": "^0.0.250",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
-    "circuit-json-to-simple-3d": "^0.0.6",
+    "circuit-json-to-simple-3d": "^0.0.8",
     "circuit-to-svg": "^0.0.189",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",