brepjs 12.8.2 → 12.10.0

package/dist/{boolean2D-0blbVtJ8.cjs → boolean2D-N9Pgumgg.cjs}

@@ -44,17 +44,17 @@ var __callDispose = (stack, error, hasError) => {
   };
   return next();
 };
-const vectors = require("./vectors-D_IiZx0q.cjs");
-const result = require("./result-fAX0OZzI.cjs");
-const faceFns = require("./faceFns-DB1Fc5gy.cjs");
+const vectors = require("./vectors-I_0zdD3O.cjs");
+const result = require("./result-DULetAht.cjs");
+const faceFns = require("./faceFns-CmIrjdt1.cjs");
 const types = require("./types-CA_xrgDq.cjs");
 const vecOps = require("./vecOps-CjRL1jau.cjs");
-const loft = require("./loft-hp3pc1M7.cjs");
-const shapeTypes = require("./shapeTypes-7xEam9Ri.cjs");
-const curveFns = require("./curveFns-BZngcnQ1.cjs");
-const surfaceBuilders = require("./surfaceBuilders-5VA34a3_.cjs");
-const helpers = require("./helpers-C8NoT0Wu.cjs");
-const Blueprint = require("./Blueprint-CQ28WJhz.cjs");
+const shapeTypes = require("./shapeTypes-T0n6mRmt.cjs");
+const sweepFns = require("./sweepFns-COqeYIUp.cjs");
+const curveFns = require("./curveFns-CWZRuXQ3.cjs");
+const surfaceBuilders = require("./surfaceBuilders-DYS8AMSS.cjs");
+const helpers = require("./helpers-mipaxDTy.cjs");
+const Blueprint = require("./Blueprint-BoC0DsDm.cjs");
 const intersectCurves = (first, second, precision = 1e-9) => {
   if (first.boundingBox.isOut(second.boundingBox))
     return result.ok({ intersections: [], commonSegments: [], commonSegmentsPoints: [] });
@@ -567,33 +567,29 @@ function upperBound(value, arr) {
   return arr[i];
 }
 function sort(values, boxes, indices, left, right, nodeSize) {
-  if (Math.floor(left / nodeSize) >= Math.floor(right / nodeSize)) return;
-  const start = values[left];
-  const mid = values[left + right >> 1];
-  const end = values[right];
-  let pivot = end;
-  const x = Math.max(start, mid);
-  if (end > x) {
-    pivot = x;
-  } else if (x === start) {
-    pivot = Math.max(mid, end);
-  } else if (x === mid) {
-    pivot = Math.max(start, end);
-  }
-  let i = left - 1;
-  let j = right + 1;
-  while (true) {
-    do
-      i++;
-    while (values[i] < pivot);
-    do
-      j--;
-    while (values[j] > pivot);
-    if (i >= j) break;
-    swap(values, boxes, indices, i, j);
-  }
-  sort(values, boxes, indices, left, j, nodeSize);
-  sort(values, boxes, indices, j + 1, right, nodeSize);
+  const stack = [left, right];
+  while (stack.length) {
+    const r = stack.pop() || 0;
+    const l = stack.pop() || 0;
+    if (r - l <= nodeSize && Math.floor(l / nodeSize) >= Math.floor(r / nodeSize)) continue;
+    const a = values[l];
+    const b = values[l + r >> 1];
+    const c = values[r];
+    const pivot = a > b !== a > c ? a : b < a !== b < c ? b : c;
+    let i = l - 1;
+    let j = r + 1;
+    while (true) {
+      do
+        i++;
+      while (values[i] < pivot);
+      do
+        j--;
+      while (values[j] > pivot);
+      if (i >= j) break;
+      swap(values, boxes, indices, i, j);
+    }
+    stack.push(l, j, j + 1, r);
+  }
 }
 function swap(values, boxes, indices, i, j) {
   const temp = values[i];
@@ -948,6 +944,69 @@ const organiseBlueprints = (blueprints) => {
     })
   );
 };
