@tscircuit/core 0.0.788 → 0.0.790

package/dist/index.js

@@ -84,6 +84,7 @@ __export(components_exports, {
 // lib/components/base-components/NormalComponent/NormalComponent.ts
 import { fp } from "@tscircuit/footprinter";
 import {
+  distance as distance4,
   pcb_manual_edit_conflict_warning,
   point3 as point32,
   rotation as rotation2,
@@ -4372,6 +4373,7 @@ var Footprint = class extends PrimitiveComponent2 {
 // lib/components/primitive-components/CadModel.ts
 import { cadmodelProps, point3 } from "@tscircuit/props";
 import { z as z7 } from "zod";
+import { distance } from "circuit-json";
 import { decomposeTSR as decomposeTSR4 } from "transformation-matrix";
 
 // lib/components/base-components/NormalComponent/utils/getFileExtension.ts
@@ -4385,6 +4387,30 @@ var getFileExtension = (filename) => {
   return extension?.toLowerCase() ?? null;
 };
 
+// lib/utils/constructAssetUrl.ts
+var joinUrlPath = (base, path) => {
+  const trimmedBase = base.replace(/\/+$/, "");
+  const trimmedPath = path.replace(/^\/+/, "");
+  return `${trimmedBase}/${trimmedPath}`;
+};
+var constructAssetUrl = (targetUrl, baseUrl) => {
+  if (!baseUrl) {
+    return targetUrl;
+  }
+  if (!targetUrl.startsWith("/")) {
+    return targetUrl;
+  }
+  try {
+    const baseUrlObj = new URL(baseUrl);
+    if (baseUrlObj.pathname !== "/" && targetUrl.startsWith(baseUrlObj.pathname)) {
+      return new URL(targetUrl, baseUrlObj.origin).toString();
+    }
+    return joinUrlPath(baseUrl, targetUrl);
+  } catch (error) {
+    return targetUrl;
+  }
+};
+
 // lib/components/primitive-components/CadModel.ts
 var rotation = z7.union([z7.number(), z7.string()]);
 var rotation3 = z7.object({ x: rotation, y: rotation, z: rotation });
@@ -4423,6 +4449,7 @@ var CadModel = class extends PrimitiveComponent2 {
       z: props.pcbZ ?? 0,
       ...typeof props.positionOffset === "object" ? props.positionOffset : {}
     });
+    const zOffsetFromSurface = props.zOffsetFromSurface !== void 0 ? distance.parse(props.zOffsetFromSurface) : 0;
     const layer = parent.props.layer === "bottom" ? "bottom" : "top";
     const ext = getFileExtension(props.modelUrl);
     const urlProps = {};
@@ -4443,7 +4470,7 @@ var CadModel = class extends PrimitiveComponent2 {
       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)
+        z: (layer === "bottom" ? -boardThickness / 2 : boardThickness / 2) + (layer === "bottom" ? -zOffsetFromSurface : zOffsetFromSurface) + Number(positionOffset.z)
       },
       rotation: {
         x: Number(rotationOffset.x),
@@ -4463,9 +4490,13 @@ var CadModel = class extends PrimitiveComponent2 {
     return p;
   }
   _addCachebustToModelUrl(url) {
-    if (!url || !url.includes("modelcdn.tscircuit.com")) return url;
+    if (!url) return url;
+    const baseUrl = this.root?.platform?.projectBaseUrl;
+    const transformedUrl = constructAssetUrl(url, baseUrl);
+    if (!transformedUrl.includes("modelcdn.tscircuit.com"))
+      return transformedUrl;
     const origin = this.root?.getClientOrigin() ?? "";
-    return `${url}${url.includes("?") ? "&" : "?"}cachebust_origin=${encodeURIComponent(origin)}`;
+    return `${transformedUrl}${transformedUrl.includes("?") ? "&" : "?"}cachebust_origin=${encodeURIComponent(origin)}`;
   }
 };
 
@@ -4727,7 +4758,7 @@ var getEnteringEdgeFromDirection = (direction) => {
 };
 
 // lib/utils/schematic/getStubEdges.ts
-import { distance } from "@tscircuit/math-utils";
+import { distance as distance2 } from "@tscircuit/math-utils";
 var getStubEdges = ({
   firstEdge,
   firstEdgePort,
@@ -4774,7 +4805,7 @@ var getStubEdges = ({
       });
     }
   }
-  edges = edges.filter((e) => distance(e.from, e.to) > 0.01);
+  edges = edges.filter((e) => distance2(e.from, e.to) > 0.01);
   return edges;
 };
 
@@ -5277,7 +5308,7 @@ import { calculateElbow } from "calculate-elbow";
 import { doesLineIntersectLine as doesLineIntersectLine3 } from "@tscircuit/math-utils";
 
 // lib/components/primitive-components/Trace/trace-utils/create-schematic-trace-crossing-segments.ts
-import { distance as distance2, doesLineIntersectLine } from "@tscircuit/math-utils";
+import { distance as distance3, doesLineIntersectLine } from "@tscircuit/math-utils";
 
 // lib/components/primitive-components/Trace/trace-utils/get-other-schematic-traces.ts
 var getOtherSchematicTraces = ({
@@ -5344,7 +5375,7 @@ var createSchematicTraceCrossingSegments = ({
         otherEdgesIntersections.push({
           otherEdge,
           crossingPoint: crossingPoint2,
-          distanceFromEdgeFrom: distance2(edge.from, crossingPoint2)
+          distanceFromEdgeFrom: distance3(edge.from, crossingPoint2)
         });
       }
     }
@@ -5369,7 +5400,7 @@ var createSchematicTraceCrossingSegments = ({
       x: crossingPoint.x + crossingUnitVec.x * crossingSegmentLength / 2,
       y: crossingPoint.y + crossingUnitVec.y * crossingSegmentLength / 2
     };
-    const overshot = distance2(afterCrossing, edge.to) < crossingSegmentLength;
+    const overshot = distance3(afterCrossing, edge.to) < crossingSegmentLength;
     const newEdges = [
       { from: edge.from, to: beforeCrossing },
       { from: beforeCrossing, to: afterCrossing, is_crossing: true },
@@ -7068,25 +7099,6 @@ import {
   circuit_json_footprint_load_error,
   external_footprint_load_error
 } from "circuit-json";
-
-// lib/utils/constructAssetUrl.ts
-var constructAssetUrl = (targetUrl, baseUrl) => {
-  if (!baseUrl) {
-    return targetUrl;
-  }
-  if (!targetUrl.startsWith("/")) {
-    return targetUrl;
-  }
-  try {
-    const base = new URL(baseUrl);
-    const resolved = new URL(targetUrl, base.origin);
-    return resolved.toString();
-  } catch (error) {
-    return targetUrl;
-  }
-};
-
-// lib/components/base-components/NormalComponent/NormalComponent_doInitialPcbFootprintStringRender.ts
 function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsyncEffect) {
   let { footprint } = component.props;
   footprint ??= component._getImpliedFootprintString?.();
@@ -8272,6 +8284,9 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       z: 0,
       ...typeof cadModel?.positionOffset === "object" ? cadModel.positionOffset : {}
     });
+    const zOffsetFromSurface = cadModel && typeof cadModel === "object" && "zOffsetFromSurface" in cadModel ? cadModel.zOffsetFromSurface !== void 0 ? distance4.parse(
+      cadModel.zOffsetFromSurface
+    ) : 0 : 0;
     const computedLayer = this.props.layer === "bottom" ? "bottom" : "top";
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
     const decomposedTransform = decomposeTSR5(globalTransform);
@@ -8281,7 +8296,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       position: {
         x: bounds.center.x + positionOffset.x,
         y: bounds.center.y + positionOffset.y,
-        z: (computedLayer === "bottom" ? -boardThickness / 2 : boardThickness / 2) + positionOffset.z
+        z: (computedLayer === "bottom" ? -boardThickness / 2 : boardThickness / 2) + (computedLayer === "bottom" ? -zOffsetFromSurface : zOffsetFromSurface) + positionOffset.z
       },
       rotation: {
         x: rotationOffset.x,
@@ -13077,7 +13092,7 @@ var Board = class extends Group6 {
   }
   get boardThickness() {
     const { _parsedProps: props } = this;
-    return 1.4;
+    return props.thickness ?? 1.4;
   }
   /**
    * Get all available layers for the board
@@ -16690,7 +16705,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.787",
+  version: "0.0.789",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -16730,7 +16745,7 @@ var package_default = {
     "@tscircuit/matchpack": "^0.0.16",
     "@tscircuit/math-utils": "^0.0.21",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "0.0.361",
+    "@tscircuit/props": "0.0.363",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.41",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.788",
+  "version": "0.0.790",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -41,7 +41,7 @@
     "@tscircuit/matchpack": "^0.0.16",
     "@tscircuit/math-utils": "^0.0.21",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "0.0.361",
+    "@tscircuit/props": "0.0.363",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.41",