circuit-json-to-tscircuit 0.0.87 → 0.0.89

package/dist/{chunk-DZP2ZWBQ.js → chunk-GVGY3ZZN.js}

@@ -140,6 +140,222 @@ var getRuntimeNetNamesBySourcePortId = ({
   return result;
 };
 
+// lib/generate-board-cad-models-tsx/format-point-prop.ts
+function formatPointProp(point) {
+  return `{ x: ${point.x}, y: ${point.y}, z: ${point.z} }`;
+}
+
+// lib/generate-board-cad-models-tsx/get-cad-model-origin-position.ts
+function getCadModelOriginPosition(cadComponent) {
+  if (cadComponent.model_origin_position !== void 0) {
+    return cadComponent.model_origin_position;
+  }
+  if (cadComponent.model_origin_alignment === "unknown") {
+    return { x: 0, y: 0, z: 0 };
+  }
+  return void 0;
+}
+
+// lib/generate-board-cad-models-tsx/get-cad-model-placement.ts
+function getCadModelPlacement({
+  cadComponent,
+  parentPlacement,
+  pcbBoard
+}) {
+  const cadModelCcwRotationDegrees = cadComponent.rotation ?? {
+    x: 0,
+    y: 0,
+    z: 0
+  };
+  const boardSurfaceZ = pcbBoard.thickness / 2;
+  let positionOffsetZ = cadComponent.position.z - boardSurfaceZ;
+  let ccwRotationOffsetDegrees = {
+    x: cadModelCcwRotationDegrees.x,
+    y: cadModelCcwRotationDegrees.y,
+    z: cadModelCcwRotationDegrees.z - parentPlacement.ccwRotationDegrees
+  };
+  if (parentPlacement.layer === "bottom") {
+    positionOffsetZ = cadComponent.position.z + boardSurfaceZ;
+    ccwRotationOffsetDegrees = {
+      x: cadModelCcwRotationDegrees.x,
+      y: cadModelCcwRotationDegrees.y - 180,
+      z: cadModelCcwRotationDegrees.z + parentPlacement.ccwRotationDegrees
+    };
+  }
+  return {
+    positionOffset: {
+      x: cadComponent.position.x - parentPlacement.center.x,
+      y: cadComponent.position.y - parentPlacement.center.y,
+      z: positionOffsetZ
+    },
+    ccwRotationOffsetDegrees
+  };
+}
+
+// lib/generate-board-cad-models-tsx/get-cad-model-url.ts
+function getCadModelUrl(cadComponent) {
+  if (cadComponent.model_glb_url) {
+    return { format: "glb", url: cadComponent.model_glb_url };
+  }
+  if (cadComponent.model_gltf_url) {
+    return { format: "gltf", url: cadComponent.model_gltf_url };
+  }
+  if (cadComponent.model_obj_url) {
+    return { format: "obj", url: cadComponent.model_obj_url };
+  }
+  if (cadComponent.model_step_url) {
+    return { format: "step", url: cadComponent.model_step_url };
+  }
+  if (cadComponent.model_stl_url) {
+    return { format: "stl", url: cadComponent.model_stl_url };
+  }
+  if (cadComponent.model_wrl_url) {
+    return { format: "wrl", url: cadComponent.model_wrl_url };
+  }
+  return void 0;
+}
+
+// lib/generate-board-cad-models-tsx/get-model-url-with-format-hint.ts
+function getModelUrlWithFormatHint({
+  format,
+  url
+}) {
+  const pathWithoutQuery = url.split(/[?#]/u)[0] ?? "";
+  if (pathWithoutQuery.toLowerCase().endsWith(`.${format}`)) return url;
+  return `${url}#ext=${format}`;
+}
+
+// lib/generate-board-cad-models-tsx/generate-cad-model-tsx.ts
+function generateCadModelTsx({
+  cadComponent,
+  parentPlacement,
+  pcbBoard
+}) {
+  const modelUrl = getCadModelUrl(cadComponent);
+  if (!modelUrl) return void 0;
+  const placement = getCadModelPlacement({
+    cadComponent,
+    parentPlacement,
+    pcbBoard
+  });
+  const attributes = [
+    `modelUrl={${JSON.stringify(getModelUrlWithFormatHint(modelUrl))}}`,
+    `positionOffset={${formatPointProp(placement.positionOffset)}}`,
+    `rotationOffset={${formatPointProp(placement.ccwRotationOffsetDegrees)}}`
+  ];
+  if (cadComponent.model_unit_to_mm_scale_factor !== void 0) {
+    attributes.push(
+      `modelUnitToMmScale={${cadComponent.model_unit_to_mm_scale_factor}}`
+    );
+  }
+  if (cadComponent.model_board_normal_direction !== void 0) {
+    attributes.push(
+      `modelBoardNormalDirection={${JSON.stringify(cadComponent.model_board_normal_direction)}}`
+    );
+  }
+  const modelOriginPosition = getCadModelOriginPosition(cadComponent);
+  if (modelOriginPosition !== void 0) {
+    attributes.push(
+      `modelOriginPosition={${formatPointProp(modelOriginPosition)}}`
+    );
+  }
+  if (cadComponent.size !== void 0) {
+    attributes.push(`size={${formatPointProp(cadComponent.size)}}`);
+  }
+  if (cadComponent.show_as_translucent_model === true) {
+    attributes.push("showAsTranslucentModel");
+  }
+  return `<cadmodel ${attributes.join(" ")} />`;
+}
+
+// lib/generate-board-cad-models-tsx/generate-cad-model-group-tsx.ts
+function generateCadModelGroupTsx({
+  cadModelGroup,
+  groupIndex,
+  pcbBoard
+}) {
+  const { cadComponents, parentPlacement } = cadModelGroup;
+  const modelElements = cadComponents.flatMap((cadComponent) => {
+    const modelElement = generateCadModelTsx({
+      cadComponent,
+      parentPlacement,
+      pcbBoard
+    });
+    return modelElement ? [modelElement] : [];
+  });
+  if (modelElements.length === 0) return void 0;
+  let cadModelTsx = modelElements[0];
+  if (modelElements.length > 1) {
+    cadModelTsx = `<cadassembly>${modelElements.join("\n")}</cadassembly>`;
+  }
+  if (!cadModelTsx) return void 0;
+  const attributes = [
+    `name={${JSON.stringify(`ImportedCadModel${groupIndex + 1}`)}}`,
+    `pcbX={${parentPlacement.center.x}}`,
+    `pcbY={${parentPlacement.center.y}}`,
+    `pcbRotation="${parentPlacement.ccwRotationDegrees}deg"`,
+    `layer="${parentPlacement.layer}"`,
+    "noSchematicRepresentation",
+    "obstructsWithinBounds={false}",
+    "footprint={<footprint />}",
+    `cadModel={${cadModelTsx}}`
+  ];
+  return `<chip ${attributes.join(" ")} />`;
+}
+
+// lib/generate-board-cad-models-tsx/get-cad-model-groups.ts
+function getCadModelGroups(circuitJson) {
+  const pcbComponentById = /* @__PURE__ */ new Map();
+  for (const element of circuitJson) {
+    if (element.type === "pcb_component") {
+      pcbComponentById.set(element.pcb_component_id, element);
+    }
+  }
+  const cadModelGroupByKey = /* @__PURE__ */ new Map();
+  for (const element of circuitJson) {
+    if (element.type !== "cad_component" || !getCadModelUrl(element)) continue;
+    const pcbComponent = element.pcb_component_id ? pcbComponentById.get(element.pcb_component_id) : void 0;
+    const layer = (element.layer ?? pcbComponent?.layer) === "bottom" ? "bottom" : "top";
+    let parentPlacement = {
+      center: element.position,
+      ccwRotationDegrees: 0,
+      layer
+    };
+    let cadModelGroupKey = element.cad_component_id;
+    if (pcbComponent !== void 0) {
+      parentPlacement = {
+        center: pcbComponent.center,
+        ccwRotationDegrees: pcbComponent.rotation,
+        layer
+      };
+      cadModelGroupKey = `${pcbComponent.pcb_component_id}:${layer}`;
+    }
+    const cadModelGroup = cadModelGroupByKey.get(cadModelGroupKey) ?? {
+      cadComponents: [],
+      parentPlacement
+    };
+    cadModelGroup.cadComponents.push(element);
+    cadModelGroupByKey.set(cadModelGroupKey, cadModelGroup);
+  }
+  return [...cadModelGroupByKey.values()];
+}
+
+// lib/generate-board-cad-models-tsx.ts
+function generateBoardCadModelsTsx({
+  circuitJson,
+  pcbBoard
+}) {
+  if (!pcbBoard) return [];
+  return getCadModelGroups(circuitJson).flatMap((cadModelGroup, groupIndex) => {
+    const cadModelGroupTsx = generateCadModelGroupTsx({
+      cadModelGroup,
+      groupIndex,
+      pcbBoard
+    });
+    return cadModelGroupTsx ? [cadModelGroupTsx] : [];
+  });
+}
+
 // lib/generate-board-nets-tsx.ts
 var generateBoardNetsTsx = (context) => {
   const runtimeNetNames = new Set(context.runtimeNetNameBySourceNetId.values());
@@ -150,6 +366,38 @@ var generateBoardNetsTsx = (context) => {
   });
 };
 
+// lib/generate-board-schematic-sheet-tsx.ts
+import { mmStr } from "@tscircuit/mm";
+var DEFAULT_SHEET_DIMENSIONS_MM = {
+  a4: { width: 297, height: 210 },
+  ansi_b: { width: 431.8, height: 279.4 }
+};
+var generateBoardSchematicSheetTsx = ({
+  circuitJson,
+  schematicElements
+}) => {
+  const sheet = circuitJson.find(
+    (element) => element.type === "schematic_sheet"
+  );
+  if (!sheet) return schematicElements.join("\n");
+  const attrs = [];
+  if (sheet.name) attrs.push(`name={${JSON.stringify(sheet.name)}}`);
+  if (sheet.sheet_index !== void 0) {
+    attrs.push(`sheetIndex={${sheet.sheet_index}}`);
+  }
+  if (sheet.sheet_size) {
+    attrs.push(`sheetSize="${sheet.sheet_size === "a4" ? "A4" : "ANSI_B"}"`);
+  }
+  const defaultDimensions = DEFAULT_SHEET_DIMENSIONS_MM[sheet.sheet_size ?? "a4"];
+  const sheetWidth = sheet.sheet_width ?? defaultDimensions.width;
+  const sheetHeight = sheet.sheet_height ?? defaultDimensions.height;
+  attrs.push(`sheetWidth="${mmStr(sheetWidth)}"`);
+  attrs.push(`sheetHeight="${mmStr(sheetHeight)}"`);
+  return `<schematicsheet ${attrs.join(" ")}>
+${schematicElements.join("\n")}
+</schematicsheet>`;
+};
+
 // lib/generate-board-schematic-tsx/convert-primitives.ts
 import { schematic_text } from "circuit-json";
 
@@ -1253,35 +1501,6 @@ var generateBoardSchematicElements = (circuitJson) => {
   ];
 };
 
-// lib/generate-board-schematic-sheet-tsx.ts
-import { mmStr } from "@tscircuit/mm";
-var generateBoardSchematicSheetTsx = ({
-  circuitJson,
-  schematicElements
-}) => {
-  const sheet = circuitJson.find(
-    (element) => element.type === "schematic_sheet"
-  );
-  if (!sheet) return schematicElements.join("\n");
-  const attrs = [];
-  if (sheet.name) attrs.push(`name={${JSON.stringify(sheet.name)}}`);
-  if (sheet.sheet_index !== void 0) {
-    attrs.push(`sheetIndex={${sheet.sheet_index}}`);
-  }
-  if (sheet.sheet_size) {
-    attrs.push(`sheetSize="${sheet.sheet_size === "a4" ? "A4" : "ANSI_B"}"`);
-  }
-  if (sheet.sheet_width !== void 0) {
-    attrs.push(`sheetWidth="${mmStr(sheet.sheet_width)}"`);
-  }
-  if (sheet.sheet_height !== void 0) {
-    attrs.push(`sheetHeight="${mmStr(sheet.sheet_height)}"`);
-  }
-  return `<schematicsheet ${attrs.join(" ")}>
-${schematicElements.join("\n")}
-</schematicsheet>`;
-};
-
 // lib/generate-copper-pours-tsx.ts
 import { su as su6 } from "@tscircuit/soup-util";
 
@@ -1924,6 +2143,9 @@ var convertNotes = (circuitJson) => {
     if (noteRect.color !== void 0) {
       attrs.push(`color="${noteRect.color}"`);
     }
+    if (noteRect.corner_radius !== void 0) {
+      attrs.push(`cornerRadius={${noteRect.corner_radius}}`);
+    }
     elementStrings.push(`<pcbnoterect ${attrs.join(" ")} />`);
   }
   for (const notePath of notePaths) {
@@ -2393,6 +2615,10 @@ var getBoardUsingTemplate = ({
   const footprintTsx = generateFootprintTsx(circuitJson, context);
   const copperPoursTsx = generateCopperPoursTsx(circuitJson, context);
   const boardNetsTsx = generateBoardNetsTsx(context);
+  const boardCadModelsTsx = generateBoardCadModelsTsx({
+    circuitJson,
+    pcbBoard
+  });
   const schematicElements = generateBoardSchematicElements(circuitJson);
   const schematicSheetTsx = generateBoardSchematicSheetTsx({
     circuitJson,
@@ -2402,6 +2628,7 @@ var getBoardUsingTemplate = ({
     ...boardNetsTsx,
     footprintTsx ? `<chip name="${context.pcbChipName}" noSchematicRepresentation footprint={${footprintTsx}} />` : "",
     ...copperPoursTsx,
+    ...boardCadModelsTsx,
     schematicSheetTsx
   ].filter(Boolean).join("\n");
   return `

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-DZP2ZWBQ.js";
+} from "../chunk-GVGY3ZZN.js";
 
 // cli/main.ts
 import { Command } from "commander";
@@ -16,7 +16,7 @@ var package_default = {
     "./cli": "./dist/cli/main.js"
   },
   type: "module",
-  version: "0.0.86",
+  version: "0.0.88",
   repository: {
     type: "git",
     url: "https://github.com/tscircuit/circuit-json-to-tscircuit.git"
@@ -38,9 +38,12 @@ var package_default = {
     "@types/react-dom": "18",
     "bun-match-svg": "^0.0.15",
     "circuit-json": "^0.0.521",
+    "circuit-json-to-gltf": "0.0.151",
     "circuit-to-svg": "https://pkg.pr.new/tscircuit/circuit-to-svg@738ef1d",
     commander: "^13.1.0",
+    "fast-png": "8.0.0",
     prettier: "^3.9.5",
+    poppygl: "0.0.34",
     "schematic-symbols": "0.0.248",
     shiki: "^4.3.1",
     "stack-svgs": "^0.0.1",

package/dist/lib/index.js

@@ -1,6 +1,6 @@
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-DZP2ZWBQ.js";
+} from "../chunk-GVGY3ZZN.js";
 export {
   convertCircuitJsonToTscircuit
 };

package/lib/generate-board-cad-models-tsx/converter-types.ts

@@ -0,0 +1,25 @@
+import type { CadComponent, PcbComponent } from "circuit-json"
+
+export interface CadModelUrl {
+  format: "glb" | "gltf" | "obj" | "step" | "stl" | "wrl"
+  url: string
+}
+
+export interface CadModelParentPlacement {
+  center: { x: number; y: number }
+  ccwRotationDegrees: number
+  layer: "bottom" | "top"
+}
+
+export interface CadModelGroup {
+  cadComponents: CadComponent[]
+  parentPlacement: CadModelParentPlacement
+}
+
+export interface CadModelPlacement {
+  positionOffset: { x: number; y: number; z: number }
+  ccwRotationOffsetDegrees: { x: number; y: number; z: number }
+}
+
+export type CadModelGroupKey = string
+export type PcbComponentId = PcbComponent["pcb_component_id"]

package/lib/generate-board-cad-models-tsx/format-point-prop.ts

@@ -0,0 +1,7 @@
+export function formatPointProp(point: {
+  x: number
+  y: number
+  z: number
+}): string {
+  return `{ x: ${point.x}, y: ${point.y}, z: ${point.z} }`
+}

package/lib/generate-board-cad-models-tsx/generate-cad-model-group-tsx.ts

@@ -0,0 +1,43 @@
+import type { PcbBoard } from "circuit-json"
+import type { CadModelGroup } from "./converter-types"
+import { generateCadModelTsx } from "./generate-cad-model-tsx"
+
+export function generateCadModelGroupTsx({
+  cadModelGroup,
+  groupIndex,
+  pcbBoard,
+}: {
+  cadModelGroup: CadModelGroup
+  groupIndex: number
+  pcbBoard: PcbBoard
+}): string | undefined {
+  const { cadComponents, parentPlacement } = cadModelGroup
+  const modelElements = cadComponents.flatMap((cadComponent) => {
+    const modelElement = generateCadModelTsx({
+      cadComponent,
+      parentPlacement,
+      pcbBoard,
+    })
+    return modelElement ? [modelElement] : []
+  })
+  if (modelElements.length === 0) return undefined
+
+  let cadModelTsx = modelElements[0]
+  if (modelElements.length > 1) {
+    cadModelTsx = `<cadassembly>${modelElements.join("\n")}</cadassembly>`
+  }
+  if (!cadModelTsx) return undefined
+
+  const attributes = [
+    `name={${JSON.stringify(`ImportedCadModel${groupIndex + 1}`)}}`,
+    `pcbX={${parentPlacement.center.x}}`,
+    `pcbY={${parentPlacement.center.y}}`,
+    `pcbRotation="${parentPlacement.ccwRotationDegrees}deg"`,
+    `layer="${parentPlacement.layer}"`,
+    "noSchematicRepresentation",
+    "obstructsWithinBounds={false}",
+    "footprint={<footprint />}",
+    `cadModel={${cadModelTsx}}`,
+  ]
+  return `<chip ${attributes.join(" ")} />`
+}

package/lib/generate-board-cad-models-tsx/generate-cad-model-tsx.ts

@@ -0,0 +1,56 @@
+import type { CadComponent, PcbBoard } from "circuit-json"
+import type { CadModelParentPlacement } from "./converter-types"
+import { formatPointProp } from "./format-point-prop"
+import { getCadModelOriginPosition } from "./get-cad-model-origin-position"
+import { getCadModelPlacement } from "./get-cad-model-placement"
+import { getCadModelUrl } from "./get-cad-model-url"
+import { getModelUrlWithFormatHint } from "./get-model-url-with-format-hint"
+
+export function generateCadModelTsx({
+  cadComponent,
+  parentPlacement,
+  pcbBoard,
+}: {
+  cadComponent: CadComponent
+  parentPlacement: CadModelParentPlacement
+  pcbBoard: PcbBoard
+}): string | undefined {
+  const modelUrl = getCadModelUrl(cadComponent)
+  if (!modelUrl) return undefined
+
+  const placement = getCadModelPlacement({
+    cadComponent,
+    parentPlacement,
+    pcbBoard,
+  })
+  const attributes = [
+    `modelUrl={${JSON.stringify(getModelUrlWithFormatHint(modelUrl))}}`,
+    `positionOffset={${formatPointProp(placement.positionOffset)}}`,
+    `rotationOffset={${formatPointProp(placement.ccwRotationOffsetDegrees)}}`,
+  ]
+
+  if (cadComponent.model_unit_to_mm_scale_factor !== undefined) {
+    attributes.push(
+      `modelUnitToMmScale={${cadComponent.model_unit_to_mm_scale_factor}}`,
+    )
+  }
+  if (cadComponent.model_board_normal_direction !== undefined) {
+    attributes.push(
+      `modelBoardNormalDirection={${JSON.stringify(cadComponent.model_board_normal_direction)}}`,
+    )
+  }
+  const modelOriginPosition = getCadModelOriginPosition(cadComponent)
+  if (modelOriginPosition !== undefined) {
+    attributes.push(
+      `modelOriginPosition={${formatPointProp(modelOriginPosition)}}`,
+    )
+  }
+  if (cadComponent.size !== undefined) {
+    attributes.push(`size={${formatPointProp(cadComponent.size)}}`)
+  }
+  if (cadComponent.show_as_translucent_model === true) {
+    attributes.push("showAsTranslucentModel")
+  }
+
+  return `<cadmodel ${attributes.join(" ")} />`
+}

package/lib/generate-board-cad-models-tsx/get-cad-model-groups.ts

@@ -0,0 +1,54 @@
+import type { AnyCircuitElement, PcbComponent } from "circuit-json"
+import type {
+  CadModelGroup,
+  CadModelGroupKey,
+  CadModelParentPlacement,
+  PcbComponentId,
+} from "./converter-types"
+import { getCadModelUrl } from "./get-cad-model-url"
+
+export function getCadModelGroups(
+  circuitJson: AnyCircuitElement[],
+): CadModelGroup[] {
+  const pcbComponentById = new Map<PcbComponentId, PcbComponent>()
+  for (const element of circuitJson) {
+    if (element.type === "pcb_component") {
+      pcbComponentById.set(element.pcb_component_id, element)
+    }
+  }
+
+  const cadModelGroupByKey = new Map<CadModelGroupKey, CadModelGroup>()
+  for (const element of circuitJson) {
+    if (element.type !== "cad_component" || !getCadModelUrl(element)) continue
+
+    const pcbComponent = element.pcb_component_id
+      ? pcbComponentById.get(element.pcb_component_id)
+      : undefined
+    const layer =
+      (element.layer ?? pcbComponent?.layer) === "bottom" ? "bottom" : "top"
+    let parentPlacement: CadModelParentPlacement = {
+      center: element.position,
+      ccwRotationDegrees: 0,
+      layer,
+    }
+    let cadModelGroupKey: CadModelGroupKey = element.cad_component_id
+
+    if (pcbComponent !== undefined) {
+      parentPlacement = {
+        center: pcbComponent.center,
+        ccwRotationDegrees: pcbComponent.rotation,
+        layer,
+      }
+      cadModelGroupKey = `${pcbComponent.pcb_component_id}:${layer}`
+    }
+
+    const cadModelGroup = cadModelGroupByKey.get(cadModelGroupKey) ?? {
+      cadComponents: [],
+      parentPlacement,
+    }
+    cadModelGroup.cadComponents.push(element)
+    cadModelGroupByKey.set(cadModelGroupKey, cadModelGroup)
+  }
+
+  return [...cadModelGroupByKey.values()]
+}

package/lib/generate-board-cad-models-tsx/get-cad-model-origin-position.ts

@@ -0,0 +1,13 @@
+import type { CadComponent } from "circuit-json"
+
+export function getCadModelOriginPosition(
+  cadComponent: CadComponent,
+): { x: number; y: number; z: number } | undefined {
+  if (cadComponent.model_origin_position !== undefined) {
+    return cadComponent.model_origin_position
+  }
+  if (cadComponent.model_origin_alignment === "unknown") {
+    return { x: 0, y: 0, z: 0 }
+  }
+  return undefined
+}

package/lib/generate-board-cad-models-tsx/get-cad-model-placement.ts

@@ -0,0 +1,46 @@
+import type { CadComponent, PcbBoard } from "circuit-json"
+import type {
+  CadModelParentPlacement,
+  CadModelPlacement,
+} from "./converter-types"
+
+export function getCadModelPlacement({
+  cadComponent,
+  parentPlacement,
+  pcbBoard,
+}: {
+  cadComponent: CadComponent
+  parentPlacement: CadModelParentPlacement
+  pcbBoard: PcbBoard
+}): CadModelPlacement {
+  const cadModelCcwRotationDegrees = cadComponent.rotation ?? {
+    x: 0,
+    y: 0,
+    z: 0,
+  }
+  const boardSurfaceZ = pcbBoard.thickness / 2
+  let positionOffsetZ = cadComponent.position.z - boardSurfaceZ
+  let ccwRotationOffsetDegrees = {
+    x: cadModelCcwRotationDegrees.x,
+    y: cadModelCcwRotationDegrees.y,
+    z: cadModelCcwRotationDegrees.z - parentPlacement.ccwRotationDegrees,
+  }
+
+  if (parentPlacement.layer === "bottom") {
+    positionOffsetZ = cadComponent.position.z + boardSurfaceZ
+    ccwRotationOffsetDegrees = {
+      x: cadModelCcwRotationDegrees.x,
+      y: cadModelCcwRotationDegrees.y - 180,
+      z: cadModelCcwRotationDegrees.z + parentPlacement.ccwRotationDegrees,
+    }
+  }
+
+  return {
+    positionOffset: {
+      x: cadComponent.position.x - parentPlacement.center.x,
+      y: cadComponent.position.y - parentPlacement.center.y,
+      z: positionOffsetZ,
+    },
+    ccwRotationOffsetDegrees,
+  }
+}

package/lib/generate-board-cad-models-tsx/get-cad-model-url.ts

@@ -0,0 +1,26 @@
+import type { CadComponent } from "circuit-json"
+import type { CadModelUrl } from "./converter-types"
+
+export function getCadModelUrl(
+  cadComponent: CadComponent,
+): CadModelUrl | undefined {
+  if (cadComponent.model_glb_url) {
+    return { format: "glb", url: cadComponent.model_glb_url }
+  }
+  if (cadComponent.model_gltf_url) {
+    return { format: "gltf", url: cadComponent.model_gltf_url }
+  }
+  if (cadComponent.model_obj_url) {
+    return { format: "obj", url: cadComponent.model_obj_url }
+  }
+  if (cadComponent.model_step_url) {
+    return { format: "step", url: cadComponent.model_step_url }
+  }
+  if (cadComponent.model_stl_url) {
+    return { format: "stl", url: cadComponent.model_stl_url }
+  }
+  if (cadComponent.model_wrl_url) {
+    return { format: "wrl", url: cadComponent.model_wrl_url }
+  }
+  return undefined
+}

package/lib/generate-board-cad-models-tsx/get-model-url-with-format-hint.ts

@@ -0,0 +1,10 @@
+import type { CadModelUrl } from "./converter-types"
+
+export function getModelUrlWithFormatHint({
+  format,
+  url,
+}: CadModelUrl): string {
+  const pathWithoutQuery = url.split(/[?#]/u)[0] ?? ""
+  if (pathWithoutQuery.toLowerCase().endsWith(`.${format}`)) return url
+  return `${url}#ext=${format}`
+}

package/lib/generate-board-cad-models-tsx.ts

@@ -0,0 +1,22 @@
+import type { AnyCircuitElement, PcbBoard } from "circuit-json"
+import { generateCadModelGroupTsx } from "./generate-board-cad-models-tsx/generate-cad-model-group-tsx"
+import { getCadModelGroups } from "./generate-board-cad-models-tsx/get-cad-model-groups"
+
+export function generateBoardCadModelsTsx({
+  circuitJson,
+  pcbBoard,
+}: {
+  circuitJson: AnyCircuitElement[]
+  pcbBoard: PcbBoard | undefined
+}): string[] {
+  if (!pcbBoard) return []
+
+  return getCadModelGroups(circuitJson).flatMap((cadModelGroup, groupIndex) => {
+    const cadModelGroupTsx = generateCadModelGroupTsx({
+      cadModelGroup,
+      groupIndex,
+      pcbBoard,
+    })
+    return cadModelGroupTsx ? [cadModelGroupTsx] : []
+  })
+}

package/lib/generate-footprint-tsx/convert-notes.ts

@@ -42,6 +42,9 @@ export const convertNotes: FootprintElementConverter = (circuitJson) => {
     if (noteRect.color !== undefined) {
       attrs.push(`color="${noteRect.color}"`)
     }
+    if (noteRect.corner_radius !== undefined) {
+      attrs.push(`cornerRadius={${noteRect.corner_radius}}`)
+    }
 
     elementStrings.push(`<pcbnoterect ${attrs.join(" ")} />`)
   }