@buerli.io/headless 0.5.0-beta.4 → 0.6.0

package/build/cjs/history.js

@@ -36,12 +36,16 @@ const core_1 = require("@buerli.io/core");
 const three_1 = require("three");
 const BufferGeometryUtils_ = __importStar(require("three/examples/jsm/utils/BufferGeometryUtils"));
 const selection_1 = require("./utils/selection");
+const meshes_1 = require("./utils/meshes");
 const featureAPI = classcad_1.ccAPI.feature;
 const sketcherAPI = classcad_1.ccAPI.sketcher;
 const baseModelerAPI = classcad_1.ccAPI.baseModeler;
 const assemblyBuilderAPI = classcad_1.ccAPI.assemblyBuilder;
+const drawing2DAPI = classcad_1.ccAPI.drawing2D;
+const geometryAPI = classcad_1.ccAPI.geometry;
 const baseUtils = classcad_1.ccUtils.base;
 const asmUtils = classcad_1.ccUtils.assembly;
+const partUtils = classcad_1.ccUtils.part;
 let BufferGeometryUtils = BufferGeometryUtils_;
 if (BufferGeometryUtils.BufferGeometryUtils) {
     BufferGeometryUtils = BufferGeometryUtils.BufferGeometryUtils;
@@ -60,33 +64,6 @@ const getDimensionType = (type) => {
     }
     return cclass;
 };