+function extrude(face, extrusionVec) {
+  if (shapeTypes.getKernel().isNull(face.wrapped)) {
+    return result.err(result.validationError(result.BrepErrorCode.NULL_SHAPE_INPUT, "extrude: face is a null shape"));
+  }
+  if (vecOps.vecLength(extrusionVec) === 0) {
+    return result.err(result.validationError("EXTRUDE_ZERO_VECTOR", "extrude: extrusion vector has zero length"));
+  }
+  try {
+    const kernel = shapeTypes.getKernel();
+    const len = vecOps.vecLength(extrusionVec);
+    const dir = vecOps.vecNormalize(extrusionVec);
+    const shape = kernel.extrude(face.wrapped, [...dir], len);
+    const downcastShape = kernel.downcast(shape, "solid");
+    const solid = shapeTypes.createSolid(downcastShape);
+    return result.ok(solid);
+  } catch (e) {
+    return result.err(
+      result.kernelError("EXTRUDE_FAILED", "Extrusion operation failed", e, {
+        operation: "extrude",
+        vectorLength: vecOps.vecLength(extrusionVec)
+      })
+    );
+  }
+}
+function revolve(face, center = [0, 0, 0], direction = [0, 0, 1], angle = 360) {
+  if (shapeTypes.getKernel().isNull(face.wrapped)) {
+    return result.err(result.validationError(result.BrepErrorCode.NULL_SHAPE_INPUT, "revolve: face is a null shape"));
+  }
+  const kernel = shapeTypes.getKernel();
+  const shape = kernel.revolveVec(face.wrapped, [...center], [...direction], angle);
+  const result$1 = shapeTypes.castShape(shape);
+  if (!shapeTypes.isShape3D(result$1)) {
+    return result.err(result.typeCastError("REVOLUTION_NOT_3D", "Revolution did not produce a 3D shape"));
+  }
+  return result.ok(result$1);
+}
+function loft(wires, { ruled = true, startPoint, endPoint, tolerance = 1e-6 } = {}, returnShell = false) {
+  if (wires.length === 0 && !startPoint && !endPoint) {
+    return result.err(result.validationError("LOFT_EMPTY", "Loft requires at least one wire or start/end point"));
+  }
+  const kernel = shapeTypes.getKernel();
+  const startVertex = startPoint ? kernel.makeVertex(...types.toVec3(startPoint)) : void 0;
+  const endVertex = endPoint ? kernel.makeVertex(...types.toVec3(endPoint)) : void 0;
+  try {
+    const shape = kernel.loftAdvanced(
+      wires.map((w) => w.wrapped),
+      {
+        solid: !returnShell,
+        ruled,
+        tolerance,
+        ...startVertex ? { startVertex } : {},
+        ...endVertex ? { endVertex } : {}
+      }
+    );
+    const result$1 = shapeTypes.castShape(shape);
+    if (!shapeTypes.isShape3D(result$1)) {
+      return result.err(result.typeCastError("LOFT_NOT_3D", "Loft did not produce a 3D shape"));
+    }
+    return result.ok(result$1);
+  } catch {
+    return result.err(result.kernelError("LOFT_FAILED", "Loft operation failed"));
+  }
+}
 class Sketch {
   wire;
   /**
@@ -1032,7 +1091,9 @@ class Sketch {
    */
   revolve(revolutionAxis, { origin } = {}) {
     const face = result.unwrap(surfaceBuilders.makeFace(this.wire));
-    const solid = result.unwrap(loft.revolution(face, origin || this.defaultOrigin, revolutionAxis));
+    const center = origin ? types.toVec3(origin) : this.defaultOrigin;
+    const dir = revolutionAxis ? types.toVec3(revolutionAxis) : [0, 0, 1];
+    const solid = result.unwrap(revolve(face, center, dir));
     face.delete();
     this.delete();
     return solid;
@@ -1058,20 +1119,26 @@ class Sketch {
     const originVec = origin ? types.toVec3(origin) : this.defaultOrigin;
     if (extrusionProfile && !twistAngle) {
       const solid2 = result.unwrap(
-        loft.complexExtrude(this.wire, [...originVec], [...extrusionVec], extrusionProfile)
+        sweepFns.complexExtrude(this.wire, [...originVec], [...extrusionVec], extrusionProfile)
       );
       this.delete();
       return solid2;
     }
     if (twistAngle) {
       const solid2 = result.unwrap(
-        loft.twistExtrude(this.wire, twistAngle, [...originVec], [...extrusionVec], extrusionProfile)
+        sweepFns.twistExtrude(
+          this.wire,
+          twistAngle,
+          [...originVec],
+          [...extrusionVec],
+          extrusionProfile
+        )
       );
       this.delete();
       return solid2;
     }
     const face = result.unwrap(surfaceBuilders.makeFace(this.wire));
-    const solid = loft.basicFaceExtrusion(face, [...extrusionVec]);
+    const solid = result.unwrap(extrude(face, [...extrusionVec]));
     this.delete();
     return solid;
   }
@@ -1095,7 +1162,7 @@ class Sketch {
     if (this.baseFace) {
       config.support = this.baseFace.wrapped;
     }
-    const shape = result.unwrap(loft.genericSweep(sketch.wire, this.wire, config));
+    const shape = result.unwrap(sweepFns.sweep(sketch.wire, this.wire, config));
     this.delete();
     return shape;
   }
@@ -1111,7 +1178,7 @@ class Sketch {
   loftWith(otherSketches, loftConfig = {}, returnShell = false) {
     const sketchArray = Array.isArray(otherSketches) ? [this, ...otherSketches] : [this, otherSketches];
     const shape = result.unwrap(
-      loft.loft(
+      loft(
         sketchArray.map((s) => s.wire),
         loftConfig,
         returnShell
@@ -2478,13 +2545,16 @@ exports.Sketch = Sketch;
 exports.chamferCurves = chamferCurves;
 exports.cut2D = cut2D;
 exports.cutBlueprints = cutBlueprints;
+exports.extrude = extrude;
 exports.filletCurves = filletCurves;
 exports.fuse2D = fuse2D;
 exports.fuseBlueprints = fuseBlueprints;
 exports.intersect2D = intersect2D;
 exports.intersectBlueprints = intersectBlueprints;
 exports.intersectCurves = intersectCurves;
+exports.loft = loft;
 exports.make2dOffset = make2dOffset;
 exports.organiseBlueprints = organiseBlueprints;
 exports.polysidesBlueprint = polysidesBlueprint;
+exports.revolve = revolve;
 exports.roundedRectangleBlueprint = roundedRectangleBlueprint;

package/dist/{booleanFns-BCTjYZAg.js → booleanFns-BXV7Oh0h.js}

@@ -1,9 +1,10 @@
-import { B as getKernel, c as castShape, p as isShape3D } from "./shapeTypes-CpSaBLDv.js";
-import { o as ok, g as isErr, e as err, z as validationError, A as BrepErrorCode, r as typeCastError, k as kernelError } from "./result-BaSD1fqR.js";
-import { r as resolvePlane } from "./vectors-Bx8wkNui.js";
-import { H as HASH_CODE_MAX, n as vecScale, v as vecAdd } from "./vecOps-ZDdZWbwT.js";
-import { a as getFaces, p as propagateOriginsByHash, b as propagateOriginsFromEvolution, c as getWires, d as getEdges, e as getVertices, g as getFaceOrigins } from "./shapeFns-FDuKkrDR.js";
-import { m as makeFace } from "./surfaceBuilders-nQdJ56fe.js";
+import { g as getKernel, c as castShape, h as isShape3D } from "./shapeTypes-dhhm-T5A.js";
+import { o as ok, b as isErr, e as err, v as validationError, B as BrepErrorCode, t as typeCastError, k as kernelError } from "./result-CoDaWsvc.js";
+import { r as resolvePlane } from "./vectors-B8juLsQB.js";
+import { H as HASH_CODE_MAX, b as vecScale, a as vecAdd } from "./vecOps-LTN--A58.js";
+import { p as propagateOriginsByHash, g as getFaceOrigins, a as propagateOriginsFromEvolution } from "./originTrackingFns-BOCAMfd0.js";
+import { b as getFaces, c as getWires, d as getEdges, e as getVertices } from "./topologyQueryFns-Dj4Xd5kx.js";
+import { m as makeFace } from "./surfaceBuilders-Dl0ATFbO.js";
 const shapeTagStore = /* @__PURE__ */ new WeakMap();
 const tagMetadataStore = /* @__PURE__ */ new WeakMap();
 function hasFaceTags(shape) {
@@ -195,6 +196,29 @@ function propagateColorsFromEvolution(evolution, inputs, result) {
     }
   }
 }
+function collectInputFaceHashes(inputs) {
+  const hasMetadata = inputs.some(
+    (s) => getFaceOrigins(s) !== void 0 || hasFaceTags(s) || hasColorMetadata(s)
+  );
+  if (!hasMetadata) return [];
+  const kernel = getKernel();
+  const hashes = [];
+  for (const input of inputs) {
+    const faces = kernel.iterShapes(input.wrapped, "face");
+    for (const face of faces) {
+      hashes.push(kernel.hashCode(face, HASH_CODE_MAX));
+    }
+  }
+  return hashes;
+}
+function propagateAllMetadata(evolution, inputs, result) {
+  propagateOriginsFromEvolution(evolution, inputs, result);
+  propagateFaceTagsFromEvolution(evolution, inputs, result);
+  propagateColorsFromEvolution(evolution, inputs, result);
+}
+function propagateMetadataByHash(inputs, result) {
+  propagateOriginsByHash(inputs, result);
+}
 function validateShape3D(shape, label) {
   if (getKernel().isNull(shape.wrapped)) {
     return err(validationError(BrepErrorCode.NULL_SHAPE_INPUT, `${label} is a null shape`));
@@ -222,20 +246,6 @@ function castToShape3D(shape, errorCode, errorMsg) {
   }
   return ok(wrapped);
 }
-function collectInputFaceHashes(inputs) {
-  const hasMetadata = inputs.some(
-    (s) => getFaceOrigins(s) !== void 0 || hasFaceTags(s) || hasColorMetadata(s)
-  );
-  if (!hasMetadata) return [];
-  const hashes = [];
-  for (const input of inputs) {
-    const faces = getKernel().iterShapes(input.wrapped, "face");
-    for (const face of faces) {
-      hashes.push(face.HashCode(HASH_CODE_MAX));
-    }
-  }
-  return hashes;
-}
 function fuse(a, b, { optimisation = "none", simplify = false, signal, fuzzyValue } = {}) {
   if (signal?.aborted) throw signal.reason;
   const checkA = validateShape3D(a, "fuse: first operand");
@@ -252,9 +262,7 @@ function fuse(a, b, { optimisation = "none", simplify = false, signal, fuzzyValu
   );
   const fuseResult = castToShape3D(resultShape, "FUSE_NOT_3D", "Fuse did not produce a 3D shape");
   if (fuseResult.ok) {
-    propagateOriginsFromEvolution(evolution, [a, b], fuseResult.value);
-    propagateFaceTagsFromEvolution(evolution, [a, b], fuseResult.value);
-    propagateColorsFromEvolution(evolution, [a, b], fuseResult.value);
+    propagateAllMetadata(evolution, [a, b], fuseResult.value);
   }
   return fuseResult;
 }
@@ -274,9 +282,7 @@ function cut(base, tool, { optimisation = "none", simplify = false, signal, fuzz
   );
   const cutResult = castToShape3D(resultShape, "CUT_NOT_3D", "Cut did not produce a 3D shape");
   if (cutResult.ok) {
-    propagateOriginsFromEvolution(evolution, [base, tool], cutResult.value);
-    propagateFaceTagsFromEvolution(evolution, [base, tool], cutResult.value);
-    propagateColorsFromEvolution(evolution, [base, tool], cutResult.value);
+    propagateAllMetadata(evolution, [base, tool], cutResult.value);
   }
   return cutResult;
 }
@@ -300,9 +306,7 @@ function intersect(a, b, { simplify = false, signal, fuzzyValue } = {}) {
     "Intersect did not produce a 3D shape"
   );
   if (intResult.ok) {
-    propagateOriginsFromEvolution(evolution, [a, b], intResult.value);
-    propagateFaceTagsFromEvolution(evolution, [a, b], intResult.value);
-    propagateColorsFromEvolution(evolution, [a, b], intResult.value);
+    propagateAllMetadata(evolution, [a, b], intResult.value);
   }
   return intResult;
 }
@@ -374,7 +378,7 @@ function fuseAll(shapes, {
       "fuseAll did not produce a 3D shape"
     );
     if (fuseAllResult.ok) {
-      propagateOriginsByHash(shapes, fuseAllResult.value);
+      propagateMetadataByHash(shapes, fuseAllResult.value);
     }
     return fuseAllResult;
   }
@@ -406,7 +410,7 @@ function cutAll(base, tools, { optimisation = "none", simplify = false, signal,
   );
   const cutAllResult = castToShape3D(result, "CUT_ALL_NOT_3D", "cutAll did not produce a 3D shape");
   if (cutAllResult.ok) {
-    propagateOriginsByHash(allInputs, cutAllResult.value);
+    propagateMetadataByHash(allInputs, cutAllResult.value);
   }
   return cutAllResult;
 }
@@ -582,26 +586,25 @@ function slice(shape, planes, options = {}) {
   return ok(results);
 }
 export {
-  propagateColorsFromEvolution as a,
-  hasColorMetadata as b,
-  cut as c,
-  sectionToFace as d,
-  slice as e,
+  cut as a,
+  sectionToFace as b,
+  collectInputFaceHashes as c,
+  slice as d,
+  split as e,
   fuse as f,
-  split as g,
-  hasFaceTags as h,
+  fuseAll as g,
+  cutAll as h,
   intersect as i,
-  fuseAll as j,
-  cutAll as k,
-  colorFaces as l,
-  colorShape as m,
-  findFacesByTag as n,
-  getFaceColor as o,
-  propagateFaceTagsFromEvolution as p,
-  getFaceTags as q,
-  getShapeColor as r,
+  colorFaces as j,
+  colorShape as k,
+  findFacesByTag as l,
+  getFaceColor as m,
+  getFaceTags as n,
+  getShapeColor as o,
+  propagateAllMetadata as p,
+  getTagMetadata as q,
+  setTagMetadata as r,
   section as s,
-  getTagMetadata as t,
-  setTagMetadata as u,
-  tagFaces as v
+  tagFaces as t,
+  propagateMetadataByHash as u
 };

package/dist/{booleanFns-gmsX3Cv2.cjs → booleanFns-CxArUj_q.cjs}

@@ -1,10 +1,11 @@
 "use strict";
-const shapeTypes = require("./shapeTypes-7xEam9Ri.cjs");
-const result = require("./result-fAX0OZzI.cjs");
-const vectors = require("./vectors-D_IiZx0q.cjs");
+const shapeTypes = require("./shapeTypes-T0n6mRmt.cjs");
+const result = require("./result-DULetAht.cjs");
+const vectors = require("./vectors-I_0zdD3O.cjs");
 const vecOps = require("./vecOps-CjRL1jau.cjs");
-const shapeFns = require("./shapeFns-C2SnNvdH.cjs");
-const surfaceBuilders = require("./surfaceBuilders-5VA34a3_.cjs");
+const originTrackingFns = require("./originTrackingFns-SPU7ly3_.cjs");
+const topologyQueryFns = require("./topologyQueryFns-0IptTUCo.cjs");
+const surfaceBuilders = require("./surfaceBuilders-DYS8AMSS.cjs");
 const shapeTagStore = /* @__PURE__ */ new WeakMap();
 const tagMetadataStore = /* @__PURE__ */ new WeakMap();
 function hasFaceTags(shape) {
@@ -27,7 +28,7 @@ function getMetaMap(shape) {
   return map;
 }
 function tagFaces(shape, selector, tag) {
-  const faces = Array.isArray(selector) ? selector : shapeFns.getFaces(shape).filter(selector);
+  const faces = Array.isArray(selector) ? selector : topologyQueryFns.getFaces(shape).filter(selector);
   const tagMap = getTagMap(shape);
   const existing = tagMap.get(tag) ?? /* @__PURE__ */ new Set();
   for (const face of faces) {
@@ -42,7 +43,7 @@ function findFacesByTag(shape, tag) {
   const hashes = tagMap.get(tag);
   if (!hashes || hashes.size === 0) return [];
   const result2 = [];
-  for (const face of shapeFns.getFaces(shape)) {
+  for (const face of topologyQueryFns.getFaces(shape)) {
     const hash = shapeTypes.getKernel().hashCode(face.wrapped, vecOps.HASH_CODE_MAX);
     if (hashes.has(hash)) {
       result2.push(face);
@@ -54,7 +55,7 @@ function getFaceTags(shape) {
   const result2 = /* @__PURE__ */ new Map();
   const tagMap = shapeTagStore.get(shape.wrapped);
   if (!tagMap) return result2;
-  const faces = shapeFns.getFaces(shape);
+  const faces = topologyQueryFns.getFaces(shape);
   const faceByHash = /* @__PURE__ */ new Map();
   for (const face of faces) {
     faceByHash.set(shapeTypes.getKernel().hashCode(face.wrapped, vecOps.HASH_CODE_MAX), face);
@@ -196,6 +197,29 @@ function propagateColorsFromEvolution(evolution, inputs, result2) {
     }
   }
 }
+function collectInputFaceHashes(inputs) {
+  const hasMetadata = inputs.some(
+    (s) => originTrackingFns.getFaceOrigins(s) !== void 0 || hasFaceTags(s) || hasColorMetadata(s)
+  );
+  if (!hasMetadata) return [];
+  const kernel = shapeTypes.getKernel();
+  const hashes = [];
+  for (const input of inputs) {
+    const faces = kernel.iterShapes(input.wrapped, "face");
+    for (const face of faces) {
+      hashes.push(kernel.hashCode(face, vecOps.HASH_CODE_MAX));
+    }
+  }
+  return hashes;
+}
+function propagateAllMetadata(evolution, inputs, result2) {
+  originTrackingFns.propagateOriginsFromEvolution(evolution, inputs, result2);
+  propagateFaceTagsFromEvolution(evolution, inputs, result2);
+  propagateColorsFromEvolution(evolution, inputs, result2);
+}
+function propagateMetadataByHash(inputs, result2) {
+  originTrackingFns.propagateOriginsByHash(inputs, result2);
+}
 function validateShape3D(shape, label) {
   if (shapeTypes.getKernel().isNull(shape.wrapped)) {
     return result.err(result.validationError(result.BrepErrorCode.NULL_SHAPE_INPUT, `${label} is a null shape`));
@@ -223,20 +247,6 @@ function castToShape3D(shape, errorCode, errorMsg) {
   }
   return result.ok(wrapped);
 }
-function collectInputFaceHashes(inputs) {
-  const hasMetadata = inputs.some(
-    (s) => shapeFns.getFaceOrigins(s) !== void 0 || hasFaceTags(s) || hasColorMetadata(s)
-  );
-  if (!hasMetadata) return [];
-  const hashes = [];
-  for (const input of inputs) {
-    const faces = shapeTypes.getKernel().iterShapes(input.wrapped, "face");
-    for (const face of faces) {
-      hashes.push(face.HashCode(vecOps.HASH_CODE_MAX));
-    }
-  }
-  return hashes;
-}
 function fuse(a, b, { optimisation = "none", simplify = false, signal, fuzzyValue } = {}) {
   if (signal?.aborted) throw signal.reason;
   const checkA = validateShape3D(a, "fuse: first operand");
@@ -253,9 +263,7 @@ function fuse(a, b, { optimisation = "none", simplify = false, signal, fuzzyValu
   );
   const fuseResult = castToShape3D(resultShape, "FUSE_NOT_3D", "Fuse did not produce a 3D shape");
   if (fuseResult.ok) {
-    shapeFns.propagateOriginsFromEvolution(evolution, [a, b], fuseResult.value);
-    propagateFaceTagsFromEvolution(evolution, [a, b], fuseResult.value);
-    propagateColorsFromEvolution(evolution, [a, b], fuseResult.value);
+    propagateAllMetadata(evolution, [a, b], fuseResult.value);
   }
   return fuseResult;
 }
@@ -275,9 +283,7 @@ function cut(base, tool, { optimisation = "none", simplify = false, signal, fuzz
   );
   const cutResult = castToShape3D(resultShape, "CUT_NOT_3D", "Cut did not produce a 3D shape");
   if (cutResult.ok) {
-    shapeFns.propagateOriginsFromEvolution(evolution, [base, tool], cutResult.value);
-    propagateFaceTagsFromEvolution(evolution, [base, tool], cutResult.value);
-    propagateColorsFromEvolution(evolution, [base, tool], cutResult.value);
+    propagateAllMetadata(evolution, [base, tool], cutResult.value);
   }
   return cutResult;
 }
@@ -301,9 +307,7 @@ function intersect(a, b, { simplify = false, signal, fuzzyValue } = {}) {
     "Intersect did not produce a 3D shape"
   );
   if (intResult.ok) {
-    shapeFns.propagateOriginsFromEvolution(evolution, [a, b], intResult.value);
-    propagateFaceTagsFromEvolution(evolution, [a, b], intResult.value);
-    propagateColorsFromEvolution(evolution, [a, b], intResult.value);
+    propagateAllMetadata(evolution, [a, b], intResult.value);
   }
   return intResult;
 }
@@ -375,7 +379,7 @@ function fuseAll(shapes, {
       "fuseAll did not produce a 3D shape"
     );
     if (fuseAllResult.ok) {
-      shapeFns.propagateOriginsByHash(shapes, fuseAllResult.value);
+      propagateMetadataByHash(shapes, fuseAllResult.value);
     }
     return fuseAllResult;
   }
@@ -407,7 +411,7 @@ function cutAll(base, tools, { optimisation = "none", simplify = false, signal,
   );
   const cutAllResult = castToShape3D(result$1, "CUT_ALL_NOT_3D", "cutAll did not produce a 3D shape");
   if (cutAllResult.ok) {
-    shapeFns.propagateOriginsByHash(allInputs, cutAllResult.value);
+    propagateMetadataByHash(allInputs, cutAllResult.value);
   }
   return cutAllResult;
 }
@@ -461,9 +465,9 @@ function section(shape, plane, { approximation = true, planeSize = 1e4 } = {}) {
 function sectionToFace(shape, plane, options = {}) {
   const sectionResult = section(shape, plane, options);
   if (!sectionResult.ok) return sectionResult;
-  const wires = shapeFns.getWires(sectionResult.value);
+  const wires = topologyQueryFns.getWires(sectionResult.value);
   if (wires.length === 0) {
-    const edges = shapeFns.getEdges(sectionResult.value);
+    const edges = topologyQueryFns.getEdges(sectionResult.value);
     if (edges.length === 0) {
       return result.err(result.kernelError("SECTION_FAILED", "sectionToFace: section produced no geometry"));
     }
@@ -471,7 +475,7 @@ function sectionToFace(shape, plane, options = {}) {
     const vertexToEdges = /* @__PURE__ */ new Map();
     const edgeVertexHashes = /* @__PURE__ */ new Map();
     for (const edge of edges) {
-      const verts = shapeFns.getVertices(edge);
+      const verts = topologyQueryFns.getVertices(edge);
       const h0 = verts[0] ? shapeTypes.getKernel().hashCode(verts[0].wrapped, vecOps.HASH_CODE_MAX) : -1;
       const h1 = verts.length > 1 && verts[1] ? shapeTypes.getKernel().hashCode(verts[1].wrapped, vecOps.HASH_CODE_MAX) : h0;
       edgeVertexHashes.set(edge, [h0, h1]);
@@ -582,6 +586,7 @@ function slice(shape, planes, options = {}) {
   }
   return result.ok(results);
 }
+exports.collectInputFaceHashes = collectInputFaceHashes;
 exports.colorFaces = colorFaces;
 exports.colorShape = colorShape;
 exports.cut = cut;
@@ -593,11 +598,9 @@ exports.getFaceColor = getFaceColor;
 exports.getFaceTags = getFaceTags;
 exports.getShapeColor = getShapeColor;
 exports.getTagMetadata = getTagMetadata;
-exports.hasColorMetadata = hasColorMetadata;
-exports.hasFaceTags = hasFaceTags;
 exports.intersect = intersect;
-exports.propagateColorsFromEvolution = propagateColorsFromEvolution;
-exports.propagateFaceTagsFromEvolution = propagateFaceTagsFromEvolution;
+exports.propagateAllMetadata = propagateAllMetadata;
+exports.propagateMetadataByHash = propagateMetadataByHash;
 exports.section = section;
 exports.sectionToFace = sectionToFace;
 exports.setTagMetadata = setTagMetadata;