[pull] master from DefinitelyTyped:master

types/webvis/package.json

@@ -1,9 +1,9 @@
 {
     "private": true,
     "nonNpm": true,
-    "nonNpmDescription": "Type definitions for non-npm package webvis 3.11",
+    "nonNpmDescription": "Type definitions for non-npm package webvis 3.12",
     "name": "@types/webvis",
-    "version": "3.11.9999",
+    "version": "3.12.9999",
     "projects": [
         "https://threedy.io"
     ],

types/webvis/test/ClipPlaneAPI.ts

@@ -51,7 +51,7 @@ function test(testContext: webvis.ContextAPI): void {
 
     const clipRoomRemoveState: webvis.RemoveState = testContext.removeClippingRoom(false);
 
-    const clipRoomId2: number = testContext.getClipRoom();
+    const clipRoomId2: number | undefined = testContext.getClipRoom();
 
     const clipRoomProps: Promise<webvis.ClipRoomProperties> = testContext.requestClipRoomData();
 

types/webvis/test/MeasurementAPI.ts

@@ -101,6 +101,11 @@ function test(testContext: webvis.ContextAPI): void {
         measurementTargetLineSegment,
     );
 
+    const measureNormalResult: Promise<webvis.NormalMeasurementResult> = testContext.measureNormal(
+        measurementTargetTopology,
+        measurementTargetPoint,
+    );
+
     const measureTangentResult: Promise<webvis.TangentMeasurementResult> = testContext.measureTangent(
         measurementTargetTopology,
         measurementTargetPoint,

types/webvis/test/MemberAPI.ts

@@ -0,0 +1,45 @@
+function test(testContext: webvis.ContextAPI): void {
+    const setEntryPromise: Promise<void> = testContext.setMemberProfileEntry("testKey", "testValue");
+
+    const deleteEntryPromise: Promise<void> = testContext.deleteMemberProfileEntry("testKey");
+
+    const members: number[] = testContext.getMembers();
+
+    const memberActionsPromise: Promise<webvis.MemberAction[]> = testContext.requestMemberActions(0);
+
+    const memberPropertiesPromise: Promise<webvis.MemberProperties | undefined> = testContext.requestMemberProperties(
+        0,
+    );
+
+    const memberName: string | undefined = testContext.getMemberName();
+
+    const useActionPromise: Promise<void> = testContext.useMemberAction(0, webvis.MemberAction.DEMOTE, {
+        role: webvis.MemberRole.VIEWER,
+    });
+
+    testContext.setMemberName("Test Name");
+
+    testContext.registerListener([webvis.EventType.MEMBER_ACTION_ADDED], (event: webvis.MemberActionAddedEvent) => {
+        console.log("MemberAction added", event.memberId, event.memberAction);
+    });
+
+    testContext.registerListener([webvis.EventType.MEMBER_ACTION_REMOVED], (event: webvis.MemberActionRemovedEvent) => {
+        console.log("MemberAction removed", event.memberId, event.memberAction);
+    });
+
+    testContext.registerListener([webvis.EventType.MEMBER_ACTION_USED], (event: webvis.MemberActionUsedEvent) => {
+        console.log("MemberAction used", event.sourceMemberId, event.targetMemberId, event.memberAction, event.details);
+    });
+
+    testContext.registerListener([webvis.EventType.MEMBER_CREATED], (event: webvis.MemberCreatedEvent) => {
+        console.log("Member created", event.memberId, event.memberProperties);
+    });
+
+    testContext.registerListener([webvis.EventType.MEMBER_CHANGED], (event: webvis.MemberChangedEvent) => {
+        console.log("Member changed", event.memberId, event.memberProperties);
+    });
+
+    testContext.registerListener([webvis.EventType.MEMBER_REMOVED], (event: webvis.MemberRemovedEvent) => {
+        console.log("Member removed", event.memberId);
+    });
+}

types/webvis/test/SessionStorageAPI.ts

@@ -3,6 +3,7 @@ function test(testContext: webvis.ContextAPI): void {
         thumbnail: true,
         thumbnailHeight: 100,
         thumbnailWidth: 100,
+        storeBackground: true,
     });
 
     const restoreSnapshotPromise: Promise<void> = testContext.restoreSnapshot(3);

types/webvis/test/SpaceAPI.ts

@@ -0,0 +1,12 @@
+function test(testContext: webvis.ContextAPI): void {
+    const emptySpacePromise: Promise<void> = testContext.openSpace();
+    const existingSpacePromise: Promise<void> = testContext.openSpace("default/1bb548e6-383d-47a5-ad10-cb7ddb9cbbcc");
+
+    const cloneSpacePromise: Promise<void> = testContext.cloneIntoNewSpace();
+
+    const spaceHandle: Promise<string> = testContext.requestSpaceHandle(webvis.MemberRole.OWNER);
+
+    testContext.registerListener([webvis.EventType.SPACE_OPENED], (event: webvis.SpaceOpenedEvent) => {
+        console.log("Space opened");
+    });
+}

types/webvis/test/TopologyAPI.ts

@@ -65,6 +65,8 @@ function test(testContext: webvis.ContextAPI): void {
         topoHandle1,
     ]);
 
+    const shapeHandles: Promise<webvis.TopologyHandle[]> = testContext.requestShapeHandles(1);
+
     const topoDescriptor: Promise<webvis.TopologyDescriptor> = testContext.requestTopologyDescriptor(
         topoHandle0,
     );
@@ -88,4 +90,7 @@ function test(testContext: webvis.ContextAPI): void {
 
     const setTopoSelectionPromise: Promise<void> = testContext.setTopologySelection(topoHandle0);
     const setToposSelectionPromise: Promise<void> = testContext.setTopologySelection([topoHandle0, topoHandle1]);
+
+    const neighboringEdgesPromise: Promise<webvis.TopologyHandle[]> = testContext.requestNeighboringEdges(topoHandle0);
+    const neighboringFacesPromise: Promise<webvis.TopologyHandle[]> = testContext.requestNeighboringFaces(topoHandle0);
 }

types/webvis/test/ViewerBackgroundAPI.ts

@@ -0,0 +1,3 @@
+function test(testContext: webvis.ContextAPI, testViewer: webvis.ViewerAPI): void {
+    testViewer.clearBackground();
+}

types/webvis/test/ViewerPointOfInterestAPI.ts

@@ -0,0 +1,153 @@
+function test(testContext: webvis.ContextAPI, testViewer: webvis.ViewerAPI): void {
+    const points: webvis.PointOfInterest[] = [
+        {
+            id: 2,
+            label: "Test point 1",
+            position: [0, 0, 0],
+        },
+        {
+            id: 1,
+            label: "Test point 2",
+            position: [1, 1, 1],
+        },
+    ];
+
+    const defaultPOIStyleId: number = testViewer.createPOIStyle();
+    const customPOIStyleId: number = testViewer.createPOIStyle({
+        color: [1, 0, 0, 0.7],
+        size: 15,
+        sprite: null,
+        name: "Test Style",
+    });
+
+    const changePOIStyleResult: webvis.POIStyleProperties = testViewer.changePOIStyle(1, {
+        color: [0, 1, 0, 0.7],
+        size: 20,
+        sprite: null,
+        name: "Changed Test Style",
+    });
+
+    testViewer.removePOIStyle(1);
+
+    const getPOIStyleDataResult: webvis.POIStyleProperties | undefined = testViewer.getPOIStyleData(1);
+
+    const getPOIStylesResult: number[] = testViewer.getPOIStyles();
+
+    const defaultPOISetId: number = testViewer.createPOISet();
+    const customPOISetId: number = testViewer.createPOISet({
+        enabled: true,
+        styleVisible: 0,
+        styleOccluded: 1,
+        styleHovered: 2,
+        useWorldUnits: false,
+        points: points,
+        labelColor: [1, 0, 0],
+        labelOutlineColor: [0, 0, 0],
+        name: "Test Label",
+    });
+
+    const changePOISetResult: webvis.POISetProperties = testViewer.changePOISet(0, {
+        enabled: false,
+        styleVisible: 2,
+        styleOccluded: 1,
+        styleHovered: 0,
+        useWorldUnits: true,
+        points: points,
+        labelColor: [1, 1, 0],
+        labelOutlineColor: [1, 0, 1],
+        name: "Changed test Label",
+    });
+
+    testViewer.removePOISet(3);
+
+    const getPOISetDataResult: webvis.POISetProperties | undefined = testViewer.getPOISetData(2);
+
+    const getPOISetsResult: number[] = testViewer.getPOISets();
+
+    const addPointsToSetResult: number[] = testViewer.addPointsToSet(3, points);
+
+    testViewer.removePointsFromSet(customPOISetId, [2]);
+
+    testViewer.changePointsInSet(1, [1, 2], points);
+
+    testContext.registerListener([webvis.EventType.VIEWER_POI_CLICKED], (event: webvis.ViewerPOIClickedEvent) => {
+        console.log("POISet clicked", event.viewerId, event.poiSetId, event.poiId, event.originalEvent);
+    });
+
+    testContext.registerListener(
+        [webvis.EventType.VIEWER_POI_POINTER_ENTER],
+        (event: webvis.ViewerPOIPointerEnterEvent) => {
+            console.log("POISet enter", event.viewerId, event.poiSetId, event.poiId, event.originalEvent);
+        },
+    );
+
+    testContext.registerListener(
+        [webvis.EventType.VIEWER_POI_POINTER_OUT],
+        (event: webvis.ViewerPOIPointerOutEvent) => {
+            console.log("POISet out", event.viewerId, event.poiSetId, event.poiId, event.originalEvent);
+        },
+    );
+
+    testContext.registerListener(
+        [webvis.EventType.VIEWER_POI_SET_CHANGED],
+        (event: webvis.ViewerPOISetChangedEvent) => {
+            console.log("POISet changed", event.viewerId, event.poiSetId, event.properties);
+        },
+    );
+
+    testContext.registerListener(
+        [webvis.EventType.VIEWER_POI_SET_CREATED],
+        (event: webvis.ViewerPOISetCreatedEvent) => {
+            console.log("POISet created", event.viewerId, event.poiSetId, event.properties);
+        },
+    );
+
+    testContext.registerListener(
+        [webvis.EventType.VIEWER_POI_SET_REMOVED],
+        (event: webvis.ViewerPOISetRemovedEvent) => {
+            console.log("POISet removed", event.viewerId, event.poiSetId);
+        },
+    );
+
+    testContext.registerListener(
+        [webvis.EventType.VIEWER_POI_SET_POINTS_ADDED],
+        (event: webvis.ViewerPOISetPointsAddedEvent) => {
+            console.log("Points added", event.viewerId, event.poiSetId, event.poiIds, event.properties);
+        },
+    );
+
+    testContext.registerListener(
+        [webvis.EventType.VIEWER_POI_SET_POINTS_CHANGED],
+        (event: webvis.ViewerPOISetPointsChangedEvent) => {
+            console.log("Points changed", event.viewerId, event.poiSetId, event.poiIds);
+        },
+    );
+
+    testContext.registerListener(
+        [webvis.EventType.VIEWER_POI_SET_POINTS_REMOVED],
+        (event: webvis.ViewerPOISetPointsRemovedEvent) => {
+            console.log("Points removed", event.viewerId, event.poiSetId, event.poiIds);
+        },
+    );
+
+    testContext.registerListener(
+        [webvis.EventType.VIEWER_POI_STYLE_CHANGED],
+        (event: webvis.ViewerPOIStyleChangedEvent) => {
+            console.log("POIStyle changed", event.viewerId, event.poiStyleId, event.poiStyleProperties);
+        },
+    );
+
+    testContext.registerListener(
+        [webvis.EventType.VIEWER_POI_STYLE_CREATED],
+        (event: webvis.ViewerPOIStyleCreatedEvent) => {
+            console.log("POIStyle created", event.viewerId, event.poiStyleId, event.poiStyleProperties);
+        },
+    );
+
+    testContext.registerListener(
+        [webvis.EventType.VIEWER_POI_STYLE_REMOVED],
+        (event: webvis.ViewerPOIStyleRemovedEvent) => {
+            console.log("POIStyle removed", event.viewerId, event.poiStyleId);
+        },
+    );
+}

types/webvis/test/ViewerPolylineAPI.ts

@@ -3,6 +3,8 @@ function test(testContext: webvis.ContextAPI, testViewer: webvis.ViewerAPI): voi
         color: [1, 0, 0, 1],
         width: 2,
         transform: [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1],
+        useWorldUnits: false,
+        sequence: [5, 10, 5, 10],
     });
 
     testViewer.changePolyline(polylineId, {

types/webvis/webvis-tests.ts

@@ -19,16 +19,19 @@ import "./test/LayerFilterAPI";
 import "./test/LogAPI";
 import "./test/MaterialAPI";
 import "./test/MeasurementAPI";
+import "./test/MemberAPI";
 import "./test/NodePathAPI";
 import "./test/QueryAPI";
 import "./test/RealityAPI";
 import "./test/SelectionAPI";
 import "./test/SessionStorageAPI";
 import "./test/SettingsAPI";
+import "./test/SpaceAPI";
 import "./test/TopologyAPI";
 import "./test/UtilityAPI";
 import "./test/VariantsAPI";
 import "./test/ViewerAPI";
+import "./test/ViewerBackgroundAPI";
 import "./test/ViewerDrawingAPI";
 import "./test/ViewerGizmoAPI";
 import "./test/ViewerHeatmapAPI";
@@ -37,6 +40,7 @@ import "./test/ViewerInteractionAPI";
 import "./test/ViewerMagnifierAPI";
 import "./test/ViewerNavigationAPI";
 import "./test/ViewerPointCloudAPI";
+import "./test/ViewerPointOfInterestAPI";
 import "./test/ViewerPolylineAPI";
 import "./test/ViewerStateAPI";
 import "./test/ViewerUserGeometryAPI";