@buerli.io/headless 0.3.0-beta.1 → 0.4.0-beta.2

package/build/history.d.ts

@@ -412,7 +412,7 @@ export declare type ApiHistory = {
         wcsId: VID;
         flip: FlipType;
         reoriented: ReorientedType;
-    }, xOffset: number | string, yOffset: number | string, zOffset: number | string, name: string) => ID;
+    }, xOffset: number | string, yOffset: number | string, zOffset: number | string, name: string) => Promise<ObjectID | null>;
     /**
      * Updates a fastened constraint.
      * @param constrId id of the constraint to update
@@ -444,13 +444,13 @@ export declare type ApiHistory = {
     updateFastenedConstraints: (...constraints: {
         constrId: VID;
         mate1: {
-            matePath: number[];
+            matePath: VID[];
             wcsId: VID;
             flip: number;
             reoriented: number;
         };
         mate2: {
-            matePath: number[];
+            matePath: VID[];
             wcsId: VID;
             flip: number;
             reoriented: number;
@@ -500,7 +500,7 @@ export declare type ApiHistory = {
         wcsId: VID;
         flip: FlipType;
         reoriented: ReorientedType;
-    }, xOffset: number | string, yOffset: number | string, zOffset: number | string, name: string) => ID;
+    }, xOffset: number | string, yOffset: number | string, zOffset: number | string, name: string) => Promise<ObjectID | null>;
     /**
      * Updates a fastened origin constraint.
      * @param constrId id of the constraint to update
@@ -524,10 +524,10 @@ export declare type ApiHistory = {
      * @image // tbd
      */
     updateFastenedOriginConstraints: (...constraints: {
-        constrId: number;
+        constrId: VID;
         mate1: {
-            matePath: number[];
-            wcsId: number;
+            matePath: VID[];
+            wcsId: VID;
             flip: number;
             reoriented: number;
         };
@@ -1137,9 +1137,9 @@ export default class CAD {
     init(callback: (api: ApiHistory) => void): () => Promise<void>;
     destroy(): void;
 }
-declare type VID = ObjectID | Promise<ObjectID> | null | Promise<number | null>;
+declare type VID = ObjectID | null | Promise<ObjectID | null>;
 declare type VIDs = ObjectID[] | Promise<ObjectID[]>;
-declare type ID = Promise<ObjectID> | Promise<number | null>;
+declare type ID = Promise<ObjectID | null>;
 declare type IDs = Promise<ObjectID[]>;
 declare type Point = {
     x: number;

package/build/history.js

@@ -1,3 +1,10 @@
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 /* eslint-disable max-lines */
 import { ccAPI, CCClasses, ccUtils, DataType, } from '@buerli.io/classcad';
 import { api, getDrawing, lineSegmentsFilter, loopFilter, MathUtils, planeFilter, pointFilter, } from '@buerli.io/core';
@@ -303,7 +310,7 @@ export default class CAD {
                                     dim.dimParam.dimTextAngle,
                                     dim.dimParam.dimOrientation,
                                     dim.dimParam.dimColor || 256,
-                                    dim.dimParam.dimLayer || '2', // which layer makes sense as default?
+                                    dim.dimParam.dimLayer || '2',
                                 ],
                                 dim.dxfView,
                             ];
@@ -330,7 +337,7 @@ export default class CAD {
                                         dim.dimParam.dimTextAngle,
                                         dim.dimParam.dimOrientation,
                                         dim.dimParam.dimColor || 256,
-                                        dim.dimParam.dimLayer || '2', // which layer makes sense as default?
+                                        dim.dimParam.dimLayer || '2',
                                     ],
                                     dim.dxfView,
                                 ]);
@@ -583,90 +590,109 @@ export default class CAD {
                         return null;
                     }, partId, ...references);
                 },