-/**
- * Transforms the transformation which is local to the ownerId into global
- * transformation and returns it.
- * @param ownerId node to get the global transformation from
- * @param localTransformation transformation local to the owner, will be calculated into global transformation
- * @returns the global transformation from local transformation to owner
- */
-const getGlobalTransformation = (drawingId, ownerId, localTransformation) => {
-    const lT = localTransformation;
-    const coordSysOwner = asmUtils.getCoordSysFromNode(drawingId, ownerId);
-    if (coordSysOwner) {
-        const origin = [lT[0].x, lT[0].y, lT[0].z];
-        const xAxis = [lT[1].x, lT[1].y, lT[1].z];
-        const yAxis = [lT[2].x, lT[2].y, lT[2].z];
-        const zAxis = new three_1.Vector3().crossVectors(new three_1.Vector3(lT[1].x, lT[1].y, lT[1].z), new three_1.Vector3(lT[2].x, lT[2].y, lT[2].z));
-        const matrix = core_1.MathUtils.convertToMatrix4([origin, xAxis, yAxis, [zAxis.x, zAxis.y, zAxis.z]]);
-        const transformation = core_1.MathUtils.convertToMatrix4(coordSysOwner).clone().multiply(matrix);
-        const transformationCoords = core_1.MathUtils.convertToCoordinateSystem(transformation);
-        const tC = transformationCoords;
-        return [
-            { x: tC[0][0], y: tC[0][1], z: tC[0][2] },
-            { x: tC[1][0], y: tC[1][1], z: tC[1][2] },
-            { x: tC[2][0], y: tC[2][1], z: tC[2][2] },
-        ];
-    }
-    return undefined;
-};
 /**
  * Helps to create the buffer geometry of the given object recursively.
  * @param object object to create the buffergeometry from
@@ -108,7 +85,7 @@ const createRecursiveBufferGeometry = async (object, drawingId, bufferGeomArray)
                 }
                 else {
                     // else get visualisation from classcad
-                    await classcad_1.ccAPI.baseModeler.requestVisualisationOfEntities(drawingId, [solid]);
+                    await baseModelerAPI.requestVisualisationOfEntities(drawingId, [solid]);
                     cDrawing = (0, core_1.getDrawing)(drawingId); // get current drawing state after request
                     cachedSolid = cDrawing.geometry.cache[solid];
                     if (cachedSolid) {
@@ -130,7 +107,7 @@ const createRecursiveBufferGeometry = async (object, drawingId, bufferGeomArray)
     else if (object.children) {
         // Assembly
         for (const child of object.children) {
-            if (tree[child].class === classcad_1.CCClasses.CCProductReference || tree[child].class === classcad_1.CCClasses.CCProductReferenceET) {
+            if (classcad_1.ccUtils.base.isA(tree[child].class, classcad_1.CCClasses.IProductReference)) {
                 await createRecursiveBufferGeometry(tree[child], drawingId, bufferGeomArray);
             }
         }
@@ -163,7 +140,7 @@ const createRecursiveScene = async (object, drawingId, root, result, options) =>
                 let cachedEntity = cDrawing.geometry.cache[entity];
                 if (!cachedEntity) {
                     // else get visualisation from classcad
-                    await classcad_1.ccAPI.baseModeler.requestVisualisationOfEntities(drawingId, [entity]);
+                    await baseModelerAPI.requestVisualisationOfEntities(drawingId, [entity]);
                     cDrawing = (0, core_1.getDrawing)(drawingId); // get current drawing state after request
                     cachedEntity = cDrawing.geometry.cache[entity];
                 }
@@ -180,9 +157,9 @@ const createRecursiveScene = async (object, drawingId, root, result, options) =>
                                 mesh.userData = { id: m.graphicId }; // add graphic id to the userData
                                 mesh.geometry = m.geometry;
                                 mesh.material = new three_1.MeshStandardMaterial({
-                                    color: m.color,
-                                    transparent: m.opacity < 1,
-                                    opacity: m.opacity,
+                                    color: m.color ? m.color : cachedEntity.color,
+                                    transparent: m.color ? m.opacity < 1 : cachedEntity.opacity < 1,
+                                    opacity: m.color ? m.opacity : cachedEntity.opacity,
                                 });
                                 _solid.add(mesh);
                                 result.meshes.push(mesh);
@@ -190,15 +167,14 @@ const createRecursiveScene = async (object, drawingId, root, result, options) =>
                         }
                         else {
                             // Merge all geometries into one mesh, sort them by color
-                            const colorMeshesMap = getDifferentColoredMeshesFromEntity(cachedEntity);
+                            const colorMeshesMap = (0, meshes_1.getDifferentColoredMeshesFromEntity)(cachedEntity);
                             Object.keys(colorMeshesMap).forEach(key => {
-                                const coloredMeshes = colorMeshesMap[key];
                                 const mesh = new three_1.Mesh();
-                                mesh.geometry = BufferGeometryUtils.mergeBufferGeometries(coloredMeshes.map(m => m.geometry));
+                                mesh.geometry = BufferGeometryUtils.mergeBufferGeometries(colorMeshesMap[key].meshes.map(m => m.geometry));
                                 mesh.material = new three_1.MeshStandardMaterial({
-                                    color: coloredMeshes[0].color,
-                                    transparent: coloredMeshes[0].opacity < 1,
-                                    opacity: coloredMeshes[0].opacity,
+                                    color: colorMeshesMap[key].color,
+                                    transparent: colorMeshesMap[key].opacity < 1,
+                                    opacity: colorMeshesMap[key].opacity,
                                 });
                                 _solid.add(mesh); // Add mesh to solid of the scene
                                 result.meshes.push(mesh); // Collect mesh to return result later
@@ -223,30 +199,12 @@ const createRecursiveScene = async (object, drawingId, root, result, options) =>
         result.nodes.push(assembly);
         root.add(assembly);
         for (const child of object.children) {
-            if (tree[child].class === classcad_1.CCClasses.CCProductReference || tree[child].class === classcad_1.CCClasses.CCProductReferenceET) {
+            if (classcad_1.ccUtils.base.isA(tree[child].class, classcad_1.CCClasses.IProductReference)) {
                 await createRecursiveScene(tree[child], drawingId, assembly, result, options);
             }
         }
     }
 };
-/**
- * Get all meshes in a map, sorted by their color / transparency
- * @param entity entity to look for the meshes
- * @returns map (key = color/transparency as string, value = meshes array)
- */
-const getDifferentColoredMeshesFromEntity = (entity) => {
-    const colorMeshesMap = {};
-    entity.meshes.forEach(mesh => {
-        const key = mesh.color.getHexString() + mesh.opacity.toString();
-        if (colorMeshesMap[key]) {
-            colorMeshesMap[key].push(mesh);
-        }
-        else {
-            colorMeshesMap[key] = [mesh];
-        }
-    });
-    return colorMeshesMap;
-};
 /**
  * Helper function to log relevant points to find geometry to the console.
  * This helps the user to copy the points directly from console to parameter of
@@ -299,8 +257,9 @@ class CAD {
                             const nodeParam = {
                                 referenceId: rProductId,
                                 ownerId: rOwnerId,
-                                transformation: getGlobalTransformation(drawingId, rOwnerId, node.transformation) || node.transformation,
+                                transformation: node.transformation,
                                 name: node.name,
+                                options: Object.assign(Object.assign({}, node.options), { isLocal: true }), // in non-interactive mode, the transformation is local to the owner
                             };
                             nodesToAdd.push(nodeParam);
                         }
@@ -312,7 +271,7 @@ class CAD {
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
-                    return classcad_1.ccAPI.assemblyBuilder.addNodes(drawingId, nodesToAdd);
+                    return assemblyBuilderAPI.addNodes(drawingId, nodesToAdd);
                 },
                 addDimensions: async (...dimensions) => {
                     var e_2, _a;
@@ -349,13 +308,13 @@ class CAD {
                         }
                         finally { if (e_2) throw e_2.error; }
                     }
-                    return classcad_1.ccAPI.drawing2D.addDimensions(drawingId, dimParamsToAdd);
+                    return drawing2DAPI.addDimensions(drawingId, dimParamsToAdd);
                 },
                 create2DViews: (productId, viewTypes, viewOptions) => {
                     return this.resolve(async ([rProductId]) => {
-                        const viewIds = await classcad_1.ccAPI.drawing2D.create2DViews(drawingId, rProductId, viewTypes, viewOptions);
+                        const viewIds = await drawing2DAPI.create2DViews(drawingId, rProductId, viewTypes, viewOptions);
                         if (viewIds !== null) {
-                            await classcad_1.ccAPI.drawing2D.centerAllViews(drawingId, rProductId, viewTypes);
+                            await drawing2DAPI.centerAllViews(drawingId, rProductId, viewTypes);
                             return viewIds;
                         }
                         return null;
@@ -363,30 +322,30 @@ class CAD {
                 },
                 getBoundaryBoxFromViews: (productId, viewTypes) => {
                     return this.resolve(async ([rProductId]) => {
-                        const bbs = await classcad_1.ccAPI.drawing2D.getBoundaryBoxFromViews(drawingId, rProductId, viewTypes);
+                        const bbs = await drawing2DAPI.getBoundaryBoxFromViews(drawingId, rProductId, viewTypes);
                         return bbs;
                     }, productId);
                 },
                 place2DViews: (productId, viewPositions) => {
                     return this.resolve(async ([rProductId]) => {
-                        return classcad_1.ccAPI.drawing2D.place2DViews(drawingId, rProductId, viewPositions);
+                        return drawing2DAPI.place2DViews(drawingId, rProductId, viewPositions);
                     }, productId);
                 },
                 exportDXF: (productId, dxfTemplateFilename) => {
                     return this.resolve(async ([rProductId]) => {
-                        return classcad_1.ccAPI.drawing2D.exportDXF(drawingId, rProductId, dxfTemplateFilename);
+                        return drawing2DAPI.exportDXF(drawingId, rProductId, dxfTemplateFilename);
                     }, productId);
                 },
                 exportSVG: (productId, modus, renderSize, dxfTemplateFilename) => {
                     return this.resolve(async ([rProductId]) => {
                         modus = modus ? modus : classcad_1.SVGModusType.FIT_WHOLE_DRAWING;
                         const renderSizeParam = (renderSize === null || renderSize === void 0 ? void 0 : renderSize.x) && (renderSize === null || renderSize === void 0 ? void 0 : renderSize.y) ? [renderSize.x, renderSize.y] : undefined;
-                        return classcad_1.ccAPI.drawing2D.exportSVG(drawingId, rProductId, modus, renderSizeParam, dxfTemplateFilename);
+                        return drawing2DAPI.exportSVG(drawingId, rProductId, modus, renderSizeParam, dxfTemplateFilename);
                     }, productId);
                 },
                 removeDimensions: (dimensionIds) => {
                     return this.resolve(async ([...rDimensionIds]) => {
-                        return classcad_1.ccAPI.drawing2D.removeDimensions(drawingId, rDimensionIds);
+                        return drawing2DAPI.removeDimensions(drawingId, rDimensionIds);
                     }, ...dimensionIds);
                 },
                 linearPattern: (partId, entities, references1, params1, references2, params2) => {
@@ -477,14 +436,11 @@ class CAD {
                         return null;
                     }, partId, entities, ...references);
                 },
-                extrusion: (partId, sketchId, type, limit1, limit2, taperAngle, direction, capEnds) => {
-                    return this.resolve(async ([rPartId, rSketchId]) => {
+                extrusion: (partId, sketchOrRegionIds, type, limit1, limit2, taperAngle, direction, capEnds) => {
+                    return this.resolve(async ([rPartId, rSketchOrRegionIds]) => {
                         const extrusion = await featureAPI.createExtrusion(drawingId, rPartId);
                         if (extrusion) {
-                            const cDrawing = await (0, core_1.getDrawing)(drawingId);
-                            const sketchLines = [];
-                            // TODO: Which sketch lines need to be included, is CCClasses.CCCurve and its derivation enough?
-                            sketchLines.push(...baseUtils.getChildren(rSketchId, classcad_1.CCClasses.CCCurve, cDrawing.structure.tree));
+                            const sketchLines = partUtils.getSketchlines(drawingId, rSketchOrRegionIds);
                             if (sketchLines) {
                                 const limit1Param = { value: limit1, isExpr: typeof limit1 === 'string' };
                                 const limit2Param = { value: limit2, isExpr: typeof limit2 === 'string' };
@@ -500,16 +456,13 @@ class CAD {
                                 return extrusion;
                             }
                         }
-                    }, partId, sketchId);
+                    }, partId, sketchOrRegionIds);
                 },
-                revolve: (partId, sketchId, axisIds, angle1, angle2, inverted) => {
-                    return this.resolve(async ([rPartId, rSketchId, ...rAxisIds]) => {
+                revolve: (partId, sketchOrRegionIds, axisIds, angle1, angle2, inverted) => {
+                    return this.resolve(async ([rPartId, rSketchOrRegionIds, ...rAxisIds]) => {
                         const revolve = await featureAPI.createRevolve(drawingId, rPartId);
                         if (revolve) {
-                            const cDrawing = await (0, core_1.getDrawing)(drawingId);
-                            const sketchLines = [];
-                            sketchLines.push(...baseUtils.getChildren(rSketchId, classcad_1.CCClasses.CCCircle, cDrawing.structure.tree));
-                            sketchLines.push(...baseUtils.getChildren(rSketchId, classcad_1.CCClasses.CCLine, cDrawing.structure.tree));
+                            const sketchLines = partUtils.getSketchlines(drawingId, rSketchOrRegionIds);
                             if (sketchLines) {
                                 const angle1Param = { value: angle1, isExpr: typeof angle1 === 'string' };
                                 const angle2Param = { value: angle2, isExpr: typeof angle2 === 'string' };
@@ -517,7 +470,7 @@ class CAD {
                                 return revolve;
                             }
                         }
-                    }, partId, sketchId, ...axisIds);
+                    }, partId, sketchOrRegionIds, ...axisIds);
                 },
                 boolean: (partId, type, entities) => {
                     return this.resolve(async ([rPartId, rEntities]) => {
@@ -1143,9 +1096,9 @@ class CAD {
                         return await assemblyBuilderAPI.createAssemblyAsTemplate(drawingId, name);
                     });
                 },
-                createRootAssembly: (name) => {
+                createRootAssembly: (name, options) => {
                     return this.resolve(async ([]) => {
-                        return await assemblyBuilderAPI.createRootAssembly(drawingId, name);
+                        return await assemblyBuilderAPI.createRootAssembly(drawingId, name, options);
                     });
                 },
                 createPart: (name) => {
@@ -1257,11 +1210,11 @@ class CAD {
                                 break;
                         }
                         const geometries = positions
-                            ? await classcad_1.ccAPI.geometry.findGeometriesByPoints(drawingId, rPartId, type, positions)
+                            ? await geometryAPI.findGeometriesByPoints(drawingId, rPartId, type, positions)
                             : await (0, selection_1.waitForSelect)(length, filter, (resolveSelection, items, diff) => {
                                 if (items.length > length - 1) {
                                     resolveSelection(items.map(i => i.data.graphicId));
-                                    classcad_1.ccAPI.geometry
+                                    geometryAPI
                                         .getPointsByGeometries(drawingId, items.map(i => i.data.graphicId))
                                         .then(points => {
                                         logPoints(points);
@@ -1289,6 +1242,18 @@ class CAD {
                         return null;
                     }, refId);
                 },
+                getProductOfNode: (refIds) => {
+                    return this.resolve(async ([rRefIds]) => {
+                        const drawing = (0, core_1.getDrawing)(drawingId);
+                        const tree = drawing.structure.tree;
+                        const products = [];
+                        for (const rRefId of rRefIds) {
+                            const product = asmUtils.findProduct(rRefId, tree);
+                            products.push(product);
+                        }
+                        return products;
+                    }, refIds);
+                },
                 setCurrentNode: (refId) => {
                     return this.resolve(async ([rRefId]) => {
                         await assemblyBuilderAPI.setCurrentNode(drawingId, rRefId);
@@ -1311,7 +1276,7 @@ class CAD {
                 },
                 setCurrentProduct: (productId) => {
                     return this.resolve(async ([rProductId]) => {
-                        await classcad_1.ccAPI.baseModeler.setCurrentProduct(drawingId, rProductId);
+                        await baseModelerAPI.setCurrentProduct(drawingId, rProductId);
                     }, productId);
                 },
                 getCurrentProduct: () => {
@@ -1339,6 +1304,15 @@ class CAD {
                         return null;
                     }, refId);
                 },
+                getSketchRegion: (refId, sketchRegionName) => {
+                    return this.resolve(async ([rRefId]) => {
+                        const sRIds = partUtils.getSketchRegion(drawingId, rRefId, sketchRegionName);
+                        if (sRIds != undefined) {
+                            return Array.isArray(sRIds) ? sRIds : [sRIds];
+                        }
+                        return null;
+                    }, refId);
+                },
                 getWorkGeometry: (refId, type, wgName) => {
                     return this.resolve(async ([rRefId]) => {
                         const wgIds = asmUtils.getWorkGeometry(drawingId, rRefId, type, wgName);
@@ -1579,22 +1553,22 @@ class CAD {
                     }, translationId);
                 },
                 save: (type) => {
-                    return classcad_1.ccAPI.baseModeler.save(drawingId, type);
+                    return baseModelerAPI.save(drawingId, type);
                 },
                 saveToUrl: (url, filetype) => {
-                    return classcad_1.ccAPI.baseModeler.saveToUrl(drawingId, url, filetype);
+                    return baseModelerAPI.saveToUrl(drawingId, url, filetype);
                 },
                 load: (content, type) => {
-                    return classcad_1.ccAPI.baseModeler.load(drawingId, content, type);
+                    return baseModelerAPI.load(drawingId, content, type);
                 },
                 loadFromUrl: (url, filetype) => {
-                    return classcad_1.ccAPI.baseModeler.loadFromUrl(drawingId, url, filetype, true);
+                    return baseModelerAPI.loadFromUrl(drawingId, url, filetype, true);
                 },
-                loadProduct: (content, type) => {
-                    return classcad_1.ccAPI.assemblyBuilder.loadProduct(drawingId, content, type);
+                loadProduct: (content, type, options) => {
+                    return assemblyBuilderAPI.loadProduct(drawingId, content, type, '', options);
                 },
-                loadProductFromUrl: (url, filetype) => {
-                    return classcad_1.ccAPI.assemblyBuilder.loadProductFromUrl(drawingId, url, filetype);
+                loadProductFromUrl: (url, filetype, options) => {
+                    return assemblyBuilderAPI.loadProductFromUrl(drawingId, url, filetype, options);
                 },
                 pick: (partId, type, points) => {
                     return this.resolve(async ([rPartId]) => {
@@ -1696,6 +1670,11 @@ class CAD {
                         await baseModelerAPI.deleteObjects(drawingId, toRemoveOps);
                     }
                 },
+                getMatePath: async (refId) => {
+                    return this.resolve(async ([rRefId]) => {
+                        return asmUtils.getMatePath(drawingId, rRefId);
+                    }, refId);
+                },
             };
             callback(publicApi);
             resolve(drawingId);

package/build/cjs/solid.js

@@ -36,6 +36,7 @@ const classcad_1 = require("@buerli.io/classcad");
 const core_1 = require("@buerli.io/core");
 const three_1 = require("three");
 const BufferGeometryUtils_ = __importStar(require("three/examples/jsm/utils/BufferGeometryUtils"));
+const meshes_1 = require("./utils/meshes");
 const solidAPI = classcad_1.ccAPI.solid;
 let BufferGeometryUtils = BufferGeometryUtils_;
 if (BufferGeometryUtils.BufferGeometryUtils) {
@@ -296,25 +297,28 @@ class CAD {
                                                 mesh.userData = { id: m.graphicId }; // add graphic id to the userData
                                                 mesh.geometry = m.geometry;
                                                 mesh.material = new three_1.MeshStandardMaterial({
-                                                    color: m.color,
-                                                    transparent: m.opacity < 1,
-                                                    opacity: m.opacity,
+                                                    color: m.color ? m.color : entity.color,
+                                                    transparent: m.opacity ? m.opacity < 1 : entity.opacity < 1,
+                                                    opacity: m.opacity ? m.opacity : entity.opacity,
                                                 });
                                                 _solid.add(mesh);
                                                 meshes.push(mesh);
                                             });
                                         }
                                         else {
-                                            // Merge all geometries into one mesh
-                                            const mesh = new three_1.Mesh();
-                                            mesh.geometry = BufferGeometryUtils.mergeBufferGeometries(entity.meshes.map(m => m.geometry));
-                                            mesh.material = new three_1.MeshStandardMaterial({
-                                                color: entity.meshes[0].color,
-                                                transparent: entity.meshes[0].opacity < 1,
-                                                opacity: entity.meshes[0].opacity,
+                                            // Merge all geometries into one mesh, sort them by color
+                                            const colorMeshesMap = (0, meshes_1.getDifferentColoredMeshesFromEntity)(entity);
+                                            Object.keys(colorMeshesMap).forEach(key => {
+                                                const mesh = new three_1.Mesh();
+                                                mesh.geometry = BufferGeometryUtils.mergeBufferGeometries(colorMeshesMap[key].meshes.map(m => m.geometry));
+                                                mesh.material = new three_1.MeshStandardMaterial({
+                                                    color: colorMeshesMap[key].color,
+                                                    transparent: colorMeshesMap[key].opacity < 1,
+                                                    opacity: colorMeshesMap[key].opacity,
+                                                });
+                                                _solid.add(mesh); // Add mesh to solid of the scene
+                                                meshes.push(mesh); // Collect mesh to return later
                                             });
-                                            _solid.add(mesh); // Add mesh to solid of the scene
-                                            meshes.push(mesh); // Collect mesh to return later
                                         }
                                         part.add(_solid); // Add solid to part of the scene
                                         _solids.push(_solid); // Collect solid to return later

package/build/cjs/utils/meshes.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDifferentColoredMeshesFromEntity = void 0;
+/**
+ * Get all meshes in a map, sorted by their color / opacity
+ * @param entity entity to look for the meshes
+ * @returns map (key = color/opacity as string, value = object containing the meshes, color and opacity)
+ */
+const getDifferentColoredMeshesFromEntity = (entity) => {
+    const colorMeshesMap = {};
+    entity.meshes.forEach(mesh => {
+        const color = mesh.color ? mesh.color : entity.color;
+        const opacity = mesh.opacity ? mesh.opacity : entity.opacity;
+        const key = (color === null || color === void 0 ? void 0 : color.getHexString()) + (opacity === null || opacity === void 0 ? void 0 : opacity.toString());
+        if (colorMeshesMap[key]) {
+            colorMeshesMap[key].meshes.push(mesh);
+        }
+        else {
+            colorMeshesMap[key] = { meshes: [mesh], color, opacity };
+        }
+    });
+    return colorMeshesMap;
+};
+exports.getDifferentColoredMeshesFromEntity = getDifferentColoredMeshesFromEntity;

