@inweb/viewer-visualize 27.5.0 → 27.6.0

package/lib/Viewer/Draggers/OdaLineDragger.d.ts

@@ -3,7 +3,6 @@ import { OdBaseDragger } from "./Common/OdBaseDragger";
 export declare const MARKUP_ENTITY_LINE = "$MarkupTempEntity_Line";
 export declare class OdaLineDragger extends OdBaseDragger {
     protected entity: any;
-    protected points: any[];
     protected drawPoints: any[];
     constructor(subject: Viewer);
     dispose(): void;

package/lib/Viewer/Markup/Visualize/VisualizeMarkup.d.ts

@@ -9,7 +9,7 @@ export declare class VisualizeMarkup implements IMarkup {
         b: number;
     };
     lineWidth: number;
-    lineType: "solid";
+    lineType: string;
     fontSize: number;
     initialize(container: HTMLElement, containerEvents: string[], viewer?: IEventEmitter, worldTransformer?: IWorldTransform): void;
     dispose(): void;

package/lib/Viewer/Viewer.d.ts

@@ -232,7 +232,7 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     activeDragger(): IDragger | null;
     setActiveDragger(name?: string): IDragger | null;
     resetActiveDragger(): void;
-    getComponent(name: string): IComponent;
+    getComponent(name: string): IComponent | null;
     drawViewpoint(viewpoint: IViewpoint): void;
     createViewpoint(): IViewpoint;
     getSnapshot(type?: string, quality?: number): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "27.5.0",
+  "version": "27.6.0",
   "description": "JavaScript library for rendering CAD and BIM files in a browser using VisualizeJS",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -29,10 +29,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~27.5.0",
-    "@inweb/eventemitter2": "~27.5.0",
-    "@inweb/markup": "~27.5.0",
-    "@inweb/viewer-core": "~27.5.0"
+    "@inweb/client": "~27.6.0",
+    "@inweb/eventemitter2": "~27.6.0",
+    "@inweb/markup": "~27.6.0",
+    "@inweb/viewer-core": "~27.6.0"
   },
   "visualizeJS": "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/master/Visualize.js"
 }

package/src/Viewer/Commands/SetSelected2.ts

