@buerli.io/headless 0.4.0 → 0.5.0-beta.1

package/build/history.d.ts

@@ -64,7 +64,7 @@ export declare type ApiHistory = {
         ownerId: VID;
         transformation: Transform;
         name?: string;
-    }[]) => IDs;
+    }[]) => Promise<ObjectID[] | null>;
     /**
      * Adds a dimension to the product in the 3D view
      * @param dimension dimension to be added to a product
@@ -150,7 +150,7 @@ export declare type ApiHistory = {
             dimLayer?: string;
         };
         dxfView: ViewType;
-    }[]) => IDs;
+    }[]) => Promise<ObjectID[] | null>;
     /**
      * Creates different 2D views, depending on the given view types, in the given product.
      * @param productId id of the product where the view will be created in
@@ -590,7 +590,7 @@ export declare type ApiHistory = {
      */
     createExpressions: (partId: VID, ...members: {
         name: string;
-        value: number | PointMemValue | string;
+        value: number | string;
     }[]) => Promise<boolean>;
     /**
      * Creates a new assembly template. This template can be used multiple times as a sub assembly in the root assembly.
@@ -799,11 +799,11 @@ export declare type ApiHistory = {
      */
     deleteExpressions: (partId: VID, members: string[]) => Promise<boolean>;
     /**
-     * Loads a sketch from a of1 filestream and adds its elements to a new sketch.
+     * 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.
      *
      * @param partId id of the part we want to create the new sketch and copy the sketch elements into it
-     * @param strm stream of of1 file which contains the sketch
+     * @param strm stream of ofb file which contains the sketch
      * @param planeId id of the face or workplane to set the new sketch on
      * @param name optional name of the sketch to load from filestream
      */
