incremented package version

onServerPrefetchFix move to new fork

packages/vue-apollo-composable/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "@vue/apollo-composable",
-  "version": "4.0.0-beta.1",
+  "name": "@speckle/vue-apollo-composable",
+  "version": "4.0.0-beta.2",
   "description": "Apollo GraphQL for Vue Composition API",
   "repository": {
     "type": "git",
-    "url": "https://github.com/vuejs/vue-apollo.git",
+    "url": "https://github.com/specklesystems/apollo.git",
     "directory": "packages/vue-apollo-composable"
   },
   "keywords": [
@@ -32,7 +32,7 @@
     "dev": "rimraf dist && nodemon --exec 'pnpm run build:code' --watch src --ext js,ts",
     "build": "rimraf dist && pnpm run build:code",
     "build:code": "node esbuild.mjs && tsc -d --emitDeclarationOnly",
-    "prepublishOnly": "pnpm run test && pnpm run build",
+    "prepublishOnly": "pnpm run test && pnpm run build:code",
     "test": "pnpm run test:types",
     "test:types": "tsc -p tests/types/"
   },

packages/vue-apollo-composable/src/useQuery.ts

@@ -21,6 +21,7 @@ import {
   ObservableSubscription,
   TypedDocumentNode,
   ApolloError,
+  NetworkStatus
 } from '@apollo/client/core'
 import { throttle, debounce } from 'throttle-debounce'
 import { useApolloClient } from './useApolloClient'
@@ -170,20 +171,45 @@ export function useQueryImpl<
 
   // SSR
   let firstResolve: (() => void) | undefined
+  let firstResolveTriggered = false
   let firstReject: ((apolloError: ApolloError) => void) | undefined
+  let firstRejectError: undefined | ApolloError
+
+  const tryFirstResolve = () => {
+    firstResolveTriggered = true
+    if (firstResolve) firstResolve()
+  }
+
+  const tryFirstReject = (apolloError: ApolloError) => {
+    firstRejectError = apolloError
+    if (firstReject) firstReject(apolloError)
+  }
+
+  const resetFirstResolveReject = () => {
+    firstResolve = undefined
+    firstReject = undefined
+    firstResolveTriggered = false
+    firstRejectError = undefined
+    stop()
+  }
+
   vm && onServerPrefetch?.(() => {
     if (!isEnabled.value || (isServer && currentOptions.value?.prefetch === false)) return
 
     return new Promise<void>((resolve, reject) => {
       firstResolve = () => {
+        resetFirstResolveReject()
         resolve()
-        firstResolve = undefined
-        firstReject = undefined
       }
       firstReject = (apolloError: ApolloError) => {
+        resetFirstResolveReject()
         reject(apolloError)
-        firstResolve = undefined
-        firstReject = undefined
+      }
+
+      if (firstResolveTriggered) {
+        firstResolve()
+      } else if (firstRejectError) {
+        firstReject(firstRejectError)
       }
     }).then(stop).catch(stop)
   })
@@ -196,6 +222,7 @@ export function useQueryImpl<
   const query: Ref<ObservableQuery<TResult, TVariables> | null | undefined> = ref()
   let observer: ObservableSubscription | undefined
   let started = false
+  let isFirstRun = true
 
   /**
    * Starts watching the query
@@ -205,7 +232,7 @@ export function useQueryImpl<
       started || !isEnabled.value ||
       (isServer && currentOptions.value?.prefetch === false)
     ) {
-      if (firstResolve) firstResolve()
+      tryFirstResolve()
       return
     }
 
@@ -233,12 +260,26 @@ export function useQueryImpl<
         addSubscribeToMore(item)
       }
     }
+
+    isFirstRun = false
   }
 
   function startQuerySubscription () {
     if (observer && !observer.closed) return
     if (!query.value) return
 
+    // If hydrating already finished queries, just handle result immediately
+    if (!isServer && isFirstRun) {
+      const currentResult = query.value.getCurrentResult()
+      if (currentResult) {
+        if (currentResult.networkStatus === NetworkStatus.ready) {
+          onNextResult(currentResult)
+        } else if (currentResult.networkStatus === NetworkStatus.error && currentResult.error) {
+          onError(currentResult.error)
+        }
+      }
+    }
+
     // Create subscription
     observer = query.value.subscribe({
       next: onNextResult,
@@ -259,10 +300,7 @@ export function useQueryImpl<
       processError(resultErrorsToApolloError(queryResult.errors))
     }
 
-    if (firstResolve) {
-      firstResolve()
-      stop()
-    }
+    tryFirstResolve()
   }
 
   function processNextResult (queryResult: ApolloQueryResult<TResult>) {
@@ -282,10 +320,7 @@ export function useQueryImpl<
       processNextResult((query.value as ObservableQuery<TResult, TVariables>).getCurrentResult())
     }
     processError(apolloError)
-    if (firstReject) {
-      firstReject(apolloError)
-      stop()
-    }
+    tryFirstReject(apolloError)
     // The observable closes the sub if an error occurs
     resubscribeToQuery()
   }
@@ -312,7 +347,7 @@ export function useQueryImpl<
    * Stop watching the query
    */
   function stop () {
-    if (firstResolve) firstResolve()
+    tryFirstResolve()
     if (!started) return
     started = false
     loading.value = false