Remove Q.js lib

.husky/pre-commit

@@ -1 +1 @@
-npx biome check --staged --write --no-errors-on-unmatched
+npm run lint

biome.jsonc

@@ -49,11 +49,26 @@
       "pskl",
       "Events",
       "Constants",
-      "Q",
       "module",
       "require",
       "console",
-      "Promise"
+      "Promise",
+      "describe",
+      "xdescribe",
+      "fdescribe",
+      "it",
+      "xit",
+      "fit",
+      "beforeEach",
+      "afterEach",
+      "beforeAll",
+      "afterAll",
+      "expect",
+      "fail",
+      "pending",
+      "spyOn",
+      "spyOnProperty",
+      "jasmine"
     ]
   },
   "css": {

src/js/controller/dialogs/backups/steps/SelectSession.js

@@ -12,11 +12,9 @@
    * @return {Promise} promise that resolves after time.
    */
   var wait = function (time) {
-    var deferred = Q.defer();
-    setTimeout(function () {
-      deferred.resolve();
-    }, time);
-    return deferred.promise;
+    return new Promise(function (resolve) {
+      setTimeout(resolve, time);
+    });
   };
 
   ns.SelectSession = function (piskelController, backupsController, container) {
@@ -96,7 +94,7 @@
     } else if (action == "delete") {
       if (window.confirm("Are you sure you want to delete this session?")) {
         evt.target.closest(".session-item").classList.add("deleting");
-        Q.all([
+        Promise.all([
           pskl.app.backupService.deleteSession(sessionId),
           // Wait for 500ms for the .hide opacity transition.
           wait(DELETE_TRANSITION_DURATION)

src/js/controller/dialogs/importwizard/steps/ImageImport.js

@@ -93,27 +93,29 @@
     // Remove extension from filename.
     name = name.replace(/\.[a-zA-Z]+$/, "");
 
-    var deferred = Q.defer();
-    pskl.app.importService.newPiskelFromImage(
-      this.importedImage_,
-      {
-        importType: this.getImportType_(),
-        frameSizeX:
-          this.getImportType_() === "single"
-            ? this.resizeWidth.value
-            : this.sanitizeInputValue_(this.frameSizeX, 1),
-        frameSizeY:
-          this.getImportType_() === "single"
-            ? this.resizeHeight.value
-            : this.sanitizeInputValue_(this.frameSizeY, 1),
-        frameOffsetX: this.sanitizeInputValue_(this.frameOffsetX, 0),
-        frameOffsetY: this.sanitizeInputValue_(this.frameOffsetY, 0),
-        smoothing: !!this.smoothResize.checked,
-        name: name
-      },
-      deferred.resolve
+    return new Promise(
+      function (resolve) {
+        pskl.app.importService.newPiskelFromImage(
+          this.importedImage_,
+          {
+            importType: this.getImportType_(),
+            frameSizeX:
+              this.getImportType_() === "single"
+                ? this.resizeWidth.value
+                : this.sanitizeInputValue_(this.frameSizeX, 1),
+            frameSizeY:
+              this.getImportType_() === "single"
+                ? this.resizeHeight.value
+                : this.sanitizeInputValue_(this.frameSizeY, 1),
+            frameOffsetX: this.sanitizeInputValue_(this.frameOffsetX, 0),
+            frameOffsetY: this.sanitizeInputValue_(this.frameOffsetY, 0),
+            smoothing: !!this.smoothResize.checked,
+            name: name
+          },
+          resolve
+        );
+      }.bind(this)
     );
-    return deferred.promise;
   };
 
   ns.ImageImport.prototype.onImportTypeChange_ = function (evt) {

src/js/database/BackupDatabase.js

@@ -6,10 +6,10 @@
 
   // Simple wrapper to promisify a request.
   var _requestPromise = function (req) {
-    var deferred = Q.defer();
-    req.onsuccess = deferred.resolve.bind(deferred);
-    req.onerror = deferred.reject.bind(deferred);
-    return deferred.promise;
+    return new Promise(function (resolve, reject) {
+      req.onsuccess = resolve;
+      req.onerror = reject;
+    });
   };
 
   /**
@@ -122,31 +122,29 @@
    *        if the snapshot is valid.
    */
   ns.BackupDatabase.prototype.findLastSnapshot = function (accept) {
-    // Create the backup promise.
-    var deferred = Q.defer();
-
     // Open a transaction to the snapshots object store.
     var objectStore = this.db
       .transaction(["snapshots"])
       .objectStore("snapshots");
 
     var index = objectStore.index("date");
     var range = IDBKeyRange.upperBound(Infinity);
-    index.openCursor(range, "prev").onsuccess = function (event) {
-      var cursor = event.target.result;
-      var snapshot = cursor && cursor.value;
-
-      // Resolve null if we couldn't find a matching snapshot.
-      if (!snapshot) {
-        deferred.resolve(null);
-      } else if (accept(snapshot)) {
-        deferred.resolve(snapshot);
-      } else {
-        cursor.continue();
-      }
-    };
 
-    return deferred.promise;
+    return new Promise(function (resolve) {
+      index.openCursor(range, "prev").onsuccess = function (event) {
+        var cursor = event.target.result;
+        var snapshot = cursor && cursor.value;
+
+        // Resolve null if we couldn't find a matching snapshot.
+        if (!snapshot) {
+          resolve(null);
+        } else if (accept(snapshot)) {
+          resolve(snapshot);
+        } else {
+          cursor.continue();
+        }
+      };
+    });
   };
 
   /**
@@ -157,9 +155,6 @@
    *        The session id
    */
   ns.BackupDatabase.prototype.getSnapshotsBySessionId = function (sessionId) {
-    // Create the backup promise.
-    var deferred = Q.defer();
-
     // Open a transaction to the snapshots object store.
     var objectStore = this.db
       .transaction(["snapshots"])
@@ -170,25 +165,22 @@
     var keyRange = IDBKeyRange.bound([sessionId, 0], [sessionId, Infinity]);
 
     var snapshots = [];
-    // Ordered by date in descending order.
-    index.openCursor(keyRange, "prev").onsuccess = function (event) {
-      var cursor = event.target.result;
-      if (cursor) {
-        snapshots.push(cursor.value);
-        cursor.continue();
-      } else {
-        // Consumed all piskel snapshots
-        deferred.resolve(snapshots);
-      }
-    };
-
-    return deferred.promise;
+    return new Promise(function (resolve) {
+      // Ordered by date in descending order.
+      index.openCursor(keyRange, "prev").onsuccess = function (event) {
+        var cursor = event.target.result;
+        if (cursor) {
+          snapshots.push(cursor.value);
+          cursor.continue();
+        } else {
+          // Consumed all piskel snapshots
+          resolve(snapshots);
+        }
+      };
+    });
   };
 
   ns.BackupDatabase.prototype.getSessions = function () {
-    // Create the backup promise.
-    var deferred = Q.defer();
-
     // Open a transaction to the snapshots object store.
     var objectStore = this.db
       .transaction(["snapshots"])
@@ -223,22 +215,23 @@
 
     var index = objectStore.index("date");
     var range = IDBKeyRange.upperBound(Infinity);
-    index.openCursor(range, "prev").onsuccess = function (event) {
-      var cursor = event.target.result;
-      var snapshot = cursor && cursor.value;
-      if (!snapshot) {
-        deferred.resolve(sessions);
-      } else {
-        if (sessions[snapshot.session_id]) {
-          _updateSession(snapshot);
+
+    return new Promise(function (resolve) {
+      index.openCursor(range, "prev").onsuccess = function (event) {
+        var cursor = event.target.result;
+        var snapshot = cursor && cursor.value;
+        if (!snapshot) {
+          resolve(sessions);
         } else {
-          _createSession(snapshot);
+          if (sessions[snapshot.session_id]) {
+            _updateSession(snapshot);
+          } else {
+            _createSession(snapshot);
+          }
+          cursor.continue();
         }
-        cursor.continue();
-      }
-    };
-
-    return deferred.promise.then(function (sessions) {
+      };
+    }).then(function (sessions) {
       // Convert the sessions map to an array.
       return Object.keys(sessions).map(function (key) {
         return sessions[key];
@@ -247,26 +240,23 @@
   };
 
   ns.BackupDatabase.prototype.deleteSnapshotsForSession = function (sessionId) {
-    // Create the backup promise.
-    var deferred = Q.defer();
-
     // Open a transaction to the snapshots object store.
     var objectStore = this.openObjectStore_();
 
     // Loop on all the saved snapshots for the provided piskel id
     var index = objectStore.index("session_id");
     var keyRange = IDBKeyRange.only(sessionId);
 
-    index.openCursor(keyRange).onsuccess = function (event) {
-      var cursor = event.target.result;
-      if (cursor) {
-        cursor.delete();
-        cursor.continue();
-      } else {
-        deferred.resolve();
-      }
-    };
-
-    return deferred.promise;
+    return new Promise(function (resolve) {
+      index.openCursor(keyRange).onsuccess = function (event) {
+        var cursor = event.target.result;
+        if (cursor) {
+          cursor.delete();
+          cursor.continue();
+        } else {
+          resolve();
+        }
+      };
+    });
   };
 })();

src/js/database/PiskelDatabase.js

@@ -6,10 +6,10 @@
 
   // Simple wrapper to promisify a request.
   var _requestPromise = function (req) {
-    var deferred = Q.defer();
-    req.onsuccess = deferred.resolve.bind(deferred);
-    req.onerror = deferred.reject.bind(deferred);
-    return deferred.promise;
+    return new Promise(function (resolve, reject) {
+      req.onsuccess = resolve;
+      req.onerror = reject;
+    });
   };
 
   /**
@@ -71,31 +71,30 @@
    * needs to be retrieved with a separate get.
    */
   ns.PiskelDatabase.prototype.list = function () {
-    var deferred = Q.defer();
-
     var piskels = [];
     var objectStore = this.openObjectStore_();
     var cursor = objectStore.openCursor();
-    cursor.onsuccess = function (event) {
-      var cursor = event.target.result;
-      if (cursor) {
-        piskels.push({
-          name: cursor.value.name,
-          date: cursor.value.date,
-          description: cursor.value.description
-        });
-        cursor.continue();
-      } else {
-        // Cursor consumed all availabled piskels
-        deferred.resolve(piskels);
-      }
-    };
-
-    cursor.onerror = function () {
-      deferred.reject();
-    };
-
-    return deferred.promise;
+
+    return new Promise(function (resolve, reject) {
+      cursor.onsuccess = function (event) {
+        var cursor = event.target.result;
+        if (cursor) {
+          piskels.push({
+            name: cursor.value.name,
+            date: cursor.value.date,
+            description: cursor.value.description
+          });
+          cursor.continue();
+        } else {
+          // Cursor consumed all availabled piskels
+          resolve(piskels);
+        }
+      };
+
+      cursor.onerror = function () {
+        reject();
+      };
+    });
   };
 
   /**