@@ -944,7 +944,7 @@ export declare type ApiHistory = {
      * const xDir = { x: 1, y: 0, z: 0 }
      * const yDir = { x: 0, y: 1, z: 0 }
      * const nutBoltAsm = await api.createRootAssembly('NutBolt_Asm')
-     * const bolt = await api.loadProduct(arraybuffer, 'of1')
+     * const bolt = await api.loadProduct(arraybuffer, 'ofb')
      * const boltRefId = await api.addNode(bolt, nutBoltAsm, [pt0, xDir, yDir])
      * const wcsIdOrigin = await api.getWorkCoordSystem(boltRefId, 'WCS_Origin')
      * await api.createFastenedOriginConstraint(nutBoltAsm, { refId: boltRefId, wcsId: wcsIdOrigin[0] }, 0, 0, 0, 0, 0, 'FOC')
@@ -982,7 +982,7 @@ export declare type ApiHistory = {
     /**
      * Writes the current drawing to a stream and returns the data.
      *
-     * Important notes about the of1 format:
+     * Important notes about the ofb format:
      *    - It contains binary geometry blocks.
      *    - Do not try to convert it to text, the geometry blocks will get damaged!
      *
@@ -990,15 +990,15 @@ export declare type ApiHistory = {
      * @example // tbd
      * @image // tbd
      */
-    save: (type: DataTypes) => Promise<Uint8Array | null>;
+    save: (type: 'ofb' | 'stp') => Promise<Uint8Array | null>;
     /**
      * POSTs the result to the given url.
      * @param url The url to POST the model to.
-     * @param filetype The file type be saved (of1, stp).
+     * @param filetype The file type be saved (ofb, stp).
      * @example // tbd
      * @image // tbd
      */
-    saveToUrl: (url: string, filetype: 'of1' | 'stp') => Promise<boolean>;
+    saveToUrl: (url: string, filetype: 'ofb' | 'stp') => Promise<boolean>;
     /**
      * Loads the given buffer.
      * @param content data as arraybuffer
@@ -1006,35 +1006,35 @@ export declare type ApiHistory = {
      * @example // tbd
      * @image // tbd
      */
-    load: (content: ArrayBuffer, type: DataTypes) => Promise<number[] | null>;
+    load: (content: ArrayBuffer, type: 'ofb' | 'stp') => Promise<number[] | null>;
     /**
      * Loads from the given url.
      * @param url The url to load data from.
-     * @param filetype The type of data delivered by the url (of1, stp).
+     * @param filetype The type of data delivered by the url (ofb, stp).
      * @example // tbd
      * @image // tbd
      */
-    loadFromUrl: (url: string, filetype: 'of1' | 'stp') => Promise<number[] | null>;
+    loadFromUrl: (url: string, filetype: 'ofb' | 'stp') => Promise<number[] | null>;
     /**
      * Loads a product into the current drawing.
      * @param content data as arraybuffer
      * @param type type of the data to load
      * @example
      * // Loads an existing product
-     * const part = api.loadProduct(arraybuffer, 'of1')
+     * const part = api.loadProduct(arraybuffer, 'ofb')
      * const geoms = await api.createBufferGeometry(part)
      * return geoms.map(geom => new THREE.Mesh(geom, new THREE.MeshStandardMaterial()))
      * @image // tbd
      */
-    loadProduct: (content: ArrayBuffer, type: DataTypes) => Promise<number[] | null>;
+    loadProduct: (content: ArrayBuffer, type: 'ofb' | 'stp') => 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 (of1, stp).
+     * @param filetype The type of data delivered by the url ('ofb', 'stp').
      * @example // tbd
      * @image // tbd
      */
-    loadProductFromUrl: (url: string, filetype: string) => Promise<number[] | null>;
+    loadProductFromUrl: (url: string, filetype: 'ofb' | 'stp') => 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.
@@ -1045,7 +1045,7 @@ export declare type ApiHistory = {
      * @example // tbd
      * @image // tbd
      */
-    importFeature: (partId: VID, content: ArrayBuffer, format: SupportedImportFormats, name?: string) => ID;
+    importFeature: (partId: VID, content: ArrayBuffer, format: 'stp' | 'step', name?: string) => ID;
     /**
      * Removes a node from an assembly node
      * @param referenceId id of the node to remove
@@ -1127,7 +1127,7 @@ export declare type ApiHistory = {
      */
     setExpressions: (partId: VID, ...members: {
         name: string;
-        value: number | PointMemValue | string;
+        value: number | string;
     }[]) => Promise<boolean>;
     /**
      * Updates multiple expression sets in different parts at once
@@ -1141,7 +1141,7 @@ export declare type ApiHistory = {
         partId: number;
         members: {
             name: string;
-            value: number | PointMemValue | string;
+            value: number | string;
         }[];
     }[]) => Promise<boolean>;
 };
@@ -1163,8 +1163,6 @@ declare type Point = {
     z: number;
 };
 export declare type Transform = [Point, Point, Point];
-declare type DataTypes = 'of1' | 'stp' | 'step';
-declare type SupportedImportFormats = 'STEP' | 'STP' | 'SAT' | 'IWB' | 'IWP' | 'IWC' | 'IGS' | 'STL' | 'DXF' | 'DWG';
 export declare type DimensionType = {
     productId: VID;
     dimParam: {
@@ -1186,6 +1184,36 @@ export declare type ViewOptionsType = {
     color?: number;
     layer?: string;
 };
+export declare type FastenedOriginConstraintType = {
+    constrId: VID;
+    mate1: {
+        matePath: VID[];
+        wcsId: VID;
+        flip: number;
+        reoriented: number;
+    };
+    xOffset: number | string;
+    yOffset: number | string;
+    zOffset: number | string;
+};
+export declare type FastenedConstraintType = {
+    constrId: VID;
+    mate1: {
+        matePath: VID[];
+        wcsId: VID;
+        flip: number;
+        reoriented: number;
+    };
+    mate2: {
+        matePath: VID[];
+        wcsId: VID;
+        flip: number;
+        reoriented: number;
+    };
+    xOffset: number | string;
+    yOffset: number | string;
+    zOffset: number | string;
+};
 /**
  * Information about constraint.
  * [

package/build/history.js

@@ -39,12 +39,13 @@ const getDataType = (value) => {
  * @returns cclass type of given type
  */
 const getDimensionType = (type) => {
+    let cclass = CCClasses.CCLinearDimension;
     switch (type) {
         case 'LinearDimension':
-            return CCClasses.CCLinearDimension;
-        case undefined:
+            cclass = CCClasses.CCLinearDimension;
             break;
     }
+    return cclass;
 };
 /**
  * Transforms the transformation which is local to the ownerId into global
@@ -283,74 +284,94 @@ export default class CAD {
                         return ccAPI.assemblyBuilder.addNode(drawingId, rProductId, rOwnerId, globalTransformation, name);
                     }, productId, ownerId);
                 },
-                addNodes: (...nodes) => {
-                    return this.resolve(async ([...rNodes]) => {
-                        const nodesToAdd = [];
-                        rNodes.forEach(node => {
-                            const globalTransformation = getGlobalTransformation(drawingId, node.ownerId, node.transformation) || node.transformation;
-                            nodesToAdd.push([node.productId, node.ownerId, globalTransformation, node.name]);
-                        });
-                        return ccAPI.assemblyBuilder.addNodes(drawingId, nodesToAdd);
-                    }, ...nodes);
+                addNodes: async (...nodes) => {
+                    var e_1, _a;
+                    const nodesToAdd = [];
+                    try {
+                        for (var nodes_1 = __asyncValues(nodes), nodes_1_1; nodes_1_1 = await nodes_1.next(), !nodes_1_1.done;) {
+                            const node = nodes_1_1.value;
+                            const [rProductId, rOwnerId] = await new Promise(res => this.resolve(id => res(id), node.productId, node.ownerId));
+                            const nodeParam = {
+                                referenceId: rProductId,
+                                ownerId: rOwnerId,
+                                transformation: getGlobalTransformation(drawingId, rOwnerId, node.transformation) || node.transformation,
+                                name: node.name,
+                            };
+                            nodesToAdd.push(nodeParam);
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (nodes_1_1 && !nodes_1_1.done && (_a = nodes_1.return)) await _a.call(nodes_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                    }
+                    return ccAPI.assemblyBuilder.addNodes(drawingId, nodesToAdd);
                 },
                 addDimension: (dim) => {
                     return this.resolve(async ([rProductId]) => {
                         const dimensionType = getDimensionType(dim.dimParam.dimType);
-                        if (dim.dimParam.dimOrientation !== undefined && dim.dxfView !== undefined) {
-                            const dimParam = [
-                                rProductId,
-                                [
-                                    dimensionType || 'CC_LinearDimenion',
-                                    dim.dimParam.dimName || 'Dimension',
-                                    dim.dimParam.dimLabel,
-                                    dim.dimParam.dimValue || null,
-                                    dim.dimParam.dimStartPos,
-                                    dim.dimParam.dimEndPos,
-                                    dim.dimParam.dimTextPos,
-                                    dim.dimParam.dimTextAngle,
-                                    dim.dimParam.dimOrientation,
-                                    dim.dimParam.dimColor || 256,
-                                    dim.dimParam.dimLayer || '1',
-                                ],
-                                dim.dxfView,
-                            ];
-                            return ccAPI.drawing2D.addDimension(drawingId, dimParam);
-                        }
+                        const dimParam = {
+                            productId: rProductId,
+                            param: {
+                                type: dimensionType,
+                                name: dim.dimParam.dimName,
+                                label: dim.dimParam.dimLabel,
+                                value: dim.dimParam.dimValue,
+                                startPos: dim.dimParam.dimStartPos,
+                                endPos: dim.dimParam.dimEndPos,
+                                textPos: dim.dimParam.dimTextPos,
+                                textAngle: dim.dimParam.dimTextAngle,
+                                orientation: dim.dimParam.dimOrientation,
+                                color: dim.dimParam.dimColor,
+                                layer: dim.dimParam.dimLayer,
+                            },
+                            dxfView: dim.dxfView,
+                        };
+                        return ccAPI.drawing2D.addDimension(drawingId, dimParam);
                     }, dim.productId);
                 },
-                addDimensions: (...dimensions) => {
-                    return this.resolve(async ([...rDimensions]) => {
-                        const dimsToAdd = [];
-                        rDimensions.forEach(dim => {
+                addDimensions: async (...dimensions) => {
+                    var e_2, _a;
+                    const dimParamsToAdd = [];
+                    try {
+                        for (var dimensions_1 = __asyncValues(dimensions), dimensions_1_1; dimensions_1_1 = await dimensions_1.next(), !dimensions_1_1.done;) {
+                            const dim = dimensions_1_1.value;
+                            const [rProductId] = await new Promise(res => this.resolve(id => res(id), dim.productId));
                             const dimensionType = getDimensionType(dim.dimParam.dimType);
-                            if (dim.dimParam.dimOrientation !== undefined && dim.dxfView !== undefined) {
-                                dimsToAdd.push([
-                                    dim.productId,
-                                    [
-                                        dimensionType || 'CC_LinearDimenion',
-                                        dim.dimParam.dimName || 'Dimension',
-                                        dim.dimParam.dimLabel,
-                                        dim.dimParam.dimValue || null,
-                                        dim.dimParam.dimStartPos,
-                                        dim.dimParam.dimEndPos,
-                                        dim.dimParam.dimTextPos,
-                                        dim.dimParam.dimTextAngle,
-                                        dim.dimParam.dimOrientation,
-                                        dim.dimParam.dimColor || 256,
-                                        dim.dimParam.dimLayer || '1',
-                                    ],
-                                    dim.dxfView,
-                                ]);
-                            }
-                        });
-                        return ccAPI.drawing2D.addDimensions(drawingId, dimsToAdd);
-                    }, ...dimensions);
+                            const dimParam = {
+                                productId: rProductId,
+                                param: {
+                                    type: dimensionType,
+                                    name: dim.dimParam.dimName,
+                                    label: dim.dimParam.dimLabel,
+                                    value: dim.dimParam.dimValue,
+                                    startPos: dim.dimParam.dimStartPos,
+                                    endPos: dim.dimParam.dimEndPos,
+                                    textPos: dim.dimParam.dimTextPos,
+                                    textAngle: dim.dimParam.dimTextAngle,
+                                    orientation: dim.dimParam.dimOrientation,
+                                    color: dim.dimParam.dimColor,
+                                    layer: dim.dimParam.dimLayer,
+                                },
+                                dxfView: dim.dxfView,
+                            };
+                            dimParamsToAdd.push(dimParam);
+                        }
+                    }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    finally {
+                        try {
+                            if (dimensions_1_1 && !dimensions_1_1.done && (_a = dimensions_1.return)) await _a.call(dimensions_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                    }
+                    return ccAPI.drawing2D.addDimensions(drawingId, dimParamsToAdd);
                 },
                 create2DViews: (productId, viewTypes, viewOptions) => {
                     return this.resolve(async ([rProductId]) => {
-                        const color = (viewOptions === null || viewOptions === void 0 ? void 0 : viewOptions.color) ? viewOptions.color : 256;
-                        const layer = (viewOptions === null || viewOptions === void 0 ? void 0 : viewOptions.layer) ? viewOptions.layer : '0';
-                        const viewIds = await ccAPI.drawing2D.create2DViews(drawingId, rProductId, viewTypes, [color, layer]);
+                        const viewIds = await ccAPI.drawing2D.create2DViews(drawingId, rProductId, viewTypes, viewOptions);
                         if (viewIds !== null) {
                             await ccAPI.drawing2D.centerAllViews(drawingId, rProductId, viewTypes);
                             return viewIds;
@@ -366,13 +387,7 @@ export default class CAD {
                 },
                 place2DViews: (productId, viewPositions) => {
                     return this.resolve(async ([rProductId]) => {
-                        const viewPositionParams = [];
-                        viewPositions.forEach(viewPos => {
-                            if (viewPos.viewType !== undefined) {
-                                viewPositionParams.push([viewPos.viewType, viewPos.vector]);
-                            }
-                        });
-                        return ccAPI.drawing2D.place2DViews(drawingId, rProductId, viewPositionParams);
+                        return ccAPI.drawing2D.place2DViews(drawingId, rProductId, viewPositions);
                     }, productId);
                 },
                 exportDXF: (productId, dxfTemplateFilename) => {
@@ -603,7 +618,7 @@ export default class CAD {
                         const xOffsetParam = { value: xOffset, isExpr: typeof xOffset === 'string' };
                         const yOffsetParam = { value: yOffset, isExpr: typeof yOffset === 'string' };
                         const zOffsetParam = { value: zOffset, isExpr: typeof zOffset === 'string' };
-                        await ccAPI.assemblyBuilder.updateFastenedConstraint(drawingId, constraintId, [rMatePath1, rWcs1, mate1.flip, mate1.reoriented], [rMatePath2, rWcs2, mate2.flip, mate2.reoriented], xOffsetParam, yOffsetParam, zOffsetParam);
+                        await ccAPI.assemblyBuilder.updateFastenedConstraint(drawingId, constraintId, { matePath: rMatePath1, wcsId: rWcs1, flip: mate1.flip, reoriented: mate1.reoriented }, { matePath: rMatePath2, wcsId: rWcs2, flip: mate2.flip, reoriented: mate2.reoriented }, xOffsetParam, yOffsetParam, zOffsetParam);
                         return constraintId;
                     }
                     return null;
@@ -615,10 +630,10 @@ export default class CAD {
                     const xOffsetParam = { value: xOffset, isExpr: typeof xOffset === 'string' };
                     const yOffsetParam = { value: yOffset, isExpr: typeof xOffset === 'string' };
                     const zOffsetParam = { value: zOffset, isExpr: typeof xOffset === 'string' };
-                    await ccAPI.assemblyBuilder.updateFastenedConstraint(drawingId, rConstrId, [rMatePath1, rWcs1, mate1.flip, mate1.reoriented], [rMatePath2, rWcs2, mate2.flip, mate2.reoriented], xOffsetParam, yOffsetParam, zOffsetParam);
+                    await ccAPI.assemblyBuilder.updateFastenedConstraint(drawingId, rConstrId, { matePath: rMatePath1, wcsId: rWcs1, flip: mate1.flip, reoriented: mate1.reoriented }, { matePath: rMatePath2, wcsId: rWcs2, flip: mate2.flip, reoriented: mate2.reoriented }, xOffsetParam, yOffsetParam, zOffsetParam);
                 },
                 updateFastenedConstraints: async (...constraints) => {
-                    var e_1, _a;
+                    var e_3, _a;
                     const constrToAdd = [];
                     try {
                         for (var constraints_1 = __asyncValues(constraints), constraints_1_1; constraints_1_1 = await constraints_1.next(), !constraints_1_1.done;) {
@@ -626,25 +641,35 @@ export default class CAD {
                             const [rConstrId, rWcs1, rWcs2] = await new Promise(res => this.resolve(ids => res(ids), constr.constrId, constr.mate1.wcsId, constr.mate2.wcsId));
                             const rMatePath1 = await new Promise(res => this.resolve(paths => res(paths), ...constr.mate1.matePath));
                             const rMatePath2 = await new Promise(res => this.resolve(paths => res(paths), ...constr.mate2.matePath));
-                            const xOffsetParam = [constr.xOffset, typeof constr.xOffset === 'string'];
-                            const yOffsetParam = [constr.yOffset, typeof constr.yOffset === 'string'];
-                            const zOffsetParam = [constr.zOffset, typeof constr.zOffset === 'string'];
-                            constrToAdd.push([
-                                rConstrId,
-                                [rMatePath1, rWcs1, constr.mate1.flip, constr.mate1.reoriented],
-                                [rMatePath2, rWcs2, constr.mate2.flip, constr.mate2.reoriented],
-                                xOffsetParam,
-                                yOffsetParam,
-                                zOffsetParam,
-                            ]);
+                            const xOffsetParam = { value: constr.xOffset, isExpr: typeof constr.xOffset === 'string' };
+                            const yOffsetParam = { value: constr.yOffset, isExpr: typeof constr.yOffset === 'string' };
+                            const zOffsetParam = { value: constr.zOffset, isExpr: typeof constr.zOffset === 'string' };
+                            constrToAdd.push({
+                                constrId: rConstrId,
+                                mate1: {
+                                    matePath: rMatePath1,
+                                    wcsId: rWcs1,
+                                    flip: constr.mate1.flip,
+                                    reoriented: constr.mate1.reoriented,
+                                },
+                                mate2: {
+                                    matePath: rMatePath2,
+                                    wcsId: rWcs2,
+                                    flip: constr.mate2.flip,
+                                    reoriented: constr.mate2.reoriented,
+                                },
+                                xOffset: xOffsetParam,
+                                yOffset: yOffsetParam,
+                                zOffset: zOffsetParam,
+                            });
                         }
                     }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
                     finally {
                         try {
                             if (constraints_1_1 && !constraints_1_1.done && (_a = constraints_1.return)) await _a.call(constraints_1);
                         }
-                        finally { if (e_1) throw e_1.error; }
+                        finally { if (e_3) throw e_3.error; }
                     }
                     await ccAPI.assemblyBuilder.updateFastenedConstraints(drawingId, constrToAdd);
                 },
@@ -656,7 +681,7 @@ export default class CAD {
                         const xOffsetParam = { value: xOffset, isExpr: typeof xOffset === 'string' };
                         const yOffsetParam = { value: yOffset, isExpr: typeof yOffset === 'string' };
                         const zOffsetParam = { value: zOffset, isExpr: typeof zOffset === 'string' };
-                        await ccAPI.assemblyBuilder.updateFastenedOriginConstraint(drawingId, constraintId, [rMatePath, rWcs1, mate1.flip, mate1.reoriented], xOffsetParam, yOffsetParam, zOffsetParam);
+                        await ccAPI.assemblyBuilder.updateFastenedOriginConstraint(drawingId, constraintId, { matePath: rMatePath, wcsId: rWcs1, flip: mate1.flip, reoriented: mate1.reoriented }, xOffsetParam, yOffsetParam, zOffsetParam);
                         return constraintId;
                     }
                     return null;
@@ -667,36 +692,41 @@ export default class CAD {
                     const xOffsetParam = { value: xOffset, isExpr: typeof xOffset === 'string' };
                     const yOffsetParam = { value: yOffset, isExpr: typeof yOffset === 'string' };
                     const zOffsetParam = { value: zOffset, isExpr: typeof zOffset === 'string' };
-                    await ccAPI.assemblyBuilder.updateFastenedOriginConstraint(drawingId, rConstrId, [rMatePath, rWcs1, mate1.flip, mate1.reoriented], xOffsetParam, yOffsetParam, zOffsetParam);
+                    await ccAPI.assemblyBuilder.updateFastenedOriginConstraint(drawingId, rConstrId, { matePath: rMatePath, wcsId: rWcs1, flip: mate1.flip, reoriented: mate1.reoriented }, xOffsetParam, yOffsetParam, zOffsetParam);
                 },
                 updateFastenedOriginConstraints: async (...constraints) => {
-                    var e_2, _a;
-                    const constrToAdd = [];
+                    var e_4, _a;
+                    const constraintsToAdd = [];
                     try {
                         for (var constraints_2 = __asyncValues(constraints), constraints_2_1; constraints_2_1 = await constraints_2.next(), !constraints_2_1.done;) {
                             const constr = constraints_2_1.value;
                             const [rConstrId, rWcs1] = await new Promise(res => this.resolve(ids => res(ids), constr.constrId, constr.mate1.wcsId));
                             const rMatePath = await new Promise(res => this.resolve(paths => res(paths), ...constr.mate1.matePath));
-                            const xOffsetParam = [constr.xOffset, typeof constr.xOffset === 'string'];
-                            const yOffsetParam = [constr.yOffset, typeof constr.yOffset === 'string'];
-                            const zOffsetParam = [constr.zOffset, typeof constr.zOffset === 'string'];
-                            constrToAdd.push([
-                                rConstrId,
-                                [rMatePath, rWcs1, constr.mate1.flip, constr.mate1.reoriented],
-                                xOffsetParam,
-                                yOffsetParam,
-                                zOffsetParam,
-                            ]);
+                            const xOffsetParam = { value: constr.xOffset, isExpr: typeof constr.xOffset === 'string' };
+                            const yOffsetParam = { value: constr.yOffset, isExpr: typeof constr.yOffset === 'string' };
+                            const zOffsetParam = { value: constr.zOffset, isExpr: typeof constr.zOffset === 'string' };
+                            constraintsToAdd.push({
+                                constrId: rConstrId,
+                                mate1: {
+                                    matePath: rMatePath,
+                                    wcsId: rWcs1,
+                                    flip: constr.mate1.flip,
+                                    reoriented: constr.mate1.reoriented,
+                                },
+                                xOffset: xOffsetParam,
+                                yOffset: yOffsetParam,
+                                zOffset: zOffsetParam,
+                            });
                         }
                     }
-                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
                     finally {
                         try {
                             if (constraints_2_1 && !constraints_2_1.done && (_a = constraints_2.return)) await _a.call(constraints_2);
                         }
-                        finally { if (e_2) throw e_2.error; }
+                        finally { if (e_4) throw e_4.error; }
                     }
-                    await ccAPI.assemblyBuilder.updateFastenedOriginConstraints(drawingId, constrToAdd);
+                    await ccAPI.assemblyBuilder.updateFastenedOriginConstraints(drawingId, constraintsToAdd);
                 },
                 createBufferGeometry: async (objectId) => {
                     await this.queue;
@@ -737,12 +767,12 @@ export default class CAD {
                         const membersToAdd = [];
                         members.forEach(mem => {
                             const isExpr = typeof mem.value === 'string'; // TODO Expression unterscheiden von normalen STrings
-                            const dataType = isExpr ? DataType.REAL : getDataType(mem.value); // TODO: Aktuell nur Real Werte als Expression
+                            const dataType = DataType.REAL; // TODO: Aktuell nur Real Werte als Expression
                             const featureAPIParam = {
                                 value: mem.value,
                                 isExpr: isExpr,
                             };
-                            membersToAdd.push([mem.name, featureAPIParam, dataType]);
+                            membersToAdd.push({ name: mem.name, value: featureAPIParam, dataType });
                         });
                         const success = featureAPI.updateExpressionSet(drawingId, rPartId, membersToAdd, [], []);
                         return success;
@@ -1140,12 +1170,12 @@ export default class CAD {
                     return this.resolve(async ([rPartId]) => {
                         const membersToModify = [];
                         members.forEach(mem => {
-                            const isExpr = typeof mem.value === 'string'; // TODO Expression unterscheiden von normalen STrings
+                            const isExpr = typeof mem.value === 'string'; // TODO Expression unterscheiden von normalen Strings
                             const featureAPIParam = {
                                 value: mem.value,
-                                isExpr: isExpr,
+                                isExpr,
                             };
-                            membersToModify.push([mem.name, featureAPIParam]);
+                            membersToModify.push({ name: mem.name, value: featureAPIParam });
                         });
                         const success = featureAPI.updateExpressionSet(drawingId, rPartId, [], membersToModify, []);
                         return success;
@@ -1157,10 +1187,19 @@ export default class CAD {
                         rExprSets.forEach(exprSet => {
                             const membersToModify = [];
                             exprSet.members.forEach((mem) => {
-                                const isExpr = typeof mem.value === 'string'; // TODO Expression unterscheiden von normalen STrings
-                                membersToModify.push([mem.name, [mem.value, isExpr]]);
+                                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 });
+                            });
+                            exprSetsToSet.push({
+                                productId: exprSet.partId,
+                                toAddMembers: [],
+                                toModifyMembers: membersToModify,
+                                toDeleteList: [],
                             });
-                            exprSetsToSet.push([exprSet.partId, [], membersToModify, []]);
                         });
                         const success = await featureAPI.updateExpressionSets(drawingId, exprSetsToSet);
                         return success;

package/build/solid.d.ts

@@ -223,9 +223,9 @@ export declare type ApiNoHistory = {
     intersect: (solidId: VID, keepSolid: boolean, ...bodies: VID[]) => ID;
     /**
      * Loads an arraybuffer in native file format. Native file format
-     * is 'of1', if you want to load 'stp' file formats, use import function.
+     * is 'ofb', if you want to load 'stp' file formats, use import function.
      * Current drawing will be overwritten by loaded data.
-     * @param data data as arraybuffer in of1 format
+     * @param data data as arraybuffer in ofb format
      * @example // tbd
      * @image // tbd
      */
@@ -321,14 +321,14 @@ export declare type ApiNoHistory = {
     rotateTo: (solidId: VID, rotationVec: Vec) => Promise<void>;
     /**
      * Writes the current drawing as native file format to a stream and returns the data.
-     * Native file is 'of1', for 'stp' file format use export method.
+     * Native file is 'ofb', for 'stp' file format use export method.
      *
-     * Important notes about the of1 format:
+     * Important notes about the ofb format:
      *    - It contains binary geometry blocks.
      *    - Do not try to convert it to text, the geometry blocks will get damaged!
      *
      * @example
-     * // Creates a rotated box and gets the of1 data.
+     * // Creates a rotated box and gets the ofb data.
      * const boxId = api.box(10, 10, 10)
      * api.rotateTo(boxId, [Math.PI / 4, 0, Math.PI / 4])
      * const data = api.save()

package/build/solid.js

@@ -302,7 +302,7 @@ export default class CAD {
                 },
                 load: (data) => {
                     return this.resolve(async () => {
-                        const productId = await solidAPI.load(drawingId, data, 'of1', true);
+                        const productId = await solidAPI.load(drawingId, data, 'ofb', true);
                         if (productId !== null) {
                             const drawing = getDrawing(drawingId);
                             const solids = drawing.structure.tree[productId].solids;
@@ -355,7 +355,7 @@ export default class CAD {
                 },
                 save: () => {
                     return this.resolve(async () => {
-                        return solidAPI.save(drawingId, 'of1');
+                        return solidAPI.save(drawingId, 'ofb');
                     });
                 },
                 scale: (target, pointOrFactor) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buerli.io/headless",
-  "version": "0.4.0",
+  "version": "0.5.0-beta.1",
   "description": "A non-manifold CAD workflow for the web",
   "author": "AWV Informatik AG <info@awv-informatik.ch>",
   "license": "ISC",
@@ -20,17 +20,17 @@
     "prettify": "prettier --write \"./{src,tests}/**/*.{js,jsx,ts,tsx,json}\""
   },
   "devDependencies": {
-    "@types/three": "^0.137",
+    "@types/three": "^0.143",
     "copyfiles": "^2.1.1",
     "rimraf": "^2.6.3",
-    "three": "^0.138",
-    "typescript": "4.1.2"
+    "three": "^0.143",
+    "typescript": "4.8.4"
   },
   "peerDependencies": {
     "three": ">=0.138"
   },
   "dependencies": {
-    "@buerli.io/classcad": "0.4.0",
+    "@buerli.io/classcad": "0.5.0-beta.1",
     "flat-promise": "^1.0.3"
   }
 }