@legendapp/state 0.21.15 → 0.21.16-next.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@legendapp/state",
3
- "version": "0.21.15",
3
+ "version": "0.21.16-next.1",
4
4
  "description": "legend-state",
5
5
  "sideEffects": false,
6
6
  "private": false,
@@ -1,3 +1,5 @@
1
- import { QueryKey } from '@tanstack/query-core';
1
+ import { QueryClient, QueryKey } from '@tanstack/query-core';
2
2
  import { UseBaseQueryOptions, UseMutationOptions } from '@tanstack/react-query';
3
- export declare function useObservableQuery<TQueryFnData, TError, TData, TQueryData, TQueryKey extends QueryKey, TContext>(options: UseBaseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>, mutationOptions?: UseMutationOptions<TData, TError, void, TContext>): import("@legendapp/state").ObservableObject<any> | import("@legendapp/state").ObservableArray<any>;
3
+ export declare function useObservableQuery<TQueryFnData, TError, TData, TQueryData, TQueryKey extends QueryKey, TContext>(options: UseBaseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey> & {
4
+ queryClient?: QueryClient;
5
+ }, mutationOptions?: UseMutationOptions<TData, TError, void, TContext>): import("@legendapp/state").ObservableObject<any> | import("@legendapp/state").ObservableArray<any>;
@@ -1,7 +1,6 @@
1
1
  'use strict';
2
2
 
3
3
  var state = require('@legendapp/state');
4
- var react = require('@legendapp/state/react');
5
4
  var queryCore = require('@tanstack/query-core');
6
5
  var reactQuery = require('@tanstack/react-query');
7
6
  var React = require('react');
@@ -54,7 +53,7 @@ const getHasError = ({ result, errorResetBoundary, useErrorBoundary, query, }) =
54
53
  };
