Move FileSystem API classes to js.html.fs.

aduros · Dec 16, 2012 · 7b34fee · 7b34fee
1 parent 43ae3a9
commit 7b34fee
Show file tree

Hide file tree

Showing 30 changed files with 111 additions and 78 deletions.
diff --git 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
@@ -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
@@ -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
@@ -46,7 +46,7 @@ extern class FileReader extends EventTarget
     static inline var LOADING :Int = 1;
 
     /** The error that occurred while reading the file. <strong>Read only.</strong> */
-    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
@@ -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
@@ -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 → generated/js/html/fs/DOMFileSystem.hx b/generated/js/html/DOMFileSystem.hx → 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 → generated/js/html/fs/DOMFileSystemSync.hx b/generated/js/html/DOMFileSystemSync.hx → 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 → generated/js/html/fs/DirectoryEntry.hx b/generated/js/html/DirectoryEntry.hx → generated/js/html/fs/DirectoryEntry.hx
@@ -21,7 +21,7 @@
  */
 
 // This file is generated, do not edit!
-package js.html;
+package js.html.fs;
 
 /** <div><strong>DRAFT</strong> <div>This page is not complete.</div>
 </div>
@@ -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 → generated/js/html/fs/DirectoryEntrySync.hx b/generated/js/html/DirectoryEntrySync.hx → generated/js/html/fs/DirectoryEntrySync.hx
@@ -21,7 +21,7 @@
  */
 
 // This file is generated, do not edit!
-package js.html;
+package js.html.fs;
 
 /** <div><strong>DRAFT</strong> <div>This page is not complete.</div>
 </div>

diff --git a/generated/js/html/DirectoryReader.hx → generated/js/html/fs/DirectoryReader.hx b/generated/js/html/DirectoryReader.hx → generated/js/html/fs/DirectoryReader.hx
@@ -21,7 +21,7 @@
  */
 
 // This file is generated, do not edit!
-package js.html;
+package js.html.fs;
 
 /** <div><strong>`DRAFT</strong> <div>This page is not complete.</div>
 </div>

diff --git a/generated/js/html/DirectoryReaderSync.hx → generated/js/html/fs/DirectoryReaderSync.hx b/generated/js/html/DirectoryReaderSync.hx → generated/js/html/fs/DirectoryReaderSync.hx
@@ -21,7 +21,7 @@
  */
 
 // This file is generated, do not edit!
-package js.html;
+package js.html.fs;
 
 /** <div><strong>`DRAFT</strong> <div>This page is not complete.</div>
 </div>

diff --git a/generated/js/html/EntriesCallback.hx → generated/js/html/fs/EntriesCallback.hx b/generated/js/html/EntriesCallback.hx → 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;
diff --git a/generated/js/html/Entry.hx → generated/js/html/fs/Entry.hx b/generated/js/html/Entry.hx → generated/js/html/fs/Entry.hx
@@ -21,7 +21,7 @@
  */
 
 // This file is generated, do not edit!
-package js.html;
+package js.html.fs;
 
 /** <div><strong>DRAFT</strong> <div>This page is not complete.</div>
 </div>
@@ -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 → generated/js/html/fs/EntryArray.hx b/generated/js/html/EntryArray.hx → 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<Entry>

diff --git a/generated/js/html/EntryArraySync.hx → generated/js/html/fs/EntryArraySync.hx b/generated/js/html/EntryArraySync.hx → 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<EntrySync>

diff --git a/generated/js/html/EntryCallback.hx → generated/js/html/fs/EntryCallback.hx b/generated/js/html/EntryCallback.hx → 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;
diff --git a/generated/js/html/EntrySync.hx → generated/js/html/fs/EntrySync.hx b/generated/js/html/EntrySync.hx → generated/js/html/fs/EntrySync.hx
@@ -21,7 +21,7 @@
  */
 
 // This file is generated, do not edit!
-package js.html;
+package js.html.fs;
 
 /** <div><strong>DRAFT</strong> <div>This page is not complete.</div>
 </div>

diff --git a/generated/js/html/ErrorCallback.hx → generated/js/html/fs/ErrorCallback.hx b/generated/js/html/ErrorCallback.hx → 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;
diff --git a/generated/js/html/FileCallback.hx → generated/js/html/fs/FileCallback.hx b/generated/js/html/FileCallback.hx → 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;
+typedef FileCallback = js.html.File -> Bool;
diff --git a/generated/js/html/FileEntry.hx → generated/js/html/fs/FileEntry.hx b/generated/js/html/FileEntry.hx → generated/js/html/fs/FileEntry.hx
@@ -21,7 +21,7 @@
  */
 
 // This file is generated, do not edit!
-package js.html;
+package js.html.fs;
 
 /** <div><strong>DRAFT</strong> <div>This page is not complete.</div>
 </div>

diff --git a/generated/js/html/FileEntrySync.hx → generated/js/html/fs/FileEntrySync.hx b/generated/js/html/FileEntrySync.hx → generated/js/html/fs/FileEntrySync.hx
@@ -21,7 +21,7 @@
  */
 
 // This file is generated, do not edit!
-package js.html;
+package js.html.fs;
 
 /** <div><strong>DRAFT</strong> <div>This page is not complete.</div>
 </div>
@@ -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 → generated/js/html/fs/FileError.hx b/generated/js/html/FileError.hx → 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 <code><a rel="custom" href="https://developer.mozilla.org/en/DOM/FileReader">FileReader</a></code>
  interface.<br><br>

diff --git a/generated/js/html/FileException.hx → generated/js/html/fs/FileException.hx b/generated/js/html/FileException.hx → generated/js/html/fs/FileException.hx
@@ -21,7 +21,7 @@
  */
 
 // This file is generated, do not edit!
-package js.html;
+package js.html.fs;
 
 /** <strong>DRAFT</strong> <div>This page is not complete.</div><br><br>
 Documentation for this class was provided by <a href="https://developer.mozilla.org/en/DOM/File_API/File_System_API/FileException">MDN</a>. */

diff --git a/generated/js/html/FileSystemCallback.hx → generated/js/html/fs/FileSystemCallback.hx b/generated/js/html/FileSystemCallback.hx → 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;