imdone-core 2.3.5 → 2.5.0

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/index.js

@@ -12,6 +12,7 @@ export * from './get-tasks-to-modify.js';
 export * from './languages.js';
 export * from './list.js';
 export * from './migrate-config.js';
+export * from './monquery.js';
 export * from './omit.js';
 export * from './project-factory.js';
 export * from './project.js';

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/lib/monquery.js

@@ -0,0 +1,120 @@
+// Derived from imdone/node-monquery 0.2.2, originally visionmedia/node-monquery.
+// Retained under the MIT license used by both projects.
+import assert from 'node:assert'
+
+export function compile(node) {
+  switch (node.type) {
+    case 'field': {
+      const value = node.cmp
+        ? { [`$${node.cmp}`]: node.value }
+        : node.value
+      return { [node.name]: value }
+    }
+    case 'op':
+      return {
+        [`$${node.op}`]: [compile(node.left), compile(node.right)],
+      }
+    default:
+      return undefined
+  }
+}
+
+function comparison(value) {
+  switch (value) {
+    case '>': return 'gt'
+    case '<': return 'lt'
+    case '<=': return 'lte'
+    case '>=': return 'gte'
+    case '!=': return 'ne'
+    default: return null
+  }
+}
+
+function numeric(value) {
+  return !Number.isNaN(Number.parseFloat(value))
+}
+
+function quoted(value) {
+  return value[0] === "'" || value[0] === '"'
+}
+
+function pattern(value) {
+  const escaped = value
+    .replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
+    .replace(/-/g, '\\x2d')
+    .replace(/\\\*/g, '.*')
+  return new RegExp(`^${escaped}$`)
+}
+
+function coerce(value) {
+  if (typeof value !== 'string') return value
+  if (value[0] === '/') return new RegExp(value.slice(1, -1))
+  if (value === 'true' || value === 'yes') return true
+  if (value === 'false' || value === 'no') return false
+  if (quoted(value)) return value.replace(/^['"]|['"]$/g, '')
+  if (value.includes('*')) return pattern(value)
+  return value
+}
+
+export function parse(input) {
+  let source = `(${input.trim()})`
+
+  const requireSyntax = (condition, message) => {
+    if (condition) return
+    assert.fail(`${message} near \`${source.slice(0, 10)}\``)
+  }
+
+  const field = () => {
+    const nameMatch = source.match(/^([-.\w]+)/)
+    if (!nameMatch) return undefined
+
+    const name = nameMatch[0]
+    source = source.slice(name.length)
+    const valueMatch = source.match(/ *([:><!=]*) *([-*\w.]+|".*?"|'.*?'|\/(.*)\/) */)
+    let value = true
+    let operator = null
+    if (valueMatch) {
+      source = source.slice(valueMatch[0].length)
+      value = valueMatch[2]
+      operator = comparison(valueMatch[1])
+      if (numeric(value)) value = Number.parseFloat(value)
+    }
+
+    return {
+      type: 'field',
+      name,
+      value: coerce(value),
+      ...(operator ? { cmp: operator } : {}),
+    }
+  }
+
+  const expression = () => {
+    requireSyntax(source[0] === '(', "missing opening '('")
+    source = source.slice(1)
+    const node = binaryOperation()
+    requireSyntax(source[0] === ')', "missing closing ')'")
+    source = source.slice(1)
+    return node
+  }
+
+  const primary = () => field() || expression()
+
+  const binaryOperation = () => {
+    const left = primary()
+    const operatorMatch = source.match(/^ *(OR|AND) */i)
+    if (!operatorMatch) return left
+    source = source.slice(operatorMatch[0].length)
+    return {
+      type: 'op',
+      op: operatorMatch[1].toLowerCase(),
+      left,
+      right: binaryOperation(),
+    }
+  }
+
+  return expression()
+}
+
+export default function monquery(input) {
+  return compile(parse(input))
+}

package/lib/repository.js

@@ -23,7 +23,7 @@ import { constants } from './constants.js'
 import debug from 'debug'
 const log = debug('imdone-core:Repository')
 import { List } from './list.js'
-import monquery from 'monquery'
+import monquery from './monquery.js'
 import sift from 'sift'
 import { sort } from 'fast-sort'
 import JSONfns from 'json-fns'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "2.3.5",
+  "version": "2.5.0",
   "description": "imdone-core",
   "repository": {
     "type": "git",
@@ -84,7 +84,6 @@
     "markdown-it-emoji": "^2.0.0",
     "markdown-it-mark": "^3.0.1",
     "moment": "^2.29.1",
-    "monquery": "https://github.com/imdone/node-monquery/archive/refs/tags/0.2.2.tar.gz",
     "multilang-extract-comments": "^0.4.0",
     "open": "^9.1.0",
     "ora": "^8.2.0",

package/types/index.d.ts

@@ -12,6 +12,7 @@ export * from "./get-tasks-to-modify.js";
 export * from "./languages.js";
 export * from "./list.js";
 export * from "./migrate-config.js";
+export * from "./monquery.js";
 export * from "./omit.js";
 export * from "./project-factory.js";
 export * from "./project.js";

package/types/monquery.d.ts

@@ -0,0 +1,3 @@
+export function compile(node: any): any;
+export function parse(input: any): any;
+export default function monquery(input: any): any;