@toa.io/storages.mongodb 1.0.0-alpha.325 → 1.0.0-alpha.327

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-alpha.327](https://github.com/toa-io/toa/compare/v1.0.0-alpha.326...v1.0.0-alpha.327) (2026-10-10)
+
+### Bug Fixes
+
+* **storages.mongodb:** pass a deleted record by when an effect gets or creates ([0cea640](https://github.com/toa-io/toa/commit/0cea6405021c8230e9b68a0f3086ff610332b34d))
+
+
+# [1.0.0-alpha.326](https://github.com/toa-io/toa/compare/v1.0.0-alpha.325...v1.0.0-alpha.326) (2026-10-06)
+
+### Features
+
+* **core:** parse criteria with [@toa](https://github.com/toa).io/rsql ([c4dc9f4](https://github.com/toa-io/toa/commit/c4dc9f41ca2719ac66607c5b14e9ead678baa740))
+
+
 # [1.0.0-alpha.325](https://github.com/toa-io/toa/compare/v1.0.0-alpha.324...v1.0.0-alpha.325) (2026-10-02)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/storages.mongodb",
-  "version": "1.0.0-alpha.325",
+  "version": "1.0.0-alpha.327",
   "type": "module",
   "description": "Toa MongoDB Storage Connector",
   "author": "temich <tema.gurtovoy@gmail.com>",
@@ -21,12 +21,12 @@
   },
   "dependencies": {
     "@toa.io/conveyor": "1.0.0-alpha.311",
-    "@toa.io/core": "1.0.0-alpha.323",
-    "@toa.io/definitions": "1.0.0-alpha.325",
+    "@toa.io/core": "1.0.0-alpha.327",
+    "@toa.io/definitions": "1.0.0-alpha.327",
     "@toa.io/generic": "1.0.0-alpha.311",
-    "@toa.io/pointer": "1.0.0-alpha.311",
-    "mongodb": "7.6.0",
-    "openspan": "1.0.0-alpha.323"
+    "@toa.io/pointer": "1.0.0-alpha.327",
+    "mongodb": "7.7.0",
+    "openspan": "1.0.0-alpha.327"
   },
-  "gitHead": "95bc03e65c65f02d536da6ed027cf4f78f5cec74"
+  "gitHead": "cd6d6d77f19fbae5d7ff85d18005ca8deb9c77f3"
 }

package/src/match.js

@@ -27,7 +27,8 @@ function matches(record, key, condition) {
     case '$nor':
       return !condition.some((filter) => match(record, filter))
     default:
-      if (key.startsWith('$')) throw new Error(`A change cannot be matched against '${key}'`)
+      if (key.startsWith('$'))
+        throw new Error(`A change cannot be matched against '${key}'`)
 
       return field(read(record, key), condition)
   }
@@ -39,7 +40,8 @@ function field(value, condition) {
   for (const [operator, operand] of Object.entries(condition)) {
     const test = OPERATORS[operator]
 
-    if (test === undefined) throw new Error(`A change cannot be matched against '${operator}'`)
+    if (test === undefined)
+      throw new Error(`A change cannot be matched against '${operator}'`)
     if (!test(value, operand)) return false
   }
 
@@ -65,14 +67,16 @@ function some(value, test) {
 /** `null` is equal to a field that is not there, and a date to a date of the same instant. */
 function equal(value, operand) {
   if (operand === null) return value === null || value === undefined
-  if (operand instanceof Date) return value instanceof Date && value.getTime() === operand.getTime()
+  if (operand instanceof Date)
+    return value instanceof Date && value.getTime() === operand.getTime()
 
   return value === operand
 }
 
 /** Values of one type compare, and values of two types are neither greater nor less. */
 function compare(value, operand) {
-  if (value instanceof Date && operand instanceof Date) return value.getTime() - operand.getTime()
+  if (value instanceof Date && operand instanceof Date)
+    return value.getTime() - operand.getTime()
   if (typeof value === 'number' && typeof operand === 'number') return value - operand
 
   if (typeof value === 'string' && typeof operand === 'string')
@@ -82,7 +86,8 @@ function compare(value, operand) {
 }
 
 function operators(condition) {
-  if (condition === null || typeof condition !== 'object' || condition instanceof Date) return false
+  if (condition === null || typeof condition !== 'object' || condition instanceof Date)
+    return false
   if (Array.isArray(condition)) return false
 
   const keys = Object.keys(condition)

package/src/record.js

@@ -44,7 +44,8 @@ export function codec(properties) {
   for (const [name, schema] of Object.entries(properties ?? {})) {
     const cast = READ[schema?.format]
 
-    if (cast !== undefined && schema.type === TYPES[schema.format]) read.push([name, cast])
+    if (cast !== undefined && schema.type === TYPES[schema.format])
+      read.push([name, cast])
   }
 
   const dates = read.map(([name]) => name)

package/src/storage.js

@@ -492,7 +492,10 @@ export class Storage extends Connector {
   async ensure(query, properties, state, row = undefined) {
     let { criteria, options } = translate(query, this.#dates)
 
-    if (query === undefined) criteria = properties
+    if (query === undefined) criteria = { ...properties }
+
+    // a deleted record is not one to get: the upsert passes it by and creates
+    if (query?.options?.deleted !== true) criteria.DELETED = null
 
     const update = { $setOnInsert: this.#to(state) }
 
@@ -523,8 +526,7 @@ export class Storage extends Connector {
               return found
             })
 
-      if (result.DELETED !== undefined && result.DELETED !== null) return null
-      else return this.#from(result)
+      return this.#from(result)
     } catch (error) {
       if (error.code === ERR_DUPLICATE_KEY)
         throw new exceptions.DuplicateException(this.#client.name)

package/src/streams.js

@@ -52,7 +52,9 @@ export class Streams {
     const token = decode(given)
 
     if (token.h !== hash)
-      throw new exceptions.QuerySyntaxException('The token was issued for other criteria or order')
+      throw new exceptions.QuerySyntaxException(
+        'The token was issued for other criteria or order'
+      )
 
     if (token.id !== undefined) return await this.#window(criteria, options, hash, token)
     if (token.p === null || !this.#history) throw lost()
@@ -84,7 +86,10 @@ export class Streams {
     const position = token.p === null ? null : { p: token.p, t: token.t }
 
     try {
-      return await this.#read(criteria, options, hash, session, position, { id: token.id, c: token.c })
+      return await this.#read(criteria, options, hash, session, position, {
+        id: token.id,
+        c: token.c
+      })
     } catch (exception) {
       await session.endSession()
 
@@ -124,8 +129,10 @@ export class Streams {
    */
   async #read(criteria, options, hash, session, position, after) {
     const limit = options.limit
-    const order = limit === undefined && after === undefined ? null : ordered(options.sort)
-    const filter = after === undefined ? criteria : { $and: [criteria, beyond(order, after)] }
+    const order =
+      limit === undefined && after === undefined ? null : ordered(options.sort)
+    const filter =
+      after === undefined ? criteria : { $and: [criteria, beyond(order, after)] }
 
     const read = { ...options, session, readConcern: { level: 'majority' } }
 
@@ -147,18 +154,30 @@ export class Streams {
       try {
         for await (const record of cursor) {
           count++
-          last = { id: record._id, c: record.CREATED instanceof Date ? record.CREATED.getTime() : undefined }
+          last = {
+            id: record._id,
+            c: record.CREATED instanceof Date ? record.CREATED.getTime() : undefined
+          }
 
           yield parts.entry(from(record))
         }
 
         if (limit !== undefined && count === limit && options.stop !== true) {
-          const window = { v: VERSION, p: position?.p ?? null, t: position?.t ?? null, id: last.id, h: hash }
+          const window = {
+            v: VERSION,
+            p: position?.p ?? null,
+            t: position?.t ?? null,
+            id: last.id,
+            h: hash
+          }
 
           if (order?.[0]?.[0] === 'CREATED') window.c = last.c
 
           yield parts.token(encode(window))
-        } else yield parts.token(position === null ? null : encode({ v: VERSION, p: position.p, h: hash }))
+        } else
+          yield parts.token(
+            position === null ? null : encode({ v: VERSION, p: position.p, h: hash })
+          )
       } finally {
         await cursor.close()
         await session.endSession()
@@ -243,7 +262,8 @@ function classify(event, criteria, from) {
   const after = event.fullDocument
   const before = event.fullDocumentBeforeChange
 
-  if (after !== undefined && after !== null && match(after, criteria)) return parts.entry(from(after))
+  if (after !== undefined && after !== null && match(after, criteria))
+    return parts.entry(from(after))
 
   if (before !== undefined && before !== null && match(before, criteria))
     return parts.removed(String(event.documentKey._id))
@@ -261,21 +281,28 @@ function prefix(filter, path) {
   for (const [key, value] of Object.entries(filter))
     if (LOGICAL.includes(key)) result[key] = value.map((filter) => prefix(filter, path))
     else if (key.startsWith('$'))
-      throw new exceptions.QuerySyntaxException(`What changed in a collection cannot be read by '${key}'`)
+      throw new exceptions.QuerySyntaxException(
+        `What changed in a collection cannot be read by '${key}'`
+      )
     else result[path + key] = value
 
   return result
 }
 
 function refusal(exception) {
-  if (LOST.includes(exception?.code) || exception?.hasErrorLabel?.('NonResumableChangeStreamError'))
+  if (
+    LOST.includes(exception?.code) ||
+    exception?.hasErrorLabel?.('NonResumableChangeStreamError')
+  )
     return lost()
 
   return exception
 }
 
 function lost() {
-  return new exceptions.StateHistoryException('The token names a point the storage no longer holds')
+  return new exceptions.StateHistoryException(
+    'The token names a point the storage no longer holds'
+  )
 }
 
 /**
@@ -300,11 +327,18 @@ function ordered(sort) {
 
   for (const [property] of sort)
     if (!UNMOVING.includes(property))
-      throw new exceptions.QuerySyntaxException(`A stream read in windows is not ordered by '${property}', which changes`)
+      throw new exceptions.QuerySyntaxException(
+        `A stream read in windows is not ordered by '${property}', which changes`
+      )
 
   const [[first, direction]] = sort
 
-  return first === '_id' ? [['_id', direction]] : [['CREATED', direction], ['_id', direction]]
+  return first === '_id'
+    ? [['_id', direction]]
+    : [
+        ['CREATED', direction],
+        ['_id', direction]
+      ]
 }
 
 /** What comes after the last entry a window read, in its order. */

package/src/translate/criteria.js

@@ -14,9 +14,7 @@ export const criteria = (node, dates = NONE) => {
 
 const OPERATORS = {
   LOGIC: {
-    and: '$and',
     ';': '$and',
-    or: '$or',
     ',': '$or'
   },
   COMPARISON: {

package/test/match.test.js

@@ -55,7 +55,10 @@ describe('match', () => {
   })
 
   it('should combine filters', () => {
-    assert.equal(match(record, { $and: [{ owner: 'alice' }, { rank: { $gt: 1 } }] }), true)
+    assert.equal(
+      match(record, { $and: [{ owner: 'alice' }, { rank: { $gt: 1 } }] }),
+      true
+    )
     assert.equal(match(record, { $or: [{ owner: 'bob' }, { rank: { $gt: 1 } }] }), true)
     assert.equal(match(record, { $or: [{ owner: 'bob' }, { rank: { $gt: 9 } }] }), false)
     assert.equal(match(record, { owner: 'alice', DELETED: null, _id: 'a1' }), true)

package/test/record.test.js

@@ -63,7 +63,11 @@ describe('codec', () => {
 
   it('should write a date-time property as a date', () => {
     const { to: write } = codec(properties)
-    const record = write({ id: '1', settled: '2026-09-05T10:00:00.000Z', endpoint: 'a.b.c' })
+    const record = write({
+      id: '1',
+      settled: '2026-09-05T10:00:00.000Z',
+      endpoint: 'a.b.c'
+    })
 
     assert.ok(record.settled instanceof Date)
     assert.strictEqual(record.settled.toISOString(), '2026-09-05T10:00:00.000Z')
@@ -100,8 +104,14 @@ describe('codec', () => {
   })
 
   it('should ignore a format said of the wrong type', () => {
-    assert.deepStrictEqual(codec({ at: { type: 'string', format: 'epoch-millis' } }).dates, [])
-    assert.deepStrictEqual(codec({ at: { type: 'integer', format: 'date-time' } }).dates, [])
+    assert.deepStrictEqual(
+      codec({ at: { type: 'string', format: 'epoch-millis' } }).dates,
+      []
+    )
+    assert.deepStrictEqual(
+      codec({ at: { type: 'integer', format: 'date-time' } }).dates,
+      []
+    )
   })
 })
 
@@ -133,7 +143,10 @@ describe('codec, epoch-millis', () => {
   })
 
   it('should read a record written before the property was a date', () => {
-    assert.strictEqual(codec(properties).from({ _id: '1', DELETED: millis }).DELETED, millis)
+    assert.strictEqual(
+      codec(properties).from({ _id: '1', DELETED: millis }).DELETED,
+      millis
+    )
   })
 
   it('should write the moments of a changeset as dates', () => {
@@ -156,6 +169,9 @@ describe('codec, epoch-millis', () => {
   it('should leave a changeset of an entity that declares no moment as it is', () => {
     const changeset = { VERSION: 2 }
 
-    assert.strictEqual(codec({ VERSION: { type: 'integer' } }).changes(changeset), changeset)
+    assert.strictEqual(
+      codec({ VERSION: { type: 'integer' } }).changes(changeset),
+      changeset
+    )
   })
 })

package/test/storage.test.js

@@ -151,7 +151,10 @@ describe('stream', () => {
   it('should read a window newest first, and by id where entries share a time', async () => {
     await storage.stream({ options: { limit: 2, sort: [['CREATED', 'desc']] } })
 
-    assert.deepStrictEqual(read()[1].sort, [['CREATED', -1], ['_id', -1]])
+    assert.deepStrictEqual(read()[1].sort, [
+      ['CREATED', -1],
+      ['_id', -1]
+    ])
   })
 
   it('should refuse a window ordered by what an entry changes', async () => {