Remove diff from watched query state for real this time.

Author: stevensJourney

packages/common/src/client/watched/processors/DifferentialQueryProcessor.ts

@@ -1,10 +1,4 @@
-import {
-  WatchCompatibleQuery,
-  WatchedQuery,
-  WatchedQueryListener,
-  WatchedQueryOptions,
-  WatchedQueryState
-} from '../WatchedQuery.js';
+import { WatchCompatibleQuery, WatchedQuery, WatchedQueryListener, WatchedQueryOptions } from '../WatchedQuery.js';
 import {
   AbstractQueryProcessor,
   AbstractQueryProcessorOptions,
@@ -89,18 +83,6 @@ export interface DifferentialWatchedQuerySettings<RowType> extends DifferentialW
   query: WatchCompatibleQuery<RowType[]>;
 }
 
-export interface DifferentialWatchedQueryState<RowType> extends WatchedQueryState<ReadonlyArray<Readonly<RowType>>> {
-  /**
-   * The difference between the current and previous result set.
-   */
-  readonly diff: WatchedQueryDifferential<RowType>;
-}
-
-type MutableDifferentialWatchedQueryState<RowType> = MutableWatchedQueryState<RowType[]> & {
-  data: RowType[];
-  diff: WatchedQueryDifferential<RowType>;
-};
-
 export interface DifferentialWatchedQueryListener<RowType>
   extends WatchedQueryListener<ReadonlyArray<Readonly<RowType>>> {
   onDiff?: (diff: WatchedQueryDifferential<RowType>) => void | Promise<void>;
@@ -158,26 +140,13 @@ export class DifferentialQueryProcessor<RowType>
   extends AbstractQueryProcessor<ReadonlyArray<Readonly<RowType>>, DifferentialWatchedQuerySettings<RowType>>
   implements DifferentialWatchedQuery<RowType>
 {
-  readonly state: DifferentialWatchedQueryState<RowType>;
-
   protected differentiator: WatchedQueryDifferentiator<RowType>;
 
   constructor(protected options: DifferentialQueryProcessorOptions<RowType>) {
     super(options);
-    this.state = this.constructInitialState();
     this.differentiator = options.differentiator ?? DEFAULT_WATCHED_QUERY_DIFFERENTIATOR;
   }
 
-  protected constructInitialState(): DifferentialWatchedQueryState<RowType> {
-    return {
-      ...super.constructInitialState(),
-      diff: {
-        ...EMPTY_DIFFERENTIAL,
-        all: this.options.placeholderData
-      }
-    };
-  }
-
   /*
    * @returns If the sets are equal
    */
@@ -274,7 +243,7 @@ export class DifferentialQueryProcessor<RowType>
               await this.updateState({ isFetching: true });
             }
 
-            const partialStateUpdate: Partial<MutableDifferentialWatchedQueryState<RowType>> = {};
+            const partialStateUpdate: Partial<MutableWatchedQueryState<RowType[]>> = {};
 
             // Always run the query if an underlying table has changed
             const result = await watchOptions.query.execute({

packages/vue/src/composables/useWatchedQuerySubscription.ts

@@ -0,0 +1,34 @@
+// import { WatchedQuery } from '@powersync/common';
+// import { reactive, Ref, ref, UnwrapRef, watchEffect } from 'vue';
+
+// /**
+//  * A composable to access and subscribe to the results of an existing {@link WatchedQuery} instance.
+//  * @example
+//  * ```vue
+//  * <script setup>
+//  * import { useQuery } from '@powersync/vue';
+//  *
+//  * const { data, isLoading, isFetching, error} = useQuery(listsQuery);
+//  * </script>
+//  *
+//  * <template>
+//  *    <div v-if="isLoading">Loading...</div>
+//  *    <div v-else-if="isFetching">Updating results...</div>
+//  *
+//  *    <div v-if="error">{{ error }}</div>
+//  *    <ul v-else>
+//  *        <li v-for="l in data" :key="l.id">{{ l.name }}</li>
+//  *    </ul>
+//  * </template>
+//  * ```
+//  */
+// export const useWatchedQuerySubscription = <
+//   ResultType = unknown,
+//   Query extends WatchedQuery<ResultType> = WatchedQuery<ResultType>
+// >(
+//   query: Query
+// ) => {
+//   const state = reactive(query.state);
+
+//   return state;
+// };