Ensure unique method names when mixing and extensions are the same name.

nojaf · nojaf · commit 72b808d87c34 · 2024-11-08T09:49:15.000+01:00
diff --git a/src/CanvasAPI/OffscreenCanvas.res b/src/CanvasAPI/OffscreenCanvas.res
@@ -129,7 +129,7 @@ Returns null if the canvas has already been initialized with another context typ
 external getContext: (
   offscreenCanvas,
   ~contextId: offscreenRenderingContextId,
-  ~options: any=?,
+  ~options: JSON.t=?,
 ) => offscreenRenderingContext = "getContext"
 
 /**
diff --git a/src/ChannelMessagingAPI/MessagePort.res b/src/ChannelMessagingAPI/MessagePort.res
@@ -116,7 +116,7 @@ Throws a "DataCloneError" DOMException if transfer contains duplicate objects or
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/MessagePort/postMessage)
 */
 @send
-external postMessage: (messagePort, ~message: any, ~transfer: array<Dict.t<string>>) => unit =
+external postMessage: (messagePort, ~message: JSON.t, ~transfer: array<Dict.t<string>>) => unit =
   "postMessage"
 
 /**
@@ -128,7 +128,7 @@ Throws a "DataCloneError" DOMException if transfer contains duplicate objects or
 @send
 external postMessage2: (
   messagePort,
-  ~message: any,
+  ~message: JSON.t,
   ~options: structuredSerializeOptions=?,
 ) => unit = "postMessage"
 
diff --git a/src/DOMAPI.res b/src/DOMAPI.res
@@ -6003,7 +6003,7 @@ and window = {
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Window/opener)
     */
-  mutable opener: any,
+  mutable opener: JSON.t,
   /**
     Refers to either the parent WindowProxy, or itself.
 
diff --git a/src/DOMAPI/DOMMatrix.res b/src/DOMAPI/DOMMatrix.res
@@ -100,13 +100,13 @@ external toFloat64Array: domMatrix => float64Array = "toFloat64Array"
 external toJSON: domMatrix => Dict.t<string> = "toJSON"
 
 @scope("DOMMatrix")
-external fromMatrix: (~other: domMatrixInit=?) => domMatrix = "fromMatrix"
+external fromMatrixD: (~other: domMatrixInit=?) => domMatrix = "fromMatrix"
 
 @scope("DOMMatrix")
-external fromFloat32Array: array<float> => domMatrix = "fromFloat32Array"
+external fromFloat32ArrayD: array<float> => domMatrix = "fromFloat32Array"
 
 @scope("DOMMatrix")
-external fromFloat64Array: float64Array => domMatrix = "fromFloat64Array"
+external fromFloat64ArrayD: float64Array => domMatrix = "fromFloat64Array"
 
 @send
 external multiplySelf: (domMatrix, ~other: domMatrixInit=?) => domMatrix = "multiplySelf"
diff --git a/src/DOMAPI/DOMPoint.res b/src/DOMAPI/DOMPoint.res
@@ -25,4 +25,4 @@ external toJSON: domPoint => Dict.t<string> = "toJSON"
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/DOMPoint/fromPoint_static)
 */
 @scope("DOMPoint")
-external fromPoint: (~other: domPointInit=?) => domPoint = "fromPoint"
+external fromPointD: (~other: domPointInit=?) => domPoint = "fromPoint"
diff --git a/src/DOMAPI/DOMRect.res b/src/DOMAPI/DOMRect.res
@@ -19,4 +19,4 @@ external toJSON: domRect => Dict.t<string> = "toJSON"
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/DOMRect/fromRect_static)
 */
 @scope("DOMRect")
-external fromRect: (~other: domRectInit=?) => domRect = "fromRect"
+external fromRectD: (~other: domRectInit=?) => domRect = "fromRect"
diff --git a/src/DOMAPI/HTMLCanvasElement.res b/src/DOMAPI/HTMLCanvasElement.res
@@ -730,16 +730,20 @@ Returns an object that provides methods and properties for drawing and manipulat
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLCanvasElement/getContext)
 */
 @send
-external getContext: (htmlCanvasElement, ~contextId: string, ~options: any=?) => renderingContext =
-  "getContext"
+external getContext: (
+  htmlCanvasElement,
+  ~contextId: string,
+  ~options: JSON.t=?,
+) => renderingContext = "getContext"
 
 /**
 Returns the content of the current canvas as an image that you can use as a source for another canvas or an HTML element.
 @param type The standard MIME type for the image format to return. If you do not specify this parameter, the default value is a PNG format image.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLCanvasElement/toDataURL)
 */
 @send