package/build/esm/history.js

@@ -8,15 +8,19 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
 /* eslint-disable max-lines */
 import { ccAPI, CCClasses, ccUtils, DataType, SVGModusType, } from '@buerli.io/classcad';
 import { api, getDrawing, lineSegmentsFilter, loopFilter, MathUtils, planeFilter, pointFilter, } from '@buerli.io/core';
-import { Group, Mesh, MeshStandardMaterial, Scene, Vector3 } from 'three';
+import { Group, Mesh, MeshStandardMaterial, Scene } from 'three';
 import * as BufferGeometryUtils_ from 'three/examples/jsm/utils/BufferGeometryUtils';
 import { waitForSelect } from './utils/selection';
+import { getDifferentColoredMeshesFromEntity } from './utils/meshes';
 const featureAPI = ccAPI.feature;
 const sketcherAPI = ccAPI.sketcher;
 const baseModelerAPI = ccAPI.baseModeler;
 const assemblyBuilderAPI = ccAPI.assemblyBuilder;
+const drawing2DAPI = ccAPI.drawing2D;
+const geometryAPI = ccAPI.geometry;
 const baseUtils = ccUtils.base;
 const asmUtils = ccUtils.assembly;
+const partUtils = ccUtils.part;
 let BufferGeometryUtils = BufferGeometryUtils_;
 if (BufferGeometryUtils.BufferGeometryUtils) {
     BufferGeometryUtils = BufferGeometryUtils.BufferGeometryUtils;
@@ -35,33 +39,6 @@ const getDimensionType = (type) => {
     }
     return cclass;
 };
