@buerli.io/react-cad 0.13.1-beta.9 → 1.0.1-beta.1

package/build/plugins/Dimensions/utils.d.ts

@@ -1,5 +1,5 @@
-import { DrawingID, ObjectID, IStructureObject } from '@buerli.io/core';
+import { DrawingID, ObjectID, ScgObject } from '@buerli.io/core';
 export declare function useDimensionSetId(drawingId: DrawingID, ownerId: ObjectID): ObjectID | undefined;
-export declare const isAngular: (dim: IStructureObject) => boolean;
-export declare const isRadial: (dim: IStructureObject) => boolean;
-export declare const isDiameter: (dim: IStructureObject) => boolean;
+export declare const isAngular: (dim: ScgObject) => boolean;
+export declare const isRadial: (dim: ScgObject) => boolean;
+export declare const isDiameter: (dim: ScgObject) => boolean;

package/build/plugins/HLConstraints/components/LimitedValue.d.ts

@@ -5,7 +5,7 @@ export declare const LimitedValue: React.FC<{
     objId: ObjectID;
     memberName: string;
     limitsName?: string;
-    onUpdate: (value: number | string) => Promise<void>;
+    onUpdate: (value: number | string) => Promise<any>;
     caption?: string;
     angle?: boolean;
     disabled?: boolean;

package/build/plugins/HLConstraints/components/Limits.d.ts

@@ -1,12 +1,15 @@
 import React from 'react';
 import { DrawingID, ObjectID } from '@buerli.io/core';
-import { LimitsParam } from '@buerli.io/classcad';
 import { MemberParam } from '../../../types';
 export declare enum LimitsDiplayType {
     MIN = 0,
     MAX = 1,
     MINMAX = 2
 }
+export declare type LimitsParam<T = string | number> = {
+    min: T | null;
+    max: T | null;
+};
 export declare function useLimitsParam(drawingId: DrawingID, objId: ObjectID, memberName: string, options?: {
     angle?: boolean;
     forceNoLimits?: boolean;

package/build/plugins/HLConstraints/validators.d.ts

@@ -1,2 +1,2 @@
-import { LimitsParam } from '@buerli.io/classcad';
+import { LimitsParam } from "./components/Limits";
 export declare function validateLimits(limits: LimitsParam, name: string): string[];

package/build/plugins/Sketch/Root/Constraints/constraintsHelpers.d.ts

@@ -1,16 +1,18 @@
-import { IStructureObject, IStructureTree, ObjectID } from '@buerli.io/core';
+import { ScgObject, ScgTree, ObjectID } from '@buerli.io/core';
+import { ScgClassType } from '@buerli.io/classcad';
 declare type GeometryChecker = {
     type: string;
-    check: (object: IStructureObject) => number | number[];
+    check: (object: ScgObject) => number | number[];
 };
 declare type ConstraintGeometryCombination = {
     entityAdapter: (entities: ObjectID[]) => ObjectID[][];
     input: GeometryChecker[];
 };
-declare function createHelper(type: string, name: string, ...constraintGeometryCombinations: ConstraintGeometryCombination[]): {
+declare function createHelper(objClass: ScgClassType, type: string, name: string, ...constraintGeometryCombinations: ConstraintGeometryCombination[]): {
+    objClass: ScgClassType;
     type: string;
     name: string;
-    adapt(entities: ObjectID[], tree: IStructureTree): number[][] | undefined;
+    adapt(entities: ObjectID[], tree: ScgTree): number[][] | undefined;
     getTooltip(): string[];
 };
 export declare const constraintsHelpers: {

package/build/plugins/Sketch/Root/Constraints/utils.d.ts

@@ -1,6 +1,6 @@
-import { CCClasses } from '@buerli.io/classcad';
+import { ScgClassType } from '@buerli.io/classcad';
 export declare const classNameMap: {
     [key: string]: string;
 };
-export declare function getKeyCode(constrClass: CCClasses): "KeyF" | "KeyH" | "KeyV" | "KeyI" | "KeyT" | "KeyP" | "KeyC" | "KeyE" | "KeyO" | "KeyD" | "KeyR" | null | undefined;
-export declare function getHotKey(constrClass: CCClasses): string;
+export declare function getKeyCode(constrClass: ScgClassType): "KeyF" | "KeyH" | "KeyV" | "KeyI" | "KeyT" | "KeyP" | "KeyC" | "KeyE" | "KeyO" | "KeyD" | "KeyR" | null | undefined;
+export declare function getHotKey(constrClass: ScgClassType): string;

package/build/plugins/Sketch/Root/CopyPatterns.d.ts

@@ -1,7 +1,2 @@
 import React from 'react';
-export declare enum Patterns {
-    RECTANGULAR = "RECTANGULAR",
-    CIRCULAR = "CIRCULAR",
-    MIRROR = "MIRROR"
-}
 export declare const CopyPatterns: React.FC;

package/build/plugins/Sketch/View/graphics/hooks.d.ts

@@ -1,4 +1,4 @@
-import { IStructureObject, DrawingID, ObjectID } from '@buerli.io/core';
+import { ScgObject, DrawingID, ObjectID } from '@buerli.io/core';
 export declare const useGeomParams: (objId: ObjectID) => {
     renderOrder: number;
     polygonOffsetUnits: number;
@@ -16,7 +16,7 @@ declare type ObjState = {
     isConstrOverdefined: boolean;
     lgsState: number;
 };
-export declare const getColor: (object: IStructureObject, objState: ObjState) => number;
+export declare const getColor: (object: ScgObject, objState: ObjState) => number;
 /**
  * Return pointerHandlers of currently enabled sketch Handler.
  * @param objId

package/build/plugins/Sketch/View/handlers/filletHelpers.d.ts

@@ -1,40 +1,22 @@
 import * as THREE from 'three';
-import { ObjectID, IStructureObject, DrawingID } from '@buerli.io/core';
-export declare function findPointsAt(drawingId: DrawingID, sketchId: ObjectID, pos: THREE.Vector3): import("@buerli.io/core").ScgObject[];
-declare type FilletInfo = {
-    lines: Array<IStructureObject>;
-    lineStarts: Array<IStructureObject>;
-    lineEnds: Array<IStructureObject>;
-    control: THREE.Vector3;
-};
-declare type NewFilletInfo = FilletInfo & {
-    incidence: ObjectID;
+import { ObjectID, DrawingID } from '@buerli.io/core';
+export declare type FilletablePointInfo = {
+    offset: number;
+    arcStartPos: THREE.Vector3;
+    arcEndPos: THREE.Vector3;
+    arcCenterPos: THREE.Vector3;
+    clockwise: boolean;
+    lineIds: ObjectID[];
 };
-declare type ExistingFilletInfo = FilletInfo & {
-    object: IStructureObject;
-    objectEnds: IStructureObject[];
-    filletPoint: IStructureObject;
+export declare type FilletArcsInfo = {
+    controlPos: THREE.Vector3;
+    arcStartPos: THREE.Vector3;
+    arcEndPos: THREE.Vector3;
 };
-export declare function recognizeFilletableAngle(drawingId: DrawingID, sketchId: ObjectID, pos: THREE.Vector3): NewFilletInfo | null;
-export declare function getTouchPoints(info: FilletInfo, distance: number): THREE.Vector3[] | null;
-export declare function calculateCenterPoint(start: THREE.Vector3, end: THREE.Vector3, control: THREE.Vector3): THREE.Vector3;
 export declare function evaluateClockwise(start: THREE.Vector3, end: THREE.Vector3, control: THREE.Vector3): boolean;
-export declare function calculateFilletParams(info: FilletInfo, distance: number): {
-    start: THREE.Vector3;
-    end: THREE.Vector3;
-    center: THREE.Vector3;
-    clockwise: boolean;
-    control: THREE.Vector3;
-} | null;
-export declare function calculateNewFilletData(drawingId: DrawingID, sketchId: ObjectID, object: IStructureObject): {
-    info: NewFilletInfo;
-    params: {
-        start: THREE.Vector3;
-        end: THREE.Vector3;
-        center: THREE.Vector3;
-        clockwise: boolean;
-        control: THREE.Vector3;
-    };
-} | null;
-export declare function recognizeFilletByArc(drawingId: DrawingID, sketchId: ObjectID, object: IStructureObject): ExistingFilletInfo | null;
-export {};
+export declare const getFilletablePointsMap: (drawingId: DrawingID, sketchId: ObjectID) => {
+    [key: number]: FilletablePointInfo;
+};
+export declare const getFilletArcsMap: (drawingId: DrawingID, sketchId: ObjectID) => {
+    [key: number]: FilletArcsInfo;
+};

package/build/plugins/Sketch/View/handlers/splitHelpers.d.ts

@@ -1,9 +1,9 @@
 import * as THREE from 'three';
 import { DrawingID, ObjectID } from '@buerli.io/core';
-import { CCClasses } from '@buerli.io/classcad';
+import { ScgClassType } from '@buerli.io/classcad';
 import { CCArcInfo, CCCircleInfo, CCLineInfo } from '../../../../utils/sketchIntersectionUtils';
 declare type CommonInfo = {
-    class: CCClasses.CCLine | CCClasses.CCArc | CCClasses.CCCircle;
+    class: ScgClassType.CCLine | ScgClassType.CCArc | ScgClassType.CCCircle;
     bb: THREE.Box2;
     isSplittable: boolean;
 };

package/build/plugins/Sketch/types.d.ts

@@ -1,5 +1,5 @@
 import { ThreeEvent, ReactThreeFiber } from '@react-three/fiber';
-import { IStructureObject, ObjectID } from '@buerli.io/core';
+import { ScgObject, ObjectID } from '@buerli.io/core';
 import { InfinityPlane } from '../../components/graphics/InfinityPlane';
 import { Geometry } from 'three-stdlib';
 export declare type HighlightedConstraintsT = Array<{
@@ -64,7 +64,7 @@ export declare type PointerEventsT = {
 };
 export declare type Handler = {
     name: HandlersList;
-    filter: (object: IStructureObject) => boolean;
+    filter: (object: ScgObject) => boolean;
     onActivate?: () => void;
     onDeactivate?: (() => void) | (() => Promise<void>);
     pointerHandlers: Record<string, (e: ThreeEvent<PointerEvent> & PointerEventsT) => void>;
@@ -119,6 +119,8 @@ export declare type TmpObject = TmpLineT | TmpPointT | TmpArcT | TmpCircleT | Tm
 export declare type TmpObjects = {
     [key: string]: TmpObject;
 };
+export declare type ConstraintType = 'COINCIDENT' | 'COLINEAR' | 'CONCENTRIC' | 'EQUAL_LENGTH' | 'EQUAL_RADIUS' | 'FIXATION' | 'HORIZONTAL' | 'MIDPOINT' | 'PARALLEL' | 'PERPENDICULAR' | 'SPLINE_FIT_POINT' | 'SYMMETRY' | 'TANGENT' | 'VERTICAL';
+export declare type DimensionType = 'RADIUS' | 'DIAMETER' | 'OFFSET' | 'HORIZONTAL_DISTANCE' | 'VERTICAL_DISTANCE' | 'ANGLE' | 'ANGLEOX';
 declare global {
     type InfinityPlaneT = ReactThreeFiber.Object3DNode<InfinityPlane, typeof InfinityPlane>;
     namespace JSX {

package/build/plugins/components/PluginForm.d.ts

@@ -1,9 +1,7 @@
 import React from 'react';
 import { DrawingID, PluginID } from '@buerli.io/core';
-import { FacadeReturn } from '@buerli.io/classcad';
 import { MemberParam } from '../../types';
 /**
- * @deprecated
  * @param drawingId - id of the drawing.
  * @param update - a function which will be called when user presses "Update" button.
  * @param params - all params which should be sent to the server. PluginForm validates each of them.
@@ -17,17 +15,7 @@ import { MemberParam } from '../../types';
 export declare const PluginForm: React.FC<{
     drawingId: DrawingID;
     pluginId: PluginID;
-    update: () => Promise<void>;
-    params: Record<string, MemberParam<any>>;
-    children?: React.ReactNode;
-    validator?: () => string[];
-    autoClose?: boolean;
-    forceUpdateEnabled?: boolean;
-}>;
-export declare const PluginForm_v1: React.FC<{
-    drawingId: DrawingID;
-    pluginId: PluginID;
-    update: () => Promise<FacadeReturn>;
+    update: () => Promise<any>;
     params: Record<string, MemberParam<any>>;
     children?: React.ReactNode;
     validator?: () => string[];

package/build/utils/conversionUtils.d.ts

@@ -0,0 +1,16 @@
+import { DrawingID, ObjectID } from "@buerli.io/core";
+import { MateParam } from "../components/UI/editors/RefsEditors";
+export declare const mateV1: (mateV0: MateParam) => {
+    flip: "X" | "-X" | "Y" | "-Y" | "Z" | "-Z";
+    reorient: "0" | "90" | "180" | "270";
+    path: number[] | undefined;
+    csys: number | undefined;
+};
+export declare const solidV1: (drawingId: DrawingID, id: ObjectID) => {
+    id: string | number;
+    indices?: number[] | undefined;
+};
+export declare const solidsV1: (drawingId: DrawingID, ids: ObjectID[]) => {
+    id: string | number;
+    indices?: number[] | undefined;
+}[];

package/build/utils/helpers.d.ts

@@ -1,18 +1,18 @@
-import { DrawingID, GeometryElement, GraphicID, IStructureObject, MemberType, ObjectID, PointMem, PointMemValue, ContainerGeometryT } from '@buerli.io/core';
+import { DrawingID, GeometryElement, GraphicID, ScgObject, MemberType, ObjectID, ScgPointMem, ScgPoint, ContainerGeometryT } from '@buerli.io/core';
 import * as THREE from 'three';
 export declare function useGlobalToLocalMatrix(drawingId: DrawingID, objId: ObjectID | undefined): THREE.Matrix4;
 export declare function getGlobalToLocalMatrix(drawingId: DrawingID, objId: ObjectID): THREE.Matrix4;
-export declare function convertToVector(point: PointMem | undefined): THREE.Vector3;
-export declare function convertToArray(point: PointMem): number[];
+export declare function convertToVector(point: ScgPointMem | undefined): THREE.Vector3;
+export declare function convertToArray(point: ScgPointMem): number[];
 export declare function linesIntersection(point1: THREE.Vector3, dir1: THREE.Vector3, point2: THREE.Vector3, dir2: THREE.Vector3): THREE.Vector3 | null;
 export declare const angleVecVec: (a: THREE.Vector3, b: THREE.Vector3) => number;
 export declare const degreesToRadians: (degrees: number) => number;
 export declare const radiansToDegrees: (radians: number) => number;
 export declare const getPointOnPlane: (unprojectedPoint: THREE.Vector3, camera: THREE.Camera, globalToLocalM: THREE.Matrix4) => THREE.Vector3;
 export declare const closestAngle: (value: number, to: number) => number;
-export declare const stringifyValue: (value: string | number | PointMemValue, type: MemberType) => string;
-export declare function findObject(drawingId: DrawingID, id: GraphicID | ObjectID, unrollRefs?: boolean): IStructureObject | ContainerGeometryT | GeometryElement | undefined;
+export declare const stringifyValue: (value: string | number | ScgPoint, type: MemberType) => string;
+export declare function findObject(drawingId: DrawingID, id: GraphicID | ObjectID, unrollRefs?: boolean): ScgObject | ContainerGeometryT | GeometryElement | undefined;
 export declare function fmod(num: number, denom: number): number;
 export declare const solveQuadratic: (a: number, b: number, c: number) => number[];
 export declare const solveQuartic: (a: number, b: number, c: number, d: number, e: number) => number[];
-export declare function getRegionCoordSys(drawingId: DrawingID, regionObj: IStructureObject): THREE.Vector3[];
+export declare function getRegionCoordSys(drawingId: DrawingID, regionObj: ScgObject): THREE.Vector3[];

package/build/utils/selection/scopes/mateSelection.d.ts

@@ -1,28 +1,28 @@
-import { DrawingID, ObjectID, IStructureObject } from '@buerli.io/core';
+import { DrawingID, ObjectID, ScgObject } from '@buerli.io/core';
 import { FlipType, ReorientedType } from '@buerli.io/classcad';
 /**
  * Implies the following data structure:
  * data: {
- *   matePath: ObjectID[],
- *   csys: IStructureObject,
+ *   path: ObjectID[],
+ *   csys: ScgObject,
  *   flip: FlipType,
- *   reoriented: ReorientedType,
+ *   reorient: ReorientedType,
  * }
  */
 export declare const MateScope = "HLConstraintScope";
-export declare const createMateItem: (matePath: ObjectID[], csys: IStructureObject, flip: FlipType, reoriented: ReorientedType) => {
+export declare const createMateItem: (path: ObjectID[], csys: ScgObject, flip: FlipType, reorient: ReorientedType) => {
     id: string;
     scope: string;
     data: {
-        matePath: number[];
-        csys: import("@buerli.io/core").ScgObject;
+        path: number[];
+        csys: ScgObject;
         flip: FlipType;
-        reoriented: ReorientedType;
+        reorient: ReorientedType;
     };
     label: string;
 };
-export declare function useIsSelected(drawingId: DrawingID, matePath: ObjectID[], csys: IStructureObject): boolean;
-export declare function useMateSelection(drawingId: DrawingID, matePath: ObjectID[], csysId: ObjectID): {
+export declare function useIsSelected(drawingId: DrawingID, path: ObjectID[], csys: ScgObject): boolean;
+export declare function useMateSelection(drawingId: DrawingID, path: ObjectID[], csysId: ObjectID): {
     isHovered: boolean;
     isSelected: boolean;
     handlers: {};

package/build/utils/selection/scopes/treeObjInteraction.d.ts

@@ -1,13 +1,13 @@
-import { DrawingID, IStructureObject, ObjectID, SelectedItem } from '@buerli.io/core';
+import { DrawingID, ScgObject, ObjectID, SelectedItem } from '@buerli.io/core';
 import { ThreeEvent } from '@react-three/fiber';
 /**
  * Implies the following data structure:
  * data: {
- *   object: IStructureObject
+ *   object: ScgObject
  * }
  */
 export declare const TreeObjScope = "TreeObjScope";
-export declare const createTreeObjSelItem: (productId: ObjectID, object: IStructureObject) => SelectedItem;
+export declare const createTreeObjSelItem: (productId: ObjectID, object: ScgObject) => SelectedItem;
 export declare function useIsGHovered(drawingId: DrawingID, objId: ObjectID): boolean;
 export declare function useIsGSelected(drawingId: DrawingID, objId: ObjectID): boolean;
 export declare function useIsSHovered(drawingId: DrawingID, objId: ObjectID): boolean;

package/build/utils/sketchUtils.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
-import { CCClasses } from '@buerli.io/classcad';
-import { ArrayMem, DrawingID, IStructureObject, ObjectID } from '@buerli.io/core';
+import { ScgClassType } from '@buerli.io/classcad';
+import { DrawingID, ScgObject, ObjectID, ScgArrayMem } from '@buerli.io/core';
 /**
  * Checks if the currently active plugin is CC_Sketch.
  *
@@ -23,28 +23,28 @@ export declare const calculateTangent: (drawingId: DrawingID, curveId: ObjectID,
  * @param arg A structure object or CCClass of a structure object.
  * @returns True if the object represents a sketch geometry, false otherwise.
  */
-export declare const isSketchGeometry: (arg: IStructureObject | CCClasses) => boolean;
+export declare const isSketchGeometry: (arg: ScgObject | ScgClassType) => boolean;
 /**
  * Checks if the object represents a 2d constraint.
  *
  * @param arg A structure object or CCClass of a structure object.
  * @returns True if the object represents a 2d constraint, false otherwise.
  */
-export declare const is2DConstraint: (arg: IStructureObject | CCClasses) => boolean;
+export declare const is2DConstraint: (arg: ScgObject | ScgClassType) => boolean;
 /**
  * Checks if the object represents a sketch geometry or 2d constraint or a sketch itself.
  *
  * @param arg A structure object or CCClass of a structure object.
  * @returns True if the object represents a sketch or a sketch geometry or a 2d constraint, false otherwise.
  */
-export declare const isSketchObj: (arg: IStructureObject | CCClasses) => boolean;
+export declare const isSketchObj: (arg: ScgObject | ScgClassType) => boolean;
 /**
  * Checks if the object represents a sketch region.
  *
  * @param arg A structure object or CCClass of a structure object.
  * @returns True if the object represents a sketch region, false otherwise.
  */
-export declare const isSketchRegion: (arg: IStructureObject | CCClasses) => boolean;
+export declare const isSketchRegion: (arg: ScgObject | ScgClassType) => boolean;
 /**
  * Searches for the sketch which nests the specified object.
  *
@@ -76,7 +76,7 @@ export declare const getEntities: (drawingId: DrawingID, objectId: ObjectID) =>
  * @param arg A structure object or CCClass of a structure object.
  * @returns A number value (1-5) which represents the sketch object's priority, or -1 if arg is not a sketch object.
  */
-export declare const getSketchPriority: (arg: IStructureObject | CCClasses) => 1 | 2 | 4 | 3 | -1 | 5;
+export declare const getSketchPriority: (arg: ScgObject | ScgClassType) => 1 | 2 | 4 | 3 | -1 | 5;
 /**
  * Projects a point onto the specified sketch geometry.
  *
@@ -137,7 +137,7 @@ export declare const getArcPreviewValue: (dir0: THREE.Vector3, dir1: THREE.Vecto
  * @param boundsMember The sketch.boundingBox member.
  * @returns An object containing the center, radius and box values.
  */
-export declare const getSketchBounds: (boundsMember: ArrayMem) => {
+export declare const getSketchBounds: (boundsMember: ScgArrayMem) => {
     center: THREE.Vector3;
     radius: number;
     box: THREE.Box3;

package/build/utils/useScale.d.ts

@@ -1,2 +1,4 @@
 import React from 'react';
-export declare function useScale<T extends THREE.Object3D>(position: THREE.Vector3, getVector?: (sf: number) => [number, number, number]): React.RefObject<T>;
+import * as THREE from 'three';
+export declare function useUnscale<T extends THREE.Object3D>(getVector?: (sf: number) => [number, number, number]): React.RefObject<T>;
+export declare function useConstantSize<T extends THREE.Object3D>(position: THREE.Vector3, getVector?: (sf: number) => [number, number, number]): React.RefObject<T>;

package/build/utils/validation.d.ts

@@ -1,12 +1,11 @@
-import { ObjectID, PointMemValue } from '@buerli.io/core';
-import { APIParam } from '../types';
+import { ObjectID, ScgPoint } from '@buerli.io/core';
 export declare function emptyValidator(x: any): never[];
 export declare function notEmptyRef(ref: ObjectID | undefined, paramName?: string): string[];
-export declare function notZeroLength(vecParam: APIParam<PointMemValue>, paramName?: string): string[];
+export declare function notZeroLength(vecParam: ScgPoint | string, paramName?: string): string[];
 export declare function acceptableRange(min: {
     value: number;
     isInclusive: boolean;
 } | undefined, max: {
     value: number;
     isInclusive: boolean;
-} | undefined): (numParam: APIParam<number>, paramName?: string) => string[];
+} | undefined): (numParam: number | string, paramName?: string) => string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buerli.io/react-cad",
-  "version": "0.13.1-beta.9",
+  "version": "1.0.1-beta.1",
   "description": "buerli CAD components",
   "author": "AWV Informatik AG <info@awv-informatik.ch>",
   "repository": {},
@@ -87,8 +87,8 @@
     "three": ">=0.153"
   },
   "dependencies": {
-    "@buerli.io/classcad": "0.13.1-beta.9",
-    "@buerli.io/react": "0.13.1-beta.9",
+    "@buerli.io/classcad": "1.0.0",
+    "@buerli.io/react": "1.0.0",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/modifiers": "^6.0.1",
     "@dnd-kit/sortable": "^7.0.2",