55
54
  function useObservableQuery(options, mutationOptions) {
56
55
  const Observer = queryCore.QueryObserver;
57
- const queryClient = reactQuery.useQueryClient({ context: options.context });
56
+ const queryClient = (options === null || options === void 0 ? void 0 : options.queryClient) || reactQuery.useQueryClient({ context: options.context });
58
57
  const isRestoring = reactQuery.useIsRestoring();
59
58
  const errorResetBoundary = reactQuery.useQueryErrorResetBoundary();
60
59
  const defaultedOptions = queryClient.defaultQueryOptions(options);
@@ -118,7 +117,7 @@ function useObservableQuery(options, mutationOptions) {
118
117
  // eslint-disable-next-line react-hooks/rules-of-hooks
119
118
  mutator = reactQuery.useMutation(mutationOptions);
120
119
  }
121
- const [{ obs, unsubscribe }] = React__namespace.useState(() => {
120
+ const [obs] = React__namespace.useState(() => {
122
121
  const obs = state.observable(observer.getCurrentResult());
123
122
  let isSetting = false;
124
123
  // If there is a mutator watch for changes as long as they don't come from the the query observer
@@ -131,7 +130,7 @@ function useObservableQuery(options, mutationOptions) {
131
130
  }
132
131
  });
133
132
  }
134
- const unsubscribe = observer.subscribe((result) => {
133
+ observer.subscribe((result) => {
135
134
  isSetting = true;
136
135
  try {
137
136
  // Update the observable with the latest value
@@ -142,10 +141,8 @@ function useObservableQuery(options, mutationOptions) {
142
141
  isSetting = false;
143
142
  }
144
143
  });
145
- return { obs, unsubscribe };
144
+ return obs;
146
145
  });
147
- // Unsubscribe from the query observer on unmount
148
- react.useUnmount(unsubscribe);
149
146
  // Return the observable
150
147
  return obs;
151
148
  }
@@ -1 +1 @@
1
- {"version":3,"file":"useObservableQuery.js","sources":["../../../../src/react-hooks/useObservableQuery.ts"],"sourcesContent":[null],"names":["React","QueryObserver","useQueryClient","useIsRestoring","useQueryErrorResetBoundary","notifyManager","useMutation","observable","observe","useUnmount"],"mappings":"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"}
1
+ {"version":3,"file":"useObservableQuery.js","sources":["../../../../src/react-hooks/useObservableQuery.ts"],"sourcesContent":[null],"names":["React","QueryObserver","useQueryClient","useIsRestoring","useQueryErrorResetBoundary","notifyManager","useMutation","observable","observe"],"mappings":"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"}
@@ -1,5 +1,4 @@
1
1
  import { observable, observe } from '@legendapp/state';
2
- import { useUnmount } from '@legendapp/state/react';
3
2
  import { notifyManager, QueryObserver } from '@tanstack/query-core';
4
3
  import { useQueryClient, useIsRestoring, useQueryErrorResetBoundary, useMutation } from '@tanstack/react-query';
5
4
  import * as React from 'react';
@@ -33,7 +32,7 @@ const getHasError = ({ result, errorResetBoundary, useErrorBoundary, query, }) =
33
32
  };
34
33
  function useObservableQuery(options, mutationOptions) {
35
34
  const Observer = QueryObserver;
36
- const queryClient = useQueryClient({ context: options.context });
35
+ const queryClient = (options === null || options === void 0 ? void 0 : options.queryClient) || useQueryClient({ context: options.context });
37
36
  const isRestoring = useIsRestoring();
38
37
  const errorResetBoundary = useQueryErrorResetBoundary();
39
38
  const defaultedOptions = queryClient.defaultQueryOptions(options);
@@ -97,7 +96,7 @@ function useObservableQuery(options, mutationOptions) {
97
96
  // eslint-disable-next-line react-hooks/rules-of-hooks
98
97
  mutator = useMutation(mutationOptions);
99
98
  }
100
- const [{ obs, unsubscribe }] = React.useState(() => {
99
+ const [obs] = React.useState(() => {
101
100
  const obs = observable(observer.getCurrentResult());
102
101
  let isSetting = false;
103
102
  // If there is a mutator watch for changes as long as they don't come from the the query observer
@@ -110,7 +109,7 @@ function useObservableQuery(options, mutationOptions) {
110
109
  }
111
110
  });
112
111
  }
113
- const unsubscribe = observer.subscribe((result) => {
112
+ observer.subscribe((result) => {
114
113
  isSetting = true;
115
114
  try {
116
115
  // Update the observable with the latest value
@@ -121,10 +120,8 @@ function useObservableQuery(options, mutationOptions) {
121
120
  isSetting = false;
122
121
  }
123
122
  });
124
- return { obs, unsubscribe };
123
+ return obs;
125
124
  });
126
- // Unsubscribe from the query observer on unmount
127
- useUnmount(unsubscribe);
128
125
  // Return the observable
129
126
  return obs;
130
127
  }
@@ -1 +1 @@
1
- {"version":3,"file":"useObservableQuery.mjs","sources":["../../../../src/react-hooks/useObservableQuery.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useObservableQuery.mjs","sources":["../../../../src/react-hooks/useObservableQuery.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
@@ -1,3 +1,5 @@
1
- import { QueryKey } from '@tanstack/query-core';
1
+ import { QueryClient, QueryKey } from '@tanstack/query-core';
2
2
  import { UseBaseQueryOptions, UseMutationOptions } from '@tanstack/react-query';
3
- export declare function useObservableQuery<TQueryFnData, TError, TData, TQueryData, TQueryKey extends QueryKey, TContext>(options: UseBaseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>, mutationOptions?: UseMutationOptions<TData, TError, void, TContext>): import("@legendapp/state").ObservableObject<any> | import("@legendapp/state").ObservableArray<any>;
3
+ export declare function useObservableQuery<TQueryFnData, TError, TData, TQueryData, TQueryKey extends QueryKey, TContext>(options: UseBaseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey> & {
4
+ queryClient?: QueryClient;
5
+ }, mutationOptions?: UseMutationOptions<TData, TError, void, TContext>): import("@legendapp/state").ObservableObject<any> | import("@legendapp/state").ObservableArray<any>;