@tramvai/react-query 2.146.0 → 2.147.1

package/lib/baseQuery/types.d.ts

@@ -11,6 +11,7 @@ export type ReactQueryKeyOrString = ReactQueryKey | string;
 export type QueryKey<Options, Deps extends ProviderDeps> = ((this: ReactQueryContext<Deps>, options: Options) => ReactQueryKeyOrString) | ReactQueryKeyOrString;
 export interface BaseCreateQueryOptions<Options, Deps extends ProviderDeps> {
     key: QueryKey<Options, Deps>;
+    actionNamePostfix?: string;
     fn: Function;
     deps?: Deps;
     conditions?: ActionConditionsParameters;
@@ -24,5 +25,6 @@ export interface BaseQuery<Options, TCreateQuery, TQuery, TUseQuery> {
      */
     raw(context: ActionContext, options?: Options): TUseQuery;
     prefetchAction(options?: Options): TramvaiAction<[], Promise<void>, any>;
+    actionNamePostfix: string;
 }
 export declare const isQuery: <Options, Result, TCreateQuery, TQuery, TUseQuery>(arg: BaseQuery<Options, TCreateQuery, TQuery, TUseQuery> | QueryOptions<Result, any, any, any>) => arg is BaseQuery<Options, TCreateQuery, TQuery, TUseQuery>;

package/lib/infiniteQuery/create.es.js

@@ -1,12 +1,13 @@
 import identity from '@tinkoff/utils/function/identity';
 import { declareAction } from '@tramvai/core';
 import { QUERY_CLIENT_TOKEN } from '@tramvai/module-react-query';
-import { CONTEXT_TOKEN } from '@tramvai/tokens-common';
+import { LOGGER_TOKEN, CONTEXT_TOKEN } from '@tramvai/tokens-common';
 import { DI_TOKEN } from '@tinkoff/dippy';
 import { QUERY_PARAMETERS } from '../baseQuery/types.es.js';
 import { normalizeKey } from '../shared/normalizeKey.es.js';
 import { resolveDI } from '../shared/resolveDI.es.js';
 import { mapQuerySignalToxecutionContext } from '../shared/signal.es.js';
+import { createUniqueActionKeyForQuery } from '../shared/createUniqueActionKeyForQuery.es.js';
 
 const convertToRawQuery = (query, di, options) => {
     const { key = identity, fn, getNextPageParam, getPreviousPageParam, deps = {}, conditions, infiniteQueryOptions, } = query[QUERY_PARAMETERS];
@@ -15,7 +16,7 @@ const convertToRawQuery = (query, di, options) => {
     const rawQueryKey = typeof key === 'function' ? key.call(ctx, options) : key;
     const queryKey = normalizeKey(rawQueryKey);
     const actionWrapper = declareAction({
-        name: 'infiniteQueryExecution',
+        name: `infiniteQueryExecution:${query.actionNamePostfix}`,
         async fn(queryContext) {
             const { abortSignal, abortController } = this;
             mapQuerySignalToxecutionContext(queryContext, this);
@@ -43,6 +44,7 @@ const createInfiniteQuery = (queryParameters) => {
     const { infiniteQueryOptions, conditions } = queryParameters;
     const query = {
         [QUERY_PARAMETERS]: queryParameters,
+        actionNamePostfix: createUniqueActionKeyForQuery(queryParameters),
         fork: (options) => {
             return createInfiniteQuery({
                 ...queryParameters,
@@ -57,26 +59,28 @@ const createInfiniteQuery = (queryParameters) => {
         },
         prefetchAction: (options) => {
             return declareAction({
-                name: 'infiniteQueryPrefetch',
+                name: `infiniteQueryPrefetch:${query.actionNamePostfix}`,
                 fn() {
                     return this.deps.queryClient.prefetchInfiniteQuery(convertToRawQuery(query, this.deps.di, options));
                 },
                 deps: {
                     di: DI_TOKEN,
                     queryClient: QUERY_CLIENT_TOKEN,
+                    logger: LOGGER_TOKEN,
                 },
                 conditions,
             });
         },
         fetchAction: (options) => {
             return declareAction({
-                name: 'infiniteQueryFetch',
+                name: `infiniteQueryFetch:${query.actionNamePostfix}`,
                 fn() {
                     return this.deps.queryClient.fetchInfiniteQuery(convertToRawQuery(query, this.deps.di, options));
                 },
                 deps: {
                     di: DI_TOKEN,
                     queryClient: QUERY_CLIENT_TOKEN,
+                    logger: LOGGER_TOKEN,
                 },
                 conditions,
             });

package/lib/infiniteQuery/create.js

@@ -11,6 +11,7 @@ var types = require('../baseQuery/types.js');
 var normalizeKey = require('../shared/normalizeKey.js');
 var resolveDI = require('../shared/resolveDI.js');
 var signal = require('../shared/signal.js');
+var createUniqueActionKeyForQuery = require('../shared/createUniqueActionKeyForQuery.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -23,7 +24,7 @@ const convertToRawQuery = (query, di, options) => {
     const rawQueryKey = typeof key === 'function' ? key.call(ctx, options) : key;
     const queryKey = normalizeKey.normalizeKey(rawQueryKey);
     const actionWrapper = core.declareAction({
-        name: 'infiniteQueryExecution',
+        name: `infiniteQueryExecution:${query.actionNamePostfix}`,
         async fn(queryContext) {
             const { abortSignal, abortController } = this;
             signal.mapQuerySignalToxecutionContext(queryContext, this);
@@ -51,6 +52,7 @@ const createInfiniteQuery = (queryParameters) => {
     const { infiniteQueryOptions, conditions } = queryParameters;
     const query = {
         [types.QUERY_PARAMETERS]: queryParameters,
+        actionNamePostfix: createUniqueActionKeyForQuery.createUniqueActionKeyForQuery(queryParameters),
         fork: (options) => {
             return createInfiniteQuery({
                 ...queryParameters,
@@ -65,26 +67,28 @@ const createInfiniteQuery = (queryParameters) => {
         },
         prefetchAction: (options) => {
             return core.declareAction({
-                name: 'infiniteQueryPrefetch',
+                name: `infiniteQueryPrefetch:${query.actionNamePostfix}`,
                 fn() {
                     return this.deps.queryClient.prefetchInfiniteQuery(convertToRawQuery(query, this.deps.di, options));
                 },
                 deps: {
                     di: dippy.DI_TOKEN,
                     queryClient: moduleReactQuery.QUERY_CLIENT_TOKEN,
+                    logger: tokensCommon.LOGGER_TOKEN,
                 },
                 conditions,
             });
         },
         fetchAction: (options) => {
             return core.declareAction({
-                name: 'infiniteQueryFetch',
+                name: `infiniteQueryFetch:${query.actionNamePostfix}`,
                 fn() {
                     return this.deps.queryClient.fetchInfiniteQuery(convertToRawQuery(query, this.deps.di, options));
                 },
                 deps: {
                     di: dippy.DI_TOKEN,
                     queryClient: moduleReactQuery.QUERY_CLIENT_TOKEN,
+                    logger: tokensCommon.LOGGER_TOKEN,
                 },
                 conditions,
             });

package/lib/query/create.es.js

@@ -2,11 +2,12 @@ import identity from '@tinkoff/utils/function/identity';
 import { DI_TOKEN } from '@tinkoff/dippy';
 import { declareAction } from '@tramvai/core';
 import { QUERY_CLIENT_TOKEN } from '@tramvai/module-react-query';
-import { CONTEXT_TOKEN } from '@tramvai/tokens-common';
+import { LOGGER_TOKEN, CONTEXT_TOKEN } from '@tramvai/tokens-common';
 import { QUERY_PARAMETERS } from '../baseQuery/types.es.js';
 import { normalizeKey } from '../shared/normalizeKey.es.js';
 import { resolveDI } from '../shared/resolveDI.es.js';
 import { mapQuerySignalToxecutionContext } from '../shared/signal.es.js';
+import { createUniqueActionKeyForQuery } from '../shared/createUniqueActionKeyForQuery.es.js';
 
 const convertToRawQuery = (query, di, options) => {
     const { key = identity, fn, deps = {}, conditions, queryOptions } = query[QUERY_PARAMETERS];
@@ -15,7 +16,7 @@ const convertToRawQuery = (query, di, options) => {
     const rawQueryKey = typeof key === 'function' ? key.call(ctx, options) : key;
     const queryKey = normalizeKey(rawQueryKey);
     const actionWrapper = declareAction({
-        name: 'queryExecution',
+        name: `queryExecution:${query.actionNamePostfix}`,
         async fn(queryContext) {
             const { abortSignal, abortController } = this;
             mapQuerySignalToxecutionContext(queryContext, this);
@@ -41,6 +42,7 @@ const createQuery = (queryParameters) => {
     const { queryOptions, conditions } = queryParameters;
     const query = {
         [QUERY_PARAMETERS]: queryParameters,
+        actionNamePostfix: createUniqueActionKeyForQuery(queryParameters),
         fork: (options) => {
             return createQuery({
                 ...queryParameters,
@@ -55,26 +57,28 @@ const createQuery = (queryParameters) => {
         },
         prefetchAction: (options) => {
             return declareAction({
-                name: 'queryPrefetch',
+                name: `queryPrefetch:${query.actionNamePostfix}`,
                 fn() {
                     return this.deps.queryClient.prefetchQuery(convertToRawQuery(query, this.deps.di, options));
                 },
                 deps: {
                     di: DI_TOKEN,
                     queryClient: QUERY_CLIENT_TOKEN,
+                    logger: LOGGER_TOKEN,
                 },
                 conditions,
             });
         },
         fetchAction: (options) => {
             return declareAction({
-                name: 'queryFetch',
+                name: `queryFetch:${query.actionNamePostfix}`,
                 fn() {
                     return this.deps.queryClient.fetchQuery(convertToRawQuery(query, this.deps.di, options));
                 },
                 deps: {
                     di: DI_TOKEN,
                     queryClient: QUERY_CLIENT_TOKEN,
+                    logger: LOGGER_TOKEN,
                 },
                 conditions,
             });

package/lib/query/create.js

@@ -11,6 +11,7 @@ var types = require('../baseQuery/types.js');
 var normalizeKey = require('../shared/normalizeKey.js');
 var resolveDI = require('../shared/resolveDI.js');
 var signal = require('../shared/signal.js');
+var createUniqueActionKeyForQuery = require('../shared/createUniqueActionKeyForQuery.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -23,7 +24,7 @@ const convertToRawQuery = (query, di, options) => {
     const rawQueryKey = typeof key === 'function' ? key.call(ctx, options) : key;
     const queryKey = normalizeKey.normalizeKey(rawQueryKey);
     const actionWrapper = core.declareAction({
-        name: 'queryExecution',
+        name: `queryExecution:${query.actionNamePostfix}`,
         async fn(queryContext) {
             const { abortSignal, abortController } = this;
             signal.mapQuerySignalToxecutionContext(queryContext, this);
@@ -49,6 +50,7 @@ const createQuery = (queryParameters) => {
     const { queryOptions, conditions } = queryParameters;
     const query = {
         [types.QUERY_PARAMETERS]: queryParameters,
+        actionNamePostfix: createUniqueActionKeyForQuery.createUniqueActionKeyForQuery(queryParameters),
         fork: (options) => {
             return createQuery({
                 ...queryParameters,
@@ -63,26 +65,28 @@ const createQuery = (queryParameters) => {
         },
         prefetchAction: (options) => {
             return core.declareAction({
-                name: 'queryPrefetch',
+                name: `queryPrefetch:${query.actionNamePostfix}`,
                 fn() {
                     return this.deps.queryClient.prefetchQuery(convertToRawQuery(query, this.deps.di, options));
                 },
                 deps: {
                     di: dippy.DI_TOKEN,
                     queryClient: moduleReactQuery.QUERY_CLIENT_TOKEN,
+                    logger: tokensCommon.LOGGER_TOKEN,
                 },
                 conditions,
             });
         },
         fetchAction: (options) => {
             return core.declareAction({
-                name: 'queryFetch',
+                name: `queryFetch:${query.actionNamePostfix}`,
                 fn() {
                     return this.deps.queryClient.fetchQuery(convertToRawQuery(query, this.deps.di, options));
                 },
                 deps: {
                     di: dippy.DI_TOKEN,
                     queryClient: moduleReactQuery.QUERY_CLIENT_TOKEN,
+                    logger: tokensCommon.LOGGER_TOKEN,
                 },
                 conditions,
             });

package/lib/shared/createUniqueActionKeyForQuery.d.ts

@@ -0,0 +1,3 @@
+import type { ProviderDeps } from '@tinkoff/dippy';
+import type { BaseCreateQueryOptions } from '../baseQuery/types';
+export declare const createUniqueActionKeyForQuery: <Options, Deps extends ProviderDeps>(queryParameters: BaseCreateQueryOptions<Options, Deps>) => string;

package/lib/shared/createUniqueActionKeyForQuery.es.js

@@ -0,0 +1,12 @@
+import { normalizeKey } from './normalizeKey.es.js';
+
+const createUniqueActionKeyForQuery = (queryParameters) => {
+    var _a;
+    const rawQueryKey = typeof queryParameters.key === 'function'
+        ? queryParameters.actionNamePostfix
+        : (_a = queryParameters.actionNamePostfix) !== null && _a !== void 0 ? _a : queryParameters.key;
+    const queryKeyArray = normalizeKey(rawQueryKey);
+    return queryKeyArray.join('_');
+};
+
+export { createUniqueActionKeyForQuery };

package/lib/shared/createUniqueActionKeyForQuery.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var normalizeKey = require('./normalizeKey.js');
+
+const createUniqueActionKeyForQuery = (queryParameters) => {
+    var _a;
+    const rawQueryKey = typeof queryParameters.key === 'function'
+        ? queryParameters.actionNamePostfix
+        : (_a = queryParameters.actionNamePostfix) !== null && _a !== void 0 ? _a : queryParameters.key;
+    const queryKeyArray = normalizeKey.normalizeKey(rawQueryKey);
+    return queryKeyArray.join('_');
+};
+
+exports.createUniqueActionKeyForQuery = createUniqueActionKeyForQuery;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/react-query",
-  "version": "2.146.0",
+  "version": "2.147.1",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@tinkoff/react-hooks": "0.1.6",
-    "@tramvai/core": "2.146.0",
-    "@tramvai/module-react-query": "2.146.0",
-    "@tramvai/react": "2.146.0",
-    "@tramvai/tokens-common": "2.146.0"
+    "@tramvai/core": "2.147.1",
+    "@tramvai/module-react-query": "2.147.1",
+    "@tramvai/react": "2.147.1",
+    "@tramvai/tokens-common": "2.147.1"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "0.8.15",