Update idlharness.js tests for new File System standard (web-platform…

…-tests#33447) This includes interfaces/ changes from @webref/idl: web-platform-tests#33446
jiangzhaoming · Apr 1, 2022 · 7d7911e · 7d7911e
1 parent f6a696e
commit 7d7911e
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 77 deletions.
diff --git a/file-system-access/idlharness.https.any.js b/file-system-access/idlharness.https.any.js
@@ -6,11 +6,13 @@
 
 idl_test(
   ['file-system-access'],
-  ['storage', 'permissions', 'streams', 'html', 'dom'],
+  ['fs', 'permissions', 'html', 'dom'],
   idl_array => {
-    idl_array.add_objects({
-      // TODO: Add instances of FileSystemHandle, FileSystemFileHandle,
-      // FileSystemDirectoryHandle and FileSystemWriter.
-    });
+    if (self.GLOBAL.isWindow()) {
+      idl_array.add_objects({
+        Window: ['window'],
+        // TODO: DataTransferItem
+      });
+    }
   }
 );
diff --git a/fs/META.yml b/fs/META.yml
@@ -0,0 +1,3 @@
+spec: https://fs.spec.whatwg.org/
+suggested_reviewers:
+  - mkruisselbrink
diff --git a/fs/idlharness.https.any.js b/fs/idlharness.https.any.js
@@ -0,0 +1,17 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+// META: timeout=long
+
+'use strict';
+
+idl_test(
+  ['fs'],
+  ['storage', 'streams'],
+  idl_array => {
+    idl_array.add_objects({
+      // TODO: Add instances of FileSystemHandle, FileSystemFileHandle,
+      // FileSystemDirectoryHandle, FileSystemWritableFileStream, and
+      // StorageManager.
+    });
+  }
+);
diff --git a/interfaces/file-system-access.idl b/interfaces/file-system-access.idl
@@ -17,78 +17,12 @@ dictionary FileSystemHandlePermissionDescriptor {
   FileSystemPermissionMode mode = "read";
 };
 
-enum FileSystemHandleKind {
-  "file",
-  "directory",
-};
-
 [Exposed=(Window,Worker), SecureContext, Serializable]
-interface FileSystemHandle {
-  readonly attribute FileSystemHandleKind kind;
-  readonly attribute USVString name;
-
-  Promise<boolean> isSameEntry(FileSystemHandle other);
-
+partial interface FileSystemHandle {
   Promise<PermissionState> queryPermission(optional FileSystemHandlePermissionDescriptor descriptor = {});
   Promise<PermissionState> requestPermission(optional FileSystemHandlePermissionDescriptor descriptor = {});
 };
 
-dictionary FileSystemCreateWritableOptions {
-  boolean keepExistingData = false;
-};
-
-[Exposed=(Window,Worker), SecureContext, Serializable]
-interface FileSystemFileHandle : FileSystemHandle {
-  Promise<File> getFile();
-  Promise<FileSystemWritableFileStream> createWritable(optional FileSystemCreateWritableOptions options = {});
-};
-
-dictionary FileSystemGetFileOptions {
-  boolean create = false;
-};
-
-dictionary FileSystemGetDirectoryOptions {
-  boolean create = false;
-};
-
-dictionary FileSystemRemoveOptions {
-  boolean recursive = false;
-};
-
-[Exposed=(Window,Worker), SecureContext, Serializable]
-interface FileSystemDirectoryHandle : FileSystemHandle {
-  async iterable<USVString, FileSystemHandle>;
-
-  Promise<FileSystemFileHandle> getFileHandle(USVString name, optional FileSystemGetFileOptions options = {});
-  Promise<FileSystemDirectoryHandle> getDirectoryHandle(USVString name, optional FileSystemGetDirectoryOptions options = {});
-
-  Promise<undefined> removeEntry(USVString name, optional FileSystemRemoveOptions options = {});
-
-  Promise<sequence<USVString>?> resolve(FileSystemHandle possibleDescendant);
-};
-
-enum WriteCommandType {
-  "write",
-  "seek",
-  "truncate",
-};
-
-dictionary WriteParams {
-  required WriteCommandType type;
-  unsigned long long? size;
-  unsigned long long? position;
-  (BufferSource or Blob or USVString)? data;
-};
-
-typedef (BufferSource or Blob or USVString or WriteParams) FileSystemWriteChunkType;
-
-[Exposed=(Window,Worker), SecureContext]
-interface FileSystemWritableFileStream : WritableStream {
-  Promise<undefined> write(FileSystemWriteChunkType data);
-  Promise<undefined> seek(unsigned long long position);
-  Promise<undefined> truncate(unsigned long long size);
-};
-
 enum WellKnownDirectory {
   "desktop",
   "documents",
@@ -135,8 +69,3 @@ partial interface Window {
 partial interface DataTransferItem {
     Promise<FileSystemHandle?> getAsFileSystemHandle();
 };
-
-[SecureContext]
-partial interface StorageManager {
-  Promise<FileSystemDirectoryHandle> getDirectory();
-};
diff --git a/interfaces/fs.idl b/interfaces/fs.idl
@@ -0,0 +1,78 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: File System Standard (https://fs.spec.whatwg.org/)
+
+enum FileSystemHandleKind {
+  "file",
+  "directory",
+};
+
+[Exposed=(Window,Worker), SecureContext, Serializable]
+interface FileSystemHandle {
+  readonly attribute FileSystemHandleKind kind;
+  readonly attribute USVString name;
+
+  Promise<boolean> isSameEntry(FileSystemHandle other);
+};
+
+dictionary FileSystemCreateWritableOptions {
+  boolean keepExistingData = false;
+};
+
+[Exposed=(Window,Worker), SecureContext, Serializable]
+interface FileSystemFileHandle : FileSystemHandle {
+  Promise<File> getFile();
+  Promise<FileSystemWritableFileStream> createWritable(optional FileSystemCreateWritableOptions options = {});
+};
+
+dictionary FileSystemGetFileOptions {
+  boolean create = false;
+};
+
+dictionary FileSystemGetDirectoryOptions {
+  boolean create = false;
+};
+
+dictionary FileSystemRemoveOptions {
+  boolean recursive = false;
+};
+
+[Exposed=(Window,Worker), SecureContext, Serializable]
+interface FileSystemDirectoryHandle : FileSystemHandle {
+  async iterable<USVString, FileSystemHandle>;
+
+  Promise<FileSystemFileHandle> getFileHandle(USVString name, optional FileSystemGetFileOptions options = {});
+  Promise<FileSystemDirectoryHandle> getDirectoryHandle(USVString name, optional FileSystemGetDirectoryOptions options = {});
+
+  Promise<undefined> removeEntry(USVString name, optional FileSystemRemoveOptions options = {});
+
+  Promise<sequence<USVString>?> resolve(FileSystemHandle possibleDescendant);
+};
+
+enum WriteCommandType {
+  "write",
+  "seek",
+  "truncate",
+};
+
+dictionary WriteParams {
+  required WriteCommandType type;
+  unsigned long long? size;
+  unsigned long long? position;
+  (BufferSource or Blob or USVString)? data;
+};
+
+typedef (BufferSource or Blob or USVString or WriteParams) FileSystemWriteChunkType;
+
+[Exposed=(Window,Worker), SecureContext]
+interface FileSystemWritableFileStream : WritableStream {
+  Promise<undefined> write(FileSystemWriteChunkType data);
+  Promise<undefined> seek(unsigned long long position);
+  Promise<undefined> truncate(unsigned long long size);
+};
+
+[SecureContext]
+partial interface StorageManager {
+  Promise<FileSystemDirectoryHandle> getDirectory();
+};