fix: correctly escape field paths with multiple backslashes or backti…

…cks (#2259) (#2261) Co-authored-by: Albert Nisbet <[email protected]>
googleapis · Dec 17, 2024 · 7056ba7 · 7056ba7
1 parent 3fd0de9
commit 7056ba7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/dev/src/path.ts b/dev/src/path.ts
@@ -672,7 +672,7 @@ export class FieldPath extends Path<FieldPath> implements firestore.FieldPath {
       .map(str => {
         return UNESCAPED_FIELD_NAME_RE.test(str)
           ? str
-          : '`' + str.replace('\\', '\\\\').replace('`', '\\`') + '`';
+          : '`' + str.replace(/\\/g, '\\\\').replace(/`/g, '\\`') + '`';
       })
       .join('.');
   }

diff --git a/dev/test/path.ts b/dev/test/path.ts
@@ -68,9 +68,23 @@ describe('ResourcePath', () => {
 
 describe('FieldPath', () => {
   it('encodes field names', () => {
-    const components = [['foo'], ['foo', 'bar'], ['.', '`'], ['\\']];
-
-    const results = ['foo', 'foo.bar', '`.`.`\\``', '`\\\\`'];
+    const components = [
+      ['foo'],
+      ['foo', 'bar'],
+      ['.', '`'],
+      ['\\'],
+      ['\\\\'],
+      ['``'],
+    ];
+
+    const results = [
+      'foo',
+      'foo.bar',
+      '`.`.`\\``',
+      '`\\\\`',
+      '`\\\\\\\\`',
+      '`\\`\\``',
+    ];
 
     for (let i = 0; i < components.length; ++i) {
       expect(new FieldPath(...components[i]).toString()).to.equal(results[i]);