mobx-tanstack-query-api 0.8.1 → 0.8.2

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.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/runtime/endpoint-query.d.ts +0 -1
  3. package/runtime/endpoint-query.d.ts.map +1 -1
  4. package/runtime/endpoint-query.js +13 -8
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mobx-tanstack-query-api",
3
- "version": "0.8.1",
3
+ "version": "0.8.2",
4
4
  "keywords": [],
5
5
  "author": "js2me",
6
6
  "license": "MIT",
package/runtime/endpoint-query.d.ts CHANGED
@@ -6,7 +6,6 @@ import { EndpointQueryFlattenOptions, EndpointQueryOptions, EndpointQueryUniqKey
6
6
  import { AnyEndpoint } from './endpoint.types.js';
7
7
  export declare class EndpointQuery<TEndpoint extends AnyEndpoint, TQueryFnData = TEndpoint['__response']['data'], TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData> extends Query<TQueryFnData, TError, TData, TQueryData> {
8
8
  private endpoint;
9
- private uniqKey?;
10
9
  private _observableData;
11
10
  constructor(endpoint: AnyEndpoint, queryClient: EndpointQueryClient, queryOptionsInput: EndpointQueryOptions<TEndpoint, TQueryFnData, TError, TData, TQueryData> | (() => EndpointQueryFlattenOptions<TEndpoint, TQueryFnData, TError, TData, TQueryData>));
12
11
  get params(): MaybeFalsy<TEndpoint["__params"]>;
package/runtime/endpoint-query.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"endpoint-query.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-query.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EACZ,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EAAE,KAAK,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAG3E,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAW,MAAM,qBAAqB,CAAC;AAE5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EACL,2BAA2B,EAC3B,oBAAoB,EACpB,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAUlD,qBAAa,aAAa,CACxB,SAAS,SAAS,WAAW,EAC7B,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,EAC9C,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,EACpB,UAAU,GAAG,YAAY,CACzB,SAAQ,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC;IAMpD,OAAO,CAAC,QAAQ;IALlB,OAAO,CAAC,OAAO,CAAC,CAAuB;IAEvC,OAAO,CAAC,eAAe,CAAoC;gBAGjD,QAAQ,EAAE,WAAW,EAC7B,WAAW,EAAE,mBAAmB,EAChC,iBAAiB,EACb,oBAAoB,CAAC,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,GACxE,CAAC,MAAM,2BAA2B,CAChC,SAAS,EACT,YAAY,EACZ,MAAM,EACN,KAAK,EACL,UAAU,CACX,CAAC;IA8KR,IAAI,MAAM,sCAET;IAED,IAAI,QAAQ,mCAEX;IAED,MAAM,CACJ,YAAY,EAAE,IAAI,CAChB,6BAA6B,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,EACtE,iBAAiB,CAClB,GAAG;QACF,MAAM,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;KAC5C;IAyBG,KAAK,CACT,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,GACxC,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAS9C,OAAO,IAAI,IAAI;CAOhB;AAED,eAAO,MAAM,oBAAoB,GAAI,KAAK,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,KAChC,WAAW,CAAC,UAAU,CAC7D,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,UAAU,WAAW,EACrB,QAAQ,UAAU,CAAC,SAAS,CAAC,EAC7B,SAAS,KAAK,CAAC,oBAAoB,CAAC,KACnC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,GAAG,EAAE,CAAA;CAerC,CAAC"}
1
+ {"version":3,"file":"endpoint-query.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-query.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EACZ,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EAAE,KAAK,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAG3E,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAW,MAAM,qBAAqB,CAAC;AAE5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EACL,2BAA2B,EAC3B,oBAAoB,EACpB,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAWlD,qBAAa,aAAa,CACxB,SAAS,SAAS,WAAW,EAC7B,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,EAC9C,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,EACpB,UAAU,GAAG,YAAY,CACzB,SAAQ,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC;IAIpD,OAAO,CAAC,QAAQ;IAHlB,OAAO,CAAC,eAAe,CAAoC;gBAGjD,QAAQ,EAAE,WAAW,EAC7B,WAAW,EAAE,mBAAmB,EAChC,iBAAiB,EACb,oBAAoB,CAAC,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,GACxE,CAAC,MAAM,2BAA2B,CAChC,SAAS,EACT,YAAY,EACZ,MAAM,EACN,KAAK,EACL,UAAU,CACX,CAAC;IAqLR,IAAI,MAAM,sCAET;IAED,IAAI,QAAQ,mCAEX;IAED,MAAM,CACJ,YAAY,EAAE,IAAI,CAChB,6BAA6B,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,EACtE,iBAAiB,CAClB,GAAG;QACF,MAAM,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;KAC5C;IA6BG,KAAK,CACT,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,GACxC,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAa9C,OAAO,IAAI,IAAI;CAOhB;AAED,eAAO,MAAM,oBAAoB,GAAI,KAAK,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,KAChC,WAAW,CAAC,UAAU,CAC7D,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,UAAU,WAAW,EACrB,QAAQ,UAAU,CAAC,SAAS,CAAC,EAC7B,SAAS,KAAK,CAAC,oBAAoB,CAAC,KACnC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,GAAG,EAAE,CAAA;CAerC,CAAC"}
package/runtime/endpoint-query.js CHANGED
@@ -4,7 +4,6 @@ import { callFunction } from 'yummies/common';
4
4
  import { getMobxAdministration, lazyObserve } from 'yummies/mobx';
5
5
  export class EndpointQuery extends Query {
6
6
  endpoint;
7
- uniqKey;
8
7
  _observableData;
9
8
  constructor(endpoint, queryClient, queryOptionsInput) {
10
9
  const isQueryOptionsInputFn = typeof queryOptionsInput === 'function';
@@ -16,6 +15,7 @@ export class EndpointQuery extends Query {
16
15
  params: null,
17
16
  dynamicOptions: undefined,
18
17
  response: null,
18
+ uniqKey: unpackedQueryOptionsInput.uniqKey,
19
19
  };
20
20
  if (!isQueryOptionsInputFn && typeof params !== 'function') {
21
21
  if ('params' in unpackedQueryOptionsInput) {
@@ -36,7 +36,7 @@ export class EndpointQuery extends Query {
36
36
  queryClient,
37
37
  meta: endpoint.toQueryMeta(queryOptions.meta),
38
38
  options: (query) => {
39
- const builtOptions = buildOptionsFromParams(endpoint, _observableData.params, uniqKey);
39
+ const builtOptions = buildOptionsFromParams(endpoint, _observableData.params, _observableData.uniqKey);
40
40
  let isEnabled = !!_observableData.initialized && builtOptions.enabled;
41
41
  if (typeof queryOptionsInput !== 'function' &&
42
42
  queryOptionsInput.enabled === false) {
@@ -85,9 +85,11 @@ export class EndpointQuery extends Query {
85
85
  const createParamsReaction = () => reaction(() => {
86
86
  let outDynamicOptions;
87
87
  let outParams;
88
+ let uniqKey;
88
89
  if (isQueryOptionsInputFn) {
89
90
  const result = queryOptionsInput();
90
- const { params, abortSignal, select, onDone, onError, onInit, enableOnDemand, ...dynamicOptions } = result;
91
+ const { params, abortSignal, select, onDone, onError, onInit, enableOnDemand, uniqKey: _uniqKey, ...dynamicOptions } = result;
92
+ uniqKey = _uniqKey;
91
93
  if ('params' in result) {
92
94
  outParams = result.params;
93
95
  }
@@ -101,19 +103,23 @@ export class EndpointQuery extends Query {
101
103
  }
102
104
  else if ('params' in unpackedQueryOptionsInput) {
103
105
  outParams = unpackedQueryOptionsInput.params;
106
+ uniqKey = unpackedQueryOptionsInput.uniqKey;
104
107
  }
105
108
  else {
106
109
  outParams = {};
110
+ uniqKey = unpackedQueryOptionsInput.uniqKey;
107
111
  }
108
112
  return {
109
113
  params: callFunction(outParams),
110
114
  dynamicOptions: outDynamicOptions,
115
+ uniqKey,
111
116
  };
112
- }, ({ params, dynamicOptions }) => {
117
+ }, ({ params, dynamicOptions, uniqKey }) => {
113
118
  runInAction(() => {
114
119
  _observableData.initialized = true;
115
120
  _observableData.params = params;
116
121
  _observableData.dynamicOptions = dynamicOptions;
122
+ _observableData.uniqKey = uniqKey;
117
123
  });
118
124
  }, {
119
125
  fireImmediately: true,
@@ -129,7 +135,6 @@ export class EndpointQuery extends Query {
129
135
  this.abortController.signal.addEventListener('abort', createParamsReaction());
130
136
  }
131
137
  }
132
- this.uniqKey = uniqKey;
133
138
  this._observableData = _observableData;
134
139
  }
135
140
  get params() {
@@ -145,13 +150,13 @@ export class EndpointQuery extends Query {
145
150
  this._observableData.params = params;
146
151
  });
147
152
  return super.update({
148
- ...buildOptionsFromParams(this.endpoint, params, this.uniqKey),
153
+ ...buildOptionsFromParams(this.endpoint, params, this._observableData.uniqKey),
149
154
  ...options,
150
155
  });
151
156
  }
152
157
  else if (this._observableData) {
153
158
  return super.update({
154
- ...buildOptionsFromParams(this.endpoint, this._observableData.params, this.uniqKey),
159
+ ...buildOptionsFromParams(this.endpoint, this._observableData.params, this._observableData.uniqKey),
155
160
  ...updateParams,
156
161
  });
157
162
  }
@@ -163,7 +168,7 @@ export class EndpointQuery extends Query {
163
168
  runInAction(() => {
164
169
  this._observableData.params = params;
165
170
  });
166
- return await super.start(buildOptionsFromParams(this.endpoint, params, this.uniqKey));
171
+ return await super.start(buildOptionsFromParams(this.endpoint, params, this._observableData.uniqKey));
167
172
  }
168
173
  destroy() {
169
174
  super.destroy();