-/**
- * Transforms the transformation which is local to the ownerId into global
- * transformation and returns it.
- * @param ownerId node to get the global transformation from
- * @param localTransformation transformation local to the owner, will be calculated into global transformation
- * @returns the global transformation from local transformation to owner
- */
-const getGlobalTransformation = (drawingId, ownerId, localTransformation) => {
-    const lT = localTransformation;
-    const coordSysOwner = asmUtils.getCoordSysFromNode(drawingId, ownerId);
-    if (coordSysOwner) {
-        const origin = [lT[0].x, lT[0].y, lT[0].z];
-        const xAxis = [lT[1].x, lT[1].y, lT[1].z];
-        const yAxis = [lT[2].x, lT[2].y, lT[2].z];
-        const zAxis = new Vector3().crossVectors(new Vector3(lT[1].x, lT[1].y, lT[1].z), new Vector3(lT[2].x, lT[2].y, lT[2].z));
-        const matrix = MathUtils.convertToMatrix4([origin, xAxis, yAxis, [zAxis.x, zAxis.y, zAxis.z]]);
-        const transformation = MathUtils.convertToMatrix4(coordSysOwner).clone().multiply(matrix);
-        const transformationCoords = MathUtils.convertToCoordinateSystem(transformation);
-        const tC = transformationCoords;
-        return [
-            { x: tC[0][0], y: tC[0][1], z: tC[0][2] },
-            { x: tC[1][0], y: tC[1][1], z: tC[1][2] },
-            { x: tC[2][0], y: tC[2][1], z: tC[2][2] },
-        ];
-    }
-    return undefined;
-};
 /**
  * Helps to create the buffer geometry of the given object recursively.
  * @param object object to create the buffergeometry from
@@ -83,7 +60,7 @@ const createRecursiveBufferGeometry = async (object, drawingId, bufferGeomArray)
                 }
                 else {
                     // else get visualisation from classcad
-                    await ccAPI.baseModeler.requestVisualisationOfEntities(drawingId, [solid]);
+                    await baseModelerAPI.requestVisualisationOfEntities(drawingId, [solid]);
                     cDrawing = getDrawing(drawingId); // get current drawing state after request
                     cachedSolid = cDrawing.geometry.cache[solid];
                     if (cachedSolid) {
@@ -105,7 +82,7 @@ const createRecursiveBufferGeometry = async (object, drawingId, bufferGeomArray)
     else if (object.children) {
         // Assembly
         for (const child of object.children) {
-            if (tree[child].class === CCClasses.CCProductReference || tree[child].class === CCClasses.CCProductReferenceET) {
+            if (ccUtils.base.isA(tree[child].class, CCClasses.IProductReference)) {
                 await createRecursiveBufferGeometry(tree[child], drawingId, bufferGeomArray);
             }
         }
@@ -138,7 +115,7 @@ const createRecursiveScene = async (object, drawingId, root, result, options) =>
                 let cachedEntity = cDrawing.geometry.cache[entity];
                 if (!cachedEntity) {
                     // else get visualisation from classcad
-                    await ccAPI.baseModeler.requestVisualisationOfEntities(drawingId, [entity]);
+                    await baseModelerAPI.requestVisualisationOfEntities(drawingId, [entity]);
                     cDrawing = getDrawing(drawingId); // get current drawing state after request
                     cachedEntity = cDrawing.geometry.cache[entity];
                 }
@@ -155,9 +132,9 @@ const createRecursiveScene = async (object, drawingId, root, result, options) =>
                                 mesh.userData = { id: m.graphicId }; // add graphic id to the userData
                                 mesh.geometry = m.geometry;
                                 mesh.material = new MeshStandardMaterial({
-                                    color: m.color,
-                                    transparent: m.opacity < 1,
-                                    opacity: m.opacity,
+                                    color: m.color ? m.color : cachedEntity.color,
+                                    transparent: m.color ? m.opacity < 1 : cachedEntity.opacity < 1,
+                                    opacity: m.color ? m.opacity : cachedEntity.opacity,
                                 });
                                 _solid.add(mesh);
                                 result.meshes.push(mesh);
@@ -167,13 +144,12 @@ const createRecursiveScene = async (object, drawingId, root, result, options) =>
                             // Merge all geometries into one mesh, sort them by color
                             const colorMeshesMap = getDifferentColoredMeshesFromEntity(cachedEntity);
                             Object.keys(colorMeshesMap).forEach(key => {
-                                const coloredMeshes = colorMeshesMap[key];
                                 const mesh = new Mesh();
-                                mesh.geometry = BufferGeometryUtils.mergeBufferGeometries(coloredMeshes.map(m => m.geometry));
+                                mesh.geometry = BufferGeometryUtils.mergeBufferGeometries(colorMeshesMap[key].meshes.map(m => m.geometry));
                                 mesh.material = new MeshStandardMaterial({
-                                    color: coloredMeshes[0].color,
-                                    transparent: coloredMeshes[0].opacity < 1,
-                                    opacity: coloredMeshes[0].opacity,
+                                    color: colorMeshesMap[key].color,
+                                    transparent: colorMeshesMap[key].opacity < 1,
+                                    opacity: colorMeshesMap[key].opacity,
                                 });
                                 _solid.add(mesh); // Add mesh to solid of the scene
                                 result.meshes.push(mesh); // Collect mesh to return result later
@@ -198,30 +174,12 @@ const createRecursiveScene = async (object, drawingId, root, result, options) =>
         result.nodes.push(assembly);
         root.add(assembly);
         for (const child of object.children) {
-            if (tree[child].class === CCClasses.CCProductReference || tree[child].class === CCClasses.CCProductReferenceET) {
+            if (ccUtils.base.isA(tree[child].class, CCClasses.IProductReference)) {
                 await createRecursiveScene(tree[child], drawingId, assembly, result, options);
             }
         }
     }
 };
-/**
- * Get all meshes in a map, sorted by their color / transparency
- * @param entity entity to look for the meshes
- * @returns map (key = color/transparency as string, value = meshes array)
- */
-const getDifferentColoredMeshesFromEntity = (entity) => {
-    const colorMeshesMap = {};
-    entity.meshes.forEach(mesh => {
-        const key = mesh.color.getHexString() + mesh.opacity.toString();
-        if (colorMeshesMap[key]) {
-            colorMeshesMap[key].push(mesh);
-        }
-        else {
-            colorMeshesMap[key] = [mesh];
-        }
-    });
-    return colorMeshesMap;
-};
 /**
  * Helper function to log relevant points to find geometry to the console.
  * This helps the user to copy the points directly from console to parameter of
@@ -274,8 +232,9 @@ export default class CAD {
                             const nodeParam = {
                                 referenceId: rProductId,
                                 ownerId: rOwnerId,
-                                transformation: getGlobalTransformation(drawingId, rOwnerId, node.transformation) || node.transformation,
+                                transformation: node.transformation,
                                 name: node.name,
+                                options: Object.assign(Object.assign({}, node.options), { isLocal: true }), // in non-interactive mode, the transformation is local to the owner
                             };
                             nodesToAdd.push(nodeParam);
                         }
@@ -287,7 +246,7 @@ export default class CAD {
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
-                    return ccAPI.assemblyBuilder.addNodes(drawingId, nodesToAdd);
+                    return assemblyBuilderAPI.addNodes(drawingId, nodesToAdd);
                 },
                 addDimensions: async (...dimensions) => {
                     var e_2, _a;
@@ -324,13 +283,13 @@ export default class CAD {
                         }
                         finally { if (e_2) throw e_2.error; }
                     }
-                    return ccAPI.drawing2D.addDimensions(drawingId, dimParamsToAdd);
+                    return drawing2DAPI.addDimensions(drawingId, dimParamsToAdd);
                 },
                 create2DViews: (productId, viewTypes, viewOptions) => {
                     return this.resolve(async ([rProductId]) => {
-                        const viewIds = await ccAPI.drawing2D.create2DViews(drawingId, rProductId, viewTypes, viewOptions);
+                        const viewIds = await drawing2DAPI.create2DViews(drawingId, rProductId, viewTypes, viewOptions);
                         if (viewIds !== null) {
-                            await ccAPI.drawing2D.centerAllViews(drawingId, rProductId, viewTypes);
+                            await drawing2DAPI.centerAllViews(drawingId, rProductId, viewTypes);
                             return viewIds;
                         }
                         return null;
@@ -338,30 +297,30 @@ export default class CAD {
                 },
                 getBoundaryBoxFromViews: (productId, viewTypes) => {
                     return this.resolve(async ([rProductId]) => {
-                        const bbs = await ccAPI.drawing2D.getBoundaryBoxFromViews(drawingId, rProductId, viewTypes);
+                        const bbs = await drawing2DAPI.getBoundaryBoxFromViews(drawingId, rProductId, viewTypes);
                         return bbs;
                     }, productId);
                 },
                 place2DViews: (productId, viewPositions) => {
                     return this.resolve(async ([rProductId]) => {
-                        return ccAPI.drawing2D.place2DViews(drawingId, rProductId, viewPositions);
+                        return drawing2DAPI.place2DViews(drawingId, rProductId, viewPositions);
                     }, productId);
                 },
                 exportDXF: (productId, dxfTemplateFilename) => {
                     return this.resolve(async ([rProductId]) => {
-                        return ccAPI.drawing2D.exportDXF(drawingId, rProductId, dxfTemplateFilename);
+                        return drawing2DAPI.exportDXF(drawingId, rProductId, dxfTemplateFilename);
                     }, productId);
                 },
                 exportSVG: (productId, modus, renderSize, dxfTemplateFilename) => {
                     return this.resolve(async ([rProductId]) => {
                         modus = modus ? modus : SVGModusType.FIT_WHOLE_DRAWING;
                         const renderSizeParam = (renderSize === null || renderSize === void 0 ? void 0 : renderSize.x) && (renderSize === null || renderSize === void 0 ? void 0 : renderSize.y) ? [renderSize.x, renderSize.y] : undefined;
-                        return ccAPI.drawing2D.exportSVG(drawingId, rProductId, modus, renderSizeParam, dxfTemplateFilename);
+                        return drawing2DAPI.exportSVG(drawingId, rProductId, modus, renderSizeParam, dxfTemplateFilename);
                     }, productId);
                 },
                 removeDimensions: (dimensionIds) => {
                     return this.resolve(async ([...rDimensionIds]) => {
-                        return ccAPI.drawing2D.removeDimensions(drawingId, rDimensionIds);
+                        return drawing2DAPI.removeDimensions(drawingId, rDimensionIds);
                     }, ...dimensionIds);
                 },
                 linearPattern: (partId, entities, references1, params1, references2, params2) => {
@@ -452,14 +411,11 @@ export default class CAD {
                         return null;
                     }, partId, entities, ...references);
                 },
-                extrusion: (partId, sketchId, type, limit1, limit2, taperAngle, direction, capEnds) => {
-                    return this.resolve(async ([rPartId, rSketchId]) => {
+                extrusion: (partId, sketchOrRegionIds, type, limit1, limit2, taperAngle, direction, capEnds) => {
+                    return this.resolve(async ([rPartId, rSketchOrRegionIds]) => {
                         const extrusion = await featureAPI.createExtrusion(drawingId, rPartId);
                         if (extrusion) {
-                            const cDrawing = await getDrawing(drawingId);
-                            const sketchLines = [];
-                            // TODO: Which sketch lines need to be included, is CCClasses.CCCurve and its derivation enough?
-                            sketchLines.push(...baseUtils.getChildren(rSketchId, CCClasses.CCCurve, cDrawing.structure.tree));
+                            const sketchLines = partUtils.getSketchlines(drawingId, rSketchOrRegionIds);
                             if (sketchLines) {
                                 const limit1Param = { value: limit1, isExpr: typeof limit1 === 'string' };
                                 const limit2Param = { value: limit2, isExpr: typeof limit2 === 'string' };
@@ -475,16 +431,13 @@ export default class CAD {
                                 return extrusion;
                             }
                         }
-                    }, partId, sketchId);
+                    }, partId, sketchOrRegionIds);
                 },
-                revolve: (partId, sketchId, axisIds, angle1, angle2, inverted) => {
-                    return this.resolve(async ([rPartId, rSketchId, ...rAxisIds]) => {
+                revolve: (partId, sketchOrRegionIds, axisIds, angle1, angle2, inverted) => {
+                    return this.resolve(async ([rPartId, rSketchOrRegionIds, ...rAxisIds]) => {
                         const revolve = await featureAPI.createRevolve(drawingId, rPartId);
                         if (revolve) {
-                            const cDrawing = await getDrawing(drawingId);
-                            const sketchLines = [];
-                            sketchLines.push(...baseUtils.getChildren(rSketchId, CCClasses.CCCircle, cDrawing.structure.tree));
-                            sketchLines.push(...baseUtils.getChildren(rSketchId, CCClasses.CCLine, cDrawing.structure.tree));
+                            const sketchLines = partUtils.getSketchlines(drawingId, rSketchOrRegionIds);
                             if (sketchLines) {
                                 const angle1Param = { value: angle1, isExpr: typeof angle1 === 'string' };
                                 const angle2Param = { value: angle2, isExpr: typeof angle2 === 'string' };
@@ -492,7 +445,7 @@ export default class CAD {
                                 return revolve;
                             }
                         }
-                    }, partId, sketchId, ...axisIds);
+                    }, partId, sketchOrRegionIds, ...axisIds);
                 },
                 boolean: (partId, type, entities) => {
                     return this.resolve(async ([rPartId, rEntities]) => {
@@ -1118,9 +1071,9 @@ export default class CAD {
                         return await assemblyBuilderAPI.createAssemblyAsTemplate(drawingId, name);
                     });
                 },
-                createRootAssembly: (name) => {
+                createRootAssembly: (name, options) => {
                     return this.resolve(async ([]) => {
-                        return await assemblyBuilderAPI.createRootAssembly(drawingId, name);
+                        return await assemblyBuilderAPI.createRootAssembly(drawingId, name, options);
                     });
                 },
                 createPart: (name) => {
@@ -1232,11 +1185,11 @@ export default class CAD {
                                 break;
                         }
                         const geometries = positions
-                            ? await ccAPI.geometry.findGeometriesByPoints(drawingId, rPartId, type, positions)
+                            ? await geometryAPI.findGeometriesByPoints(drawingId, rPartId, type, positions)
                             : await waitForSelect(length, filter, (resolveSelection, items, diff) => {
                                 if (items.length > length - 1) {
                                     resolveSelection(items.map(i => i.data.graphicId));
-                                    ccAPI.geometry
+                                    geometryAPI
                                         .getPointsByGeometries(drawingId, items.map(i => i.data.graphicId))
                                         .then(points => {
                                         logPoints(points);
@@ -1264,6 +1217,18 @@ export default class CAD {
                         return null;
                     }, refId);
                 },
+                getProductOfNode: (refIds) => {
+                    return this.resolve(async ([rRefIds]) => {
+                        const drawing = getDrawing(drawingId);
+                        const tree = drawing.structure.tree;
+                        const products = [];
+                        for (const rRefId of rRefIds) {
+                            const product = asmUtils.findProduct(rRefId, tree);
+                            products.push(product);
+                        }
+                        return products;
+                    }, refIds);
+                },
                 setCurrentNode: (refId) => {
                     return this.resolve(async ([rRefId]) => {
                         await assemblyBuilderAPI.setCurrentNode(drawingId, rRefId);
@@ -1286,7 +1251,7 @@ export default class CAD {
                 },
                 setCurrentProduct: (productId) => {
                     return this.resolve(async ([rProductId]) => {
-                        await ccAPI.baseModeler.setCurrentProduct(drawingId, rProductId);
+                        await baseModelerAPI.setCurrentProduct(drawingId, rProductId);
                     }, productId);
                 },
                 getCurrentProduct: () => {
@@ -1314,6 +1279,15 @@ export default class CAD {
                         return null;
                     }, refId);
                 },
+                getSketchRegion: (refId, sketchRegionName) => {
+                    return this.resolve(async ([rRefId]) => {
+                        const sRIds = partUtils.getSketchRegion(drawingId, rRefId, sketchRegionName);
+                        if (sRIds != undefined) {
+                            return Array.isArray(sRIds) ? sRIds : [sRIds];
+                        }
+                        return null;
+                    }, refId);
+                },
                 getWorkGeometry: (refId, type, wgName) => {
                     return this.resolve(async ([rRefId]) => {
                         const wgIds = asmUtils.getWorkGeometry(drawingId, rRefId, type, wgName);
@@ -1554,22 +1528,22 @@ export default class CAD {
                     }, translationId);
                 },
                 save: (type) => {
-                    return ccAPI.baseModeler.save(drawingId, type);
+                    return baseModelerAPI.save(drawingId, type);
                 },
                 saveToUrl: (url, filetype) => {
-                    return ccAPI.baseModeler.saveToUrl(drawingId, url, filetype);
+                    return baseModelerAPI.saveToUrl(drawingId, url, filetype);
                 },
                 load: (content, type) => {
-                    return ccAPI.baseModeler.load(drawingId, content, type);
+                    return baseModelerAPI.load(drawingId, content, type);
                 },
                 loadFromUrl: (url, filetype) => {
-                    return ccAPI.baseModeler.loadFromUrl(drawingId, url, filetype, true);
+                    return baseModelerAPI.loadFromUrl(drawingId, url, filetype, true);
                 },
-                loadProduct: (content, type) => {
-                    return ccAPI.assemblyBuilder.loadProduct(drawingId, content, type);
+                loadProduct: (content, type, options) => {
+                    return assemblyBuilderAPI.loadProduct(drawingId, content, type, '', options);
                 },
-                loadProductFromUrl: (url, filetype) => {
-                    return ccAPI.assemblyBuilder.loadProductFromUrl(drawingId, url, filetype);
+                loadProductFromUrl: (url, filetype, options) => {
+                    return assemblyBuilderAPI.loadProductFromUrl(drawingId, url, filetype, options);
                 },
                 pick: (partId, type, points) => {
                     return this.resolve(async ([rPartId]) => {
@@ -1671,6 +1645,11 @@ export default class CAD {
                         await baseModelerAPI.deleteObjects(drawingId, toRemoveOps);
                     }
                 },
+                getMatePath: async (refId) => {
+                    return this.resolve(async ([rRefId]) => {
+                        return asmUtils.getMatePath(drawingId, rRefId);
+                    }, refId);
+                },
             };
             callback(publicApi);
             resolve(drawingId);

package/build/esm/solid.js

@@ -10,6 +10,7 @@ import { ccAPI } from '@buerli.io/classcad';
 import { api, getDrawing } from '@buerli.io/core';
 import { Group, Mesh, MeshStandardMaterial, Scene, Shape } from 'three';
 import * as BufferGeometryUtils_ from 'three/examples/jsm/utils/BufferGeometryUtils';
+import { getDifferentColoredMeshesFromEntity } from './utils/meshes';
 const solidAPI = ccAPI.solid;
 let BufferGeometryUtils = BufferGeometryUtils_;
 if (BufferGeometryUtils.BufferGeometryUtils) {
@@ -269,25 +270,28 @@ export default class CAD {
                                                 mesh.userData = { id: m.graphicId }; // add graphic id to the userData
                                                 mesh.geometry = m.geometry;
                                                 mesh.material = new MeshStandardMaterial({
-                                                    color: m.color,
-                                                    transparent: m.opacity < 1,
-                                                    opacity: m.opacity,
+                                                    color: m.color ? m.color : entity.color,
+                                                    transparent: m.opacity ? m.opacity < 1 : entity.opacity < 1,
+                                                    opacity: m.opacity ? m.opacity : entity.opacity,
                                                 });
                                                 _solid.add(mesh);
                                                 meshes.push(mesh);
                                             });
                                         }
                                         else {
-                                            // Merge all geometries into one mesh
-                                            const mesh = new Mesh();
-                                            mesh.geometry = BufferGeometryUtils.mergeBufferGeometries(entity.meshes.map(m => m.geometry));
-                                            mesh.material = new MeshStandardMaterial({
-                                                color: entity.meshes[0].color,
-                                                transparent: entity.meshes[0].opacity < 1,
-                                                opacity: entity.meshes[0].opacity,
+                                            // Merge all geometries into one mesh, sort them by color
+                                            const colorMeshesMap = getDifferentColoredMeshesFromEntity(entity);
+                                            Object.keys(colorMeshesMap).forEach(key => {
+                                                const mesh = new Mesh();
+                                                mesh.geometry = BufferGeometryUtils.mergeBufferGeometries(colorMeshesMap[key].meshes.map(m => m.geometry));
+                                                mesh.material = new MeshStandardMaterial({
+                                                    color: colorMeshesMap[key].color,
+                                                    transparent: colorMeshesMap[key].opacity < 1,
+                                                    opacity: colorMeshesMap[key].opacity,
+                                                });
+                                                _solid.add(mesh); // Add mesh to solid of the scene
+                                                meshes.push(mesh); // Collect mesh to return later
                                             });
-                                            _solid.add(mesh); // Add mesh to solid of the scene
-                                            meshes.push(mesh); // Collect mesh to return later
                                         }
                                         part.add(_solid); // Add solid to part of the scene
                                         _solids.push(_solid); // Collect solid to return later

package/build/esm/utils/meshes.js

@@ -0,0 +1,20 @@
+/**
+ * Get all meshes in a map, sorted by their color / opacity
+ * @param entity entity to look for the meshes
+ * @returns map (key = color/opacity as string, value = object containing the meshes, color and opacity)
+ */
+export const getDifferentColoredMeshesFromEntity = (entity) => {
+    const colorMeshesMap = {};
+    entity.meshes.forEach(mesh => {
+        const color = mesh.color ? mesh.color : entity.color;
+        const opacity = mesh.opacity ? mesh.opacity : entity.opacity;
+        const key = (color === null || color === void 0 ? void 0 : color.getHexString()) + (opacity === null || opacity === void 0 ? void 0 : opacity.toString());
+        if (colorMeshesMap[key]) {
+            colorMeshesMap[key].meshes.push(mesh);
+        }
+        else {
+            colorMeshesMap[key] = { meshes: [mesh], color, opacity };
+        }
+    });
+    return colorMeshesMap;
+};