-external toDataURL: (htmlCanvasElement, ~type_: string=?, ~quality: any=?) => string = "toDataURL"
+external toDataURL: (htmlCanvasElement, ~type_: string=?, ~quality: JSON.t=?) => string =
+  "toDataURL"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLCanvasElement/toBlob)
@@ -749,7 +753,7 @@ external toBlob: (
   htmlCanvasElement,
   ~callback: blobCallback,
   ~type_: string=?,
-  ~quality: any=?,
+  ~quality: JSON.t=?,
 ) => unit = "toBlob"
 
 /**
diff --git a/src/DOMAPI/HTMLCollectionOf.re.js b/src/DOMAPI/HTMLCollectionOf.re.js
diff --git a/src/DOMAPI/HTMLSelectElement.res b/src/DOMAPI/HTMLSelectElement.res
@@ -754,15 +754,15 @@ Removes an element from the collection.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLSelectElement/remove)
 */
 @send
-external remove: htmlSelectElement => unit = "remove"
+external removeH: htmlSelectElement => unit = "remove"
 
 /**
 Removes an element from the collection.
 @param index Number that specifies the zero-based index of the element to remove from the collection.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLSelectElement/remove)
 */
 @send
-external remove2: (htmlSelectElement, int) => unit = "remove"
+external removeH2: (htmlSelectElement, int) => unit = "remove"
 
 /**
 Returns whether a form will validate when it is submitted, without having to submit it.
diff --git a/src/DOMAPI/Window.res b/src/DOMAPI/Window.res
@@ -10,7 +10,7 @@ open EventAPI
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Window/reportError)
 */
 @send
-external reportError: (window, any) => unit = "reportError"
+external reportError: (window, JSON.t) => unit = "reportError"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Window/btoa)
@@ -28,14 +28,14 @@ external atob: (window, string) => string = "atob"
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Window/setTimeout)
 */
 @send
-external setTimeout: (window, ~handler: string, ~timeout: int=?, ~arguments: any) => int =
+external setTimeout: (window, ~handler: string, ~timeout: int=?, ~arguments: JSON.t) => int =
   "setTimeout"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Window/setTimeout)
 */
 @send
-external setTimeout2: (window, ~handler: unit => unit, ~timeout: int=?, ~arguments: any) => int =
+external setTimeout2: (window, ~handler: unit => unit, ~timeout: int=?, ~arguments: JSON.t) => int =
   "setTimeout"
 
 /**
@@ -48,15 +48,19 @@ external clearTimeout: (window, int) => unit = "clearTimeout"
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Window/setInterval)
 */
 @send
-external setInterval: (window, ~handler: string, ~timeout: int=?, ~arguments: any) => int =
+external setInterval: (window, ~handler: string, ~timeout: int=?, ~arguments: JSON.t) => int =
   "setInterval"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Window/setInterval)
 */
 @send
-external setInterval2: (window, ~handler: unit => unit, ~timeout: int=?, ~arguments: any) => int =
-  "setInterval"
+external setInterval2: (
+  window,
+  ~handler: unit => unit,
+  ~timeout: int=?,
+  ~arguments: JSON.t,
+) => int = "setInterval"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Window/clearInterval)
@@ -491,7 +495,7 @@ Throws a "DataCloneError" DOMException if transfer array contains duplicate obje
 @send
 external postMessage: (
   window,
-  ~message: any,
+  ~message: JSON.t,
   ~targetOrigin: string,
   ~transfer: array<Dict.t<string>>=?,
 ) => unit = "postMessage"
@@ -509,7 +513,7 @@ Throws a "DataCloneError" DOMException if transfer array contains duplicate obje
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Window/postMessage)
 */
 @send
-external postMessage2: (window, ~message: any, ~options: windowPostMessageOptions=?) => unit =
+external postMessage2: (window, ~message: JSON.t, ~options: windowPostMessageOptions=?) => unit =
   "postMessage"
 
 /**
diff --git a/src/EventAPI.res b/src/EventAPI.res
@@ -196,7 +196,7 @@ and abortSignal = {
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AbortSignal/reason)
     */
-  reason: any,
+  reason: JSON.t,
 }
 
 type eventListenerOptions = {mutable capture?: bool}
diff --git a/src/EventAPI/AbortController.res b/src/EventAPI/AbortController.res
@@ -12,4 +12,4 @@ Invoking this method will set this object's AbortSignal's aborted flag and signa
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AbortController/abort)
 */
 @send
-external abort: (abortController, ~reason: any=?) => unit = "abort"
+external abort: (abortController, ~reason: JSON.t=?) => unit = "abort"
diff --git a/src/EventAPI/AbortSignal.res b/src/EventAPI/AbortSignal.res
@@ -112,7 +112,7 @@ external dispatchEvent: (abortSignal, event) => bool = "dispatchEvent"
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AbortSignal/abort_static)
 */
 @scope("AbortSignal")
