@tscircuit/core 0.0.789 → 0.0.790

package/dist/index.js

@@ -4387,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 });
@@ -4466,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)}`;
   }
 };
 
@@ -7071,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?.();
@@ -16696,7 +16705,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.788",
+  version: "0.0.789",
   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.789",
+  "version": "0.0.790",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",