package/build/types/history.d.ts

@@ -1,5 +1,5 @@
 import { BooleanOperationType, ChamferType, FlipType, ReorientedType, WorkAxisType, WorkCoordSystemType, WorkPlaneType, WorkPointType, ViewType, OrientationType, ExtrusionType, BrepElemType, WorkGeomType, SVGModusType, LimitsParam, LimitedValue } from '@buerli.io/classcad';
-import { ObjectID, PointMemValue } from '@buerli.io/core';
+import { ObjectIdent, ObjectID, PointMemValue } from '@buerli.io/core';
 import { BufferGeometry, Group, Mesh, Scene } from 'three';
 /**
  * History based modeling is similar to solid modeling, but it is non-destructive and
@@ -27,17 +27,21 @@ export declare type ApiHistory = {
     /**
      * Adds multiple products as nodes to an existing assembly at once
      * @param nodes array of node parameter objects. See following descriptions.
-     * @param productId id of the product template to add
-     * @param ownerId id of the owner where the product template will be added to
+     * @param productId id or identifier of the product template to add
+     * @param ownerId id or identifier of the owner where the product template will be added to
      * @param transformation transformation of the product template in x-, y- and z-axis
      * @param name optional name for adding node
+     * @param options optional object containing ident property, to define a identifier for the added node
      * @example // tbd
      */
     addNodes: (...nodes: {
-        productId: VID;
-        ownerId: VID;
+        productId: VID | ObjectIdent;
+        ownerId: VID | ObjectIdent;
         transformation: Transform;
         name?: string;
+        options?: {
+            ident?: ObjectIdent;
+        };
     }[]) => Promise<ObjectID[] | null>;
     /**
      * Adds multiple dimensions to products in the 3D view
@@ -213,7 +217,7 @@ export declare type ApiHistory = {
     /**
      * Creates an extrusion
      * @param partId Id of the part to create the extrusion in.
-     * @param sketchId Id of the sketch to extrude
+     * @param sketchOrRegionIds Id of the sketch to extrude or multiple ids of sketch regions
      * @param type Type of extrusion (up, down, symmetric, custom)
      * @param limit1 Start of extrusion (0 = start at sketch, only for type custom necessary)
      * @param limit2 End of extrusion, which is actually the height
@@ -221,17 +225,17 @@ export declare type ApiHistory = {
      * @param direction Direction of extrusion
      * @param capEnds If true, ends will be capped, else a sheet will be created
      */
