@pbvision/firestore-orm 0.0.22 → 0.0.24

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@pbvision/firestore-orm",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "Firestore ORM Library",
   "license": "Apache-2.0",
   "type": "module",
   "engines": {
-    "node": ">=20"
+    "node": ">=24"
   },
   "exports": "./src/default-db.js",
   "scripts": {
@@ -40,7 +40,7 @@
   ],
   "dependencies": {
     "@google-cloud/firestore": "^7.1.0",
-    "@pbvision/schema": "^0.2.29",
+    "@pbvision/schema": "^0.2.31",
     "deep-object-diff": "^1.1.7",
     "fast-deep-equal": "^3.1.3",
     "fast-json-stable-stringify": "^2.1.0",
@@ -59,7 +59,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-standard": "^4.0.1",
-    "firebase-tools": "^13.5.2",
+    "firebase-tools": "^14.26.0",
     "jest": "^29",
     "jsdoc": "3.6.4",
     "nodemon": "^2.0.20",

package/src/context.js

@@ -14,6 +14,7 @@ import {
   WriteAttemptedInReadOnlyTxError,
   ModelTrackedTwiceError,
   ModelAlreadyExistsError,
+  TransactionExpiredError,
   TransactionLockTimeoutError
 } from './errors.js'
 import { Key } from './key.js'
@@ -644,6 +645,22 @@ function parseFirestoreError (err) {
       return new TransactionLockTimeoutError(err.message, err)
     }
 
+    // error 3 is INVALID_ARGUMENT, which mostly means the caller got something
+    // wrong and must NOT be retried (bad field value, malformed query). The one
+    // exception is "The referenced transaction has expired or is no longer
+    // valid": the transaction outlived Firestore's limit before this call
+    // reached the server, which happens when the client library's own retries
+    // push a slow call past the window. That says nothing about the work being
+    // wrong, only that this attempt ran out of time, so a fresh transaction is
+    // expected to succeed. Left unclassified it was non-retryable, so a
+    // transient slowdown surfaced to callers as a hard failure. Match on the
+    // message, never on the code alone, so genuine INVALID_ARGUMENT bugs still
+    // fail fast.
+    if (err.code === 3 &&
+        /transaction has expired or is no longer valid/i.test(err.message)) {
+      return new TransactionExpiredError(err.message, err)
+    }
+
     // error 6 is if you try to create a model that already exists
     if (err.code === 6) {
       // if we can't parse out the doc id, then still throw this error but the
@@ -683,13 +700,17 @@ function parseFirestoreErrorPath (err) {
   }
 }
 
-// istanbul ignore next
 function parseFirestoreErrorPathAlternate (err) {
   const startIdx = err.message.indexOf('path=')
   if (startIdx === -1) {
     return
   }
-  const endIdx = err.message.lastIndexOf('}')
+  // the path value is terminated by the EntityRef bracket. firebase-tools<=14
+  // (firestore emulator v1.19.x) wraps it in curly braces
+  // (EntityRef{...path=/Type/id}), while v1.21.0 switched to square brackets
+  // (EntityRef[...path=/Type/id]); accept whichever closes last.
+  const endIdx = Math.max(
+    err.message.lastIndexOf('}'), err.message.lastIndexOf(']'))
   if (endIdx < startIdx) {
     return
   }

package/src/errors.js

@@ -70,6 +70,23 @@ export class TransactionLockTimeoutError extends TransactionFailedError {
   }
 }
 
+/**
+ * Thrown when Firestore rejects an operation because the transaction it names
+ * is no longer valid, i.e. the transaction outlived Firestore's limit before
+ * this call reached the server. Like a lock timeout this says nothing about the
+ * work being wrong, only that this attempt ran out of time, so a fresh attempt
+ * is expected to succeed and it is retryable.
+ *
+ * @memberof Errors
+ */
+export class TransactionExpiredError extends TransactionFailedError {
+  constructor (reason, original) {
+    super(reason, original)
+    this.name = this.constructor.name
+    this.retryable = true
+  }
+}
+
 /**
  * Thrown when there's some error with a particular model.
  * @memberof Errors