diff --git a/bin/haxerenderer.py b/bin/haxerenderer.py index d77001c..88d6edf 100644 --- a/bin/haxerenderer.py +++ b/bin/haxerenderer.py @@ -129,36 +129,66 @@ "VideoElement": "video", } -# Web Audio classes (by grepping for WEB_AUDIO in the IDL database) -audio_classes = [ - "AnalyserNode", - "AudioBuffer", - "AudioBufferCallback", - "AudioBufferSourceNode", - "AudioContext", - "AudioDestinationNode", - "AudioGain", - "AudioListener", - "AudioNode", - "AudioParam", - "AudioProcessingEvent", - "AudioSourceNode", - "BiquadFilterNode", - "ChannelMergerNode", - "ChannelSplitterNode", - "ConvolverNode", - "DelayNode", - "DynamicsCompressorNode", - "GainNode", - "MediaElementAudioSourceNode", - "MediaStreamAudioSourceNode", - "OfflineAudioCompletionEvent", - "OscillatorNode", - "PannerNode", - "ScriptProcessorNode", - "WaveShaperNode", - "WaveTable", -] +packaged_classes = { + "audio": [ + # Web Audio classes (by grepping for WEB_AUDIO in the IDL database) + "AnalyserNode", + "AudioBuffer", + "AudioBufferCallback", + "AudioBufferSourceNode", + "AudioContext", + "AudioDestinationNode", + "AudioGain", + "AudioListener", + "AudioNode", + "AudioParam", + "AudioProcessingEvent", + "AudioSourceNode", + "BiquadFilterNode", + "ChannelMergerNode", + "ChannelSplitterNode", + "ConvolverNode", + "DelayNode", + "DynamicsCompressorNode", + "GainNode", + "MediaElementAudioSourceNode", + "MediaStreamAudioSourceNode", + "OfflineAudioCompletionEvent", + "OscillatorNode", + "PannerNode", + "ScriptProcessorNode", + "WaveShaperNode", + "WaveTable", + ], + "fs": [ + # FileSystem API classes (grep for FILE_SYSTEM) + # "DataTransferItem", + "DOMFileSystem", + "DOMFileSystemSync", + "DirectoryEntry", + "DirectoryEntrySync", + "DirectoryReader", + "DirectoryReaderSync", + "EntriesCallback", + "Entry", + "EntryArray", + "EntryArraySync", + "EntryCallback", + "EntrySync", + "ErrorCallback", + "FileCallback", + "FileEntry", + "FileEntrySync", + "FileError", + "FileException", + "FileSystemCallback", + "FileWriter", + "FileWriterCallback", + "FileWriterSync", + "Metadata", + "MetadataCallback", + ], +} # Merged class pairs merged_targets = { @@ -210,8 +240,11 @@ def to_haxe(id): id = id[len("IDB"):] path += ["idb"] - elif id in audio_classes: - path += ["audio"] + else: + for package, names in packaged_classes.iteritems(): + if id in names: + path += [package] + break path += [id] diff --git a/generated/js/html/DOMWindow.hx b/generated/js/html/DOMWindow.hx index 217ae8b..ef6af44 100644 --- a/generated/js/html/DOMWindow.hx +++ b/generated/js/html/DOMWindow.hx @@ -419,13 +419,13 @@ extern class DOMWindow extends EventTarget @:overload(function (callback_ :RequestAnimationFrameCallback) :Int {}) function requestAnimationFrame (callback_ :RequestAnimationFrameCallback) :Int; - function requestFileSystem (type :Int, size :Int, successCallback :FileSystemCallback, ?errorCallback :ErrorCallback) :Void; + function requestFileSystem (type :Int, size :Int, successCallback :js.html.fs.FileSystemCallback, ?errorCallback :js.html.fs.ErrorCallback) :Void; function resizeBy (x :Float, y :Float) :Void; function resizeTo (width :Float, height :Float) :Void; - function resolveLocalFileSystemURL (url :String, successCallback :EntryCallback, ?errorCallback :ErrorCallback) :Void; + function resolveLocalFileSystemURL (url :String, successCallback :js.html.fs.EntryCallback, ?errorCallback :js.html.fs.ErrorCallback) :Void; function scroll (x :Int, y :Int) :Void; diff --git a/generated/js/html/DataTransferItem.hx b/generated/js/html/DataTransferItem.hx index 15d13f3..6204ff7 100644 --- a/generated/js/html/DataTransferItem.hx +++ b/generated/js/html/DataTransferItem.hx @@ -30,7 +30,7 @@ extern class DataTransferItem var type (default,null) :String; - function getAsEntry () :Entry; + function getAsEntry () :js.html.fs.Entry; function getAsFile () :Blob; diff --git a/generated/js/html/FileReader.hx b/generated/js/html/FileReader.hx index 7e7fb19..a435072 100644 --- a/generated/js/html/FileReader.hx +++ b/generated/js/html/FileReader.hx @@ -46,7 +46,7 @@ extern class FileReader extends EventTarget static inline var LOADING :Int = 1; /** The error that occurred while reading the file. Read only. */ - var error (default,null) :FileError; + var error (default,null) :js.html.fs.FileError; /** Called when the read operation is aborted. */ var onabort :EventListener; diff --git a/generated/js/html/InputElement.hx b/generated/js/html/InputElement.hx index 3b2d2d4..930621e 100644 --- a/generated/js/html/InputElement.hx +++ b/generated/js/html/InputElement.hx @@ -75,7 +75,7 @@ extern class InputElement extends Element HTML attribute, indicating that the control is not available for interaction. */ var disabled :Bool; - var entries (default,null) :EntryArray; + var entries (default,null) :js.html.fs.EntryArray; /** A list of selected files. */ var files :FileList; diff --git a/generated/js/html/WorkerContext.hx b/generated/js/html/WorkerContext.hx index 805e590..dbb6615 100644 --- a/generated/js/html/WorkerContext.hx +++ b/generated/js/html/WorkerContext.hx @@ -54,13 +54,13 @@ extern class WorkerContext extends EventTarget function openDatabaseSync (name :String, version :String, displayName :String, estimatedSize :Int, ?creationCallback :DatabaseCallback) :DatabaseSync; - function requestFileSystem (type :Int, size :Int, ?successCallback :FileSystemCallback, ?errorCallback :ErrorCallback) :Void; + function requestFileSystem (type :Int, size :Int, ?successCallback :js.html.fs.FileSystemCallback, ?errorCallback :js.html.fs.ErrorCallback) :Void; - function requestFileSystemSync (type :Int, size :Int) :DOMFileSystemSync; + function requestFileSystemSync (type :Int, size :Int) :js.html.fs.DOMFileSystemSync; - function resolveLocalFileSystemSyncURL (url :String) :EntrySync; + function resolveLocalFileSystemSyncURL (url :String) :js.html.fs.EntrySync; - function resolveLocalFileSystemURL (url :String, successCallback :EntryCallback, ?errorCallback :ErrorCallback) :Void; + function resolveLocalFileSystemURL (url :String, successCallback :js.html.fs.EntryCallback, ?errorCallback :js.html.fs.ErrorCallback) :Void; function setInterval (handler :Void->Void, timeout :Int) :Int; diff --git a/generated/js/html/DOMFileSystem.hx b/generated/js/html/fs/DOMFileSystem.hx similarity index 98% rename from generated/js/html/DOMFileSystem.hx rename to generated/js/html/fs/DOMFileSystem.hx index 11fd310..36ccec7 100644 --- a/generated/js/html/DOMFileSystem.hx +++ b/generated/js/html/fs/DOMFileSystem.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; @:native("DOMFileSystem") extern class DOMFileSystem diff --git a/generated/js/html/DOMFileSystemSync.hx b/generated/js/html/fs/DOMFileSystemSync.hx similarity index 98% rename from generated/js/html/DOMFileSystemSync.hx rename to generated/js/html/fs/DOMFileSystemSync.hx index 3c17589..f206522 100644 --- a/generated/js/html/DOMFileSystemSync.hx +++ b/generated/js/html/fs/DOMFileSystemSync.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; @:native("DOMFileSystemSync") extern class DOMFileSystemSync diff --git a/generated/js/html/DirectoryEntry.hx b/generated/js/html/fs/DirectoryEntry.hx similarity index 93% rename from generated/js/html/DirectoryEntry.hx rename to generated/js/html/fs/DirectoryEntry.hx index 64a3666..f594880 100644 --- a/generated/js/html/DirectoryEntry.hx +++ b/generated/js/html/fs/DirectoryEntry.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; /**
DRAFT
This page is not complete.
@@ -36,6 +36,6 @@ extern class DirectoryEntry extends Entry function getFile (path :String, ?options :Dynamic, ?successCallback :EntryCallback, ?errorCallback :ErrorCallback) :Void; - function removeRecursively (successCallback :VoidCallback, ?errorCallback :ErrorCallback) :Void; + function removeRecursively (successCallback :js.html.VoidCallback, ?errorCallback :ErrorCallback) :Void; } diff --git a/generated/js/html/DirectoryEntrySync.hx b/generated/js/html/fs/DirectoryEntrySync.hx similarity index 98% rename from generated/js/html/DirectoryEntrySync.hx rename to generated/js/html/fs/DirectoryEntrySync.hx index 46fc407..63fdecd 100644 --- a/generated/js/html/DirectoryEntrySync.hx +++ b/generated/js/html/fs/DirectoryEntrySync.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; /**
DRAFT
This page is not complete.
diff --git a/generated/js/html/DirectoryReader.hx b/generated/js/html/fs/DirectoryReader.hx similarity index 98% rename from generated/js/html/DirectoryReader.hx rename to generated/js/html/fs/DirectoryReader.hx index 5226546..a1da456 100644 --- a/generated/js/html/DirectoryReader.hx +++ b/generated/js/html/fs/DirectoryReader.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; /**
`DRAFT
This page is not complete.
diff --git a/generated/js/html/DirectoryReaderSync.hx b/generated/js/html/fs/DirectoryReaderSync.hx similarity index 98% rename from generated/js/html/DirectoryReaderSync.hx rename to generated/js/html/fs/DirectoryReaderSync.hx index d518204..619c065 100644 --- a/generated/js/html/DirectoryReaderSync.hx +++ b/generated/js/html/fs/DirectoryReaderSync.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; /**
`DRAFT
This page is not complete.
diff --git a/generated/js/html/EntriesCallback.hx b/generated/js/html/fs/EntriesCallback.hx similarity index 94% rename from generated/js/html/EntriesCallback.hx rename to generated/js/html/fs/EntriesCallback.hx index 08beb97..94fcda6 100644 --- a/generated/js/html/EntriesCallback.hx +++ b/generated/js/html/fs/EntriesCallback.hx @@ -21,6 +21,6 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; typedef EntriesCallback = EntryArray -> Bool; \ No newline at end of file diff --git a/generated/js/html/Entry.hx b/generated/js/html/fs/Entry.hx similarity index 95% rename from generated/js/html/Entry.hx rename to generated/js/html/fs/Entry.hx index b8cb811..35d1d34 100644 --- a/generated/js/html/Entry.hx +++ b/generated/js/html/fs/Entry.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; /**
DRAFT
This page is not complete.
@@ -52,7 +52,7 @@ extern class Entry function moveTo (parent :DirectoryEntry, ?name :String, ?successCallback :EntryCallback, ?errorCallback :ErrorCallback) :Void; - function remove (successCallback :VoidCallback, ?errorCallback :ErrorCallback) :Void; + function remove (successCallback :js.html.VoidCallback, ?errorCallback :ErrorCallback) :Void; function toURL () :String; diff --git a/generated/js/html/EntryArray.hx b/generated/js/html/fs/EntryArray.hx similarity index 98% rename from generated/js/html/EntryArray.hx rename to generated/js/html/fs/EntryArray.hx index 582bf30..a6ac759 100644 --- a/generated/js/html/EntryArray.hx +++ b/generated/js/html/fs/EntryArray.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; @:native("EntryArray") extern class EntryArray implements ArrayAccess diff --git a/generated/js/html/EntryArraySync.hx b/generated/js/html/fs/EntryArraySync.hx similarity index 98% rename from generated/js/html/EntryArraySync.hx rename to generated/js/html/fs/EntryArraySync.hx index 37614c7..aee9b4d 100644 --- a/generated/js/html/EntryArraySync.hx +++ b/generated/js/html/fs/EntryArraySync.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; @:native("EntryArraySync") extern class EntryArraySync implements ArrayAccess diff --git a/generated/js/html/EntryCallback.hx b/generated/js/html/fs/EntryCallback.hx similarity index 95% rename from generated/js/html/EntryCallback.hx rename to generated/js/html/fs/EntryCallback.hx index 618cbf6..998dadd 100644 --- a/generated/js/html/EntryCallback.hx +++ b/generated/js/html/fs/EntryCallback.hx @@ -21,6 +21,6 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; typedef EntryCallback = Entry -> Bool; \ No newline at end of file diff --git a/generated/js/html/EntrySync.hx b/generated/js/html/fs/EntrySync.hx similarity index 99% rename from generated/js/html/EntrySync.hx rename to generated/js/html/fs/EntrySync.hx index f59d3e7..32aa896 100644 --- a/generated/js/html/EntrySync.hx +++ b/generated/js/html/fs/EntrySync.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; /**
DRAFT
This page is not complete.
diff --git a/generated/js/html/ErrorCallback.hx b/generated/js/html/fs/ErrorCallback.hx similarity index 94% rename from generated/js/html/ErrorCallback.hx rename to generated/js/html/fs/ErrorCallback.hx index ab36aa8..f32ffb1 100644 --- a/generated/js/html/ErrorCallback.hx +++ b/generated/js/html/fs/ErrorCallback.hx @@ -21,6 +21,6 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; typedef ErrorCallback = FileError -> Bool; \ No newline at end of file diff --git a/generated/js/html/FileCallback.hx b/generated/js/html/fs/FileCallback.hx similarity index 94% rename from generated/js/html/FileCallback.hx rename to generated/js/html/fs/FileCallback.hx index 0042af8..97d4d17 100644 --- a/generated/js/html/FileCallback.hx +++ b/generated/js/html/fs/FileCallback.hx @@ -21,6 +21,6 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; -typedef FileCallback = File -> Bool; \ No newline at end of file +typedef FileCallback = js.html.File -> Bool; \ No newline at end of file diff --git a/generated/js/html/FileEntry.hx b/generated/js/html/fs/FileEntry.hx similarity index 98% rename from generated/js/html/FileEntry.hx rename to generated/js/html/fs/FileEntry.hx index ea7688a..0d94d54 100644 --- a/generated/js/html/FileEntry.hx +++ b/generated/js/html/fs/FileEntry.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; /**
DRAFT
This page is not complete.
diff --git a/generated/js/html/FileEntrySync.hx b/generated/js/html/fs/FileEntrySync.hx similarity index 96% rename from generated/js/html/FileEntrySync.hx rename to generated/js/html/fs/FileEntrySync.hx index 0e15e96..55c6d47 100644 --- a/generated/js/html/FileEntrySync.hx +++ b/generated/js/html/fs/FileEntrySync.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; /**
DRAFT
This page is not complete.
@@ -32,6 +32,6 @@ extern class FileEntrySync extends EntrySync { function createWriter () :FileWriterSync; - function file () :File; + function file () :js.html.File; } diff --git a/generated/js/html/FileError.hx b/generated/js/html/fs/FileError.hx similarity index 99% rename from generated/js/html/FileError.hx rename to generated/js/html/fs/FileError.hx index b822189..21ea1bf 100644 --- a/generated/js/html/FileError.hx +++ b/generated/js/html/fs/FileError.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; /** Represents an error that occurs while using the FileReader interface.

diff --git a/generated/js/html/FileException.hx b/generated/js/html/fs/FileException.hx similarity index 99% rename from generated/js/html/FileException.hx rename to generated/js/html/fs/FileException.hx index bff65ec..f2da9be 100644 --- a/generated/js/html/FileException.hx +++ b/generated/js/html/fs/FileException.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; /** DRAFT
This page is not complete.


Documentation for this class was provided by MDN. */ diff --git a/generated/js/html/FileSystemCallback.hx b/generated/js/html/fs/FileSystemCallback.hx similarity index 94% rename from generated/js/html/FileSystemCallback.hx rename to generated/js/html/fs/FileSystemCallback.hx index af76295..71b92fd 100644 --- a/generated/js/html/FileSystemCallback.hx +++ b/generated/js/html/fs/FileSystemCallback.hx @@ -21,6 +21,6 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; typedef FileSystemCallback = DOMFileSystem -> Bool; \ No newline at end of file diff --git a/generated/js/html/FileWriter.hx b/generated/js/html/fs/FileWriter.hx similarity index 81% rename from generated/js/html/FileWriter.hx rename to generated/js/html/fs/FileWriter.hx index 736e5f3..7323539 100644 --- a/generated/js/html/FileWriter.hx +++ b/generated/js/html/fs/FileWriter.hx @@ -21,10 +21,10 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; @:native("FileWriter") -extern class FileWriter extends EventTarget +extern class FileWriter extends js.html.EventTarget { static inline var DONE :Int = 2; @@ -36,17 +36,17 @@ extern class FileWriter extends EventTarget var length (default,null) :Int; - var onabort :EventListener; + var onabort :js.html.EventListener; - var onerror :EventListener; + var onerror :js.html.EventListener; - var onprogress :EventListener; + var onprogress :js.html.EventListener; - var onwrite :EventListener; + var onwrite :js.html.EventListener; - var onwriteend :EventListener; + var onwriteend :js.html.EventListener; - var onwritestart :EventListener; + var onwritestart :js.html.EventListener; var position (default,null) :Int; @@ -58,6 +58,6 @@ extern class FileWriter extends EventTarget function truncate (size :Int) :Void; - function write (data :Blob) :Void; + function write (data :js.html.Blob) :Void; } diff --git a/generated/js/html/FileWriterCallback.hx b/generated/js/html/fs/FileWriterCallback.hx similarity index 94% rename from generated/js/html/FileWriterCallback.hx rename to generated/js/html/fs/FileWriterCallback.hx index 5b48548..801b416 100644 --- a/generated/js/html/FileWriterCallback.hx +++ b/generated/js/html/fs/FileWriterCallback.hx @@ -21,6 +21,6 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; typedef FileWriterCallback = FileWriter -> Bool; \ No newline at end of file diff --git a/generated/js/html/FileWriterSync.hx b/generated/js/html/fs/FileWriterSync.hx similarity index 95% rename from generated/js/html/FileWriterSync.hx rename to generated/js/html/fs/FileWriterSync.hx index 394bede..225ed12 100644 --- a/generated/js/html/FileWriterSync.hx +++ b/generated/js/html/fs/FileWriterSync.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; @:native("FileWriterSync") extern class FileWriterSync @@ -34,6 +34,6 @@ extern class FileWriterSync function truncate (size :Int) :Void; - function write (data :Blob) :Void; + function write (data :js.html.Blob) :Void; } diff --git a/generated/js/html/Metadata.hx b/generated/js/html/fs/Metadata.hx similarity index 98% rename from generated/js/html/Metadata.hx rename to generated/js/html/fs/Metadata.hx index f54f128..3365887 100644 --- a/generated/js/html/Metadata.hx +++ b/generated/js/html/fs/Metadata.hx @@ -21,7 +21,7 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; /** Metadata is structured data about data. Metadata which is included with SVG content should be specified within metadata elements. The contents of the metadata should be elements from other XML namespaces such as RDF, FOAF, etc.

Documentation for this class was provided by MDN. */ diff --git a/generated/js/html/MetadataCallback.hx b/generated/js/html/fs/MetadataCallback.hx similarity index 94% rename from generated/js/html/MetadataCallback.hx rename to generated/js/html/fs/MetadataCallback.hx index 343c77c..6090079 100644 --- a/generated/js/html/MetadataCallback.hx +++ b/generated/js/html/fs/MetadataCallback.hx @@ -21,6 +21,6 @@ */ // This file is generated, do not edit! -package js.html; +package js.html.fs; typedef MetadataCallback = Metadata -> Bool; \ No newline at end of file