-external abort: (~reason: any=?) => abortSignal = "abort"
+external abort: (~reason: JSON.t=?) => abortSignal = "abort"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/AbortSignal/timeout_static)
diff --git a/src/FetchAPI/Request.res b/src/FetchAPI/Request.res
@@ -42,7 +42,7 @@ external formData: request => Promise.t<formData> = "formData"
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Request/json)
 */
 @send
-external json: request => Promise.t<any> = "json"
+external json: request => Promise.t<JSON.t> = "json"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Request/text)
diff --git a/src/FetchAPI/Response.res b/src/FetchAPI/Response.res
@@ -72,7 +72,7 @@ external formData: response => Promise.t<formData> = "formData"
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Request/json)
 */
 @send
-external json: response => Promise.t<any> = "json"
+external json: response => Promise.t<JSON.t> = "json"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Request/text)
@@ -96,7 +96,7 @@ external redirect: (~url: string, ~status: int=?) => response = "redirect"
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response/json_static)
 */
 @scope("Response")
-external json: (~data: any, ~init: responseInit=?) => response = "json"
+external jsonR: (~data: JSON.t, ~init: responseInit=?) => response = "json"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response/clone)
diff --git a/src/FileAPI.res b/src/FileAPI.res
@@ -139,7 +139,7 @@ type writableStreamDefaultWriter<'t> = any
 
 type fileSystemWriteChunkType = any
 
-type underlyingSourceCancelCallback = any => Promise.t<unit>
+type underlyingSourceCancelCallback = JSON.t => Promise.t<unit>
 
 type blobPropertyBag = {
   @as("type") mutable type_?: string,
diff --git a/src/FileAPI/FileSystemWritableFileStream.res b/src/FileAPI/FileSystemWritableFileStream.res
@@ -5,7 +5,7 @@ open FileAPI
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/WritableStream/abort)
 */
 @send
-external abort: (fileSystemWritableFileStream, ~reason: any=?) => Promise.t<unit> = "abort"
+external abort: (fileSystemWritableFileStream, ~reason: JSON.t=?) => Promise.t<unit> = "abort"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/WritableStream/close)
diff --git a/src/FileAPI/ReadableStream.res b/src/FileAPI/ReadableStream.res
@@ -23,7 +23,7 @@ external make3: unit => unknown = "ReadableStream"
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/ReadableStream/cancel)
 */
 @send
-external cancel: (readableStream<'r>, ~reason: any=?) => Promise.t<unit> = "cancel"
+external cancel: (readableStream<'r>, ~reason: JSON.t=?) => Promise.t<unit> = "cancel"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/ReadableStream/getReader)
diff --git a/src/FileAPI/WritableStream.res b/src/FileAPI/WritableStream.res
@@ -14,7 +14,7 @@ external make: (
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/WritableStream/abort)
 */
 @send
-external abort: (writableStream<'w>, ~reason: any=?) => Promise.t<unit> = "abort"
+external abort: (writableStream<'w>, ~reason: JSON.t=?) => Promise.t<unit> = "abort"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/WritableStream/close)
diff --git a/src/FileAPI/WritableStreamDefaultController.res b/src/FileAPI/WritableStreamDefaultController.res
@@ -5,4 +5,4 @@ open FileAPI
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultController/error)
 */
 @send
-external error: (writableStreamDefaultController, ~e: any=?) => unit = "error"
+external error: (writableStreamDefaultController, ~e: JSON.t=?) => unit = "error"
diff --git a/src/HistoryAPI.res b/src/HistoryAPI.res
@@ -22,5 +22,5 @@ type history = {
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/History/state)
     */
-  state: any,
+  state: JSON.t,
 }
diff --git a/src/HistoryAPI/History.res b/src/HistoryAPI/History.res
@@ -23,11 +23,11 @@ external forward: history => unit = "forward"
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/History/pushState)
 */
 @send
-external pushState: (history, ~data: any, ~unused: string, ~url: string=?) => unit = "pushState"
+external pushState: (history, ~data: JSON.t, ~unused: string, ~url: string=?) => unit = "pushState"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/History/replaceState)
 */
 @send
-external replaceState: (history, ~data: any, ~unused: string, ~url: string=?) => unit =
+external replaceState: (history, ~data: JSON.t, ~unused: string, ~url: string=?) => unit =
   "replaceState"
diff --git a/src/IndexedDBAPI/IDBFactory.res b/src/IndexedDBAPI/IDBFactory.res
@@ -28,4 +28,4 @@ Throws a "DataError" DOMException if either input is not a valid key.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/IDBFactory/cmp)
 */
 @send
