circuit-json-to-step 0.0.23 → 0.0.24

package/dist/index.js

@@ -27,14 +27,6 @@ import {
   Circle as Circle2,
   ClosedShell as ClosedShell2,
   ManifoldSolidBrep as ManifoldSolidBrep4,
-  ColourRgb,
-  FillAreaStyleColour,
-  FillAreaStyle,
-  SurfaceStyleFillArea,
-  SurfaceSideStyle,
-  SurfaceStyleUsage,
-  PresentationStyleAssignment,
-  StyledItem,
   MechanicalDesignGeometricPresentationRepresentation,
   AdvancedBrepShapeRepresentation,
   ShapeDefinitionRepresentation
@@ -46,6 +38,43 @@ import "stepts";
 // lib/scene-box-to-step.ts
 import { ClosedShell, ManifoldSolidBrep } from "stepts";
 
+// lib/step-style-utils.ts
+import {
+  ColourRgb,
+  FillAreaStyle,
+  FillAreaStyleColour,
+  PresentationStyleAssignment,
+  StyledItem,
+  SurfaceSideStyle,
+  SurfaceStyleFillArea,
+  SurfaceStyleUsage
+} from "stepts";
+function createStyleCache() {
+  return /* @__PURE__ */ new Map();
+}
+function createStyledItem(repo, options) {
+  const { itemRef, rgb, styleCache, name = "color" } = options;
+  const key = rgb.map((value) => value.toFixed(6)).join(",");
+  let presStyle = styleCache.get(key);
+  if (!presStyle) {
+    const color = repo.add(new ColourRgb("", rgb[0], rgb[1], rgb[2]));
+    const fillColor = repo.add(new FillAreaStyleColour("", color));
+    const fillStyle = repo.add(new FillAreaStyle("", [fillColor]));
+    const surfaceFill = repo.add(new SurfaceStyleFillArea(fillStyle));
+    const surfaceSide = repo.add(new SurfaceSideStyle("", [surfaceFill]));
+    const surfaceUsage = repo.add(new SurfaceStyleUsage(".BOTH.", surfaceSide));
+    presStyle = repo.add(new PresentationStyleAssignment([surfaceUsage]));
+    styleCache.set(key, presStyle);
+  }
+  return repo.add(new StyledItem(name, [presStyle], itemRef));
+}
+function createStyledItems(repo, options) {
+  const { itemRefs, rgb, styleCache, name } = options;
+  return itemRefs.map(
+    (itemRef) => createStyledItem(repo, { itemRef, rgb, styleCache, name })
+  );
+}
+
 // lib/scene-geometry.ts
 function rotatePoint3(point, rotation) {
   if (!rotation) return point;
@@ -219,9 +248,16 @@ function createSceneBoxSolid(repo, box) {
     [vertices[3], vertices[7], vertices[4], vertices[0]]
   ].map((faceVertices) => createFaceFromVertices(repo, faceVertices));
   const shell = repo.add(new ClosedShell("", faces));
-  return repo.add(new ManifoldSolidBrep("Component", shell));
+  return {
+    solid: repo.add(new ManifoldSolidBrep(box.label ?? "Component", shell)),
+    styledItems: [],
+    usesIntrinsicFaceStyles: false,
+    styleTargets: faces
+  };
 }
 function createSceneMeshSolid(repo, box) {
+  const styleCache = createStyleCache();
+  const styledItems = [];
   const faces = box.mesh.triangles.map((triangle) => {
     const vertices = triangle.vertices.map((vertex) => {
       const rotated = rotatePoint3(vertex, box.rotation);
@@ -232,10 +268,38 @@ function createSceneMeshSolid(repo, box) {
       };
       return createVertex(repo, translated);
     });
-    return createFaceFromVertices(repo, vertices);
+    const face = createFaceFromVertices(repo, vertices);
+    const faceColor = normalizeTriangleColor(triangle.color);
+    if (faceColor) {
+      styledItems.push(
+        createStyledItem(repo, {
+          itemRef: face,
+          rgb: faceColor,
+          styleCache
+        })
+      );
+    }
+    return face;
   });
   const shell = repo.add(new ClosedShell("", faces));
-  return repo.add(new ManifoldSolidBrep("Component", shell));
+  return {
+    solid: repo.add(new ManifoldSolidBrep(box.label ?? "Component", shell)),
+    styledItems,
+    usesIntrinsicFaceStyles: faces.length > 0 && styledItems.length === faces.length,
+    styleTargets: []
+  };
+}
+function normalizeTriangleColor(color) {
+  if (!Array.isArray(color) || color.length < 3) return null;
+  const scale = color.some((value) => value > 1) ? 255 : 1;
+  return [
+    clampColorChannel(color[0] / scale),
+    clampColorChannel(color[1] / scale),
+    clampColorChannel(color[2] / scale)
+  ];
+}
+function clampColorChannel(value) {
+  return Math.max(0, Math.min(1, value));
 }
 
 // lib/mesh-generation.ts
@@ -320,17 +384,6 @@ var EXCLUDED_ENTITY_TYPES = /* @__PURE__ */ new Set([
   "PRODUCT_DEFINITION_SHAPE",
   "SHAPE_DEFINITION_REPRESENTATION",
   "ADVANCED_BREP_SHAPE_REPRESENTATION",
-  "MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION",
-  "PRESENTATION_STYLE_ASSIGNMENT",
-  "SURFACE_STYLE_USAGE",
-  "SURFACE_SIDE_STYLE",
-  "SURFACE_STYLE_FILL_AREA",
-  "FILL_AREA_STYLE",
-  "FILL_AREA_STYLE_COLOUR",
-  "COLOUR_RGB",
-  "STYLED_ITEM",
-  "CURVE_STYLE",
-  "DRAUGHTING_PRE_DEFINED_CURVE_FONT",
   "PRODUCT_RELATED_PRODUCT_CATEGORY",
   "NEXT_ASSEMBLY_USAGE_OCCURRENCE",
   "CONTEXT_DEPENDENT_SHAPE_REPRESENTATION",
@@ -699,7 +752,7 @@ function normalizeStepNumericExponents(stepText) {
 var package_default = {
   name: "circuit-json-to-step",
   main: "dist/index.js",
-  version: "0.0.22",
+  version: "0.0.23",
   type: "module",
   scripts: {
     "pull-reference": `git clone https://github.com/tscircuit/circuit-json.git && find circuit-json/tests -name '*.test.ts' -exec bash -c 'mv "$0" "\${0%.test.ts}.ts"' {} \\; && git clone https://github.com/tscircuit/stepts.git && find stepts/tests -name '*.test.ts' -exec bash -c 'mv "$0" "\${0%.test.ts}.ts"' {} \\;`,
@@ -717,7 +770,7 @@ var package_default = {
     "@resvg/resvg-wasm": "^2.6.2",
     "@tscircuit/circuit-json-util": "^0.0.75",
     "@types/bun": "latest",
-    "circuit-json": "^0.0.286",
+    "circuit-json": "^0.0.406",
     "looks-same": "^10.0.1",
     "occt-import-js": "^0.0.23",
     poppygl: "^0.0.17",
@@ -1584,11 +1637,11 @@ async function circuitJsonToStep(circuitJson, options = {}) {
   );
   const bottomHoleLoops = [];
   for (const hole of holes) {
-    const holeShape = hole.hole_shape || hole.shape;
+    const holeShape = hole.hole_shape ?? hole.shape;
     if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x.value;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y.value;
-      const radius = hole.hole_diameter / 2;
+      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
+      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
+      const radius = (hole.hole_diameter ?? 0) / 2;
       const holeCenter = repo.add(
         new CartesianPoint4("", holeX, holeY, -halfBoardThickness)
       );
@@ -1624,10 +1677,7 @@ async function circuitJsonToStep(circuitJson, options = {}) {
   const bottomFace = repo.add(
     new AdvancedFace3(
       "",
-      [
-        repo.add(new FaceOuterBound3("", bottomLoop, true)),
-        ...bottomHoleLoops
-      ],
+      [repo.add(new FaceOuterBound3("", bottomLoop, true)), ...bottomHoleLoops],
       bottomPlane,
       true
     )
@@ -1643,11 +1693,11 @@ async function circuitJsonToStep(circuitJson, options = {}) {
   );
   const topHoleLoops = [];
   for (const hole of holes) {
-    const holeShape = hole.hole_shape || hole.shape;
+    const holeShape = hole.hole_shape ?? hole.shape;
     if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x.value;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y.value;
-      const radius = hole.hole_diameter / 2;
+      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
+      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
+      const radius = (hole.hole_diameter ?? 0) / 2;
       const holeCenter = repo.add(
         new CartesianPoint4("", holeX, holeY, halfBoardThickness)
       );
@@ -1721,11 +1771,11 @@ async function circuitJsonToStep(circuitJson, options = {}) {
   }
   const holeCylindricalFaces = [];
   for (const hole of holes) {
-    const holeShape = hole.hole_shape || hole.shape;
+    const holeShape = hole.hole_shape ?? hole.shape;
     if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x.value;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y.value;
-      const radius = hole.hole_diameter / 2;
+      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
+      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
+      const radius = (hole.hole_diameter ?? 0) / 2;
       const bottomHoleCenter = repo.add(
         new CartesianPoint4("", holeX, holeY, -halfBoardThickness)
       );
@@ -1809,9 +1859,17 @@ async function circuitJsonToStep(circuitJson, options = {}) {
     }
   }
   const allFaces = [bottomFace, topFace, ...sideFaces, ...holeCylindricalFaces];
+  const styleCache = createStyleCache();
+  const boardStyledItems = createStyledItems(repo, {
+    itemRefs: allFaces,
+    rgb: [0.2, 0.6, 0.2],
+    styleCache
+  });
   const shell = repo.add(new ClosedShell2("", allFaces));
   const solid = repo.add(new ManifoldSolidBrep4(productName, shell));
   const allSolids = [solid];
+  const componentStyledItems = [];
+  const solidsWithIntrinsicFaceStyles = /* @__PURE__ */ new Set();
   let handledComponentIds = /* @__PURE__ */ new Set();
   let handledPcbComponentIds = /* @__PURE__ */ new Set();
   if (options.includeComponents && options.includeExternalMeshes) {
@@ -1824,6 +1882,9 @@ async function circuitJsonToStep(circuitJson, options = {}) {
     handledComponentIds = mergeResult.handledComponentIds;
     handledPcbComponentIds = mergeResult.handledPcbComponentIds;
     allSolids.push(...mergeResult.solids);
+    mergeResult.solids.forEach((solidRef) => {
+      solidsWithIntrinsicFaceStyles.add(String(solidRef.id));
+    });
   }
   if (options.includeComponents) {
     const pcbComponentIdsWithStepUrl = /* @__PURE__ */ new Set();
@@ -1863,21 +1924,39 @@ async function circuitJsonToStep(circuitJson, options = {}) {
         excludePcbComponentIds: handledPcbComponentIds,
         pcbComponentIdsWithStepUrl
       });
-      allSolids.push(...componentSolids);
+      for (const componentSolid of componentSolids) {
+        allSolids.push(componentSolid.solid);
+        componentStyledItems.push(...componentSolid.styledItems);
+        if (componentSolid.usesIntrinsicFaceStyles) {
+          solidsWithIntrinsicFaceStyles.add(String(componentSolid.solid.id));
+        } else if (componentSolid.styleTargets.length > 0) {
+          componentStyledItems.push(
+            ...createStyledItems(repo, {
+              itemRefs: componentSolid.styleTargets,
+              rgb: [0.75, 0.75, 0.75],
+              styleCache
+            })
+          );
+          solidsWithIntrinsicFaceStyles.add(String(componentSolid.solid.id));
+        }
+      }
     }
   }
-  const styledItems = [];
-  allSolids.forEach((solidRef, index) => {
+  const styledItems = [
+    ...boardStyledItems,
+    ...componentStyledItems
+  ];
+  allSolids.forEach((itemRef, index) => {
     const isBoard = index === 0;
-    const [r, g, b] = isBoard ? [0.2, 0.6, 0.2] : [0.75, 0.75, 0.75];
-    const color = repo.add(new ColourRgb("", r, g, b));
-    const fillColor = repo.add(new FillAreaStyleColour("", color));
-    const fillStyle = repo.add(new FillAreaStyle("", [fillColor]));
-    const surfaceFill = repo.add(new SurfaceStyleFillArea(fillStyle));
-    const surfaceSide = repo.add(new SurfaceSideStyle("", [surfaceFill]));
-    const surfaceUsage = repo.add(new SurfaceStyleUsage(".BOTH.", surfaceSide));
-    const presStyle = repo.add(new PresentationStyleAssignment([surfaceUsage]));
-    const styledItem = repo.add(new StyledItem("", [presStyle], solidRef));
+    if (isBoard || solidsWithIntrinsicFaceStyles.has(String(itemRef.id))) {
+      return;
+    }
+    const styledItem = createStyledItem(repo, {
+      itemRef,
+      rgb: [0.75, 0.75, 0.75],
+      styleCache,
+      name: ""
+    });
     styledItems.push(styledItem);
   });
   repo.add(

package/lib/index.ts

@@ -42,10 +42,27 @@ import {
 } from "stepts"
 import { generateComponentMeshes } from "./mesh-generation"
 import { mergeExternalStepModels } from "./step-model-merger"
+import {
+  createStyleCache,
+  createStyledItem,
+  createStyledItems,
+} from "./step-style-utils"
 import { normalizeStepNumericExponents } from "./step-text-utils"
 import { VERSION } from "./version"
 import { createPillCylindricalFaces, createPillHoleLoop } from "./pill-geometry"
 
+type Hole = Extract<
+  CircuitJson[number],
+  { type: "pcb_hole" | "pcb_plated_hole" }
+>
+type RuntimeHole = Hole & {
+  x?: number | { value: number }
+  y?: number | { value: number }
+  hole_shape?: string
+  shape?: string
+  hole_diameter?: number
+}
+
 export interface CircuitJsonToStepOptions {
   /** Board width in mm (optional if pcb_board is present) */
   boardWidth?: number
@@ -78,8 +95,9 @@ export async function circuitJsonToStep(
 
   // Extract pcb_board and holes from circuit JSON
   const pcbBoard = circuitJson.find((item) => item.type === "pcb_board")
-  const holes: any[] = circuitJson.filter(
-    (item) => item.type === "pcb_hole" || item.type === "pcb_plated_hole",
+  const holes = circuitJson.filter(
+    (item): item is RuntimeHole =>
+      item.type === "pcb_hole" || item.type === "pcb_plated_hole",
   )
 
   // Get dimensions from pcb_board or options
@@ -329,11 +347,11 @@ export async function circuitJsonToStep(
   const bottomHoleLoops: Ref<FaceBound>[] = []
   for (const hole of holes) {
     // Check shape (pcb_hole uses hole_shape, pcb_plated_hole uses shape)
-    const holeShape = hole.hole_shape || hole.shape
+    const holeShape = hole.hole_shape ?? hole.shape
     if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : (hole.x as any).value
-      const holeY = typeof hole.y === "number" ? hole.y : (hole.y as any).value
-      const radius = hole.hole_diameter / 2
+      const holeX = typeof hole.x === "number" ? hole.x : (hole.x ?? 0)
+      const holeY = typeof hole.y === "number" ? hole.y : (hole.y ?? 0)
+      const radius = (hole.hole_diameter ?? 0) / 2
 
       const holeCenter = repo.add(
         new CartesianPoint("", holeX, holeY, -halfBoardThickness),
@@ -372,10 +390,7 @@ export async function circuitJsonToStep(
   const bottomFace = repo.add(
     new AdvancedFace(
       "",
-      [
-        repo.add(new FaceOuterBound("", bottomLoop, true)),
-        ...bottomHoleLoops,
-      ] as any,
+      [repo.add(new FaceOuterBound("", bottomLoop, true)), ...bottomHoleLoops],
       bottomPlane,
       true,
     ),
@@ -396,11 +411,11 @@ export async function circuitJsonToStep(
   const topHoleLoops: Ref<FaceBound>[] = []
   for (const hole of holes) {
     // Check shape (pcb_hole uses hole_shape, pcb_plated_hole uses shape)
-    const holeShape = hole.hole_shape || hole.shape
+    const holeShape = hole.hole_shape ?? hole.shape
     if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : (hole.x as any).value
-      const holeY = typeof hole.y === "number" ? hole.y : (hole.y as any).value
-      const radius = hole.hole_diameter / 2
+      const holeX = typeof hole.x === "number" ? hole.x : (hole.x ?? 0)
+      const holeY = typeof hole.y === "number" ? hole.y : (hole.y ?? 0)
+      const radius = (hole.hole_diameter ?? 0) / 2
 
       const holeCenter = repo.add(
         new CartesianPoint("", holeX, holeY, halfBoardThickness),
@@ -434,7 +449,7 @@ export async function circuitJsonToStep(
   const topFace = repo.add(
     new AdvancedFace(
       "",
-      [repo.add(new FaceOuterBound("", topLoop, true)), ...topHoleLoops] as any,
+      [repo.add(new FaceOuterBound("", topLoop, true)), ...topHoleLoops],
       topPlane,
       true,
     ),
@@ -489,11 +504,11 @@ export async function circuitJsonToStep(
   // Create cylindrical faces for holes
   const holeCylindricalFaces: Ref<AdvancedFace>[] = []
   for (const hole of holes) {
-    const holeShape = hole.hole_shape || hole.shape
+    const holeShape = hole.hole_shape ?? hole.shape
     if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : (hole.x as any).value
-      const holeY = typeof hole.y === "number" ? hole.y : (hole.y as any).value
-      const radius = hole.hole_diameter / 2
+      const holeX = typeof hole.x === "number" ? hole.x : (hole.x ?? 0)
+      const holeY = typeof hole.y === "number" ? hole.y : (hole.y ?? 0)
+      const radius = (hole.hole_diameter ?? 0) / 2
 
       // Create circular edges at bottom and top
       const bottomHoleCenter = repo.add(
@@ -587,6 +602,12 @@ export async function circuitJsonToStep(
 
   // Collect all faces
   const allFaces = [bottomFace, topFace, ...sideFaces, ...holeCylindricalFaces]
+  const styleCache = createStyleCache()
+  const boardStyledItems = createStyledItems(repo, {
+    itemRefs: allFaces,
+    rgb: [0.2, 0.6, 0.2],
+    styleCache,
+  })
 
   // Create closed shell and solid
   const shell = repo.add(new ClosedShell("", allFaces))
@@ -594,6 +615,8 @@ export async function circuitJsonToStep(
 
   // Array to hold all solids (board + optional components)
   const allSolids: Ref<ManifoldSolidBrep>[] = [solid]
+  const componentStyledItems: Ref<StyledItem>[] = []
+  const solidsWithIntrinsicFaceStyles = new Set<string>()
 
   let handledComponentIds = new Set<string>()
   let handledPcbComponentIds = new Set<string>()
@@ -608,6 +631,9 @@ export async function circuitJsonToStep(
     handledComponentIds = mergeResult.handledComponentIds
     handledPcbComponentIds = mergeResult.handledPcbComponentIds
     allSolids.push(...mergeResult.solids)
+    mergeResult.solids.forEach((solidRef) => {
+      solidsWithIntrinsicFaceStyles.add(String(solidRef.id))
+    })
   }
 
   // Generate component mesh fallback if requested
@@ -677,24 +703,42 @@ export async function circuitJsonToStep(
         excludePcbComponentIds: handledPcbComponentIds,
         pcbComponentIdsWithStepUrl,
       })
-      allSolids.push(...componentSolids)
+      for (const componentSolid of componentSolids) {
+        allSolids.push(componentSolid.solid)
+        componentStyledItems.push(...componentSolid.styledItems)
+        if (componentSolid.usesIntrinsicFaceStyles) {
+          solidsWithIntrinsicFaceStyles.add(String(componentSolid.solid.id))
+        } else if (componentSolid.styleTargets.length > 0) {
+          componentStyledItems.push(
+            ...createStyledItems(repo, {
+              itemRefs: componentSolid.styleTargets,
+              rgb: [0.75, 0.75, 0.75],
+              styleCache,
+            }),
+          )
+          solidsWithIntrinsicFaceStyles.add(String(componentSolid.solid.id))
+        }
+      }
     }
   }
 
   // Add presentation/styling for all solids
-  const styledItems: Ref<StyledItem>[] = []
+  const styledItems: Ref<StyledItem>[] = [
+    ...boardStyledItems,
+    ...componentStyledItems,
+  ]
 
-  allSolids.forEach((solidRef, index) => {
+  allSolids.forEach((itemRef, index) => {
     const isBoard = index === 0
-    const [r, g, b] = isBoard ? [0.2, 0.6, 0.2] : [0.75, 0.75, 0.75]
-    const color = repo.add(new ColourRgb("", r, g, b))
-    const fillColor = repo.add(new FillAreaStyleColour("", color))
-    const fillStyle = repo.add(new FillAreaStyle("", [fillColor]))
-    const surfaceFill = repo.add(new SurfaceStyleFillArea(fillStyle))
-    const surfaceSide = repo.add(new SurfaceSideStyle("", [surfaceFill]))
-    const surfaceUsage = repo.add(new SurfaceStyleUsage(".BOTH.", surfaceSide))
-    const presStyle = repo.add(new PresentationStyleAssignment([surfaceUsage]))
-    const styledItem = repo.add(new StyledItem("", [presStyle], solidRef))
+    if (isBoard || solidsWithIntrinsicFaceStyles.has(String(itemRef.id))) {
+      return
+    }
+    const styledItem = createStyledItem(repo, {
+      itemRef,
+      rgb: [0.75, 0.75, 0.75],
+      styleCache,
+      name: "",
+    })
     styledItems.push(styledItem)
   })
 

package/lib/mesh-generation.ts

@@ -2,7 +2,7 @@ import type { CircuitJson } from "circuit-json"
 import type { Ref, Repository } from "stepts"
 import { ManifoldSolidBrep } from "stepts"
 import { createSceneBoxSolid } from "./scene-box-to-step"
-import type { SceneBox } from "./scene-geometry"
+import type { GeneratedSceneSolid, SceneBox } from "./scene-geometry"
 
 export interface MeshGenerationOptions {
   /** Repository to add STEP entities to */
@@ -30,7 +30,7 @@ export interface MeshGenerationOptions {
  */
 export async function generateComponentMeshes(
   options: MeshGenerationOptions,
-): Promise<Ref<ManifoldSolidBrep>[]> {
+): Promise<GeneratedSceneSolid[]> {
   const {
     repo,
     circuitJson,
@@ -41,7 +41,7 @@ export async function generateComponentMeshes(
     pcbComponentIdsWithStepUrl,
   } = options
 
-  const solids: Ref<ManifoldSolidBrep>[] = []
+  const solids: GeneratedSceneSolid[] = []
 
   try {
     const filteredCircuitJson = circuitJson

package/lib/scene-box-to-step.ts

@@ -1,13 +1,18 @@
-import type { Ref, Repository } from "stepts"
+import type { Ref, Repository, StyledItem } from "stepts"
 import { ClosedShell, ManifoldSolidBrep } from "stepts"
-import type { SceneBox } from "./scene-geometry"
+import type {
+  GeneratedSceneSolid,
+  SceneBox,
+  TriangleColor,
+} from "./scene-geometry"
+import { createStyleCache, createStyledItem } from "./step-style-utils"
 import { rotatePoint3 } from "./scene-geometry"
 import { createFaceFromVertices, createVertex } from "./step-brep-utils"
 
 export function createSceneBoxSolid(
   repo: Repository,
   box: SceneBox,
-): Ref<ManifoldSolidBrep> {
+): GeneratedSceneSolid {
   if (box.mesh?.triangles?.length) {
     return createSceneMeshSolid(repo, box)
   }
@@ -65,13 +70,21 @@ export function createSceneBoxSolid(
   ].map((faceVertices) => createFaceFromVertices(repo, faceVertices))
 
   const shell = repo.add(new ClosedShell("", faces))
-  return repo.add(new ManifoldSolidBrep("Component", shell))
+  return {
+    solid: repo.add(new ManifoldSolidBrep(box.label ?? "Component", shell)),
+    styledItems: [],
+    usesIntrinsicFaceStyles: false,
+    styleTargets: faces,
+  }
 }
 
 function createSceneMeshSolid(
   repo: Repository,
   box: SceneBox,
-): Ref<ManifoldSolidBrep> {
+): GeneratedSceneSolid {
+  const styleCache = createStyleCache()
+  const styledItems: Ref<StyledItem>[] = []
+
   const faces = box.mesh!.triangles!.map((triangle) => {
     const vertices = triangle.vertices.map((vertex) => {
       const rotated = rotatePoint3(vertex, box.rotation)
@@ -83,9 +96,43 @@ function createSceneMeshSolid(
       return createVertex(repo, translated)
     })
 
-    return createFaceFromVertices(repo, vertices)
+    const face = createFaceFromVertices(repo, vertices)
+    const faceColor = normalizeTriangleColor(triangle.color)
+    if (faceColor) {
+      styledItems.push(
+        createStyledItem(repo, {
+          itemRef: face,
+          rgb: faceColor,
+          styleCache,
+        }),
+      )
+    }
+    return face
   })
 
   const shell = repo.add(new ClosedShell("", faces))
-  return repo.add(new ManifoldSolidBrep("Component", shell))
+  return {
+    solid: repo.add(new ManifoldSolidBrep(box.label ?? "Component", shell)),
+    styledItems,
+    usesIntrinsicFaceStyles:
+      faces.length > 0 && styledItems.length === faces.length,
+    styleTargets: [],
+  }
+}
+
+function normalizeTriangleColor(
+  color: TriangleColor,
+): [number, number, number] | null {
+  if (!Array.isArray(color) || color.length < 3) return null
+
+  const scale = color.some((value: number) => value > 1) ? 255 : 1
+  return [
+    clampColorChannel(color[0]! / scale),
+    clampColorChannel(color[1]! / scale),
+    clampColorChannel(color[2]! / scale),
+  ]
+}
+
+function clampColorChannel(value: number): number {
+  return Math.max(0, Math.min(1, value))
 }

package/lib/scene-geometry.ts

@@ -1,3 +1,5 @@
+import type { Entity, Ref, StyledItem, ManifoldSolidBrep } from "stepts"
+
 export type Point3 = { x: number; y: number; z: number }
 
 export type Rotation3 = { x: number; y: number; z: number }
@@ -5,8 +7,11 @@ export type Rotation3 = { x: number; y: number; z: number }
 export type Triangle = {
   vertices: [Point3, Point3, Point3]
   normal: Point3
+  color?: [number, number, number] | [number, number, number, number]
 }
 
+export type TriangleColor = Triangle["color"]
+
 export type BoundingBox = {
   min: Point3
   max: Point3
@@ -16,12 +21,20 @@ export type SceneBox = {
   center: Point3
   size: Point3
   rotation?: Rotation3
+  label?: string
   mesh?: {
     boundingBox: BoundingBox
     triangles?: Triangle[]
   }
 }
 
+export type GeneratedSceneSolid = {
+  solid: Ref<ManifoldSolidBrep>
+  styledItems: Ref<StyledItem>[]
+  usesIntrinsicFaceStyles: boolean
+  styleTargets: Ref<Entity>[]
+}
+
 export function rotatePoint3(point: Point3, rotation?: Rotation3): Point3 {
   if (!rotation) return point
 

package/lib/step-model-merger/excluded-entity-types.ts

@@ -9,17 +9,6 @@ export const EXCLUDED_ENTITY_TYPES = new Set<string>([
   "PRODUCT_DEFINITION_SHAPE",
   "SHAPE_DEFINITION_REPRESENTATION",
   "ADVANCED_BREP_SHAPE_REPRESENTATION",
-  "MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION",
-  "PRESENTATION_STYLE_ASSIGNMENT",
-  "SURFACE_STYLE_USAGE",
-  "SURFACE_SIDE_STYLE",
-  "SURFACE_STYLE_FILL_AREA",
-  "FILL_AREA_STYLE",
-  "FILL_AREA_STYLE_COLOUR",
-  "COLOUR_RGB",
-  "STYLED_ITEM",
-  "CURVE_STYLE",
-  "DRAUGHTING_PRE_DEFINED_CURVE_FONT",
   "PRODUCT_RELATED_PRODUCT_CATEGORY",
   "NEXT_ASSEMBLY_USAGE_OCCURRENCE",
   "CONTEXT_DEPENDENT_SHAPE_REPRESENTATION",

package/lib/step-model-merger.ts

@@ -1,6 +1,7 @@
 import {
   CartesianPoint,
   Direction,
+  type Entity,
   ManifoldSolidBrep,
   Ref,
   Repository,
@@ -136,7 +137,7 @@ function mergeSingleStepModel(
   return solids
 }
 
-type RepositoryEntry = readonly [number, any]
+type RepositoryEntry = readonly [number, Entity]
 
 function adjustTransformForPlacement(
   entries: ReadonlyArray<RepositoryEntry>,

package/lib/step-style-utils.ts

@@ -0,0 +1,63 @@
+import type { Entity, Ref, Repository } from "stepts"
+import {
+  ColourRgb,
+  FillAreaStyle,
+  FillAreaStyleColour,
+  PresentationStyleAssignment,
+  StyledItem,
+  SurfaceSideStyle,
+  SurfaceStyleFillArea,
+  SurfaceStyleUsage,
+} from "stepts"
+
+export type StyleCache = Map<string, Ref<PresentationStyleAssignment>>
+
+type StyledItemOptions = {
+  itemRef: Ref<Entity>
+  rgb: [number, number, number]
+  styleCache: StyleCache
+  name?: string
+}
+
+type StyledItemsOptions = {
+  itemRefs: ReadonlyArray<Ref<Entity>>
+  rgb: [number, number, number]
+  styleCache: StyleCache
+  name?: string
+}
+
+export function createStyleCache(): StyleCache {
+  return new Map<string, Ref<PresentationStyleAssignment>>()
+}
+
+export function createStyledItem(
+  repo: Repository,
+  options: StyledItemOptions,
+): Ref<StyledItem> {
+  const { itemRef, rgb, styleCache, name = "color" } = options
+  const key = rgb.map((value) => value.toFixed(6)).join(",")
+  let presStyle = styleCache.get(key)
+
+  if (!presStyle) {
+    const color = repo.add(new ColourRgb("", rgb[0], rgb[1], rgb[2]))
+    const fillColor = repo.add(new FillAreaStyleColour("", color))
+    const fillStyle = repo.add(new FillAreaStyle("", [fillColor]))
+    const surfaceFill = repo.add(new SurfaceStyleFillArea(fillStyle))
+    const surfaceSide = repo.add(new SurfaceSideStyle("", [surfaceFill]))
+    const surfaceUsage = repo.add(new SurfaceStyleUsage(".BOTH.", surfaceSide))
+    presStyle = repo.add(new PresentationStyleAssignment([surfaceUsage]))
+    styleCache.set(key, presStyle)
+  }
+
+  return repo.add(new StyledItem(name, [presStyle], itemRef))
+}
+
+export function createStyledItems(
+  repo: Repository,
+  options: StyledItemsOptions,
+): Ref<StyledItem>[] {
+  const { itemRefs, rgb, styleCache, name } = options
+  return itemRefs.map((itemRef) =>
+    createStyledItem(repo, { itemRef, rgb, styleCache, name }),
+  )
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-step",
   "main": "dist/index.js",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "type": "module",
   "scripts": {
     "pull-reference": "git clone https://github.com/tscircuit/circuit-json.git && find circuit-json/tests -name '*.test.ts' -exec bash -c 'mv \"$0\" \"${0%.test.ts}.ts\"' {} \\; && git clone https://github.com/tscircuit/stepts.git && find stepts/tests -name '*.test.ts' -exec bash -c 'mv \"$0\" \"${0%.test.ts}.ts\"' {} \\;",
@@ -19,7 +19,7 @@
     "@resvg/resvg-wasm": "^2.6.2",
     "@tscircuit/circuit-json-util": "^0.0.75",
     "@types/bun": "latest",
-    "circuit-json": "^0.0.286",
+    "circuit-json": "^0.0.406",
     "looks-same": "^10.0.1",
     "occt-import-js": "^0.0.23",
     "poppygl": "^0.0.17",

package/test/fixtures/step-snapshot.ts

@@ -11,12 +11,27 @@ import type { OcctMesh } from "../utils/occt/importer"
 // Ensure PNG matcher is loaded so we can reuse it
 import "./png-matcher"
 
+type GLTFPrimitive = {
+  attributes: Record<string, number>
+  indices: number
+  material: number
+  mode: 4
+}
+
+type GLTFMaterial = {
+  pbrMetallicRoughness: {
+    baseColorFactor: [number, number, number, number]
+    metallicFactor: number
+    roughnessFactor: number
+  }
+}
+
 type GLTF = {
   asset: { version: "2.0"; generator?: string }
   scene: number
   scenes: { nodes: number[] }[]
   nodes: { mesh: number }[]
-  meshes: { primitives: any[] }[]
+  meshes: { primitives: GLTFPrimitive[] }[]
   buffers: { byteLength: number }[]
   bufferViews: {
     buffer: number
@@ -33,7 +48,7 @@ type GLTF = {
     min?: number[]
     max?: number[]
   }[]
-  materials: any[]
+  materials: GLTFMaterial[]
 }
 
 function createFloat32Buffer(data: number[]): Uint8Array {
@@ -89,6 +104,25 @@ function gltfFromOcctMeshes(meshes: OcctMesh[]) {
   }
 
   const defaultColor: [number, number, number] = [0.82, 0.82, 0.82]
+  const materialCache = new Map<string, number>()
+
+  const getMaterialIndex = (color: [number, number, number]) => {
+    const key = color.map((value) => value.toFixed(6)).join(",")
+    const existing = materialCache.get(key)
+    if (typeof existing === "number") return existing
+
+    const matIndex =
+      gltf.materials.push({
+        pbrMetallicRoughness: {
+          baseColorFactor: [color[0], color[1], color[2], 1],
+          metallicFactor: 0,
+          roughnessFactor: 0.9,
+        },
+      }) - 1
+
+    materialCache.set(key, matIndex)
+    return matIndex
+  }
 
   for (const m of meshes) {
     const positions = (m.attributes.position?.array ?? []) as number[]
@@ -100,17 +134,6 @@ function gltfFromOcctMeshes(meshes: OcctMesh[]) {
       continue
     }
 
-    // Material
-    const [r, g, b] = (m.color ?? defaultColor) as [number, number, number]
-    const matIndex =
-      gltf.materials.push({
-        pbrMetallicRoughness: {
-          baseColorFactor: [r, g, b, 1],
-          metallicFactor: 0,
-          roughnessFactor: 0.9,
-        },
-      }) - 1
-
     // POSITION
     const posBufIdx = addBuffer(createFloat32Buffer(positions))
     const posBVIdx =
@@ -168,16 +191,55 @@ function gltfFromOcctMeshes(meshes: OcctMesh[]) {
     const attributes: Record<string, number> = { POSITION: posAccIdx }
     if (typeof normAccIdx === "number") attributes.NORMAL = normAccIdx
 
-    const meshIndex =
-      gltf.meshes.push({
-        primitives: [
+    const hasFaceColors = m.brep_faces.some((face) => face.color !== null)
+    const primitives: GLTFPrimitive[] = hasFaceColors
+      ? m.brep_faces.flatMap((face) => {
+          const color = (face.color ?? m.color ?? defaultColor) as [
+            number,
+            number,
+            number,
+          ]
+          const faceIndices = indices.slice(face.first * 3, (face.last + 1) * 3)
+          if (!faceIndices.length) return []
+
+          const faceIdxBufIdx = addBuffer(createUint32Buffer(faceIndices))
+          const faceIdxBVIdx =
+            gltf.bufferViews.push({
+              buffer: faceIdxBufIdx,
+              byteLength: faceIndices.length * 4,
+              target: 34963, // ELEMENT_ARRAY_BUFFER
+            }) - 1
+          const faceIdxAccIdx =
+            gltf.accessors.push({
+              bufferView: faceIdxBVIdx,
+              componentType: 5125, // UNSIGNED_INT
+              count: faceIndices.length,
+              type: "SCALAR",
+            }) - 1
+
+          return [
+            {
+              attributes,
+              indices: faceIdxAccIdx,
+              material: getMaterialIndex(color),
+              mode: 4, // TRIANGLES
+            },
+          ]
+        })
+      : [
           {
             attributes,
             indices: idxAccIdx,
-            material: matIndex,
+            material: getMaterialIndex(
+              (m.color ?? defaultColor) as [number, number, number],
+            ),
             mode: 4, // TRIANGLES
           },
-        ],
+        ]
+
+    const meshIndex =
+      gltf.meshes.push({
+        primitives,
       }) - 1
 
     const nodeIndex = gltf.nodes.push({ mesh: meshIndex }) - 1
@@ -199,7 +261,7 @@ async function renderStepToPNG(
   }
 
   const { gltf, buffers } = gltfFromOcctMeshes(result.meshes)
-  const scene = createSceneFromGLTF(gltf as any, { buffers, images: [] })
+  const scene = createSceneFromGLTF(gltf, { buffers, images: [] })
 
   const { bitmap } = renderSceneFromGLTF(
     scene,
@@ -224,19 +286,28 @@ async function renderStepToPNG(
  *   await expect(stepContent).toMatchStepSnapshot(import.meta.path, "optionalName")
  */
 async function toMatchStepSnapshot(
-  // biome-ignore lint/suspicious/noExplicitAny: bun doesn't expose
-  this: any,
-  stepContent: string | Uint8Array | ArrayBuffer,
+  this: unknown,
+  received: unknown,
   testPathOriginal: string,
   pngName?: string,
 ) {
-  const png = await renderStepToPNG(stepContent)
+  if (
+    typeof received !== "string" &&
+    !(received instanceof Uint8Array) &&
+    !(received instanceof ArrayBuffer)
+  ) {
+    throw new Error(
+      "Expected STEP content to be a string, Uint8Array, or ArrayBuffer",
+    )
+  }
+
+  const png = await renderStepToPNG(received)
   // Delegate to existing PNG matcher for snapshot compare/update UX
   return await expect(png).toMatchPngSnapshot(testPathOriginal, pngName)
 }
 
 expect.extend({
-  toMatchStepSnapshot: toMatchStepSnapshot as any,
+  toMatchStepSnapshot,
 })
 
 declare module "bun:test" {

package/test/utils/occt/importer.ts

@@ -70,7 +70,7 @@ let occtInstancePromise: Promise<OcctImport> | undefined
 
 async function loadOcct(): Promise<OcctImport> {
   if (!occtInstancePromise) {
-    const imported = (await import("occt-import-js")) as any
+    const imported = await import("occt-import-js")
     const factory = resolveFactory(imported)
     occtInstancePromise = factory()
   }