imdone-core 2.4.0 → 2.5.1

package/lib/default-filtered-move-position.js

@@ -22,15 +22,13 @@ export function resolveDefaultFilteredMovePosition({
     .filter(candidate => !sameTask(candidate, task))
   if (visibleDestinationCards.length === 0) return destinationCards.length
 
-  const anchor = visibleDestinationCards[
-    Math.min(newPosition, visibleDestinationCards.length - 1)
-  ]
+  const anchor = newPosition === 0
+    ? visibleDestinationCards[0]
+    : visibleDestinationCards[newPosition - 1]
   const anchorPosition = destinationCards.findIndex(candidate => sameTask(candidate, anchor))
   if (anchorPosition < 0) {
     throw new Error(`Filtered task is missing from ${newList}: ${anchor.id}`)
   }
 
-  return newPosition < visibleDestinationCards.length
-    ? anchorPosition
-    : anchorPosition + 1
+  return newPosition === 0 ? anchorPosition : anchorPosition + 1
 }

package/lib/mixins/repo-watched-fs-store.js

@@ -23,6 +23,7 @@ export function watchedFileSystemStoreMixin(repo, fs = realFs) {
 
   function trackWatcherEvent(listener) {
     return (...args) => {
+      if (watcherPaused) return
       const event = Promise.resolve().then(() => listener(...args))
       const trackedEvent = event.catch((err) => {
         logger.error('Error processing watcher event')
@@ -34,6 +35,12 @@ export function watchedFileSystemStoreMixin(repo, fs = realFs) {
     }
   }
 
+  async function waitForWatcherEvents() {
+    while (watcherEvents.size > 0) {
+      await Promise.allSettled([...watcherEvents])
+    }
+  }
+
   function ready() {
     return !initializing && !refreshing
   }
@@ -49,8 +56,14 @@ export function watchedFileSystemStoreMixin(repo, fs = realFs) {
   repo.pauseWatcher = async function() {
     if (repo.watcher && !watcherPaused) {
       logger.info('Pausing file watcher for:', repo.path)
-      await repo.watcher.close()
       watcherPaused = true
+      try {
+        await repo.watcher.close()
+        await waitForWatcherEvents()
+      } catch (err) {
+        watcherPaused = false
+        throw err
+      }
       repo.emit('watcher.paused')
       return true
     }
@@ -94,7 +107,7 @@ export function watchedFileSystemStoreMixin(repo, fs = realFs) {
 
   repo.destroy = async function () {
     if (repo.watcher) await repo.watcher.close()
-    await Promise.allSettled([...watcherEvents])
+    await waitForWatcherEvents()
     await _destroy.apply(repo)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "2.4.0",
+  "version": "2.5.1",
   "description": "imdone-core",
   "repository": {
     "type": "git",
@@ -43,7 +43,7 @@
   },
   "homepage": "https://github.com/imdone/imdone-core",
   "dependencies": {
-    "adm-zip": "^0.6.0",
+    "adm-zip": "^0.6.1",
     "async": "^3.2.6",
     "async-es": "^3.2.6",
     "chalk": "^5.4.1",
@@ -60,7 +60,7 @@
     "ignore": "^5.2.0",
     "imdone-api": "^2.0.4",
     "isbinaryfile": "^5.0.4",
-    "js-yaml": "^4.2.0",
+    "js-yaml": "^4.3.2",
     "json-fns": "^1.0.0",
     "lodash.assign": "^4.2.0",
     "lodash.debounce": "^4.0.8",
@@ -113,5 +113,10 @@
     "prettier": "^2.5.1",
     "typescript": "^5.8.2",
     "vitest": "^4.1.9"
+  },
+  "allowScripts": {
+    "core-js-pure@3.42.0": true,
+    "esbuild@0.28.1": true,
+    "fsevents@2.3.3": true
   }
 }