permissions: use discriminated union type for PermissionDescriptor

denoland · Oct 26, 2019 · 3505437 · 3505437
1 parent 5024f1c
commit 3505437
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/cli/js/lib.deno_runtime.d.ts b/cli/js/lib.deno_runtime.d.ts
@@ -891,11 +891,21 @@ declare namespace Deno {
     | "env"
     | "hrtime";
   export type PermissionState = "granted" | "denied" | "prompt";
-  interface PermissionDescriptor {
-    name: PermissionName;
-    url?: string;
+  interface SimplePermissionDescriptor {
+    name: "run" | "env" | "hrtime";
+  }
+  interface PathPermissionDescriptor {
+    name: "read" | "write";
     path?: string;
   }
+  interface NetPermissionDescriptor {
+    name: "net";
+    url?: string;
+  }
+  type PermissionDescriptor =
+    | SimplePermissionDescriptor
+    | PathPermissionDescriptor
+    | NetPermissionDescriptor
   export class Permissions {
     query(d: PermissionDescriptor): Promise<PermissionStatus>;
     revoke(d: PermissionDescriptor): Promise<PermissionStatus>;

diff --git a/cli/js/permissions.ts b/cli/js/permissions.ts
@@ -18,12 +18,25 @@ export type PermissionName =
 export type PermissionState = "granted" | "denied" | "prompt";
 
 /** See: https://w3c.github.io/permissions/#permission-descriptor */
-interface PermissionDescriptor {
-  name: PermissionName;
+interface SimplePermissionDescriptor {
+  name: "env" | "run" | "hrtime";
+}
+
+interface NetPermissionDescriptor {
+  name: "net";
   url?: string;
+}
+
+interface PathPermissionDescriptor {
+  name: "read" | "write";
   path?: string;
 }
 
+type PermissionDescriptor =
+  | SimplePermissionDescriptor
+  | PathPermissionDescriptor
+  | NetPermissionDescriptor
+
 /** https://w3c.github.io/permissions/#permissionstatus */
 export class PermissionStatus {
   constructor(public state: PermissionState) {}