@buerli.io/core 0.7.1 → 0.9.0-beta.1

package/build/cjs/geometry/ThreeGeometryCreator.js

@@ -201,7 +201,7 @@ class ThreeGeometryCreator {
     createEdge(edge, container, points, color) {
         const threePts = [];
         const graphicId = edge.id;
-        let type = types_1.GraphicType.EDGE;
+        let type = types_1.GraphicType.NURBSCURVE;
         if (container.type === types_1.ContainerType.CURVEARRAY) {
             type = types_1.GraphicType.CURVESPLINE;
         }
@@ -274,7 +274,7 @@ class ThreeGeometryCreator {
         this.insertPoint(container, `${endId}|point`, endId, end, arc.id, 'end', points);
         const geometry = new THREE.BufferGeometry().setFromPoints(threePts);
         return Object.assign(Object.assign({ geometry,
-            graphicId, type: type }, this.getMetadata(arc, container, color)), { normal: normal.clone(), center: center.clone(), radius: arc.radius, angle: arc.angle });
+            graphicId, type: type }, this.getMetadata(arc, container, color)), { normal: normal.clone(), center: center.clone(), start: start.clone(), end: end.clone(), radius: arc.radius, angle: arc.angle });
     }
     createPoint(container, key, graphicId, position, ownerId, type) {
         return Object.assign(Object.assign({ key,

package/build/cjs/graphic/filters.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.solidFilter = exports.loopFilter = exports.planeFilter = exports.meshFilter = exports.pointFilter = exports.arcCircleFilter = exports.circleFilter = exports.arcFilter = exports.lineSegmentsFilter = exports.lineFilter = void 0;
-const IGraphicPackage_1 = require("../types/IGraphicPackage");
+exports.solidFilter = exports.loopFilter = exports.planeFilter = exports.meshFilter = exports.pointFilter = exports.arcCircleFilter = exports.circleFilter = exports.arcFilter = exports.edgeFilter = exports.lineFilter = void 0;
 const selection_1 = require("../store/states/selection");
-const lineFilter = (scope, data) => scope === selection_1.BuerliScope && (data === IGraphicPackage_1.GraphicType.LINE || data === IGraphicPackage_1.GraphicType.EDGE);
+const IGraphicPackage_1 = require("../types/IGraphicPackage");
+const lineFilter = (scope, data) => scope === selection_1.BuerliScope && data === IGraphicPackage_1.GraphicType.LINE;
 exports.lineFilter = lineFilter;
-const lineSegmentsFilter = (scope, data) => scope === selection_1.BuerliScope && IGraphicPackage_1.LineSegments.includes(data);
-exports.lineSegmentsFilter = lineSegmentsFilter;
+const edgeFilter = (scope, data) => scope === selection_1.BuerliScope && IGraphicPackage_1.EdgeTypes.includes(data);
+exports.edgeFilter = edgeFilter;
 const arcFilter = (scope, data) => scope === selection_1.BuerliScope && data === IGraphicPackage_1.GraphicType.ARC;
 exports.arcFilter = arcFilter;
 const circleFilter = (scope, data) => scope === selection_1.BuerliScope && data === IGraphicPackage_1.GraphicType.CIRCLE;
@@ -15,7 +15,7 @@ const arcCircleFilter = (scope, data) => scope === selection_1.BuerliScope && (d
 exports.arcCircleFilter = arcCircleFilter;
 const pointFilter = (scope, data) => scope === selection_1.BuerliScope && data === IGraphicPackage_1.GraphicType.POINT;
 exports.pointFilter = pointFilter;
-const meshFilter = (scope, data) => scope === selection_1.BuerliScope && IGraphicPackage_1.Surfaces.includes(data);
+const meshFilter = (scope, data) => scope === selection_1.BuerliScope && IGraphicPackage_1.MeshTypes.includes(data);
 exports.meshFilter = meshFilter;
 const planeFilter = (scope, data) => scope === selection_1.BuerliScope && data === IGraphicPackage_1.GraphicType.PLANE;
 exports.planeFilter = planeFilter;

package/build/cjs/store/states/drawing.js

@@ -23,7 +23,7 @@ const structure_1 = require("./structure");
 ////////////////////////////////////////////////////
 const createDrawingState = (set, get, buerliApi, drawingNumber, name) => {
     const drawingId = (0, uuid_1.v4)();
-    return {
+    const initialData = () => ({
         structure: (0, structure_1.structureData)(),
         selection: (0, selection_1.selectionData)(),
         interaction: (0, interaction_1.interactionData)(),
@@ -31,7 +31,8 @@ const createDrawingState = (set, get, buerliApi, drawingNumber, name) => {
         geometry: (0, geometry_1.geometryData)(),
         graphic: (0, graphic_1.graphicData)(),
         cad: (0, cad_1.cadData)(),
-        api: {
+    });
+    return Object.assign(Object.assign({}, initialData()), { api: {
             structure: (0, structure_1.structureApi)(set, get, buerliApi),
             selection: (0, selection_1.selectionApi)(set, get, buerliApi),
             plugin: (0, plugin_1.pluginApi)(set, get, buerliApi),
@@ -39,9 +40,10 @@ const createDrawingState = (set, get, buerliApi, drawingNumber, name) => {
             graphic: (0, graphic_1.graphicApi)(set, get, buerliApi),
             cad: (0, cad_1.cadApi)(set, get, buerliApi),
             interaction: (0, interaction_1.interactionApi)(set, get, buerliApi),
-        },
-        id: drawingId,
-        name: name || `Drawing #${drawingNumber}`,
-    };
+            reset: () => {
+                set(state => (Object.assign(Object.assign({}, state), initialData())));
+                buerliApi.getState().options.globalPlugins.forEach(def => get().api.plugin.createPlugin(def));
+            },
+        }, id: drawingId, name: name || `Drawing #${drawingNumber}` });
 };
 exports.createDrawingState = createDrawingState;

package/build/cjs/store/states/structure.js

@@ -165,7 +165,7 @@ const structureApi = (set, get, buerliApi) => ({
         //////////
         // 1. Collect the products
         //////////
-        const searchRoot = structure.root; // || structure.currentNode || structure.currentProduct
+        const searchRoot = structure.root; // || structure.currentInstance || structure.currentProduct
         const productIds = api.structure.collectProducts(searchRoot).map(p => p.id);
         //////////
         // 2. Collect the solid ids

package/build/cjs/store/subscribtion/selection.js

@@ -29,7 +29,10 @@ function subscribeItem(buerliApi, drawingId, selectorId, item) {
     }
 }
 function unsubscribeItems(buerliApi, drawingId, selectorId, items) {
-    const items_ = items || buerliApi.getState().drawing.refs[drawingId].selection.refs[selectorId].items;
+    var _a, _b, _c, _d;
+    // The following line leeds to exceptions if for example the corresponding drawing is going to be reset.
+    // To prevent those exceptions, check all properties for existance.
+    const items_ = items || ((_d = (_c = (_b = (_a = buerliApi.getState().drawing.refs[drawingId]) === null || _a === void 0 ? void 0 : _a.selection) === null || _b === void 0 ? void 0 : _b.refs) === null || _c === void 0 ? void 0 : _c[selectorId]) === null || _d === void 0 ? void 0 : _d.items) || [];
     items_.forEach(item => {
         unsubscribeItem(selectorId, item);
     });

package/build/cjs/types/IGraphicPackage.js

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PointTypes = exports.EntityTypes = exports.CurveSegments = exports.Primitives = exports.LineSegments = exports.Surfaces = exports.AllTypes = exports.ContainerType = exports.GraphicType = void 0;
+exports.PointTypes = exports.EntityTypes = exports.CurveTypes = exports.EdgeTypes = exports.MeshTypes = exports.ContainerType = exports.GraphicType = void 0;
 var GraphicType;
 (function (GraphicType) {
     // Primitives
     GraphicType["POINT"] = "point";
     GraphicType["LINE"] = "line";
-    GraphicType["EDGE"] = "edge";
     GraphicType["ARC"] = "arc";
     GraphicType["CIRCLE"] = "circle";
     GraphicType["PLANE"] = "plane";
     GraphicType["CYLINDER"] = "cylinder";
     GraphicType["CONE"] = "cone";
     GraphicType["SPHERE"] = "sphere";
-    GraphicType["NURBS"] = "nurbs";
+    GraphicType["NURBSCURVE"] = "nurbsCurve";
     GraphicType["NURBSSURFACE"] = "nurbsSurface";
     // Entities
     GraphicType["NONE"] = "none";
@@ -40,10 +39,8 @@ var ContainerType;
     // LIGHTWEIGHTBREP = 6, // Not used at the moment
 })(ContainerType = exports.ContainerType || (exports.ContainerType = {}));
 const G = GraphicType;
-exports.AllTypes = Object.keys(G).map(key => G[key]);
-exports.Surfaces = [G.PLANE, G.CYLINDER, G.CONE, G.SPHERE, G.NURBS, G.NURBSSURFACE];
-exports.LineSegments = [G.LINE, G.EDGE, G.ARC, G.CIRCLE];
-exports.Primitives = exports.Surfaces.concat(exports.LineSegments).concat([G.POINT]);
-exports.CurveSegments = [G.CURVELINE, G.CURVESPLINE, G.CURVEARC, G.CURVECIRCLE];
+exports.MeshTypes = [G.PLANE, G.CYLINDER, G.CONE, G.SPHERE, G.NURBSSURFACE];
+exports.EdgeTypes = [G.LINE, G.ARC, G.CIRCLE, G.NURBSCURVE];
+exports.CurveTypes = [G.CURVELINE, G.CURVESPLINE, G.CURVEARC, G.CURVECIRCLE];
 exports.EntityTypes = [G.BREP, G.POLYBREP, G.CURVEARRAY];
 exports.PointTypes = [G.POINT, G.CURVEPOINT];

package/build/cjs/types/IStructureTree.js

@@ -11,6 +11,7 @@ const DEFAULT_STRUCTURE_TREE = () => {
         root: exports.NOID,
         currentProduct: exports.NOID,
         currentNode: exports.NOID,
+        currentInstance: exports.NOID,
         testRoot: exports.NOID,
     };
 };

package/build/cjs/utils/Measure.js

@@ -82,6 +82,8 @@ exports.Measure = {
                     arc.normal = arc.normal.clone().applyMatrix3(matrix3);
                     arc.normal.normalize();
                     arc.center = arc.center.clone().applyMatrix4(matrix);
+                    arc.start = arc.start.clone().applyMatrix4(matrix);
+                    arc.end = arc.end.clone().applyMatrix4(matrix);
                     break;
                 case types_1.GraphicType.CIRCLE:
                 case types_1.GraphicType.CURVECIRCLE:
@@ -89,6 +91,8 @@ exports.Measure = {
                     circle.normal = circle.normal.clone().applyMatrix3(matrix3);
                     circle.normal.normalize();
                     circle.center = circle.center.clone().applyMatrix4(matrix);
+                    circle.start = circle.start.clone().applyMatrix4(matrix);
+                    circle.end = circle.end.clone().applyMatrix4(matrix);
                     break;
                 default:
                     break;
@@ -128,7 +132,7 @@ exports.Measure = {
                         measureData: { value: absoluteDistance, start: line.start.clone(), end: line.end.clone() },
                     });
                     break;
-                case types_1.GraphicType.EDGE:
+                case types_1.GraphicType.NURBSCURVE:
                 case types_1.GraphicType.CURVESPLINE:
                     const edge = element;
                     results.push({
@@ -139,7 +143,7 @@ exports.Measure = {
                     results.push({
                         description: 'Edge end',
                         type: MeasureResultType.POSITION,
-                        measureData: { value: edge.start.clone() },
+                        measureData: { value: edge.end.clone() },
                     });
                     break;
                 case types_1.GraphicType.ARC:
@@ -147,6 +151,16 @@ exports.Measure = {
                     const arc = element;
                     const arcNEnd = arc.center.clone().addScaledVector(arc.normal.clone().normalize(), 40);
                     const pointOnArc = getPointOnCircumference(arc.center, arc.normal, arc.radius);
+                    results.push({
+                        description: 'Arc start',
+                        type: MeasureResultType.POSITION,
+                        measureData: { value: arc.start.clone() },
+                    });
+                    results.push({
+                        description: 'Arc end',
+                        type: MeasureResultType.POSITION,
+                        measureData: { value: arc.end.clone() },
+                    });
                     results.push({
                         description: 'Arc center',
                         type: MeasureResultType.POSITION,
@@ -183,6 +197,11 @@ exports.Measure = {
                         type: MeasureResultType.DISTANCE,
                         measureData: { value: circle.radius, start: circle.center.clone(), end: pointOnCircle },
                     });
+                    results.push({
+                        description: 'Circle start/end',
+                        type: MeasureResultType.POSITION,
+                        measureData: { value: circle.start.clone() },
+                    });
                     break;
                 case types_1.GraphicType.PLANE:
                     const plane = element;
@@ -275,9 +294,6 @@ exports.Measure = {
                         measureData: { value: sphere.radius },
                     });
                     break;
-                case types_1.GraphicType.NURBS:
-                    results.push({ description: 'NURBS', type: MeasureResultType.NONE });
-                    break;
                 case types_1.GraphicType.NURBSSURFACE:
                     results.push({ description: 'NURBS Surface', type: MeasureResultType.NONE });
                     break;

package/build/esm/geometry/ThreeGeometryCreator.js

@@ -175,7 +175,7 @@ export class ThreeGeometryCreator {
     createEdge(edge, container, points, color) {
         const threePts = [];
         const graphicId = edge.id;
-        let type = GraphicType.EDGE;
+        let type = GraphicType.NURBSCURVE;
         if (container.type === ContainerType.CURVEARRAY) {
             type = GraphicType.CURVESPLINE;
         }
@@ -248,7 +248,7 @@ export class ThreeGeometryCreator {
         this.insertPoint(container, `${endId}|point`, endId, end, arc.id, 'end', points);
         const geometry = new THREE.BufferGeometry().setFromPoints(threePts);
         return Object.assign(Object.assign({ geometry,
-            graphicId, type: type }, this.getMetadata(arc, container, color)), { normal: normal.clone(), center: center.clone(), radius: arc.radius, angle: arc.angle });
+            graphicId, type: type }, this.getMetadata(arc, container, color)), { normal: normal.clone(), center: center.clone(), start: start.clone(), end: end.clone(), radius: arc.radius, angle: arc.angle });
     }
     createPoint(container, key, graphicId, position, ownerId, type) {
         return Object.assign(Object.assign({ key,

package/build/esm/graphic/filters.js

@@ -1,12 +1,12 @@
-import { GraphicType as GT, LineSegments, Surfaces } from '../types/IGraphicPackage';
 import { BuerliScope } from '../store/states/selection';
-export const lineFilter = (scope, data) => scope === BuerliScope && (data === GT.LINE || data === GT.EDGE);
-export const lineSegmentsFilter = (scope, data) => scope === BuerliScope && LineSegments.includes(data);
+import { EdgeTypes, GraphicType as GT, MeshTypes } from '../types/IGraphicPackage';
+export const lineFilter = (scope, data) => scope === BuerliScope && data === GT.LINE;
+export const edgeFilter = (scope, data) => scope === BuerliScope && EdgeTypes.includes(data);
 export const arcFilter = (scope, data) => scope === BuerliScope && data === GT.ARC;
 export const circleFilter = (scope, data) => scope === BuerliScope && data === GT.CIRCLE;
 export const arcCircleFilter = (scope, data) => scope === BuerliScope && (data === GT.ARC || data === GT.CIRCLE);
 export const pointFilter = (scope, data) => scope === BuerliScope && data === GT.POINT;
-export const meshFilter = (scope, data) => scope === BuerliScope && Surfaces.includes(data);
+export const meshFilter = (scope, data) => scope === BuerliScope && MeshTypes.includes(data);
 export const planeFilter = (scope, data) => scope === BuerliScope && data === GT.PLANE;
 export const loopFilter = (scope, data) => scope === BuerliScope && data === GT.LOOP;
 export const solidFilter = (scope, data) => scope === BuerliScope && data === GT.BREP;

package/build/esm/store/states/drawing.js

@@ -20,7 +20,7 @@ import { structureApi, structureData } from './structure';
 ////////////////////////////////////////////////////
 export const createDrawingState = (set, get, buerliApi, drawingNumber, name) => {
     const drawingId = uuidv4();
-    return {
+    const initialData = () => ({
         structure: structureData(),
         selection: selectionData(),
         interaction: interactionData(),
@@ -28,7 +28,8 @@ export const createDrawingState = (set, get, buerliApi, drawingNumber, name) =>
         geometry: geometryData(),
         graphic: graphicData(),
         cad: cadData(),
-        api: {
+    });
+    return Object.assign(Object.assign({}, initialData()), { api: {
             structure: structureApi(set, get, buerliApi),
             selection: selectionApi(set, get, buerliApi),
             plugin: pluginApi(set, get, buerliApi),
@@ -36,8 +37,9 @@ export const createDrawingState = (set, get, buerliApi, drawingNumber, name) =>
             graphic: graphicApi(set, get, buerliApi),
             cad: cadApi(set, get, buerliApi),
             interaction: interactionApi(set, get, buerliApi),
-        },
-        id: drawingId,
-        name: name || `Drawing #${drawingNumber}`,
-    };
+            reset: () => {
+                set(state => (Object.assign(Object.assign({}, state), initialData())));
+                buerliApi.getState().options.globalPlugins.forEach(def => get().api.plugin.createPlugin(def));
+            },
+        }, id: drawingId, name: name || `Drawing #${drawingNumber}` });
 };

package/build/esm/store/states/structure.js

@@ -135,7 +135,7 @@ export const structureApi = (set, get, buerliApi) => ({
         //////////
         // 1. Collect the products
         //////////
-        const searchRoot = structure.root; // || structure.currentNode || structure.currentProduct
+        const searchRoot = structure.root; // || structure.currentInstance || structure.currentProduct
         const productIds = api.structure.collectProducts(searchRoot).map(p => p.id);
         //////////
         // 2. Collect the solid ids

package/build/esm/store/subscribtion/selection.js

@@ -25,7 +25,10 @@ function subscribeItem(buerliApi, drawingId, selectorId, item) {
     }
 }
 export function unsubscribeItems(buerliApi, drawingId, selectorId, items) {
-    const items_ = items || buerliApi.getState().drawing.refs[drawingId].selection.refs[selectorId].items;
+    var _a, _b, _c, _d;
+    // The following line leeds to exceptions if for example the corresponding drawing is going to be reset.
+    // To prevent those exceptions, check all properties for existance.
+    const items_ = items || ((_d = (_c = (_b = (_a = buerliApi.getState().drawing.refs[drawingId]) === null || _a === void 0 ? void 0 : _a.selection) === null || _b === void 0 ? void 0 : _b.refs) === null || _c === void 0 ? void 0 : _c[selectorId]) === null || _d === void 0 ? void 0 : _d.items) || [];
     items_.forEach(item => {
         unsubscribeItem(selectorId, item);
     });

package/build/esm/types/IGraphicPackage.js

@@ -3,14 +3,13 @@ export var GraphicType;
     // Primitives
     GraphicType["POINT"] = "point";
     GraphicType["LINE"] = "line";
-    GraphicType["EDGE"] = "edge";
     GraphicType["ARC"] = "arc";
     GraphicType["CIRCLE"] = "circle";
     GraphicType["PLANE"] = "plane";
     GraphicType["CYLINDER"] = "cylinder";
     GraphicType["CONE"] = "cone";
     GraphicType["SPHERE"] = "sphere";
-    GraphicType["NURBS"] = "nurbs";
+    GraphicType["NURBSCURVE"] = "nurbsCurve";
     GraphicType["NURBSSURFACE"] = "nurbsSurface";
     // Entities
     GraphicType["NONE"] = "none";
@@ -37,10 +36,8 @@ export var ContainerType;
     // LIGHTWEIGHTBREP = 6, // Not used at the moment
 })(ContainerType || (ContainerType = {}));
 const G = GraphicType;
-export const AllTypes = Object.keys(G).map(key => G[key]);
-export const Surfaces = [G.PLANE, G.CYLINDER, G.CONE, G.SPHERE, G.NURBS, G.NURBSSURFACE];
-export const LineSegments = [G.LINE, G.EDGE, G.ARC, G.CIRCLE];
-export const Primitives = Surfaces.concat(LineSegments).concat([G.POINT]);
-export const CurveSegments = [G.CURVELINE, G.CURVESPLINE, G.CURVEARC, G.CURVECIRCLE];
+export const MeshTypes = [G.PLANE, G.CYLINDER, G.CONE, G.SPHERE, G.NURBSSURFACE];
+export const EdgeTypes = [G.LINE, G.ARC, G.CIRCLE, G.NURBSCURVE];
+export const CurveTypes = [G.CURVELINE, G.CURVESPLINE, G.CURVEARC, G.CURVECIRCLE];
 export const EntityTypes = [G.BREP, G.POLYBREP, G.CURVEARRAY];
 export const PointTypes = [G.POINT, G.CURVEPOINT];

package/build/esm/types/IStructureTree.js

@@ -8,6 +8,7 @@ export const DEFAULT_STRUCTURE_TREE = () => {
         root: NOID,
         currentProduct: NOID,
         currentNode: NOID,
+        currentInstance: NOID,
         testRoot: NOID,
     };
 };

package/build/esm/utils/Measure.js

@@ -56,6 +56,8 @@ export const Measure = {
                     arc.normal = arc.normal.clone().applyMatrix3(matrix3);
                     arc.normal.normalize();
                     arc.center = arc.center.clone().applyMatrix4(matrix);
+                    arc.start = arc.start.clone().applyMatrix4(matrix);
+                    arc.end = arc.end.clone().applyMatrix4(matrix);
                     break;
                 case GraphicType.CIRCLE:
                 case GraphicType.CURVECIRCLE:
@@ -63,6 +65,8 @@ export const Measure = {
                     circle.normal = circle.normal.clone().applyMatrix3(matrix3);
                     circle.normal.normalize();
                     circle.center = circle.center.clone().applyMatrix4(matrix);
+                    circle.start = circle.start.clone().applyMatrix4(matrix);
+                    circle.end = circle.end.clone().applyMatrix4(matrix);
                     break;
                 default:
                     break;
@@ -102,7 +106,7 @@ export const Measure = {
                         measureData: { value: absoluteDistance, start: line.start.clone(), end: line.end.clone() },
                     });
                     break;
-                case GraphicType.EDGE:
+                case GraphicType.NURBSCURVE:
                 case GraphicType.CURVESPLINE:
                     const edge = element;
                     results.push({
@@ -113,7 +117,7 @@ export const Measure = {
                     results.push({
                         description: 'Edge end',
                         type: MeasureResultType.POSITION,
-                        measureData: { value: edge.start.clone() },
+                        measureData: { value: edge.end.clone() },
                     });
                     break;
                 case GraphicType.ARC:
@@ -121,6 +125,16 @@ export const Measure = {
                     const arc = element;
                     const arcNEnd = arc.center.clone().addScaledVector(arc.normal.clone().normalize(), 40);
                     const pointOnArc = getPointOnCircumference(arc.center, arc.normal, arc.radius);
+                    results.push({
+                        description: 'Arc start',
+                        type: MeasureResultType.POSITION,
+                        measureData: { value: arc.start.clone() },
+                    });
+                    results.push({
+                        description: 'Arc end',
+                        type: MeasureResultType.POSITION,
+                        measureData: { value: arc.end.clone() },
+                    });
                     results.push({
                         description: 'Arc center',
                         type: MeasureResultType.POSITION,
@@ -157,6 +171,11 @@ export const Measure = {
                         type: MeasureResultType.DISTANCE,
                         measureData: { value: circle.radius, start: circle.center.clone(), end: pointOnCircle },
                     });
+                    results.push({
+                        description: 'Circle start/end',
+                        type: MeasureResultType.POSITION,
+                        measureData: { value: circle.start.clone() },
+                    });
                     break;
                 case GraphicType.PLANE:
                     const plane = element;
@@ -249,9 +268,6 @@ export const Measure = {
                         measureData: { value: sphere.radius },
                     });
                     break;
-                case GraphicType.NURBS:
-                    results.push({ description: 'NURBS', type: MeasureResultType.NONE });
-                    break;
                 case GraphicType.NURBSSURFACE:
                     results.push({ description: 'NURBS Surface', type: MeasureResultType.NONE });
                     break;

package/build/types/geometry/ThreeGeometryCreator.d.ts

@@ -30,7 +30,7 @@ export declare class ThreeGeometryCreator {
         operationId: any;
         rawGraphic: IGraphicElement | null;
         isValid: boolean;
-        geometry: THREE.BufferGeometry;
+        geometry: THREE.BufferGeometry<THREE.NormalBufferAttributes>;
         graphicId: number;
         type: GraphicType;
         loops: number[][];
@@ -47,7 +47,7 @@ export declare class ThreeGeometryCreator {
         operationId: any;
         rawGraphic: IGraphicElement | null;
         isValid: boolean;
-        geometry: THREE.BufferGeometry;
+        geometry: THREE.BufferGeometry<THREE.NormalBufferAttributes>;
         graphicId: number;
         type: GraphicType;
         loops: number[][];
@@ -56,6 +56,7 @@ export declare class ThreeGeometryCreator {
         type: GraphicType;
         pointOnPlane: THREE.Vector3;
         normal: THREE.Vector3;
+        graphicId: number;
         color: THREE.Color | undefined;
         opacity: number;
         layer: any;
@@ -67,8 +68,7 @@ export declare class ThreeGeometryCreator {
         operationId: any;
         rawGraphic: IGraphicElement | null;
         isValid: boolean;
-        geometry: THREE.BufferGeometry;
-        graphicId: number;
+        geometry: THREE.BufferGeometry<THREE.NormalBufferAttributes>;
         loops: number[][];
     };
     createCylinder(mesh: IGraphicMesh, meshGeom: MeshGeometry): {
@@ -77,6 +77,7 @@ export declare class ThreeGeometryCreator {
         axis: THREE.Vector3;
         height: number;
         radius: number;
+        graphicId: number;
         color: THREE.Color | undefined;
         opacity: number;
         layer: any;
@@ -88,8 +89,7 @@ export declare class ThreeGeometryCreator {
         operationId: any;
         rawGraphic: IGraphicElement | null;
         isValid: boolean;
-        geometry: THREE.BufferGeometry;
-        graphicId: number;
+        geometry: THREE.BufferGeometry<THREE.NormalBufferAttributes>;
         loops: number[][];
     };
     createCone(mesh: IGraphicMesh, meshGeom: MeshGeometry): {
@@ -99,6 +99,7 @@ export declare class ThreeGeometryCreator {
         height: number;
         radiusBottom: number;
         radiusTop: number;
+        graphicId: number;
         color: THREE.Color | undefined;
         opacity: number;
         layer: any;
@@ -110,13 +111,13 @@ export declare class ThreeGeometryCreator {
         operationId: any;
         rawGraphic: IGraphicElement | null;
         isValid: boolean;
-        geometry: THREE.BufferGeometry;
-        graphicId: number;
+        geometry: THREE.BufferGeometry<THREE.NormalBufferAttributes>;
         loops: number[][];
     };
     createSphere(mesh: IGraphicMesh, meshGeom: MeshGeometry): {
         type: GraphicType;
         radius: number;
+        graphicId: number;
         color: THREE.Color | undefined;
         opacity: number;
         layer: any;
@@ -128,8 +129,7 @@ export declare class ThreeGeometryCreator {
         operationId: any;
         rawGraphic: IGraphicElement | null;
         isValid: boolean;
-        geometry: THREE.BufferGeometry;
-        graphicId: number;
+        geometry: THREE.BufferGeometry<THREE.NormalBufferAttributes>;
         loops: number[][];
     };
     createLine(line: IGraphicLine, container: IGraphicContainer, points: PointMap, color?: number[]): {
@@ -145,7 +145,7 @@ export declare class ThreeGeometryCreator {
         };
         operationId: any;
         rawGraphic: IGraphicElement | null;
-        geometry: THREE.BufferGeometry;
+        geometry: THREE.BufferGeometry<THREE.NormalBufferAttributes>;
         graphicId: number;
         type: GraphicType;
     };
@@ -162,13 +162,15 @@ export declare class ThreeGeometryCreator {
         };
         operationId: any;
         rawGraphic: IGraphicElement | null;
-        geometry: THREE.BufferGeometry;
+        geometry: THREE.BufferGeometry<THREE.NormalBufferAttributes>;
         graphicId: number;
         type: GraphicType;
     };
     createArc(arc: IGraphicArc, container: IGraphicContainer, points: PointMap, color?: number[]): {
         normal: THREE.Vector3;
         center: THREE.Vector3;
+        start: THREE.Vector3;
+        end: THREE.Vector3;
         radius: number;
         angle: number;
         color: THREE.Color | undefined;
@@ -181,7 +183,7 @@ export declare class ThreeGeometryCreator {
         };
         operationId: any;
         rawGraphic: IGraphicElement | null;
-        geometry: THREE.BufferGeometry;
+        geometry: THREE.BufferGeometry<THREE.NormalBufferAttributes>;
         graphicId: number;
         type: GraphicType;
     };
@@ -209,16 +211,21 @@ export declare class ThreeGeometryCreator {
     private insertPoint;
 }
 export declare const EMPTY_CONTAINER_GEOMETRY: () => ContainerGeometryT;
-export declare type MeshGeometry = ReturnType<ThreeGeometryCreator['createMesh']>;
-export declare type PlaneGeometry = ReturnType<ThreeGeometryCreator['createPlane']>;
-export declare type CylinderGeometry = ReturnType<ThreeGeometryCreator['createCylinder']>;
-export declare type ConeGeometry = ReturnType<ThreeGeometryCreator['createCone']>;
-export declare type SphereGeometry = ReturnType<ThreeGeometryCreator['createSphere']>;
-export declare type LineGeometry = ReturnType<ThreeGeometryCreator['createLine']>;
-export declare type EdgeGeometry = ReturnType<ThreeGeometryCreator['createEdge']>;
-export declare type ArcGeometry = ReturnType<ThreeGeometryCreator['createArc']>;
+declare type CommonProps = {
+    graphicId: GraphicID;
+    type: GraphicType;
+};
+export declare type Metadata = ReturnType<ThreeGeometryCreator['getMetadata']>;
+export declare type MeshGeometry = CommonProps & ReturnType<ThreeGeometryCreator['createMesh']>;
+export declare type PlaneGeometry = CommonProps & ReturnType<ThreeGeometryCreator['createPlane']>;
+export declare type CylinderGeometry = CommonProps & ReturnType<ThreeGeometryCreator['createCylinder']>;
+export declare type ConeGeometry = CommonProps & ReturnType<ThreeGeometryCreator['createCone']>;
+export declare type SphereGeometry = CommonProps & ReturnType<ThreeGeometryCreator['createSphere']>;
+export declare type LineGeometry = CommonProps & ReturnType<ThreeGeometryCreator['createLine']>;
+export declare type EdgeGeometry = CommonProps & ReturnType<ThreeGeometryCreator['createEdge']>;
+export declare type ArcGeometry = CommonProps & ReturnType<ThreeGeometryCreator['createArc']>;
 export declare type CircleGeometry = ArcGeometry;
-export declare type PointGeometry = ReturnType<ThreeGeometryCreator['createPoint']> & {
+export declare type PointGeometry = CommonProps & ReturnType<ThreeGeometryCreator['createPoint']> & {
     owners: Array<{
         ownerId: GraphicID;
         type: PointType;
@@ -245,5 +252,6 @@ export declare type GeometryElement = MeshGeometry | PlaneGeometry | CylinderGeo
 export declare type ProductElement = GeometryElement & {
     productId: ObjectID;
 };
+export declare type AnyGeometryElement = CommonProps & Metadata & Partial<MeshGeometry> & Partial<PlaneGeometry> & Partial<CylinderGeometry> & Partial<ConeGeometry> & Partial<SphereGeometry> & Partial<LineGeometry> & Partial<EdgeGeometry> & Partial<ArcGeometry> & Partial<CircleGeometry> & Partial<PointGeometry>;
 export declare const isEqualGeometry: (a: GeometryElement, b: GeometryElement) => boolean;
 export {};

package/build/types/graphic/filters.d.ts

@@ -1,6 +1,6 @@
 import { GraphicType as GT } from '../types/IGraphicPackage';
 export declare const lineFilter: (scope: string, data: GT) => boolean;
-export declare const lineSegmentsFilter: (scope: string, data: GT) => boolean;
+export declare const edgeFilter: (scope: string, data: GT) => boolean;
 export declare const arcFilter: (scope: string, data: GT) => boolean;
 export declare const circleFilter: (scope: string, data: GT) => boolean;
 export declare const arcCircleFilter: (scope: string, data: GT) => boolean;

package/build/types/store/states/drawing.d.ts

@@ -25,6 +25,7 @@ export declare type DrawingAPI = {
     geometry: GeometryApi;
     graphic: GraphicApi;
     cad: CadApi;
+    reset: () => void;
 };
 declare type StateData = {
     id: DrawingID;

package/build/types/store/states/geometry.d.ts

@@ -1,7 +1,6 @@
 import * as THREE from 'three';
 import { StoreApi } from 'zustand';
 import { ContainerGeometryT, GeometryElement } from '../../geometry/ThreeGeometryCreator';
-import { GraphicID } from '../../types/IGraphicPackage';
 import { ObjectID } from '../../types/IStructureTree';
 import { BuerliState } from './buerli';
 import { DrawingState } from './drawing';
@@ -26,7 +25,9 @@ export declare type GeometryConfig = {
     points?: ElementConfig;
 };
 export declare type GeometryData = {
-    cache: Record<GraphicID, ContainerGeometryT & {
+    cache: Record<ObjectID, // The id of the CADEntity
+    // The id of the CADEntity
+    ContainerGeometryT & {
         /**
          * The dirty stamp will be updated, as soon as a client side modification of the geometry will happen!
          * Examples: 'setColor' or 'setOpacity'
@@ -38,7 +39,7 @@ export declare type GeometryData = {
     stamp: number;
     bounds: GeometryBounds;
     config: {
-        product: Record<ObjectID | GraphicID, GeometryConfig>;
+        product: Record<ObjectID, GeometryConfig>;
     };
 };
 export declare type GeometryApi = ReturnType<typeof geometryApi>;
@@ -49,10 +50,10 @@ export declare const geometryApi: (set: StoreApi<DrawingState>['setState'], get:
      * The update will only happen, if at least one solid of one product is available.
      */
     updateBounds: () => void;
-    createGeometryIfNotCached: (containerId: number, color?: number[]) => ContainerGeometryT | undefined;
-    setColor: (containerId: GraphicID, r: number, g: number, b: number) => void;
-    setOpacity: (containerId: GraphicID, opacity: number) => void;
-    setConfig: (objId: ObjectID | GraphicID, config: Partial<GeometryConfig> | null) => void;
+    createGeometryIfNotCached: (containerId: ObjectID, color?: number[]) => ContainerGeometryT | undefined;
+    setColor: (containerId: ObjectID, r: number, g: number, b: number) => void;
+    setOpacity: (containerId: ObjectID, opacity: number) => void;
+    setConfig: (objId: ObjectID, config: Partial<GeometryConfig> | null) => void;
     findDecorated: () => GeometryElement[];
     filter: (cb: (elem: GeometryElement) => boolean, options?: {
         onlyOne?: boolean;

package/build/types/types/IGraphicPackage.d.ts

@@ -8,7 +8,9 @@ export interface IGraphicPackageProperties {
     version: number;
 }
 export interface IGraphicContainer {
-    id: GraphicID;
+    /** The CADEntity id */
+    id: ObjectID;
+    /** The CC_Solid id */
     owner: ObjectID;
     type: ContainerType;
     properties: IGraphicContainerProps;
@@ -87,7 +89,7 @@ export interface IGraphicMeshProperties {
     material: IGraphicMaterial;
 }
 export interface IGraphicSurface {
-    type: GraphicType.PLANE | GraphicType.CYLINDER | GraphicType.CONE | GraphicType.SPHERE | GraphicType.NURBS | GraphicType.NURBSSURFACE;
+    type: GraphicType.PLANE | GraphicType.CYLINDER | GraphicType.CONE | GraphicType.SPHERE | GraphicType.NURBSSURFACE;
 }
 export interface IGraphicPlane extends IGraphicSurface {
     pointOnPlane: number[];
@@ -112,14 +114,13 @@ export interface IGraphicSphere extends IGraphicSurface {
 export declare enum GraphicType {
     POINT = "point",
     LINE = "line",
-    EDGE = "edge",
     ARC = "arc",
     CIRCLE = "circle",
     PLANE = "plane",
     CYLINDER = "cylinder",
     CONE = "cone",
     SPHERE = "sphere",
-    NURBS = "nurbs",
+    NURBSCURVE = "nurbsCurve",
     NURBSSURFACE = "nurbsSurface",
     NONE = "none",
     BREP = "brep",
@@ -139,11 +140,9 @@ export declare enum ContainerType {
     POLYBREP = 3
 }
 declare type RoA = ReadonlyArray<GraphicType>;
-export declare const AllTypes: RoA;
-export declare const Surfaces: RoA;
-export declare const LineSegments: RoA;
-export declare const Primitives: RoA;
-export declare const CurveSegments: RoA;
+export declare const MeshTypes: RoA;
+export declare const EdgeTypes: RoA;
+export declare const CurveTypes: RoA;
 export declare const EntityTypes: RoA;
 export declare const PointTypes: RoA;
 export interface IGraphicMaterial {

package/build/types/types/IStructureTree.d.ts

@@ -18,8 +18,13 @@ export interface IStructureProtocol {
     root: ObjectID;
     /** Id of the current product (root or node in part/assembly container). Can be undefined or zero -->> object does not exist! */
     currentProduct?: ObjectID;
-    /** Id of the current node in the expanded assembly tree. Can be undefined or zero -->> object does not exist! */
+    /**
+     * Id of the current node in the expanded assembly tree. Can be undefined or zero -->> object does not exist!
+     * @deprecated currentNode will be removed in a future release, use currentInstance instead.
+     */
     currentNode?: ObjectID;
+    /** Id of the current instance in the expanded assembly tree. Can be undefined or zero -->> object does not exist! */
+    currentInstance?: ObjectID;
     /** Id of the test root. Can be undefined or zero -->> object does not exist! */
     testRoot?: ObjectID;
 }

package/build/types/types/InteractionInfo.d.ts

@@ -14,7 +14,7 @@ export declare type InteractionInfo<T = any> = {
      */
     objectId: ObjectID;
     /**
-     * Identifies the node of the Assembly (for BaseModeling).
+     * Identifies the instance of the Assembly (for BaseModeling).
      * Needed to identify the location ot the object in the tree.
      */
     prodRefId?: ObjectID | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buerli.io/core",
-  "version": "0.7.1",
+  "version": "0.9.0-beta.1",
   "description": "buerli state management",
   "author": "AWV Informatik AG <info@awv-informatik.ch>",
   "license": "ISC",
@@ -21,7 +21,7 @@
     "prettify": "prettier --write \"./{src,tests}/**/*.{js,jsx,ts,tsx,json}\""
   },
   "devDependencies": {
-    "@types/three": "^0.143",
+    "@types/three": "^0.152.1",
     "@babel/preset-env": "^7.10.4",
     "@babel/preset-typescript": "^7.10.4",
     "babel-jest": "^26.1.0",
@@ -29,7 +29,7 @@
     "babel-plugin-transform-class-properties": "^6.24.1",
     "jest": "^26.1.0",
     "rimraf": "^2.6.3",
-    "three": "^0.143",
+    "three": "^0.153",
     "typescript": "4.8.4"
   },
   "dependencies": {