fix: guard calling isFile on null/undefined webkit entry objects

dist/types/src/components/VueTransmit.vue.d.ts → dist/src/components/VueTransmit.vue.d.ts

@@ -162,9 +162,9 @@ export default class VueTransmit extends Vue {
     handleDragLeave(e: DragEvent): void;
     handleDragEnd(e: DragEvent): void;
     onDrop(e: DragEvent): void;
-    paste(e: any): void;
+    paste(e: ClipboardEvent): void;
     handleFiles(files: File[]): VTransmitFile[];
-    addFilesFromItems(items: any): void;
-    addFilesFromDirectory(directory: any, path: any): void;
+    addFilesFromItems(items: DataTransferItem[]): void;
+    addFilesFromDirectory(directory: WebKitDirectoryEntry, path: any): void;
     mounted(): void;
 }

dist/types/src/core/utils.d.ts → dist/src/core/utils.d.ts

@@ -45,3 +45,5 @@ export interface IDimensions {
     height: number;
 }
 export declare function resizeImg(file: VTransmitFile, dims: IDimensions): IDrawImageArgs;
+export declare function webkitIsFile(entry: WebKitFileEntry | WebKitDirectoryEntry): entry is WebKitFileEntry;
+export declare function webkitIsDir(entry: WebKitFileEntry | WebKitDirectoryEntry): entry is WebKitDirectoryEntry;

scripts/clean.js

@@ -21,7 +21,10 @@ async function rmDirContents(dirPath) {
 
 async function main() {
   try {
-    return await rmDirContents(resolve(__dirname, "../dist"))
+    return await Promise.all([
+      rmDirContents(resolve(__dirname, "../dist")),
+      rmDirContents(resolve(__dirname, "../types"))
+    ])
   } catch (err) {
     console.error(err)
   }

src/components/VueTransmit.vue

@@ -64,9 +64,21 @@ import Vue from "vue"
 import { Component, Prop, Watch } from "vue-property-decorator"
 import noop from "lodash-es/noop"
 import identity from "lodash-es/identity"
-import { READY_STATES, hbsRegex, hbsReplacer, objFactory, resizeImg, IDrawImageArgs, IDimensions } from "../core/utils"
+import {
+  READY_STATES,
+  hbsRegex,
+  hbsReplacer,
+  objFactory,
+  resizeImg,
+  IDrawImageArgs,
+  IDimensions,
+  webkitIsFile,
+  webkitIsDir
+} from "../core/utils"
 import VTransmitFile from "../classes/VTransmitFile"
 
+type FileSystemEntry = WebKitFileEntry | WebKitDirectoryEntry
+
 const STATUSES = {
   ADDED: "added",
   QUEUED: "queued",
@@ -819,7 +831,7 @@ export default class VueTransmit extends Vue {
       this.handleFiles(files)
     }
   }
-  paste(e): void {
+  paste(e: ClipboardEvent): void {
     if (!e || !e.clipboardData || !e.clipboardData.items) {
       return
     }
@@ -832,14 +844,17 @@ export default class VueTransmit extends Vue {
   handleFiles(files: File[]): VTransmitFile[] {
     return files.map(this.addFile)
   }
-  addFilesFromItems(items): void {
+  addFilesFromItems(items: DataTransferItem[]): void {
     for (const item of items) {
       if (item.webkitGetAsEntry) {
-        const entry = item.webkitGetAsEntry()
+        const entry: FileSystemEntry = item.webkitGetAsEntry()
+        if (entry == null) {
+          continue
+        }
 
-        if (entry.isFile) {
-          entry.file(this.addFile)
-        } else if (entry.isDirectory) {
+        if (webkitIsFile(entry)) {
+          entry.file(this.addFile as any)
+        } else if (webkitIsDir(entry)) {
           this.addFilesFromDirectory(entry, entry.name)
         }
       } else if (item.getAsFile) {
@@ -849,22 +864,33 @@ export default class VueTransmit extends Vue {
       }
     }
   }
-  addFilesFromDirectory(directory, path): void {
-    directory.createReader().readEntries(entries => {
-      for (const entry of entries) {
-        if (entry.isFile) {
-          entry.file(file => {
-            if (this.ignoreHiddenFiles && /^\./.test(file.name)) {
-              return
-            }
-            file.fullPath = `${path}/${file.name}`
-            this.addFile(file)
-          }, console.error)
-        } else if (entry.isDirectory) {
-          this.addFilesFromDirectory(entry, `${path}/${entry.name}`)
+  addFilesFromDirectory(directory: WebKitDirectoryEntry, path): void {
+    directory.createReader().readEntries(
+      <any>((entries: FileSystemEntry[]) => {
+        for (const entry of entries) {
+          if (entry == null) {
+            continue
+          }
+          if (webkitIsDir(entry)) {
+            this.addFilesFromDirectory(entry, `${path}/${entry.name}`)
+            continue
+          }
+          if (webkitIsFile(entry)) {
+            entry.file(
+              <any>((file: File) => {
+                if (this.ignoreHiddenFiles && /^\./.test(file.name)) {
+                  return
+                }
+                ;(file as any).fullPath = `${path}/${file.name}`
+                this.addFile(file)
+              }),
+              console.error
+            )
+          }
         }
-      }
-    }, console.error)
+      }),
+      console.error
+    )
   }
 
   mounted() {

types/src/core/utils.d.ts → src/core/utils.d.ts

@@ -45,3 +45,5 @@ export interface IDimensions {
     height: number;
 }
 export declare function resizeImg(file: VTransmitFile, dims: IDimensions): IDrawImageArgs;
+export declare function webkitIsFile(entry: WebKitFileEntry | WebKitDirectoryEntry): entry is WebKitFileEntry;
+export declare function webkitIsDir(entry: WebKitFileEntry | WebKitDirectoryEntry): entry is WebKitDirectoryEntry;

src/core/utils.ts

@@ -122,3 +122,11 @@ export function resizeImg(file: VTransmitFile, dims: IDimensions): IDrawImageArg
 
   return imgCoords
 }
+
+export function webkitIsFile(entry: WebKitFileEntry | WebKitDirectoryEntry): entry is WebKitFileEntry {
+  return entry.isFile
+}
+
+export function webkitIsDir(entry: WebKitFileEntry | WebKitDirectoryEntry): entry is WebKitDirectoryEntry {
+  return entry.isDirectory
+}

tsconfig.json

@@ -8,7 +8,6 @@
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,
-    "declarationDir": "./types",
     "allowJs": false,
     "experimentalDecorators": true,
     "noImplicitAny": false,
@@ -17,8 +16,7 @@
     "removeComments": false,
     "preserveConstEnums": true,
     "sourceMap": true,
-    "skipLibCheck": true,
-    "baseUrl": "./src/"
+    "skipLibCheck": true
   },
   "include": ["./src", "./index.ts"],
   "exclude": ["node_modules", "vendor"]