From 1bb2420fbb9e89cd51acabe1ebd0376df232ec3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donatas=20Lu=C4=8Di=C5=ABnas?= Date: Sun, 6 Feb 2022 12:45:38 +0200 Subject: [PATCH 1/4] Update utils.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Works incorrectly with { collection: [{ ref: null }] } → { collection: [{ ref: 'something/longId' }] } --- packages/@posva/vuefire-core/src/firestore/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@posva/vuefire-core/src/firestore/utils.ts b/packages/@posva/vuefire-core/src/firestore/utils.ts index 3fb3c6c5..c0787bd0 100644 --- a/packages/@posva/vuefire-core/src/firestore/utils.ts +++ b/packages/@posva/vuefire-core/src/firestore/utils.ts @@ -69,7 +69,7 @@ export function extractRefs( key in oldDoc && // only copy refs if they were refs before // https://github.com/vuejs/vuefire/issues/831 - typeof oldDoc[key] != 'string' + typeof oldDoc[key] === 'object' ? oldDoc[key] : ref.path // TODO: handle subpathes? From b5e3274d604da22991e194a94e644118cbc6e400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donatas=20Lu=C4=8Di=C5=ABnas?= Date: Sun, 6 Feb 2022 14:00:01 +0200 Subject: [PATCH 2/4] Update utils.ts --- packages/@posva/vuefire-core/src/firestore/utils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/@posva/vuefire-core/src/firestore/utils.ts b/packages/@posva/vuefire-core/src/firestore/utils.ts index c0787bd0..3245bbcd 100644 --- a/packages/@posva/vuefire-core/src/firestore/utils.ts +++ b/packages/@posva/vuefire-core/src/firestore/utils.ts @@ -69,9 +69,9 @@ export function extractRefs( key in oldDoc && // only copy refs if they were refs before // https://github.com/vuejs/vuefire/issues/831 - typeof oldDoc[key] === 'object' - ? oldDoc[key] - : ref.path + typeof oldDoc[key] === 'string' || oldDoc[key] === null + ? ref.path + : oldDoc[key] // TODO: handle subpathes? refs[path + key] = ref } else if (Array.isArray(ref)) { From 1c5f95753a31a2f6b26047a135a43640bbd277b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donatas=20Lu=C4=8Di=C5=ABnas?= Date: Sun, 6 Feb 2022 14:11:48 +0200 Subject: [PATCH 3/4] Bugfix --- packages/@posva/vuefire-core/src/firestore/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@posva/vuefire-core/src/firestore/utils.ts b/packages/@posva/vuefire-core/src/firestore/utils.ts index 3245bbcd..ade01634 100644 --- a/packages/@posva/vuefire-core/src/firestore/utils.ts +++ b/packages/@posva/vuefire-core/src/firestore/utils.ts @@ -69,7 +69,7 @@ export function extractRefs( key in oldDoc && // only copy refs if they were refs before // https://github.com/vuejs/vuefire/issues/831 - typeof oldDoc[key] === 'string' || oldDoc[key] === null + (typeof oldDoc[key] === 'string' || oldDoc[key] === null) ? ref.path : oldDoc[key] // TODO: handle subpathes? From adf9f0492d19330ad1dca4fa168b25d1d64061d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donatas=20Lu=C4=8Di=C5=ABnas?= Date: Sun, 6 Feb 2022 14:31:06 +0200 Subject: [PATCH 4/4] Update utils.ts --- packages/@posva/vuefire-core/src/firestore/utils.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/@posva/vuefire-core/src/firestore/utils.ts b/packages/@posva/vuefire-core/src/firestore/utils.ts index ade01634..1d4edad1 100644 --- a/packages/@posva/vuefire-core/src/firestore/utils.ts +++ b/packages/@posva/vuefire-core/src/firestore/utils.ts @@ -69,9 +69,10 @@ export function extractRefs( key in oldDoc && // only copy refs if they were refs before // https://github.com/vuejs/vuefire/issues/831 - (typeof oldDoc[key] === 'string' || oldDoc[key] === null) - ? ref.path - : oldDoc[key] + typeof oldDoc[key] != 'string' && + oldDoc[key] !== null + ? oldDoc[key] + : ref.path // TODO: handle subpathes? refs[path + key] = ref } else if (Array.isArray(ref)) {