@tscircuit/core 0.0.2017 → 0.0.2019

package/dist/index.js

@@ -64561,7 +64561,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.2016",
+  version: "0.0.2018",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -64616,7 +64616,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
-    "@tscircuit/props": "^0.0.670",
+    "@tscircuit/props": "^0.0.672",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.212",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -64634,7 +64634,7 @@ var package_default = {
     "chokidar-cli": "^3.0.0",
     "circuit-json": "^0.0.507",
     "circuit-json-to-bpc": "^0.0.13",
-    "circuit-json-to-connectivity-map": "^0.0.30",
+    "circuit-json-to-connectivity-map": "^0.0.32",
     "circuit-json-to-gltf": "^0.0.133",
     "circuit-json-to-spice": "^0.0.45",
     "circuit-to-svg": "^0.0.433",
@@ -64695,7 +64695,7 @@ var package_default = {
   },
   overrides: {
     "@tscircuit/circuit-json-util": "^0.0.116",
-    "@tscircuit/props": "^0.0.670",
+    "@tscircuit/props": "^0.0.672",
     "circuit-json": "^0.0.507"
   }
 };
@@ -76550,6 +76550,22 @@ var CopperPour = class extends PrimitiveComponent2 {
 // lib/components/primitive-components/AssemblyDevice.ts
 import { assemblyDeviceProps } from "@tscircuit/props";
 import { identity as identity10 } from "transformation-matrix";
+
+// lib/components/primitive-components/resolve-assembly-model.ts
+var resolveAssemblyModel = (props) => {
+  if (props.model !== void 0) {
+    if (/^https?:\/\//i.test(props.model))
+      return resolveAssemblyModelUrl(props.model);
+    return {
+      glbUrl: `https://modelcdn.tscircuit.com/jscad_models/${encodeURIComponent(props.model)}.glb`
+    };
+  }
+  if (props.modelUrl !== void 0)
+    return resolveAssemblyModelUrl(props.modelUrl);
+  return void 0;
+};
+
+// lib/components/primitive-components/AssemblyDevice.ts
 var AssemblyDevice = class extends PrimitiveComponent2 {
   isAssemblyDeviceContainer = true;
   get config() {
@@ -76567,20 +76583,22 @@ var AssemblyDevice = class extends PrimitiveComponent2 {
     return identity10();
   }
   doInitialSourceRender() {
-    if (this._parsedProps.modelUrl === void 0 || !this.root) return;
+    if (this._parsedProps.modelUrl === void 0 && this._parsedProps.model === void 0 || !this.root)
+      return;
     this.source_component_id = this.root.db.source_component.insert({
       ftype: "simple_chip",
       name: this.name
     }).source_component_id;
   }
   doInitialCadModelRender() {
-    if (!this.root || this.root.pcbDisabled || !this.source_component_id || this._parsedProps.modelUrl === void 0)
+    const model = resolveAssemblyModel(this._parsedProps);
+    if (!this.root || this.root.pcbDisabled || !this.source_component_id || !model)
       return;
-    this.cad_component_id = renderAssemblyCadModel(
-      this,
-      resolveAssemblyModelUrl(this._parsedProps.modelUrl),
-      { position: { x: 0, y: 0, z: 0 }, pcbRotation: 0, layer: "top" }
-    );
+    this.cad_component_id = renderAssemblyCadModel(this, model, {
+      position: { x: 0, y: 0, z: 0 },
+      pcbRotation: 0,
+      layer: "top"
+    });
   }
 };
 
@@ -76604,7 +76622,7 @@ var AssemblyScreen_doInitialCadModelRender = (component) => {
   const placement = resolveAssemblyPlacement(component);
   component.cad_component_id = renderAssemblyCadModel(
     component,
-    component._parsedProps.modelUrl !== void 0 ? resolveAssemblyModelUrl(component._parsedProps.modelUrl) : component._parsedProps.cadModel ?? getDefaultFlexScreenModel(component),
+    resolveAssemblyModel(component._parsedProps) ?? component._parsedProps.cadModel ?? getDefaultFlexScreenModel(component),
     placement
   );
 };
@@ -76663,7 +76681,7 @@ var AssemblySubassembly = class extends PrimitiveComponent2 {
   doInitialCadModelRender() {
     if (!this.root || this.root.pcbDisabled || !this.source_component_id) return;
     const placement = resolveAssemblyPlacement(this);
-    const model = this._parsedProps.modelUrl !== void 0 ? resolveAssemblyModelUrl(this._parsedProps.modelUrl) : this._parsedProps.cadModel;
+    const model = resolveAssemblyModel(this._parsedProps) ?? this._parsedProps.cadModel;
     if (model && !(typeof model === "object" && "type" in model)) {
       this.cad_component_id = renderAssemblyCadModel(this, model, placement);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.2017",
+  "version": "0.0.2019",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -56,7 +56,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
-    "@tscircuit/props": "^0.0.670",
+    "@tscircuit/props": "^0.0.672",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.212",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -74,7 +74,7 @@
     "chokidar-cli": "^3.0.0",
     "circuit-json": "^0.0.507",
     "circuit-json-to-bpc": "^0.0.13",
-    "circuit-json-to-connectivity-map": "^0.0.30",
+    "circuit-json-to-connectivity-map": "^0.0.32",
     "circuit-json-to-gltf": "^0.0.133",
     "circuit-json-to-spice": "^0.0.45",
     "circuit-to-svg": "^0.0.433",
@@ -135,7 +135,7 @@
   },
   "overrides": {
     "@tscircuit/circuit-json-util": "^0.0.116",
-    "@tscircuit/props": "^0.0.670",
+    "@tscircuit/props": "^0.0.672",
     "circuit-json": "^0.0.507"
   }
 }