[pull] master from DefinitelyTyped:master

types/rails__activestorage/index.d.ts

@@ -6,6 +6,7 @@ export class DirectUpload {
     id: number;
     file: File;
     url: string;
+    delegate?: DirectUploadDelegate;
 
     constructor(file: File, url: string, delegate?: DirectUploadDelegate, customHeaders?: Record<string, string>);
 

types/rails__activestorage/rails__activestorage-tests.ts

@@ -25,6 +25,8 @@ const d = new ActiveStorage.DirectUpload(
     customHeaders,
 );
 
+console.log(d.delegate);
+
 d.create((error: Error | null) => {
     if (error) {
         console.log(error.message);

types/three/examples/jsm/Addons.d.ts

@@ -116,7 +116,7 @@ export * from "./loaders/TGALoader.js";
 export * from "./loaders/TIFFLoader.js";
 export * from "./loaders/TTFLoader.js";
 export * from "./loaders/UltraHDRLoader.js";
-export * from "./loaders/USDZLoader.js";
+export * from "./loaders/USDLoader.js";
 export * from "./loaders/VOXLoader.js";
 export * from "./loaders/VRMLLoader.js";
 export * from "./loaders/VTKLoader.js";
@@ -145,7 +145,6 @@ export * from "./misc/MorphAnimMesh.js";
 export * from "./misc/MorphBlendMesh.js";
 export * from "./misc/ProgressiveLightMap.js";
 export * from "./misc/RollerCoaster.js";
-export * from "./misc/Timer.js";
 export * from "./misc/TubePainter.js";
 export * from "./misc/Volume.js";
 export * from "./misc/VolumeSlice.js";

types/three/examples/jsm/exporters/USDZExporter.d.ts

@@ -5,6 +5,7 @@ import * as WebGPUTextureUtils from "../utils/WebGPUTextureUtils.js";
 export interface USDZExporterOptions {
     ar?: { anchoring: { type: "plane" }; planeAnchoring: { alignment: "horizontal" | "vertical" | "any" } } | undefined;
     includeAnchoringProperties?: boolean | undefined;
+    onlyVisible?: boolean | undefined;
     quickLookCompatible?: boolean | undefined;
     maxTextureSize?: number | undefined;
 }

types/three/examples/jsm/loaders/EXRLoader.d.ts

@@ -1,4 +1,14 @@
-import { DataTextureLoader, LoadingManager, PixelFormat, TextureDataType } from "three";
+import {
+    DataTextureLoader,
+    FloatType,
+    HalfFloatType,
+    LoadingManager,
+    PixelFormat,
+    RedFormat,
+    RGBAFormat,
+    RGFormat,
+    TextureDataType,
+} from "three";
 
 export interface EXR {
     header: object;
@@ -7,13 +17,16 @@ export interface EXR {
     data: Float32Array | Uint16Array;
     format: PixelFormat;
     colorSpace: string;
-    type: TextureDataType;
+    type: typeof HalfFloatType | typeof FloatType;
 }
 
-export class EXRLoader extends DataTextureLoader {
-    constructor(manager?: LoadingManager);
+declare class EXRLoader extends DataTextureLoader {
     type: TextureDataType;
+    outputFormat: typeof RGBAFormat | typeof RGFormat | typeof RedFormat;
+
+    constructor(manager?: LoadingManager);
 
     parse(buffer: ArrayBuffer): EXR;
-    setDataType(type: TextureDataType): this;
+    setDataType(type: typeof HalfFloatType | typeof FloatType): this;
+    setOutputFormat(value: typeof RGBAFormat | typeof RGFormat | typeof RedFormat): this;
 }

types/three/examples/jsm/loaders/USDLoader.d.ts

@@ -0,0 +1,9 @@
+import { Group, Loader, LoadingManager } from "three";
+
+declare class USDLoader extends Loader<Group> {
+    constructor(manager?: LoadingManager);
+
+    parse(buffer: ArrayBuffer | string): Group;
+}
+
+export { USDLoader };

types/three/examples/jsm/loaders/USDZLoader.d.ts

@@ -1,11 +1,14 @@
-import { Group, Loader, LoadingManager, Mesh } from "three";
+import { LoadingManager } from "three";
+import { USDLoader } from "./USDLoader.js";
 
-export class USDAParser {
-    parse(text: string): object;
-}
-
-export class USDZLoader extends Loader<Mesh> {
+/**
+ * @deprecated USDZLoader has been deprecated. Please use USDLoader instead.
+ */
+declare class USDZLoader extends USDLoader {
+    /**
+     * @deprecated USDZLoader has been deprecated. Please use USDLoader instead.
+     */
     constructor(manager?: LoadingManager);
-
-    parse(buffer: ArrayBuffer | string): Group;
 }
+
+export { USDZLoader };

types/three/examples/jsm/tsl/display/TRAANode.d.ts

@@ -0,0 +1,22 @@
+import { ShaderNodeObject } from "three/tsl";
+import { Camera, Node, TempNode, TextureNode } from "three/webgpu";
+
+declare class TRAANode extends TempNode {
+    readonly isTRAANode: true;
+
+    beautyNode: TextureNode;
+    depthNode: TextureNode;
+    velocityNode: TextureNode;
+    camera: Camera;
+
+    constructor(beautyNode: TextureNode, depthNode: TextureNode, velocityNode: TextureNode, camera: Camera);
+}
+
+export default TRAANode;
+
+export const traa: (
+    beautyNode: Node,
+    depthNode: TextureNode,
+    velocityNode: TextureNode,
+    camera: Camera,
+) => ShaderNodeObject<TRAANode>;

types/three/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@types/three",
-    "version": "0.178.9999",
+    "version": "0.179.9999",
     "projects": [
         "https://threejs.org/"
     ],
@@ -26,7 +26,7 @@
         "@types/webxr": "*",
         "@webgpu/types": "*",
         "fflate": "~0.8.2",
-        "meshoptimizer": "~0.18.1"
+        "meshoptimizer": "~0.22.0"
     },
     "devDependencies": {
         "@types/three": "workspace:."

types/three/src/Three.Core.d.ts

@@ -39,6 +39,7 @@ export * from "./core/Object3D.js";
 export * from "./core/Raycaster.js";
 export * from "./core/RenderTarget.js";
 export * from "./core/RenderTarget3D.js";
+export * from "./core/Timer.js";
 export * from "./core/Uniform.js";
 export * from "./core/UniformsGroup.js";
 export * from "./extras/Controls.js";