-    extrusion: (partId: VID, sketchId: VID, type: ExtrusionType, limit1: number | string, limit2: number | string, taperAngle: number | string, direction: PointMemValue, capEnds: 0 | 1) => ID;
+    extrusion: (partId: VID, sketchOrRegionIds: VID | VIDs, type: ExtrusionType, limit1: number | string, limit2: number | string, taperAngle: number | string, direction: PointMemValue, capEnds: 0 | 1) => ID;
     /**
      * Creates a revolve
      * @param partId Id of the part to create the revolve in.
-     * @param sketchId Id of the sketch to revolve
+     * @param sketchOrRegionIds Id of the sketch to extrude or multiple ids of sketch regions
      * @param axisIds Array of ids, either [lineId] or [point1Id, point2Id], ids can be both ccId or graphicId
      * @param angle1 Start of revolve in degrees
      * @param angle2 End of revolve in degrees
      * @param inverted flag, whether to invert the axis or not
      */
-    revolve: (partId: VID, sketchId: VID, axisIds: VID[], angle1: number | string, angle2: number | string, inverted: 0 | 1) => ID;
+    revolve: (partId: VID, sketchOrRegionIds: VID | VIDs, axisIds: VID[], angle1: number | string, angle2: number | string, inverted: 0 | 1) => ID;
     /**
      * Creates a boolean operation.
      * @param partId id of the part where the operation will be created on
@@ -615,7 +619,7 @@ export declare type ApiHistory = {
     }>;
     /**
      * Creates one or more expressions.
-     * @param partId id of part where to create the expression
+     * @param partId id or identifier of part where to create the expression
      * @param members array of members which contain a name and a value. Value can be an expression, e.g. '2 * laenge'
      * @example
      * // Creates an expression and links it with the width of the box
@@ -625,7 +629,7 @@ export declare type ApiHistory = {
      * const geoms = await api.createBufferGeometry(part)
      * return geoms.map(geom => new THREE.Mesh(geom, new THREE.MeshStandardMaterial()))
      */