-external cmp: (idbFactory, ~first: any, ~second: any) => int = "cmp"
+external cmp: (idbFactory, ~first: JSON.t, ~second: JSON.t) => int = "cmp"
diff --git a/src/IndexedDBAPI/IDBIndex.res b/src/IndexedDBAPI/IDBIndex.res
@@ -8,7 +8,7 @@ If successful, request's result will be the value, or undefined if there was no
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/IDBIndex/get)
 */
 @send
-external get: (idbIndex, any) => idbRequest<any> = "get"
+external get: (idbIndex, any) => idbRequest<JSON.t> = "get"
 
 /**
 Retrieves the key of the first record matching the given key or key range in query.
@@ -26,7 +26,7 @@ If successful, request's result will be an Array of the values.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/IDBIndex/getAll)
 */
 @send
-external getAll: (idbIndex, ~query: any=?, ~count: int=?) => idbRequest<array<any>> = "getAll"
+external getAll: (idbIndex, ~query: any=?, ~count: int=?) => idbRequest<array<JSON.t>> = "getAll"
 
 /**
 Retrieves the keys of records matching the given key or key range in query (up to count if given).
diff --git a/src/IndexedDBAPI/IDBObjectStore.res b/src/IndexedDBAPI/IDBObjectStore.res
@@ -12,7 +12,8 @@ If successful, request's result will be the record's key.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/IDBObjectStore/put)
 */
 @send
-external put: (idbObjectStore, ~value: any, ~key: idbValidKey=?) => idbRequest<idbValidKey> = "put"
+external put: (idbObjectStore, ~value: JSON.t, ~key: idbValidKey=?) => idbRequest<idbValidKey> =
+  "put"
 
 /**
 Adds or updates a record in store with the given value and key.
@@ -25,7 +26,8 @@ If successful, request's result will be the record's key.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/IDBObjectStore/add)
 */
 @send
-external add: (idbObjectStore, ~value: any, ~key: idbValidKey=?) => idbRequest<idbValidKey> = "add"
+external add: (idbObjectStore, ~value: JSON.t, ~key: idbValidKey=?) => idbRequest<idbValidKey> =
+  "add"
 
 /**
 Deletes records in store with the given key or in the given key range in query.
@@ -52,7 +54,7 @@ If successful, request's result will be the value, or undefined if there was no
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/IDBObjectStore/get)
 */
 @send
-external get: (idbObjectStore, any) => idbRequest<any> = "get"
+external get: (idbObjectStore, any) => idbRequest<JSON.t> = "get"
 
 /**
 Retrieves the key of the first record matching the given key or key range in query.
@@ -70,7 +72,8 @@ If successful, request's result will be an Array of the values.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/IDBObjectStore/getAll)
 */
 @send
-external getAll: (idbObjectStore, ~query: any=?, ~count: int=?) => idbRequest<array<any>> = "getAll"
+external getAll: (idbObjectStore, ~query: any=?, ~count: int=?) => idbRequest<array<JSON.t>> =
+  "getAll"
 
 /**
 Retrieves the keys of records matching the given key or key range in query (up to count if given).
diff --git a/src/NotificationAPI.res b/src/NotificationAPI.res
@@ -62,7 +62,7 @@ type notification = {
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Notification/data)
     */
-  data: any,
+  data: JSON.t,
 }
 
 type notificationOptions = {
@@ -74,7 +74,7 @@ type notificationOptions = {
   mutable badge?: string,
   mutable silent?: Null.t<bool>,
   mutable requireInteraction?: bool,
-  mutable data?: any,
+  mutable data?: JSON.t,
 }
 
 type getNotificationOptions = {mutable tag?: string}
diff --git a/src/PerformanceAPI.res b/src/PerformanceAPI.res
diff --git a/src/ServiceWorkerAPI/ServiceWorker.res b/src/ServiceWorkerAPI/ServiceWorker.res
diff --git a/src/ViewTransitionsAPI.res b/src/ViewTransitionsAPI.res
diff --git a/src/WebAudioAPI/AudioBufferSourceNode.res b/src/WebAudioAPI/AudioBufferSourceNode.res
diff --git a/src/WebCryptoAPI/SubtleCrypto.res b/src/WebCryptoAPI/SubtleCrypto.res
diff --git a/src/WebLocksAPI.res b/src/WebLocksAPI.res
diff --git a/src/WebLocksAPI/LockManager.res b/src/WebLocksAPI/LockManager.res
diff --git a/tools/TypeScript-DOM-lib-generator/scratch.js b/tools/TypeScript-DOM-lib-generator/scratch.js
diff --git a/tools/TypeScript-DOM-lib-generator/src/build/emitter.ts b/tools/TypeScript-DOM-lib-generator/src/build/emitter.ts