-                createFastenedConstraint: (asmId, mate1, mate2, xOffset, yOffset, zOffset, name) => {
-                    return this.resolve(async ([rAsmId, rMate1, rMate2, rMatePath1, rMatePath2]) => {
-                        const constraintId = await ccAPI.assemblyBuilder.create3DConstraint(drawingId, rAsmId, CCClasses.CCFastenedConstraint, name);
-                        if (constraintId != null) {
-                            const xOffsetParam = { value: xOffset, isExpr: typeof xOffset === 'string' };
-                            const yOffsetParam = { value: yOffset, isExpr: typeof yOffset === 'string' };
-                            const zOffsetParam = { value: zOffset, isExpr: typeof zOffset === 'string' };
-                            rMatePath1 = Array.isArray(rMatePath1) ? rMatePath1 : [rMatePath1];
-                            rMatePath2 = Array.isArray(rMatePath2) ? rMatePath2 : [rMatePath2];
-                            await ccAPI.assemblyBuilder.updateFastenedConstraint(drawingId, constraintId, [rMatePath1, rMate1.wcsId, rMate1.flip, rMate1.reoriented], [rMatePath2, rMate2.wcsId, rMate2.flip, rMate2.reoriented], xOffsetParam, yOffsetParam, zOffsetParam);
-                            return constraintId;
-                        }
-                        return null;
-                    }, asmId, mate1, mate2, ...mate1.matePath, ...mate2.matePath);
-                },
-                updateFastenedConstraint: (constrId, mate1, mate2, xOffset, yOffset, zOffset) => {
-                    return this.resolve(async ([rConstrId, rMate1, rMate2, rMatePath1, rMatePath2]) => {
+                createFastenedConstraint: async (asmId, mate1, mate2, xOffset, yOffset, zOffset, name) => {
+                    const [rAsmId, rWcs1, rWcs2] = await new Promise(res => this.resolve(ids => res(ids), asmId, mate1.wcsId, mate2.wcsId));
+                    const rMatePath1 = await new Promise(res => this.resolve(paths => res(paths), ...mate1.matePath));
+                    const rMatePath2 = await new Promise(res => this.resolve(paths => res(paths), ...mate2.matePath));
+                    const constraintId = await ccAPI.assemblyBuilder.create3DConstraint(drawingId, rAsmId, CCClasses.CCFastenedConstraint, name);
+                    if (constraintId != null) {
                         const xOffsetParam = { value: xOffset, isExpr: typeof xOffset === 'string' };
-                        const yOffsetParam = { value: yOffset, isExpr: typeof xOffset === 'string' };
-                        const zOffsetParam = { value: zOffset, isExpr: typeof xOffset === 'string' };
-                        rMatePath1 = Array.isArray(rMatePath1) ? rMatePath1 : [rMatePath1];
-                        rMatePath2 = Array.isArray(rMatePath2) ? rMatePath2 : [rMatePath2];
-                        await ccAPI.assemblyBuilder.updateFastenedConstraint(drawingId, rConstrId, [rMatePath1, rMate1.wcsId, rMate1.flip, rMate1.reoriented], [rMatePath2, rMate2.wcsId, rMate2.flip, rMate2.reoriented], xOffsetParam, yOffsetParam, zOffsetParam);
-                    }, constrId, mate1, mate2, ...mate1.matePath, ...mate2.matePath);
-                },
-                updateFastenedConstraints: (...constraints) => {
-                    return this.resolve(async ([...rConstraints]) => {
-                        const constrToAdd = [];
-                        rConstraints.forEach(constr => {
+                        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);
+                        return constraintId;
+                    }
+                    return null;
+                },
+                updateFastenedConstraint: async (constrId, mate1, mate2, xOffset, yOffset, zOffset) => {
+                    const [rConstrId, rWcs1, rWcs2] = await new Promise(res => this.resolve(ids => res(ids), constrId, mate1.wcsId, mate2.wcsId));
+                    const rMatePath1 = await new Promise(res => this.resolve(paths => res(paths), ...mate1.matePath));
+                    const rMatePath2 = await new Promise(res => this.resolve(paths => res(paths), ...mate2.matePath));
+                    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);
+                },
+                updateFastenedConstraints: async (...constraints) => {
+                    var e_1, _a;
+                    const constrToAdd = [];
+                    try {
+                        for (var constraints_1 = __asyncValues(constraints), constraints_1_1; constraints_1_1 = await constraints_1.next(), !constraints_1_1.done;) {
+                            const constr = constraints_1_1.value;
+                            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([
-                                constr.constrId,
-                                [constr.mate1.matePath, constr.mate1.wcsId, constr.mate1.flip, constr.mate1.reoriented],
-                                [constr.mate2.matePath, constr.mate2.wcsId, constr.mate2.flip, constr.mate2.reoriented],
+                                rConstrId,
+                                [rMatePath1, rWcs1, constr.mate1.flip, constr.mate1.reoriented],
+                                [rMatePath2, rWcs2, constr.mate2.flip, constr.mate2.reoriented],
                                 xOffsetParam,
                                 yOffsetParam,
                                 zOffsetParam,
                             ]);
-                        });
-                        await ccAPI.assemblyBuilder.updateFastenedConstraints(drawingId, constrToAdd);
-                    }, ...constraints);
-                },
-                createFastenedOriginConstraint: (asmId, mate1, xOffset, yOffset, zOffset, name) => {
-                    return this.resolve(async ([rAsmId, rMatePath, rMateWcsId]) => {
-                        const constraintId = await ccAPI.assemblyBuilder.create3DConstraint(drawingId, rAsmId, CCClasses.CCFastenedOriginConstraint, name);
-                        if (constraintId != null) {
-                            const xOffsetParam = { value: xOffset, isExpr: typeof xOffset === 'string' };
-                            const yOffsetParam = { value: yOffset, isExpr: typeof yOffset === 'string' };
-                            const zOffsetParam = { value: zOffset, isExpr: typeof zOffset === 'string' };
-                            rMatePath = Array.isArray(rMatePath) ? rMatePath : [rMatePath];
-                            await ccAPI.assemblyBuilder.updateFastenedOriginConstraint(drawingId, constraintId, [rMatePath, rMateWcsId, mate1.flip, mate1.reoriented], xOffsetParam, yOffsetParam, zOffsetParam);
-                            return constraintId;
                         }
-                        return null;
-                    }, asmId, ...mate1.matePath, mate1.wcsId);
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_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; }
+                    }
+                    await ccAPI.assemblyBuilder.updateFastenedConstraints(drawingId, constrToAdd);
                 },
