DefinitelyTyped · typescript-bot · May 3, 2024 · Apr 23, 2024 · Apr 23, 2024 · Apr 23, 2024
diff --git a/types/forge-viewer/forge-viewer-tests.ts b/types/forge-viewer/forge-viewer-tests.ts
@@ -1,7 +1,7 @@
 let viewer: Autodesk.Viewing.GuiViewer3D;
 const options = {
-    env: "AutodeskProduction",
-    api: "derivativeV2", // for models uploaded to EMEA change this option to 'derivativeV2_EU'
+    env: "AutodeskProduction2",
+    api: "streamingV2", // for models uploaded to EMEA change this option to 'streamingV2_EU'
     accessToken: "",
 };
 
@@ -61,6 +61,9 @@ Autodesk.Viewing.Initializer(options, async () => {
     await streamLineTests(viewer);
     await stringExtractorTests(viewer);
     await visualClustersTests(viewer);
+    await selectiveLoadingTest(viewer);
+    await cameraMappingTest(viewer);
+    await dbIdRemappingTest(viewer);
     // shutdown the viewer
     viewer.tearDown();
 });
@@ -662,3 +665,96 @@ function selectionTests(viewer: Autodesk.Viewing.GuiViewer3D) {
 
     viewer.select([]);
 }
+
+async function selectiveLoadingTest(viewer: Autodesk.Viewing.GuiViewer3D): Promise<void> {
+    const documentId = "urn:dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6bXktYnVja2V0L215LWF3ZXNvbWUtZm9yZ2UtZmlsZS5ydnQ";
+    const doc = await loadDocument(documentId);
+    const viewable = doc.getRoot().getDefaultGeometry();
+
+    let query = [{
+        $like: ["?Name", "'%2%'"],
+    }];
+    let fakeLoadedModel = await viewer.loadDocumentNode(doc, viewable, {
+        filter: {
+            property_query: query,
+        },
+    });
+
+    await viewer.waitForLoadDone();
+
+    const propHashes = await fakeLoadedModel.getPropertyHashes();
+    viewer.unloadDocumentNode(fakeLoadedModel.getDocumentNode());
+
+    const matches = JSON.stringify(query).matchAll(/(["'])\?([\w\d\s]+)\1/g);
+    for (const match of matches) {
+        const attributeSearchString = match[2].trim();
+        query = propHashes.filter(propHash => propHash[1] === attributeSearchString)
+            .map(propHash => {
+                return {
+                    $like: [`s.props.${propHash[0]}`, query[0]["$like"][1]],
+                };
+            });
+    }
+
+    let model = await viewer.loadDocumentNode(doc, viewable, {
+        filter: {
+            property_query: query,
+        },
+    });
+
+    await viewer.waitForLoadDone();
+}
+
+async function cameraMappingTest(viewer: Autodesk.Viewing.GuiViewer3D): Promise<void> {
+    const state = viewer.getState({ viewport: true });
+    const model = viewer.getAllModels()[0];
+    const invTransform = model.getInverseModelToViewerTransform();
+
+    const currentTarget = new THREE.Vector3().fromArray(state.viewport.target);
+    // {x: -14.770469665527344, y: 36.571967124938965, z: -1.212925910949707}
+
+    const currentPosition = new THREE.Vector3().fromArray(state.viewport.eye);
+    // {x: -14.870469093322754, y: 36.57156276702881, z: -1.212925910949707}
+
+    const originTarget = currentTarget.clone().applyMatrix4(invTransform);
+    // {x: -15.02436066552734, y: -8.984211875061035, z: 4.921260089050291}
+
+    const originPosition = currentPosition.clone().applyMatrix4(invTransform);
+    // {x: -15.12436009332275, y: -8.984616232971192, z: 4.921260089050291}
+
+    let data =
+        "{\"aspect\":1.7963206307490145,\"isPerspective\":true,\"fov\":90.6808770984145,\"position\":[-15.165047992449978,-8.997701015094862,4.916143307734757],\"target\":[-15.02430824140946,-8.997131602441378,4.916143307734757],\"up\":[0,0,1],\"orthoScale\":1}";
+    const viewData = JSON.parse(data);
+    let view = new Autodesk.Viewing.UnifiedCamera();
+    view = Object.assign(view, {
+        aspect: viewData.aspect,
+        isPerspective: viewData.isPerspective,
+        fov: viewData.fov,
+        position: new THREE.Vector3().fromArray(viewData.position),
+        target: new THREE.Vector3().fromArray(viewData.target),
+        up: new THREE.Vector3().fromArray(viewData.up),
+        orthoScale: viewData.orthoScale,
+    });
+
+    const offsetMatrix = model.getModelToViewerTransform();
+    view.position = view.position.applyMatrix4(offsetMatrix);
+    view.target = view.target.applyMatrix4(offsetMatrix);
+
+    viewer.impl.setViewFromCamera(view);
+}
+
+async function dbIdRemappingTest(viewer: Autodesk.Viewing.GuiViewer3D): Promise<void> {
+    // Override `PropDbLoader#load` so that the svf1/svf2 dbid mapping is always loaded.
+    const _load = Autodesk.Viewing.Private.PropDbLoader.prototype.load;
+    Autodesk.Viewing.Private.PropDbLoader.prototype.load = function() {
+        this.needsDbIdRemap = true;
+        _load.call(this);
+    };
+
+    // Override `PropDbLoader#processLoadResult` so that the dbid mapping is stored within all models (by default it is only stored in 2D models).
+    const _processLoadResult = Autodesk.Viewing.Private.PropDbLoader.prototype.processLoadResult;
+    Autodesk.Viewing.Private.PropDbLoader.prototype.processLoadResult = function(result) {
+        _processLoadResult.call(this, result);
+        this.model.idRemap = result.dbidOldToNew;
+    };
+}
diff --git a/types/forge-viewer/index.d.ts b/types/forge-viewer/index.d.ts
@@ -256,11 +256,16 @@ declare namespace Autodesk {
 
         interface LoadModelOptions {
             fileLoader?: FileLoader | undefined;
+            keepCurrentModels?: boolean;
             loadOptions?: object | undefined;
             sharedPropertyDbPath?: string | undefined;
-            ids?: string | undefined;
-            applyScaling?: string | { from: string; to: string };
+            ids?: number[] | undefined;
+            loadAsHidden?: boolean;
             modelNameOverride?: string;
+            placementTransform?: THREE.Matrix4 | undefined;
+            applyScaling?: string | { from: string; to: string };
+            applyPlacementInModelUnits?: boolean;
+            globalOffset?: THREE.Vector3 | undefined;
             [key: string]: any;
         }
 
@@ -503,6 +508,7 @@ declare namespace Autodesk {
             isRevitPdf(): boolean;
             isViewable(): boolean;
             isViewPreset(): boolean;
+            isMasterView(): boolean;
             lineageUrn(encode?: boolean): string;
             name(): string;
             search(propsToMatch: BubbleNodeSearchProps): BubbleNode[];
@@ -703,6 +709,7 @@ declare namespace Autodesk {
         class Model {
             id: number;
             visibilityManager: Private.VisibilityManager;
+            idRemap: Int32Array;
 
             clearThemingColors(): void;
             fetchTopology(maxSizeMB: number): Promise<object>;
@@ -757,7 +764,7 @@ declare namespace Autodesk {
                 errorCallback?: (err: any) => void,
                 options?: { needExternalId: boolean },
             ): void;
-            getPropertyDb(): PropDbLoader;
+            getPropertyDb(): Private.PropDbLoader;
             getPropertySet(
                 dbIds: number[],
                 options: {
@@ -774,6 +781,7 @@ declare namespace Autodesk {
                     needsExternalId?: boolean | undefined;
                 },
             ): Promise<PropertySet>;
+            getPropertyHashes(): Promise<string[]>;
             geomPolyCount(): number;
             getDefaultCamera(): THREE.Camera;
             getDisplayUnit(): string;
@@ -893,10 +901,6 @@ declare namespace Autodesk {
             }
         }
 
-        interface PropDbLoader {
-            executeUserFunction(userFunc: (pdb: any, ...args: any[]) => any, args?: any): Promise<any>;
-        }
-
         interface PropertyResult {
             dbId: number;
             externalId?: string | undefined;
@@ -1198,7 +1202,11 @@ declare namespace Autodesk {
                 onErrorCallback?: (errorCode: number, errorMessage: string, errorArgs: any) => void,
             ): any;
             unloadModel(model: Model): void;
-            loadDocumentNode(avDocument: Document, manifestNode: any, /*BubbleNode*/ options?: object): Promise<Model>;
+            loadDocumentNode(
+                avDocument: Document,
+                manifestNode: any,
+                /*BubbleNode*/ options?: LoadModelOptions,
+            ): Promise<Model>;
             unloadDocumentNode(manifestNode: any /*BubbleNode*/): boolean;
             getDimensions(): Private.Dimensions;
             resize(): void;
@@ -1878,6 +1886,57 @@ declare namespace Autodesk {
                 onVertex?(cx: number, cy: number, vpId: number): void;
             }
 
+            class PropDbLoader {
+                model: Autodesk.Viewing.Model;
+                needsDbIdRemap: boolean;
+                processLoadResult(result: any): void;
+                load(options: any): void;
+
+                getProperties(
+                    dbId: number,
+                    successCallback?: (r: PropertyResult) => void,
+                    errorCallback?: (err: any) => void,
+                ): void;
+                getProperties2(
+                    dbIds: number[],
+                    successCallback?: (r: PropertyResult) => void,
+                    errorCallback?: (err: any) => void,
+                    options?: { needExternalId: boolean },
+                ): void;
+                getBulkProperties(
+                    dbIds: number[],
+                    options?: {
+                        propFilter?: string[] | undefined;
+                        ignoreHidden?: boolean | undefined;
+                    },
+                    successCallback?: (r: PropertyResult[]) => void,
+                    errorCallback?: (err: any) => void,
+                    ignoreHidden?: boolean,
+                ): void;
+                getBulkProperties2(
+                    dbIds: number[],
+                    options?: {
+                        propFilter?: string[] | undefined;
+                        categoryFilter?: string[] | undefined;
+                        ignoreHidden?: boolean | undefined;
+                        needExternalId?: boolean | undefined;
+                    },
+                    successCallback?: (r: PropertyResult[]) => void,
+                    errorCallback?: (s: any, m: any, d: any) => void,
+                ): void;
+                getPropertySet(
+                    dbIds: number[],
+                    options: {
+                        propFilter?: string[] | undefined;
+                        ignoreHidden?: boolean | undefined;
+                        needsExternalId?: boolean | undefined;
+                    },
+                ): void;
+                executeUserFunction(userFunc: (pdb: any, ...args: any[]) => any, args?: any): Promise<any>;
+                getLoadProgress(): number;
+                isLoadDone(): boolean;
+            }
+
             interface GeometryList {
                 disableStreaming: boolean;
                 geomBoxes: Float32Array;

diff --git a/types/forge-viewer/package.json b/types/forge-viewer/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@types/forge-viewer",
-    "version": "7.69.9999",
+    "version": "7.89.9999",
     "nonNpm": true,
     "nonNpmDescription": "Forge Viewer",
     "projects": [
@@ -15,6 +15,10 @@
             "name": "Autodesk Forge Partner Development",
             "githubUsername": "Autodesk-Forge"
         },
+        {
+            "name": "Autodesk Developer Advocacy and Support",
+            "githubUsername": "autodesk-platform-services"
+        },
         {
             "name": "Alan Smith",
             "githubUsername": "alansmithnbs"
@@ -27,6 +31,10 @@
             "name": "Petr Broz",
             "githubUsername": "petrbroz"
         },
+        {
+            "name": "Eason Kang",
+            "githubUsername": "yiskang"
+        },
         {
             "name": "Cyrille Fauvel",
             "githubUsername": "cyrillef"

diff --git a/types/forge-viewer/tsconfig.json b/types/forge-viewer/tsconfig.json
@@ -3,7 +3,8 @@
         "module": "node16",
         "lib": [
             "es6",
-            "dom"
+            "dom",
+            "ES2020.String"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,