@pbvision/firestore-orm 0.0.14 → 0.0.16

package/environment.js

@@ -1 +1 @@
-process.env.FIRESTORE_EMULATOR_HOST = '[::1]:8404'
+process.env.FIRESTORE_EMULATOR_HOST = '127.0.0.1:9091'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pbvision/firestore-orm",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "Firestore ORM Library",
   "license": "Apache-2.0",
   "type": "module",
@@ -59,6 +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",
     "jest": "^29",
     "jsdoc": "3.6.4",
     "nodemon": "^2.0.20",

package/scripts/.firebaserc

@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "localhost-emulator"
+  }
+}

package/scripts/firebase.json

@@ -0,0 +1,12 @@
+{
+  "firestore": {},
+  "emulators": {
+    "singleProjectMode": true,
+    "auth": {
+      "port": "9090"
+    },
+    "firestore": {
+      "port": "9091"
+    }
+  }
+}

package/scripts/start-local-db.sh

@@ -1,12 +1,13 @@
 #!/bin/bash
 set -o errexit
 set -o nounset
+cd "`dirname \"$0\"`"
 
-firestorePort=8404
-pid=`lsof -tPi :$firestorePort -sTCP:LISTEN || echo 'port_not_in_use'`
-if [ "$pid" != "port_not_in_use" ]; then
-    echo "local db emulator port $firestorePort already in use; replacing PID $pid"
+firestorePort=9091
+pid=`ps ax | grep 'firebase emulators:start' | grep -v grep | cut -d' ' -f1`
+if [ "$pid" != "" ]; then
+    echo "local emulator already running; replacing PID $pid"
     kill $pid
 fi
-gcloud emulators firestore start --host-port [::1]:$firestorePort > /dev/null 2> /dev/null &
-echo "firestore db emulator is now running in the background as PID $!"
+firebase emulators:start --only firestore > /dev/null 2> /dev/null &
+echo "firebase emulators are now running in the background as PID $!"

package/src/context.js

@@ -642,11 +642,18 @@ function parseFirestoreError (err) {
     }
 
     // error 6 is if you try to create a model that already exists
-    const docInfo = parseFirestoreErrorPath(err)
-    if (docInfo) {
-      if (err.code === 6) {
-        return new ModelAlreadyExistsError(docInfo.collection, docInfo.id)
+    if (err.code === 6) {
+      // if we can't parse out the doc id, then still throw this error but the
+      // error data will require some parsing to get the doc id later (noticed
+      // that from firebase-tools 1.18.2 to 1.19.1 the format of this error
+      // changed)
+      const docInfo = parseFirestoreErrorPath(err)
+      if (!docInfo) {
+        console.warn('could not parse model already exists error: ', err)
       }
+      return new ModelAlreadyExistsError(
+        docInfo?.collection ?? 'could not parse',
+        docInfo?.id ?? err.message)
     }
   }
 }
@@ -668,5 +675,24 @@ function parseFirestoreErrorPath (err) {
         return elt
       } catch { /* no-op */ }
     }
+  } else {
+    return parseFirestoreErrorPathAlternate(err)
+  }
+}
+
+// istanbul ignore next
+function parseFirestoreErrorPathAlternate (err) {
+  const startIdx = err.message.indexOf('path=')
+  if (startIdx === -1) {
+    return
+  }
+  const endIdx = err.message.lastIndexOf('}')
+  if (endIdx < startIdx) {
+    return
+  }
+  const path = err.message.substring(startIdx + 5, endIdx)
+  const pieces = path.split('/', 2)
+  if (pieces.length === 2) {
+    return { collection: pieces[0], id: pieces[1] }
   }
 }