-    createExpressions: (partId: VID, ...members: {
+    createExpressions: (partId: VID | ObjectIdent, ...members: {
         name: string;
         value: number | string;
     }[]) => Promise<boolean>;
@@ -672,6 +676,7 @@ export declare type ApiHistory = {
     /**
      * Creates a new rootAssembly. This is the top level assembly.
      * @param name [optional] name of the root assembly. Default = 'AssemblyRoot'
+     * @param options optional object containing ident property, to define a identifier for the created root assembly
      * @example
      * // Defines some consts
      * const orig = { x: 0, y: 0, z: 0 }
@@ -693,7 +698,9 @@ export declare type ApiHistory = {
      * const geoms = await api.createBufferGeometry(rootAsm)
      * return geoms.map(geom => new THREE.Mesh(geom, new THREE.MeshStandardMaterial()))
      */
-    createRootAssembly: (name?: string) => ID;
+    createRootAssembly: (name?: string, options?: {
+        ident?: ObjectIdent;
+    }) => ID;
     /**
      * Creates a new part.
      * @param name [optional] name of the part. Default = 'Part'
@@ -814,7 +821,7 @@ export declare type ApiHistory = {
     createWorkPoint: (partId: VID, type: WorkPointType, references: VID[], position: PointMemValue, local: boolean, name?: string) => ID;
     /**
      * Deletes an existing expression.
-     * @param partId id of part to delete expressions from
+     * @param partId id or identifier of part to delete expressions from
      * @param members name of members to delete
      * @example
      * // Deletes an expression from part's expression set
@@ -825,7 +832,7 @@ export declare type ApiHistory = {
      * const geoms = await api.createBufferGeometry(part)
      * return geoms.map(geom => new THREE.Mesh(geom, new THREE.MeshStandardMaterial()))
      */
-    deleteExpressions: (partId: VID, members: string[]) => Promise<boolean>;
+    deleteExpressions: (partId: VID | ObjectIdent, members: string[]) => Promise<boolean>;
     /**
      * Loads a sketch from a ofb filestream and adds its elements to a new sketch.
      * The id of this new created sketch will be returned.
@@ -911,6 +918,12 @@ export declare type ApiHistory = {
      * @example // tbd
      */
     getAssemblyNode: (refId: VID, nodeName?: string) => IDs;
+    /**
+     * Returns the products (array of product ids) of the given nodes (refIds).
+     * @param refIds ids of the nodes (product references) to get the product (part or assembly) from
+     * @example // tbd
+     */
+    getProductOfNode: (refIds: VID[]) => IDs;
     /**
      * Returns the id of the current product
      * @example // tbd
@@ -972,6 +985,14 @@ export declare type ApiHistory = {
      * return geoms.map(geom => new THREE.Mesh(geom, new THREE.MeshStandardMaterial()))
      */
     getWorkCoordSystem: (refId: VID, wcsName?: string) => IDs;
+    /**
+     * Returns the sketch region with the given sketchRegionName from the given reference.
+     * If sketchRegionName is not set, all sketch regions of the reference will be returned.
+     * @param refId id of the reference to look for the sketch region
+     * @param wcsName name of the sketch region to look for
+     * @example // tbd
+     */
+    getSketchRegion: (refId: VID, sketchRegionName?: string) => IDs;
     /**
      * Returns the work geometry of given type with given name. If the name of the work geometry is empty,
      * all found work geometry of given type is returned
@@ -1098,20 +1119,26 @@ export declare type ApiHistory = {
      * Loads a product into the current drawing.
      * @param content data as arraybuffer
      * @param type type of the data to load
+     * @param options optional object containing ident property, to define a identifier for the loaded product
      * @example
      * // Loads an existing product
      * const part = api.loadProduct(arraybuffer, 'ofb')
      * const geoms = await api.createBufferGeometry(part)
      * return geoms.map(geom => new THREE.Mesh(geom, new THREE.MeshStandardMaterial()))
      */
-    loadProduct: (content: ArrayBuffer, type: 'ofb' | 'stp') => Promise<number[] | null>;
+    loadProduct: (content: ArrayBuffer, type: 'ofb' | 'stp', options?: {
+        ident?: ObjectIdent;
+    }) => Promise<number[] | null>;
     /**
      * Loads a product from the given URL into the current drawing.
      * @param url The url to load data from.
      * @param filetype The type of data delivered by the url ('ofb', 'stp').
+     * @param options optional object containing ident property, to define a identifier for the loaded product
      * @example // tbd
      */
-    loadProductFromUrl: (url: string, filetype: 'ofb' | 'stp') => Promise<number[] | null>;
+    loadProductFromUrl: (url: string, filetype: 'ofb' | 'stp', options?: {
+        ident?: ObjectIdent;
+    }) => Promise<number[] | null>;
     /**
      * Creates a new feature and appends geometry to it. This method can be used to import specific geometry
      * which can be used for further operations like boolean, translations and so on.
@@ -1125,13 +1152,11 @@ export declare type ApiHistory = {
     /**
      * Removes multiple nodes from an assembly node at once
      * @param nodes array of node parameter objects. See following descriptions.
-     * @param referenceId id of the node to remove
-     * @param ownerId id of the assembly node to remove the node from
+     * @param referenceId id or identifier of the node to remove
      * @example // tbd
      */
     removeNodes: (...nodes: {
-        referenceId: VID;
-        ownerId: VID;
+        referenceId: VID | ObjectIdent;
     }[]) => Promise<void>;
     /**
      * Transforms the node with referenceId with the given transformation within an assembly
@@ -1181,13 +1206,13 @@ export declare type ApiHistory = {
      * Updates multiple expressions in different parts at once
      *
      * @param expressions array of expression objects containing the part id and the expression to set
-     * @param partId id of part to update expression
+     * @param partId id or identifier of part to update expression
      * @param members array of members to update which contain a name and a value. Value can be an expression, e.g. '2 * laenge'
      * @example // tbd
      * @returns true, if updating expressions in all parts was successfull
      */
     setExpressions: (...expressions: {
-        partId: number;
+        partId: VID | ObjectIdent;
         members: {
             name: string;
             value: number | string;
@@ -1208,6 +1233,13 @@ export declare type ApiHistory = {
      * @param toOperation all operations, from rollback bar until the id of this operation, will be deleted
      */
     removeOperations: (operations: VID[], toOperation: VID) => Promise<void>;
+    /**
+     * Creates and returns the mate path as array from the given reference id up to the current node.
+     * This helps to get the right path to set constraints between nodes which are located in
+     * subassemblies.
+     * @param refId id of the node to set the constraint on
+     */
+    getMatePath: (refId: VID) => Promise<ObjectID[]>;
 };
 export default class CAD {
     private drawingId;

package/build/types/utils/meshes.d.ts

@@ -0,0 +1,14 @@
+import { ContainerGeometryT, MeshGeometry } from '@buerli.io/core';
+import { Color } from 'three';
+declare type ColorMeshMap = Record<string, {
+    meshes: MeshGeometry[];
+    color: Color | undefined;
+    opacity: number;
+}>;
+/**
+ * Get all meshes in a map, sorted by their color / opacity
+ * @param entity entity to look for the meshes
+ * @returns map (key = color/opacity as string, value = object containing the meshes, color and opacity)
+ */
+export declare const getDifferentColoredMeshesFromEntity: (entity: ContainerGeometryT) => ColorMeshMap;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buerli.io/headless",
-  "version": "0.5.0-beta.4",
+  "version": "0.6.0",
   "description": "A non-manifold CAD workflow for the web",
   "author": "AWV Informatik AG <info@awv-informatik.ch>",
   "license": "ISC",
@@ -30,7 +30,7 @@
     "three": ">=0.138"
   },
   "dependencies": {
-    "@buerli.io/classcad": "0.5.0-beta.4",
+    "@buerli.io/classcad": "0.6.0",
     "flat-promise": "^1.0.3"
   }
 }