@@ -24,7 +24,7 @@
 import { Viewer } from "../Viewer";
 
 export function setSelected2(viewer: Viewer, handles2: string[] = []): void {
-  const handles = [];
+  const handles: string[] = [];
 
   handles2.forEach((handle) => {
     if (!handle.includes(":")) {

package/src/Viewer/Components/CanvasRemoveComponent.ts

@@ -36,7 +36,6 @@ export class CanvasRemoveComponent implements IComponent {
 
   dispose() {
     this.mutationObserver.disconnect();
-    this.mutationObserver = undefined;
   }
 
   cleanupViewer = (mutations: MutationRecord[]) => {

package/src/Viewer/Components/GestureManagerComponent.ts

@@ -34,6 +34,5 @@ export class GestureManagerComponent implements IComponent {
 
   dispose() {
     this.gestureManager.dispose();
-    this.gestureManager = undefined;
   }
 }

package/src/Viewer/Components/ZoomWheelComponent.ts

@@ -35,6 +35,5 @@ export class ZoomWheelComponent implements IComponent {
 
   dispose() {
     this.zoomWheelDragger.dispose();
-    this.zoomWheelDragger = undefined;
   }
 }

package/src/Viewer/Draggers/Common/OdBaseDragger.ts

@@ -37,7 +37,7 @@ export class OdBaseDragger extends OdaGeAction {
   protected isDragging: boolean;
   protected press: boolean;
 
-  public name: string;
+  public name = "";
 
   constructor(subject: Viewer) {
     super(subject.visualizeJs);
@@ -45,6 +45,8 @@ export class OdBaseDragger extends OdaGeAction {
     this.needInputText = false;
     this.mouseDownPosition = { x: 0, y: 0 };
     this.autoSelect = false;
+    this.isDragging = false;
+    this.press = false;
 
     this.pointerdown = this.pointerdown.bind(this);
     this.pointerup = this.pointerup.bind(this);

package/src/Viewer/Draggers/MeasureLineDragger/MeasureUtils.ts

@@ -142,8 +142,8 @@ export function getDataForDrawLineWithFixed(p1: Point2d, p2: Point2d, width: num
   checkSegmentsIntersect(p1, p2, pLB, pRB, intersects);
   checkSegmentsIntersect(p1, p2, pRB, pRU, intersects);
 
-  let fixedP1: Point2d = null;
-  let fixedP2: Point2d = null;
+  let fixedP1: Point2d | null = null;
+  let fixedP2: Point2d | null = null;
 
   if (intersects.length === 0) {
     fixedP1 = p1;

package/src/Viewer/Draggers/OdaLineDragger.ts

@@ -27,24 +27,23 @@ export const MARKUP_ENTITY_LINE = "$MarkupTempEntity_Line";
 
 export class OdaLineDragger extends OdBaseDragger {
   protected entity: any;
-  protected points: any[];
   protected drawPoints: any[];
 
   constructor(subject: Viewer) {
     super(subject);
     this.press = false;
+    this.drawPoints = [];
   }
 
   override dispose(): void {
     super.dispose();
     this.end();
-    this.points = null;
-    this.drawPoints = null;
+    this.drawPoints.length = 0;
   }
 
   override start(x: number, y: number): void {
     const point = this.getViewer().screenToWorld(x, y);
-    this.drawPoints = [point[0], point[1], point[2]];
+    this.drawPoints.push(point[0], point[1], point[2]);
   }
 
   override drag(x: number, y: number): void {
@@ -58,7 +57,7 @@ export class OdaLineDragger extends OdBaseDragger {
   override end(): void {
     if (this.entity) {
       this.entity.delete();
-      this.drawPoints = null;
+      this.drawPoints.length = 0;
       this.entity = null;
     }
   }

package/src/Viewer/Loaders/FileLoader.ts

@@ -24,12 +24,11 @@
 export class FileLoader {
   private requestHeader: HeadersInit;
   private withCredentials: boolean;
-  private abortSignal: AbortSignal;
+  private abortSignal: AbortSignal | undefined;
 
   constructor() {
     this.requestHeader = {};
     this.withCredentials = false;
-    this.abortSignal = undefined;
   }
 
   setRequestHeader(requestHeader: HeadersInit) {
@@ -56,13 +55,16 @@ export class FileLoader {
         .then((response) => {
           if (!response.ok) throw new Error(`Failed to fetch "${response.url}", status ${response.status}`);
 
+          const body = response.body;
+          if (!body) return response;
+
           const contentLength = response.headers.get("X-File-Size") || response.headers.get("Content-Length");
           const total = parseInt(contentLength || "", 10) || 0;
           const lengthComputable = total > 0;
 
           const stream = new ReadableStream({
             async start(controller) {
-              const reader = response.body.getReader();
+              const reader = body.getReader();
               let loaded = 0;
               try {
                 while (true) {
@@ -91,7 +93,7 @@ export class FileLoader {
         const reader = new FileReader();
         reader.onload = () => resolve(reader.result as any);
         reader.onerror = () => reject(reader.error);
-        reader.onprogress = onProgress;
+        reader.onprogress = onProgress || null;
         reader.readAsArrayBuffer(new Blob([file]));
       });
     }

package/src/Viewer/Loaders/VSFFileLoader.ts

@@ -34,7 +34,7 @@ export class VSFFileLoader extends Loader {
     this.viewer = viewer;
   }
 
-  override isSupport(file: any, format?: string): boolean {
+  override isSupport(file: any, format = ""): boolean {
     return (
       (typeof file === "string" || file instanceof globalThis.File || file instanceof ArrayBuffer) &&
       /vsf$/i.test(format)

package/src/Viewer/Loaders/VSFXCloudPartialLoader.ts

@@ -52,6 +52,8 @@ export class VSFXCloudPartialLoader extends Loader {
   override async load(model: any): Promise<this> {
     if (!this.viewer.visualizeJs) return this;
 
+    type Range = { requestId: number; begin: number; end: number };
+
     const visViewer = this.viewer.visViewer();
     visViewer.memoryLimit = this.viewer.options.memoryLimit;
 
@@ -94,7 +96,7 @@ export class VSFXCloudPartialLoader extends Loader {
       }
     };
 
-    const downloadResourceRange = async (dataId: string, requestId: number, ranges: any) => {
+    const downloadResourceRange = async (dataId: string, requestId: number, ranges: Range[]) => {
       const abortCtrl = new AbortController();
       this.abortControllerForRequestMap.set(requestId, abortCtrl);
       try {
@@ -107,8 +109,8 @@ export class VSFXCloudPartialLoader extends Loader {
       }
     };
 
-    const requestRecordsToRanges = (requestId: number, records: any): any => {
-      const ranges = [];
+    const requestRecordsToRanges = (requestId: number, records: any): Range[] => {
+      const ranges: Range[] = [];
       for (let i = 0; i < records.size(); i++) {
         const record = records.get(i);
         ranges.push({
@@ -151,7 +153,7 @@ export class VSFXCloudPartialLoader extends Loader {
         const dataId = `${model.fileId}${model.file.type}`;
         const ranges = requestRecordsToRanges(requestId, records);
 
-        let pendingRanges = [];
+        let pendingRanges: Range[] = [];
         let requestNumber = 0;
         const pendingRequest = pendingRequestsMap.get(dataId);
         if (pendingRequest) {

package/src/Viewer/Loaders/VSFXFileLoader.ts

@@ -34,7 +34,7 @@ export class VSFXFileLoader extends Loader {
     this.viewer = viewer;
   }
 
-  override isSupport(file: any, format?: string): boolean {
+  override isSupport(file: any, format = ""): boolean {
     return (
       (typeof file === "string" || file instanceof globalThis.File || file instanceof ArrayBuffer) &&
       /vsfx$/i.test(format)

package/src/Viewer/Markup/Visualize/VisualizeMarkup.ts

@@ -33,7 +33,7 @@ export class VisualizeMarkup implements IMarkup {
   protected _markupColor = { r: 255, g: 0, b: 0 };
 
   public lineWidth = 4;
-  public lineType: "solid";
+  public lineType = "solid";
   public fontSize = 34;
 
   initialize(

package/src/Viewer/Models/ModelImpl.ts

@@ -26,7 +26,7 @@ import { IModelImpl } from "./IModelImpl";
 // Basic model implementation.
 
 export class ModelImpl implements IModelImpl {
-  public id: string;
+  public id = "";
 
   dispose(): void {}
 }

package/src/Viewer/Viewer.ts

@@ -127,6 +127,7 @@ export class Viewer
     this.canvasEvents = CANVAS_EVENTS.slice();
     this.canvaseventlistener = (event: Event) => this.emit(event);
 
+    this._visualizeTimestamp = 0;
     this._activeDragger = null;
     this._components = [];
 
@@ -274,7 +275,8 @@ export class Viewer
     this._markup.initialize(this.canvas, this.canvasEvents, this, this);
 
     for (const name of components.getComponents().keys()) {
-      this._components.push(components.createComponent(name, this));
+      const component = components.createComponent(name, this);
+      if (component) this._components.push(component);
     }
 
     this.syncOptions();
@@ -300,10 +302,7 @@ export class Viewer
     this._components.forEach((component: IComponent) => component.dispose());
     this._components.length = 0;
 
-    if (this._markup) {
-      this._markup.dispose();
-      this._markup = undefined;
-    }
+    this._markup.dispose();
 
     if (this.canvas) {
       this.canvasEvents.forEach((x) => this.canvas.removeEventListener(x, this.canvaseventlistener));
@@ -313,7 +312,7 @@ export class Viewer
     if (this._viewer) this._viewer.clear();
 
     this._visualizeJs = undefined;
-    this._visualizeTimestamp = undefined;
+    this._visualizeTimestamp = 0;
     this._viewer = undefined;
 
     return this;
@@ -884,8 +883,8 @@ export class Viewer
 
   setActiveDragger(name = ""): IDragger | null {
     if (!this._activeDragger || this._activeDragger.name !== name) {
-      const oldDragger = this._activeDragger;
-      let newDragger = null;
+      const oldDragger: IDragger | null = this._activeDragger;
+      let newDragger: IDragger | null = null;
 
       if (this._activeDragger) {
         this._activeDragger.dispose();
@@ -915,8 +914,8 @@ export class Viewer
     }
   }
 
-  getComponent(name: string): IComponent {
-    return this._components.find((component) => component.name === name);
+  getComponent(name: string): IComponent | null {
+    return this._components.find((component) => component.name === name) || null;
   }
 
   drawViewpoint(viewpoint: IViewpoint): void {
@@ -929,7 +928,7 @@ export class Viewer
       return [point3d.x, point3d.y, point3d.z];
     };
 
-    const setOrthogonalCamera = (orthogonal_camera: IOrthogonalCamera) => {
+    const setOrthogonalCamera = (orthogonal_camera?: IOrthogonalCamera) => {
       if (orthogonal_camera) {
         activeView.setView(
           getPoint3dAsArray(orthogonal_camera.view_point),
@@ -945,7 +944,7 @@ export class Viewer
       }
     };
 
-    const setPerspectiveCamera = (perspective_camera: IPerspectiveCamera) => {
+    const setPerspectiveCamera = (perspective_camera?: IPerspectiveCamera) => {
       if (perspective_camera) {
         // ===================== AI-CODE-START ======================
         // Source: Claude Sonnet 4.5
@@ -984,7 +983,7 @@ export class Viewer
       }
     };
 
-    const setClippingPlanes = (clipping_planes: IClippingPlane[]) => {
+    const setClippingPlanes = (clipping_planes?: IClippingPlane[]) => {
       if (clipping_planes) {
         for (const clipping_plane of clipping_planes) {
           const cuttingPlane = new (this.visLib().OdTvPlane)();
@@ -1035,7 +1034,7 @@ export class Viewer
       return { x: array[0], y: array[1], z: array[2] };
     };
 
-    const getOrthogonalCamera = (): IOrthogonalCamera => {
+    const getOrthogonalCamera = (): IOrthogonalCamera | undefined => {
       if (!activeView.perspective)
         return {
           view_point: getPoint3dFromArray(activeView.viewPosition),
@@ -1048,7 +1047,7 @@ export class Viewer
       else return undefined;
     };
 
-    const getPerspectiveCamera = (): IPerspectiveCamera => {
+    const getPerspectiveCamera = (): IPerspectiveCamera | undefined => {
       if (activeView.perspective) {
         // ===================== AI-CODE-START ======================
         // Source: Claude Sonnet 4.5
@@ -1080,7 +1079,7 @@ export class Viewer
     };
 
     const getClippingPlanes = (): IClippingPlane[] => {
-      const clipping_planes = [];
+      const clipping_planes: IClippingPlane[] = [];
       for (let i = 0; i < activeView.numCuttingPlanes(); i++) {
         const cuttingPlane = activeView.getCuttingPlane(i);
 

package/src/Viewer/utils.ts

@@ -30,7 +30,7 @@ export function loadScript(url: string, params: LoadParams = {}): Promise<HTMLSc
     const script = document.createElement("script");
     script.src = url;
     script.async = true;
-    script.crossOrigin = params.crossOrigin;
+    script.crossOrigin = params.crossOrigin || null;
     script.onload = () => resolve(script);
     script.onerror = () => {
       script.remove();