@buerli.io/headless 0.5.0-beta.3 → 0.5.0

package/build/cjs/history.js

@@ -40,8 +40,11 @@ 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;
@@ -108,7 +111,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) {
@@ -163,7 +166,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];
                 }
@@ -312,7 +315,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 +352,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 +366,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 +480,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 +500,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 +514,7 @@ class CAD {
                                 return revolve;
                             }
                         }
-                    }, partId, sketchId, ...axisIds);
+                    }, partId, sketchOrRegionIds, ...axisIds);
                 },
                 boolean: (partId, type, entities) => {
                     return this.resolve(async ([rPartId, rEntities]) => {
@@ -1132,7 +1129,7 @@ class CAD {
                             };
                             membersToAdd.push({ name: mem.name, value: featureAPIParam, dataType });
                         });
-                        const success = featureAPI.updateExpressionSets(drawingId, [
+                        const success = featureAPI.updateExpressions(drawingId, [
                             { productId: rPartId, toAddMembers: membersToAdd, toModifyMembers: [], toDeleteList: [] },
                         ]);
                         return success;
@@ -1257,11 +1254,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);
@@ -1311,7 +1308,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 +1336,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 +1585,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);
+                    return assemblyBuilderAPI.loadProduct(drawingId, content, type);
                 },
                 loadProductFromUrl: (url, filetype) => {
-                    return classcad_1.ccAPI.assemblyBuilder.loadProductFromUrl(drawingId, url, filetype);
+                    return assemblyBuilderAPI.loadProductFromUrl(drawingId, url, filetype);
                 },
                 pick: (partId, type, points) => {
                     return this.resolve(async ([rPartId]) => {
@@ -1605,29 +1611,12 @@ class CAD {
                         return null;
                     }, partId);
                 },
-                setExpressions: (partId, ...members) => {
-                    return this.resolve(async ([rPartId]) => {
-                        const membersToModify = [];
-                        members.forEach(mem => {
-                            const isExpr = typeof mem.value === 'string'; // TODO Expression unterscheiden von normalen Strings
-                            const featureAPIParam = {
-                                value: mem.value,
-                                isExpr,
-                            };
-                            membersToModify.push({ name: mem.name, value: featureAPIParam });
-                        });
-                        const success = featureAPI.updateExpressionSets(drawingId, [
-                            { productId: rPartId, toAddMembers: [], toModifyMembers: membersToModify, toDeleteList: [] },
-                        ]);
-                        return success;
-                    }, partId);
-                },
-                setExpressionSets: (...exprSets) => {
-                    return this.resolve(async ([...rExprSets]) => {
-                        const exprSetsToSet = [];
-                        rExprSets.forEach(exprSet => {
+                setExpressions: (...expressions) => {
+                    return this.resolve(async ([...rExpressions]) => {
+                        const expressionsToSet = [];
+                        rExpressions.forEach(expr => {
                             const membersToModify = [];
-                            exprSet.members.forEach((mem) => {
+                            expr.members.forEach((mem) => {
                                 const isExpr = typeof mem.value === 'string'; // TODO Expression unterscheiden von normalen Strings
                                 const featureAPIParam = {
                                     value: mem.value,
@@ -1635,20 +1624,20 @@ class CAD {
                                 };
                                 membersToModify.push({ name: mem.name, value: featureAPIParam });
                             });
-                            exprSetsToSet.push({
-                                productId: exprSet.partId,
+                            expressionsToSet.push({
+                                productId: expr.partId,
                                 toAddMembers: [],
                                 toModifyMembers: membersToModify,
                                 toDeleteList: [],
                             });
                         });
-                        const success = await featureAPI.updateExpressionSets(drawingId, exprSetsToSet);
+                        const success = await featureAPI.updateExpressions(drawingId, expressionsToSet);
                         return success;
-                    }, ...exprSets);
+                    }, ...expressions);
                 },
                 deleteExpressions: (partId, members) => {
                     return this.resolve(async ([rPartId]) => {
-                        const success = featureAPI.updateExpressionSets(drawingId, [
+                        const success = featureAPI.updateExpressions(drawingId, [
                             { productId: rPartId, toAddMembers: [], toModifyMembers: [], toDeleteList: members },
                         ]);
                         return success;

package/build/esm/history.js

@@ -15,8 +15,11 @@ 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;
@@ -83,7 +86,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) {
@@ -138,7 +141,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];
                 }
@@ -287,7 +290,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 +327,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 +341,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 +455,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 +475,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 +489,7 @@ export default class CAD {
                                 return revolve;
                             }
                         }
-                    }, partId, sketchId, ...axisIds);
+                    }, partId, sketchOrRegionIds, ...axisIds);
                 },
                 boolean: (partId, type, entities) => {
                     return this.resolve(async ([rPartId, rEntities]) => {
@@ -1107,7 +1104,7 @@ export default class CAD {
                             };
                             membersToAdd.push({ name: mem.name, value: featureAPIParam, dataType });
                         });
-                        const success = featureAPI.updateExpressionSets(drawingId, [
+                        const success = featureAPI.updateExpressions(drawingId, [
                             { productId: rPartId, toAddMembers: membersToAdd, toModifyMembers: [], toDeleteList: [] },
                         ]);
                         return success;
@@ -1232,11 +1229,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);
@@ -1286,7 +1283,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 +1311,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 +1560,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);
+                    return assemblyBuilderAPI.loadProduct(drawingId, content, type);
                 },
                 loadProductFromUrl: (url, filetype) => {
-                    return ccAPI.assemblyBuilder.loadProductFromUrl(drawingId, url, filetype);
+                    return assemblyBuilderAPI.loadProductFromUrl(drawingId, url, filetype);
                 },
                 pick: (partId, type, points) => {
                     return this.resolve(async ([rPartId]) => {
@@ -1580,29 +1586,12 @@ export default class CAD {
                         return null;
                     }, partId);
                 },
-                setExpressions: (partId, ...members) => {
-                    return this.resolve(async ([rPartId]) => {
-                        const membersToModify = [];
-                        members.forEach(mem => {
-                            const isExpr = typeof mem.value === 'string'; // TODO Expression unterscheiden von normalen Strings
-                            const featureAPIParam = {
-                                value: mem.value,
-                                isExpr,
-                            };
-                            membersToModify.push({ name: mem.name, value: featureAPIParam });
-                        });
-                        const success = featureAPI.updateExpressionSets(drawingId, [
-                            { productId: rPartId, toAddMembers: [], toModifyMembers: membersToModify, toDeleteList: [] },
-                        ]);
-                        return success;
-                    }, partId);
-                },
-                setExpressionSets: (...exprSets) => {
-                    return this.resolve(async ([...rExprSets]) => {
-                        const exprSetsToSet = [];
-                        rExprSets.forEach(exprSet => {
+                setExpressions: (...expressions) => {
+                    return this.resolve(async ([...rExpressions]) => {
+                        const expressionsToSet = [];
+                        rExpressions.forEach(expr => {
                             const membersToModify = [];
-                            exprSet.members.forEach((mem) => {
+                            expr.members.forEach((mem) => {
                                 const isExpr = typeof mem.value === 'string'; // TODO Expression unterscheiden von normalen Strings
                                 const featureAPIParam = {
                                     value: mem.value,
@@ -1610,20 +1599,20 @@ export default class CAD {
                                 };
                                 membersToModify.push({ name: mem.name, value: featureAPIParam });
                             });
-                            exprSetsToSet.push({
-                                productId: exprSet.partId,
+                            expressionsToSet.push({
+                                productId: expr.partId,
                                 toAddMembers: [],
                                 toModifyMembers: membersToModify,
                                 toDeleteList: [],
                             });
                         });
-                        const success = await featureAPI.updateExpressionSets(drawingId, exprSetsToSet);
+                        const success = await featureAPI.updateExpressions(drawingId, expressionsToSet);
                         return success;
-                    }, ...exprSets);
+                    }, ...expressions);
                 },
                 deleteExpressions: (partId, members) => {
                     return this.resolve(async ([rPartId]) => {
-                        const success = featureAPI.updateExpressionSets(drawingId, [
+                        const success = featureAPI.updateExpressions(drawingId, [
                             { productId: rPartId, toAddMembers: [], toModifyMembers: [], toDeleteList: members },
                         ]);
                         return success;

package/build/types/history.d.ts

@@ -213,7 +213,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 +221,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
@@ -972,6 +972,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
@@ -1178,31 +1186,15 @@ export declare type ApiHistory = {
      */
     pick: (partId: VID, type: 'vertex' | 'edge' | 'face', points: PointMemValue[]) => IDs;
     /**
-     * Updates an existing expression
+     * 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 members array of members to update which contain a name and a value. Value can be an expression, e.g. '2 * laenge'
-     * @example
-     * // Sets expression height to value = 30
-     * const part = api.createPart('Part')
-     * api.createExpressions(part, { name: 'width', value: 20 }, { name: 'height', value: 40 })
-     * api.setExpressions(part, { name: 'height', value: 30 })
-     * await api.box(part, [], 'ExpressionSet.width', 20, 'ExpressionSet.height')
-     * const geoms = await api.createBufferGeometry(part)
-     * return geoms.map(geom => new THREE.Mesh(geom, new THREE.MeshStandardMaterial()))
-     * @returns true, if updating expressions was successfull
-     */
-    setExpressions: (partId: VID, ...members: {
-        name: string;
-        value: number | string;
-    }[]) => Promise<boolean>;
-    /**
-     * Updates multiple expression sets in different parts at once
-     *
-     * @param exprSets array of expression objects containing the part id and the expression to set
      * @example // tbd
-     * @returns true, if updating expressions in all expression sets was successfull
+     * @returns true, if updating expressions in all parts was successfull
      */
-    setExpressionSets: (...exprSets: {
+    setExpressions: (...expressions: {
         partId: number;
         members: {
             name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buerli.io/headless",
-  "version": "0.5.0-beta.3",
+  "version": "0.5.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.3",
+    "@buerli.io/classcad": "0.5.0",
     "flat-promise": "^1.0.3"
   }
 }