-                updateFastenedOriginConstraint: (constrId, mate1, xOffset, yOffset, zOffset) => {
-                    return this.resolve(async ([rConstrId, rMatePath, rMateWcsId]) => {
+                createFastenedOriginConstraint: async (asmId, mate1, xOffset, yOffset, zOffset, name) => {
+                    const [rAsmId, rWcs1] = await new Promise(res => this.resolve(ids => res(ids), asmId, mate1.wcsId));
+                    const rMatePath = await new Promise(res => this.resolve(paths => res(paths), ...mate1.matePath));
+                    const constraintId = await ccAPI.assemblyBuilder.create3DConstraint(drawingId, rAsmId, CCClasses.CCFastenedOriginConstraint, name);
+                    if (constraintId != null) {
                         const xOffsetParam = { value: xOffset, isExpr: typeof xOffset === 'string' };
                         const yOffsetParam = { value: yOffset, isExpr: typeof yOffset === 'string' };
                         const zOffsetParam = { value: zOffset, isExpr: typeof zOffset === 'string' };
-                        rMatePath = Array.isArray(rMatePath) ? rMatePath : [rMatePath];
-                        await ccAPI.assemblyBuilder.updateFastenedOriginConstraint(drawingId, rConstrId, [rMatePath, rMateWcsId, mate1.flip, mate1.reoriented], xOffsetParam, yOffsetParam, zOffsetParam);
-                    }, constrId, ...mate1.matePath, mate1.wcsId);
-                },
-                updateFastenedOriginConstraints: (...constraints) => {
-                    return this.resolve(async ([...rConstraints]) => {
-                        const constrToAdd = [];
-                        rConstraints.forEach(constr => {
+                        await ccAPI.assemblyBuilder.updateFastenedOriginConstraint(drawingId, constraintId, [rMatePath, rWcs1, mate1.flip, mate1.reoriented], xOffsetParam, yOffsetParam, zOffsetParam);
+                        return constraintId;
+                    }
+                    return null;
+                },
+                updateFastenedOriginConstraint: async (constrId, mate1, xOffset, yOffset, zOffset) => {
+                    const [rConstrId, rWcs1] = await new Promise(res => this.resolve(ids => res(ids), constrId, mate1.wcsId));
+                    const rMatePath = await new Promise(res => this.resolve(paths => res(paths), ...mate1.matePath));
+                    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);
+                },
+                updateFastenedOriginConstraints: async (...constraints) => {
+                    var e_2, _a;
+                    const constrToAdd = [];
+                    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([
-                                constr.constrId,
-                                [constr.mate1.matePath, constr.mate1.wcsId, constr.mate1.flip, constr.mate1.reoriented],
+                                rConstrId,
+                                [rMatePath, rWcs1, constr.mate1.flip, constr.mate1.reoriented],
                                 xOffsetParam,
                                 yOffsetParam,
                                 zOffsetParam,
                             ]);
-                        });
-                        await ccAPI.assemblyBuilder.updateFastenedOriginConstraints(drawingId, constrToAdd);
-                    }, ...constraints);
+                        }
+                    }
+                    catch (e_2_1) { e_2 = { error: e_2_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; }
+                    }
+                    await ccAPI.assemblyBuilder.updateFastenedOriginConstraints(drawingId, constrToAdd);
                 },
                 createBufferGeometry: async (objectId) => {
                     await this.queue;
@@ -693,7 +719,12 @@ export default class CAD {
                     const scene = new Scene();
                     if (rObjectId != null) {
                         const rootObj = structureTree[rObjectId];
-                        await createRecursiveScene(rootObj, drawingId, scene, options);
+                        if (rootObj) {
+                            await createRecursiveScene(rootObj, drawingId, scene, options);
+                        }
+                        else {
+                            throw new Error('Root object does not exist!');
+                        }
                     }
                     return scene;
                 },
@@ -984,7 +1015,7 @@ export default class CAD {
                         const featureName = name ? name : 'Import';
                         const importFeatureId = await featureAPI.createFeature(drawingId, rPartId, CCClasses.CCImport, featureName);
                         if (importFeatureId !== null) {
-                            const solids = await featureAPI.loadGeometryStreamToImportFeature(drawingId, importFeatureId, content, format);
+                            const solids = await featureAPI.updateImport(drawingId, importFeatureId, content, format, featureName);
                             if (solids !== null) {
                                 return importFeatureId;
                             }
@@ -996,6 +1027,7 @@ export default class CAD {
                     return this.resolve(async ([rPartId, rPlaneId]) => {
                         const sketch = await sketcherAPI.createSketch(drawingId, rPartId);
                         if (sketch) {
+                            await featureAPI.closeFeature(drawingId, sketch);
                             const tree = getDrawing(drawingId).structure.tree;
                             const plane = tree[rPlaneId];
                             if (plane && base.isA(plane.class, CCClasses.CCWorkPlane)) {
@@ -1013,6 +1045,7 @@ export default class CAD {
                     return this.resolve(async ([rPartId, rPlaneId, rSketchId]) => {
                         const sketch = await sketcherAPI.createSketch(drawingId, rPartId);
                         if (sketch) {
+                            await featureAPI.closeFeature(drawingId, sketch);
                             const tree = getDrawing(drawingId).structure.tree;
                             const plane = tree[rPlaneId];
                             if (plane && base.isA(plane.class, CCClasses.CCWorkPlane)) {

package/build/solid.js

@@ -182,7 +182,9 @@ export default class CAD {
         this.queue = Promise.resolve(0);
     }
     resolve(callback, ...args) {
-        return (this.queue = this.queue.then(() => Promise.all(args).then(callback)).catch(e => {
+        return (this.queue = this.queue
+            .then(() => Promise.all(args).then(callback))
+            .catch(e => {
             // catch is necessary to avoid error promises in the queue
         }));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buerli.io/headless",
-  "version": "0.3.0-beta.1",
+  "version": "0.4.0-beta.2",
   "description": "A non-manifold CAD workflow for the web",
   "author": "AWV Informatik AG <info@awv-informatik.ch>",
   "license": "ISC",
@@ -12,8 +12,8 @@
   "scripts": {
     "ver": "npm version",
     "prepack": "npm run clean && npm run build",
-    "clean": "rimraf ./build",
-    "build": "tsc",
+    "clean": "rimraf ./build && rimraf ./tsconfig.tsbuildinfo",
+    "build": "tsc -v && tsc",
     "build:dev": "tsc --sourceMap true --declarationMap true",
     "test": "echo no tests yet",
     "lint": "eslint \"./src/**/*.ts?(x)\"",
@@ -23,13 +23,14 @@
     "@types/three": "^0.137",
     "copyfiles": "^2.1.1",
     "rimraf": "^2.6.3",
-    "three": "^0.138"
+    "three": "^0.138",
+    "typescript": "4.1.2"
   },
   "peerDependencies": {
     "three": ">=0.138"
   },
   "dependencies": {
-    "@buerli.io/classcad": "0.3.0-beta.1",
+    "@buerli.io/classcad": "0.4.0-beta.2",
     "flat-promise": "^1.0.3"
   }
 }