some minor fix

Author: jimmywarting

jsconfig.json

@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "noEmit": false,
+    "target": "esnext",
+    "module": "esnext",
+    "declaration": true,
+    "allowJs": true,
+    "checkJs": true,
+    "removeComments": true,
+    "emitDeclarationOnly": true,
+    "outDir": "./types/"
+  },
+  "exclude": ["node_modules"],
+  "include": ["mod.js"]
+}

tsconfig.json renamed to old-tsconfig

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "moduleResolution": "node",
     "noEmit": false,
     "target": "esnext",
     "module": "esnext",

package-lock.json

@@ -15,7 +15,7 @@
     "test:deno": "deno run --allow-read --allow-write --allow-net test/test-deno.js",
     "test:wpt-in-deno": "deno run --allow-read --allow-write --allow-net test/test-wpt-in-deno.js",
     "build": "rm -rf dist && rollup -c rollup.config.js",
-    "prepublishOnly": "rm -rf types && tsc"
+    "prepublishOnly": "rm -rf types && tsc -p jsconfig.json"
   },
   "repository": {
     "type": "git",
@@ -55,15 +55,6 @@
     "fetch-blob": "^3.1.4",
     "node-domexception": "^1.0.0"
   },
-  "devDependencies": {
-    "@types/filesystem": "^0.0.30",
-    "rollup": "^2.51.1",
-    "rollup-plugin-multi-input": "^1.3.1",
-    "rollup-plugin-terser": "^7.0.2",
-    "standard": "^16.0.3",
-    "tape": "^5.2.2",
-    "typescript": "^4.4.4"
-  },
   "standard": {
     "globals": [
       "File",
@@ -87,5 +78,14 @@
       "type": "paypal",
       "url": "https://paypal.me/jimmywarting"
     }
-  ]
+  ],
+  "devDependencies": {
+    "@types/filesystem": "^0.0.32",
+    "rollup": "^2.67.3",
+    "rollup-plugin-multi-input": "^1.3.1",
+    "rollup-plugin-terser": "^7.0.2",
+    "standard": "^16.0.4",
+    "tape": "^5.5.2",
+    "typescript": "^4.5.5"
+  }
 }

package.json

@@ -18,26 +18,35 @@ class FileSystemDirectoryHandle extends FileSystemHandle {
    * @returns {Promise<FileSystemDirectoryHandle>}
    */
   async getDirectoryHandle (name, options = {}) {
-    if (name === '') throw new TypeError(`Name can't be an empty string.`)
-    if (name === '.' || name === '..' || name.includes('/')) throw new TypeError(`Name contains invalid characters.`)
+    if (name === '') {
+      throw new TypeError(`Name can't be an empty string.`)
+    }
+    if (name === '.' || name === '..' || name.includes('/')) {
+      throw new TypeError(`Name contains invalid characters.`)
+    }
     options.create = !!options.create
-    return new FileSystemDirectoryHandle(await this[kAdapter].getDirectoryHandle(name, options))
+    const handle = await this[kAdapter].getDirectoryHandle(name, options)
+    return new FileSystemDirectoryHandle(handle)
   }
 
   /** @returns {AsyncGenerator<[string, FileSystemHandle | FileSystemDirectoryHandle]>} */
   async * entries () {
     const {FileSystemFileHandle} = await import('./FileSystemFileHandle.js')
 
     for await (const [_, entry] of this[kAdapter].entries())
-      yield [entry.name, entry.kind === 'file' ? new FileSystemFileHandle(entry) : new FileSystemDirectoryHandle(entry)]
+      yield [entry.name, entry.kind === 'file'
+        ? new FileSystemFileHandle(entry)
+        : new FileSystemDirectoryHandle(entry)]
   }
 
   /** @deprecated use .entries() instead */
   async * getEntries() {
     const {FileSystemFileHandle} = await import('./FileSystemFileHandle.js')
     console.warn('deprecated, use .entries() instead')
     for await (let entry of this[kAdapter].entries())
-      yield entry.kind === 'file' ? new FileSystemFileHandle(entry) : new FileSystemDirectoryHandle(entry)
+      yield entry.kind === 'file'
+        ? new FileSystemFileHandle(entry)
+        : new FileSystemDirectoryHandle(entry)
   }
 
   /**
@@ -48,9 +57,12 @@ class FileSystemDirectoryHandle extends FileSystemHandle {
   async getFileHandle (name, options = {}) {
     const {FileSystemFileHandle} = await import('./FileSystemFileHandle.js')
     if (name === '') throw new TypeError(`Name can't be an empty string.`)
-    if (name === '.' || name === '..' || name.includes('/')) throw new TypeError(`Name contains invalid characters.`)
+    if (name === '.' || name === '..' || name.includes('/')) {
+      throw new TypeError(`Name contains invalid characters.`)
+    }
     options.create = !!options.create
-    return new FileSystemFileHandle(await this[kAdapter].getFileHandle(name, options))
+    const handle = await this[kAdapter].getFileHandle(name, options)
+    return new FileSystemFileHandle(handle)
   }
 
   /**
@@ -59,13 +71,16 @@ class FileSystemDirectoryHandle extends FileSystemHandle {
    * @param {boolean} [options.recursive]
    */
   async removeEntry (name, options = {}) {
-    if (name === '') throw new TypeError(`Name can't be an empty string.`)
-    if (name === '.' || name === '..' || name.includes('/')) throw new TypeError(`Name contains invalid characters.`)
+    if (name === '') {
+      throw new TypeError(`Name can't be an empty string.`)
+    }
+    if (name === '.' || name === '..' || name.includes('/')) {
+      throw new TypeError(`Name contains invalid characters.`)
+    }
     options.recursive = !!options.recursive // cuz node's fs.rm require boolean
     return this[kAdapter].removeEntry(name, options)
   }
 
-  // TODO: jsdoc
   async resolve (possibleDescendant) {
     if (await possibleDescendant.isSameEntry(this)) {
       return []

src/FileSystemDirectoryHandle.js

@@ -186,9 +186,12 @@ class FolderHandle {
 
   /** @returns {AsyncGenerator<[string, FileHandle | FolderHandle]>} */
   async * entries () {
-    const entries = await new Promise(resolve => {
-      store(this._db)[1].get(this._id).onsuccess = evt => resolve(evt.target.result)
+    const req = store(this._db)[1].get(this._id);
+    await new Promise((rs, rj) => {
+      req.onsuccess = () => rs()
+      req.onerror = () => rj(req.error)
     })
+    const entries = req.result
     if (!entries) throw new DOMException(...GONE)
     for (const [name, [id, isFile]] of Object.entries(entries)) {
       yield [name, isFile

src/adapters/indexeddb.js

@@ -81,6 +81,9 @@ export class FileHandle {
     return this.file.name
   }
 
+  /**
+   * @param {{ file: { toURL: () => string; }; }} other
+   */
   isSameEntry (other) {
     return this.file.toURL() === other.file.toURL()
   }