circuit-json-to-step 0.0.28 → 0.0.30

package/dist/index.js

@@ -12,7 +12,7 @@ import {
   Unknown as Unknown2,
   CartesianPoint as CartesianPoint4,
   Direction as Direction4,
-  Axis2Placement3D as Axis2Placement3D3,
+  Axis2Placement3D as Axis2Placement3D4,
   Plane as Plane3,
   CylindricalSurface as CylindricalSurface2,
   VertexPoint as VertexPoint3,
@@ -28,7 +28,8 @@ import {
   ClosedShell as ClosedShell2,
   ManifoldSolidBrep as ManifoldSolidBrep4,
   MechanicalDesignGeometricPresentationRepresentation,
-  AdvancedBrepShapeRepresentation,
+  AdvancedBrepShapeRepresentation as AdvancedBrepShapeRepresentation2,
+  ShapeRepresentation,
   ShapeDefinitionRepresentation
 } from "stepts";
 
@@ -373,12 +374,16 @@ async function generateComponentMeshes(options) {
 
 // lib/step-model-merger.ts
 import {
+  AdvancedBrepShapeRepresentation,
+  Axis2Placement3D as Axis2Placement3D2,
   CartesianPoint as CartesianPoint2,
   Direction as Direction2,
+  Entity,
   ManifoldSolidBrep as ManifoldSolidBrep3,
   Ref,
   Unknown,
-  parseRepository
+  parseRepository,
+  stepStr
 } from "stepts";
 import { eid } from "stepts";
 
@@ -416,14 +421,6 @@ function toRadians(rotation) {
     z: rotation.z * factor
   };
 }
-function transformPoint(point, rotation, translation) {
-  const rotated = rotateVector(point, rotation);
-  return [
-    rotated[0] + translation.x,
-    rotated[1] + translation.y,
-    rotated[2] + translation.z
-  ];
-}
 function transformDirection(vector, rotation) {
   return rotateVector(vector, rotation);
 }
@@ -489,13 +486,19 @@ async function mergeExternalStepModels(options) {
   const solids = [];
   const handledComponentIds = /* @__PURE__ */ new Set();
   const handledPcbComponentIds = /* @__PURE__ */ new Set();
+  const importedModels = /* @__PURE__ */ new Map();
   for (const component of cadComponents) {
     const componentId = component.cad_component_id ?? "";
     const stepUrl = component.model_step_url;
     try {
-      const stepText = fsMap?.[stepUrl] ?? await readStepFile(stepUrl);
-      if (!stepText.trim()) {
-        throw new Error("STEP file is empty");
+      let importedModel = importedModels.get(stepUrl);
+      if (!importedModel) {
+        const stepText = fsMap?.[stepUrl] ?? await readStepFile(stepUrl);
+        if (!stepText.trim()) {
+          throw new Error("STEP file is empty");
+        }
+        importedModel = importStepModelOnce(repo, stepText, stepUrl);
+        importedModels.set(stepUrl, importedModel);
       }
       const pcbComponent = component.pcb_component_id ? pcbComponentMap.get(component.pcb_component_id) : void 0;
       const layer = pcbComponent?.layer?.toLowerCase();
@@ -503,9 +506,14 @@ async function mergeExternalStepModels(options) {
         translation: asVector3(component.position),
         rotation: asVector3(component.rotation)
       };
-      const componentSolids = mergeSingleStepModel(repo, stepText, transform, {
-        layer,
-        boardThickness
+      const componentSolids = createMappedStepModelInstance({
+        repo,
+        importedModel,
+        transform,
+        placement: {
+          layer,
+          boardThickness
+        }
       });
       if (componentSolids.length > 0) {
         if (componentId) {
@@ -523,12 +531,38 @@ async function mergeExternalStepModels(options) {
   }
   return { solids, handledComponentIds, handledPcbComponentIds };
 }
-function mergeSingleStepModel(targetRepo, stepText, transform, placement) {
+var RepresentationMap = class extends Entity {
+  constructor(mappingOrigin, mappedRepresentation) {
+    super();
+    this.mappingOrigin = mappingOrigin;
+    this.mappedRepresentation = mappedRepresentation;
+  }
+  mappingOrigin;
+  mappedRepresentation;
+  type = "REPRESENTATION_MAP";
+  toStep() {
+    return `REPRESENTATION_MAP(${this.mappingOrigin},${this.mappedRepresentation})`;
+  }
+};
+var MappedItem = class extends Entity {
+  constructor(name, mappingSource, mappingTarget) {
+    super();
+    this.name = name;
+    this.mappingSource = mappingSource;
+    this.mappingTarget = mappingTarget;
+  }
+  name;
+  mappingSource;
+  mappingTarget;
+  type = "MAPPED_ITEM";
+  toStep() {
+    return `MAPPED_ITEM(${stepStr(this.name)},${this.mappingSource},${this.mappingTarget})`;
+  }
+};
+function importStepModelOnce(targetRepo, stepText, modelName) {
   const sourceRepo = parseRepository(stepText);
   let entries = sourceRepo.entries().map(([id, entity]) => [Number(id), entity]).filter(([, entity]) => !EXCLUDED_ENTITY_TYPES.has(entity.type));
   entries = pruneInvalidEntries(entries);
-  adjustTransformForPlacement(entries, transform, placement);
-  applyTransform(entries, transform);
   const idMapping = allocateIds(targetRepo, entries);
   remapReferences(entries, idMapping);
   for (const [oldId, entity] of entries) {
@@ -545,7 +579,65 @@ function mergeSingleStepModel(targetRepo, stepText, transform, placement) {
       }
     }
   }
-  return solids;
+  const originPoint = targetRepo.add(new CartesianPoint2("", 0, 0, 0));
+  const zDirection = targetRepo.add(new Direction2("", 0, 0, 1));
+  const xDirection = targetRepo.add(new Direction2("", 1, 0, 0));
+  const mappingOrigin = targetRepo.add(
+    new Axis2Placement3D2("", originPoint, zDirection, xDirection)
+  );
+  const representation = targetRepo.add(
+    new AdvancedBrepShapeRepresentation(
+      modelName,
+      solids,
+      getGeomContext(targetRepo)
+    )
+  );
+  const representationMap = targetRepo.add(
+    new RepresentationMap(mappingOrigin, representation)
+  );
+  return { entries, representationMap };
+}
+function createMappedStepModelInstance({
+  repo,
+  importedModel,
+  transform,
+  placement
+}) {
+  adjustTransformForPlacement(importedModel.entries, transform, placement);
+  const placementTarget = createPlacementTarget(repo, transform);
+  const mappedItem = repo.add(
+    new MappedItem("", importedModel.representationMap, placementTarget)
+  );
+  return [mappedItem];
+}
+function createPlacementTarget(repo, transform) {
+  const rotation = toRadians(transform.rotation);
+  const [refX, refY, refZ] = transformDirection([1, 0, 0], rotation);
+  const [axisX, axisY, axisZ] = transformDirection([0, 0, 1], rotation);
+  const axis = repo.add(new Direction2("", axisX, axisY, axisZ));
+  const refDirection = repo.add(new Direction2("", refX, refY, refZ));
+  const origin = repo.add(
+    new CartesianPoint2(
+      "",
+      transform.translation.x,
+      transform.translation.y,
+      transform.translation.z
+    )
+  );
+  return repo.add(new Axis2Placement3D2("", origin, axis, refDirection));
+}
+function getGeomContext(repo) {
+  for (const [id, entity] of repo.entries()) {
+    if (entity.type === "GEOMETRIC_REPRESENTATION_CONTEXT") {
+      return new Ref(id);
+    }
+    if (entity instanceof Unknown && entity.args.some(
+      (arg) => arg.includes("GEOMETRIC_REPRESENTATION_CONTEXT")
+    )) {
+      return new Ref(id);
+    }
+  }
+  throw new Error("GEOMETRIC_REPRESENTATION_CONTEXT is missing");
 }
 function adjustTransformForPlacement(entries, transform, placement) {
   if (!placement) return;
@@ -667,32 +759,6 @@ function collectReferencedIdsRecursive(value, result, seen) {
     }
   }
 }
-function applyTransform(entries, transform) {
-  const rotation = toRadians(transform.rotation);
-  for (const [, entity] of entries) {
-    if (entity instanceof CartesianPoint2) {
-      const [x, y, z] = transformPoint(
-        [entity.x, entity.y, entity.z],
-        rotation,
-        transform.translation
-      );
-      entity.x = x;
-      entity.y = y;
-      entity.z = z;
-    } else if (entity instanceof Direction2) {
-      const [dx, dy, dz] = transformDirection(
-        [entity.dx, entity.dy, entity.dz],
-        rotation
-      );
-      const length = Math.hypot(dx, dy, dz);
-      if (length > 0) {
-        entity.dx = dx / length;
-        entity.dy = dy / length;
-        entity.dz = dz / length;
-      }
-    }
-  }
-}
 function allocateIds(targetRepo, entries) {
   let nextId = getNextEntityId(targetRepo);
   const idMapping = /* @__PURE__ */ new Map();
@@ -762,7 +828,7 @@ function normalizeStepNumericExponents(stepText) {
 var package_default = {
   name: "circuit-json-to-step",
   main: "dist/index.js",
-  version: "0.0.27",
+  version: "0.0.28",
   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"' {} \\;`,
@@ -805,7 +871,7 @@ var VERSION = package_default.version;
 // lib/pill-geometry.ts
 import {
   AdvancedFace as AdvancedFace2,
-  Axis2Placement3D as Axis2Placement3D2,
+  Axis2Placement3D as Axis2Placement3D3,
   CartesianPoint as CartesianPoint3,
   Circle,
   CylindricalSurface,
@@ -903,7 +969,7 @@ function createArcEdge(repo, centerX, centerY, z, radius, startAngle, endAngle,
     new Direction3("", Math.cos(refAngle), Math.sin(refAngle), 0)
   );
   const placement = repo.add(
-    new Axis2Placement3D2("", centerPoint, normalDir, refDir)
+    new Axis2Placement3D3("", centerPoint, normalDir, refDir)
   );
   const circle = repo.add(new Circle("", placement, radius));
   return repo.add(new EdgeCurve2("", startVertex, endVertex, circle, false));
@@ -1289,7 +1355,7 @@ function createCylindricalWall(repo, centerX, centerY, radius, startAngle, endAn
     new CartesianPoint3("", centerRotated.x, centerRotated.y, zMin)
   );
   const bottomPlacement = repo.add(
-    new Axis2Placement3D2(
+    new Axis2Placement3D3(
       "",
       bottomCenter,
       repo.add(new Direction3("", 0, 0, -1)),
@@ -1303,7 +1369,7 @@ function createCylindricalWall(repo, centerX, centerY, radius, startAngle, endAn
   const topCenter = repo.add(
     new CartesianPoint3("", centerRotated.x, centerRotated.y, zMax)
   );
-  const topPlacement = repo.add(new Axis2Placement3D2("", topCenter, zDir, xDir));
+  const topPlacement = repo.add(new Axis2Placement3D3("", topCenter, zDir, xDir));
   const topCircle = repo.add(new Circle("", topPlacement, radius));
   const topArc = repo.add(new EdgeCurve2("", topEnd, topStart, topCircle, false));
   const v1 = repo.add(
@@ -1348,7 +1414,7 @@ function createCylindricalWall(repo, centerX, centerY, radius, startAngle, endAn
     ])
   );
   const cylinderPlacement = repo.add(
-    new Axis2Placement3D2("", bottomCenter, zDir, xDir)
+    new Axis2Placement3D3("", bottomCenter, zDir, xDir)
   );
   const cylinderSurface = repo.add(
     new CylindricalSurface("", cylinderPlacement, radius)
@@ -1422,7 +1488,7 @@ function createPlanarWall(repo, startX, startY, endX, endY, rotation, centerX0,
   );
   const planeOrigin = repo.add(new CartesianPoint3("", start.x, start.y, zMin));
   const placement = repo.add(
-    new Axis2Placement3D2("", planeOrigin, normalDir, refDir)
+    new Axis2Placement3D3("", planeOrigin, normalDir, refDir)
   );
   const plane = repo.add(new Plane2("", placement));
   return repo.add(
@@ -1631,7 +1697,7 @@ async function circuitJsonToStep(circuitJson, options = {}) {
   const xDir = repo.add(new Direction4("", 1, 0, 0));
   const zDir = repo.add(new Direction4("", 0, 0, 1));
   const bottomFrame = repo.add(
-    new Axis2Placement3D3(
+    new Axis2Placement3D4(
       "",
       origin,
       repo.add(new Direction4("", 0, 0, -1)),
@@ -1664,7 +1730,7 @@ async function circuitJsonToStep(circuitJson, options = {}) {
         )
       );
       const holePlacement = repo.add(
-        new Axis2Placement3D3(
+        new Axis2Placement3D4(
           "",
           holeCenter,
           repo.add(new Direction4("", 0, 0, -1)),
@@ -1693,7 +1759,7 @@ async function circuitJsonToStep(circuitJson, options = {}) {
     )
   );
   const topOrigin = repo.add(new CartesianPoint4("", 0, 0, halfBoardThickness));
-  const topFrame = repo.add(new Axis2Placement3D3("", topOrigin, zDir, xDir));
+  const topFrame = repo.add(new Axis2Placement3D4("", topOrigin, zDir, xDir));
   const topPlane = repo.add(new Plane3("", topFrame));
   const topLoop = repo.add(
     new EdgeLoop3(
@@ -1720,7 +1786,7 @@ async function circuitJsonToStep(circuitJson, options = {}) {
         )
       );
       const holePlacement = repo.add(
-        new Axis2Placement3D3("", holeCenter, zDir, xDir)
+        new Axis2Placement3D4("", holeCenter, zDir, xDir)
       );
       const holeCircle = repo.add(new Circle2("", holePlacement, radius));
       const holeEdge = repo.add(
@@ -1758,7 +1824,7 @@ async function circuitJsonToStep(circuitJson, options = {}) {
     const normalDir = repo.add(new Direction4("", edgeDir.y, -edgeDir.x, 0));
     const refDir = repo.add(new Direction4("", edgeDir.x, edgeDir.y, 0));
     const sideFrame = repo.add(
-      new Axis2Placement3D3("", bottomV1Pnt, normalDir, refDir)
+      new Axis2Placement3D4("", bottomV1Pnt, normalDir, refDir)
     );
     const sidePlane = repo.add(new Plane3("", sideFrame));
     const sideLoop = repo.add(
@@ -1798,7 +1864,7 @@ async function circuitJsonToStep(circuitJson, options = {}) {
         )
       );
       const bottomHolePlacement = repo.add(
-        new Axis2Placement3D3(
+        new Axis2Placement3D4(
           "",
           bottomHoleCenter,
           repo.add(new Direction4("", 0, 0, -1)),
@@ -1829,7 +1895,7 @@ async function circuitJsonToStep(circuitJson, options = {}) {
         )
       );
       const topHolePlacement = repo.add(
-        new Axis2Placement3D3("", topHoleCenter, zDir, xDir)
+        new Axis2Placement3D4("", topHoleCenter, zDir, xDir)
       );
       const topHoleCircle = repo.add(new Circle2("", topHolePlacement, radius));
       const topHoleEdge = repo.add(
@@ -1842,7 +1908,7 @@ async function circuitJsonToStep(circuitJson, options = {}) {
         ])
       );
       const holeCylinderPlacement = repo.add(
-        new Axis2Placement3D3("", bottomHoleCenter, zDir, xDir)
+        new Axis2Placement3D4("", bottomHoleCenter, zDir, xDir)
       );
       const holeCylinderSurface = repo.add(
         new CylindricalSurface2("", holeCylinderPlacement, radius)
@@ -1976,8 +2042,15 @@ async function circuitJsonToStep(circuitJson, options = {}) {
       geomContext
     )
   );
+  const hasMappedItems = allSolids.some(
+    (itemRef) => itemRef.resolve(repo).type === "MAPPED_ITEM"
+  );
   const shapeRep = repo.add(
-    new AdvancedBrepShapeRepresentation(productName, allSolids, geomContext)
+    hasMappedItems ? new ShapeRepresentation(productName, allSolids, geomContext) : new AdvancedBrepShapeRepresentation2(
+      productName,
+      allSolids,
+      geomContext
+    )
   );
   repo.add(new ShapeDefinitionRepresentation(productDefShape, shapeRep));
   const stepText = repo.toPartFile({ name: productName });

package/lib/index.ts

@@ -37,7 +37,9 @@ import {
   StyledItem,
   MechanicalDesignGeometricPresentationRepresentation,
   AdvancedBrepShapeRepresentation,
+  ShapeRepresentation,
   ShapeDefinitionRepresentation,
+  type Entity,
   type Ref,
 } from "stepts"
 import { generateComponentMeshes } from "./mesh-generation"
@@ -614,7 +616,7 @@ export async function circuitJsonToStep(
   const solid = repo.add(new ManifoldSolidBrep(productName, shell))
 
   // Array to hold all solids (board + optional components)
-  const allSolids: Ref<ManifoldSolidBrep>[] = [solid]
+  const allSolids: Ref<Entity>[] = [solid]
   const componentStyledItems: Ref<StyledItem>[] = []
   const solidsWithIntrinsicFaceStyles = new Set<string>()
 
@@ -750,9 +752,17 @@ export async function circuitJsonToStep(
     ),
   )
 
-  // Shape representation with all solids
+  const hasMappedItems = allSolids.some(
+    (itemRef) => itemRef.resolve(repo).type === "MAPPED_ITEM",
+  )
   const shapeRep = repo.add(
-    new AdvancedBrepShapeRepresentation(productName, allSolids, geomContext),
+    hasMappedItems
+      ? new ShapeRepresentation(productName, allSolids, geomContext)
+      : new AdvancedBrepShapeRepresentation(
+          productName,
+          allSolids,
+          geomContext,
+        ),
   )
   repo.add(new ShapeDefinitionRepresentation(productDefShape, shapeRep))
 

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

@@ -1,5 +1,5 @@
 import type { CircuitJson } from "circuit-json"
-import type { ManifoldSolidBrep, Ref, Repository } from "stepts"
+import type { Entity, Ref, Repository } from "stepts"
 
 export type CadComponent = {
   type: "cad_component"
@@ -28,7 +28,7 @@ export type MergeTransform = {
 }
 
 export type MergeStepModelResult = {
-  solids: Ref<ManifoldSolidBrep>[]
+  solids: Ref<Entity>[]
   handledComponentIds: Set<string>
   handledPcbComponentIds: Set<string>
 }

package/lib/step-model-merger.ts

@@ -1,12 +1,15 @@
 import {
+  AdvancedBrepShapeRepresentation,
+  Axis2Placement3D,
   CartesianPoint,
   Direction,
-  type Entity,
+  Entity,
   ManifoldSolidBrep,
   Ref,
   Repository,
   Unknown,
   parseRepository,
+  stepStr,
 } from "stepts"
 import { eid } from "stepts"
 import { EXCLUDED_ENTITY_TYPES } from "./step-model-merger/excluded-entity-types"
@@ -47,18 +50,24 @@ export async function mergeExternalStepModels(
     }
   }
 
-  const solids: Ref<ManifoldSolidBrep>[] = []
+  const solids: Ref<Entity>[] = []
   const handledComponentIds = new Set<string>()
   const handledPcbComponentIds = new Set<string>()
+  const importedModels = new Map<string, ImportedStepModel>()
 
   for (const component of cadComponents) {
     const componentId = component.cad_component_id ?? ""
     const stepUrl = component.model_step_url!
 
     try {
-      const stepText = fsMap?.[stepUrl] ?? (await readStepFile(stepUrl))
-      if (!stepText.trim()) {
-        throw new Error("STEP file is empty")
+      let importedModel = importedModels.get(stepUrl)
+      if (!importedModel) {
+        const stepText = fsMap?.[stepUrl] ?? (await readStepFile(stepUrl))
+        if (!stepText.trim()) {
+          throw new Error("STEP file is empty")
+        }
+        importedModel = importStepModelOnce(repo, stepText, stepUrl)
+        importedModels.set(stepUrl, importedModel)
       }
 
       const pcbComponent = component.pcb_component_id
@@ -71,9 +80,14 @@ export async function mergeExternalStepModels(
         rotation: asVector3(component.rotation),
       }
 
-      const componentSolids = mergeSingleStepModel(repo, stepText, transform, {
-        layer,
-        boardThickness,
+      const componentSolids = createMappedStepModelInstance({
+        repo,
+        importedModel,
+        transform,
+        placement: {
+          layer,
+          boardThickness,
+        },
       })
       if (componentSolids.length > 0) {
         if (componentId) {
@@ -98,12 +112,47 @@ type PlacementOptions = {
   boardThickness?: number
 }
 
-function mergeSingleStepModel(
+type ImportedStepModel = {
+  entries: RepositoryEntry[]
+  representationMap: Ref<RepresentationMap>
+}
+
+class RepresentationMap extends Entity {
+  readonly type = "REPRESENTATION_MAP"
+
+  constructor(
+    public mappingOrigin: Ref<Entity>,
+    public mappedRepresentation: Ref<Entity>,
+  ) {
+    super()
+  }
+
+  toStep(): string {
+    return `REPRESENTATION_MAP(${this.mappingOrigin},${this.mappedRepresentation})`
+  }
+}
+
+class MappedItem extends Entity {
+  readonly type = "MAPPED_ITEM"
+
+  constructor(
+    public name: string,
+    public mappingSource: Ref<RepresentationMap>,
+    public mappingTarget: Ref<Entity>,
+  ) {
+    super()
+  }
+
+  toStep(): string {
+    return `MAPPED_ITEM(${stepStr(this.name)},${this.mappingSource},${this.mappingTarget})`
+  }
+}
+
+function importStepModelOnce(
   targetRepo: Repository,
   stepText: string,
-  transform: MergeTransform,
-  placement?: PlacementOptions,
-): Ref<ManifoldSolidBrep>[] {
+  modelName: string,
+): ImportedStepModel {
   const sourceRepo = parseRepository(stepText)
   let entries: RepositoryEntry[] = sourceRepo
     .entries()
@@ -112,9 +161,6 @@ function mergeSingleStepModel(
 
   entries = pruneInvalidEntries(entries)
 
-  adjustTransformForPlacement(entries, transform, placement)
-  applyTransform(entries, transform)
-
   const idMapping = allocateIds(targetRepo, entries)
   remapReferences(entries, idMapping)
 
@@ -134,7 +180,84 @@ function mergeSingleStepModel(
     }
   }
 
-  return solids
+  const originPoint = targetRepo.add(new CartesianPoint("", 0, 0, 0))
+  const zDirection = targetRepo.add(new Direction("", 0, 0, 1))
+  const xDirection = targetRepo.add(new Direction("", 1, 0, 0))
+  const mappingOrigin = targetRepo.add(
+    new Axis2Placement3D("", originPoint, zDirection, xDirection),
+  )
+  const representation = targetRepo.add(
+    new AdvancedBrepShapeRepresentation(
+      modelName,
+      solids,
+      getGeomContext(targetRepo),
+    ),
+  )
+  const representationMap = targetRepo.add(
+    new RepresentationMap(mappingOrigin, representation),
+  )
+
+  return { entries, representationMap }
+}
+
+function createMappedStepModelInstance({
+  repo,
+  importedModel,
+  transform,
+  placement,
+}: {
+  repo: Repository
+  importedModel: ImportedStepModel
+  transform: MergeTransform
+  placement?: PlacementOptions
+}): Ref<Entity>[] {
+  adjustTransformForPlacement(importedModel.entries, transform, placement)
+
+  const placementTarget = createPlacementTarget(repo, transform)
+  const mappedItem = repo.add(
+    new MappedItem("", importedModel.representationMap, placementTarget),
+  )
+
+  return [mappedItem]
+}
+
+function createPlacementTarget(
+  repo: Repository,
+  transform: MergeTransform,
+): Ref<Axis2Placement3D> {
+  const rotation = toRadians(transform.rotation)
+  const [refX, refY, refZ] = transformDirection([1, 0, 0], rotation)
+  const [axisX, axisY, axisZ] = transformDirection([0, 0, 1], rotation)
+
+  const axis = repo.add(new Direction("", axisX, axisY, axisZ))
+  const refDirection = repo.add(new Direction("", refX, refY, refZ))
+  const origin = repo.add(
+    new CartesianPoint(
+      "",
+      transform.translation.x,
+      transform.translation.y,
+      transform.translation.z,
+    ),
+  )
+
+  return repo.add(new Axis2Placement3D("", origin, axis, refDirection))
+}
+
+function getGeomContext(repo: Repository): Ref<Entity> {
+  for (const [id, entity] of repo.entries()) {
+    if (entity.type === "GEOMETRIC_REPRESENTATION_CONTEXT") {
+      return new Ref<Entity>(id)
+    }
+    if (
+      entity instanceof Unknown &&
+      entity.args.some((arg) =>
+        arg.includes("GEOMETRIC_REPRESENTATION_CONTEXT"),
+      )
+    ) {
+      return new Ref<Entity>(id)
+    }
+  }
+  throw new Error("GEOMETRIC_REPRESENTATION_CONTEXT is missing")
 }
 
 type RepositoryEntry = readonly [number, Entity]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-step",
   "main": "dist/index.js",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "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\"' {} \\;",

package/test/repros/kicad-step/kicad-step.test.ts

@@ -20,6 +20,11 @@ const EXPECTED_COMPONENT_CENTERS = (circuitJson as CadComponentJson[])
     x: item.position?.x ?? 0,
     y: item.position?.y ?? 0,
   }))
+const EXPECTED_UNIQUE_STEP_MODEL_COUNT = new Set(
+  (circuitJson as CadComponentJson[])
+    .filter((item) => item.type === "cad_component" && item.model_step_url)
+    .map((item) => item.model_step_url),
+).size
 
 const fixturesDir = fileURLToPath(
   new URL("../../fixtures/kicad-models/", import.meta.url),
@@ -99,6 +104,9 @@ test("kicad-step: merges KiCad STEP models referenced via model_step_url", async
     fsMap,
   })
 
+  const outputPath = "debug-output/kicad-step.step"
+  await Bun.write(outputPath, stepText)
+
   expect(stepText).toContain("KiCadStepMerge")
   const solidCount = (stepText.match(/MANIFOLD_SOLID_BREP/g) || []).length
   expect(solidCount).toBeGreaterThanOrEqual(3)
@@ -114,10 +122,16 @@ test("kicad-step: merges KiCad STEP models referenced via model_step_url", async
     (entity) => entity.name === "KiCadStepMerge",
   )
   expect(boardSolids.length).toBe(1)
-  const componentSolids = solids.length - boardSolids.length
-  expect(componentSolids).toBeGreaterThanOrEqual(
+  const uniqueComponentSolids = solids.length - boardSolids.length
+  expect(uniqueComponentSolids).toBeGreaterThanOrEqual(
+    EXPECTED_UNIQUE_STEP_MODEL_COUNT,
+  )
+  expect(stepText.match(/MAPPED_ITEM/g) ?? []).toHaveLength(
     EXPECTED_COMPONENT_CENTERS.length,
   )
+  expect(stepText.match(/REPRESENTATION_MAP/g) ?? []).toHaveLength(
+    EXPECTED_UNIQUE_STEP_MODEL_COUNT,
+  )
 
   try {
     const occtBoard = await importStepWithOcct(stepText)