mobx-tanstack-query-api 0.0.64 → 0.0.66

package/codegen/index.js

@@ -5,7 +5,7 @@ import { allExportsTmpl } from './templates/all-exports.tmpl.js';
 import { LINTERS_IGNORE } from './templates/constants.js';
 import { dataContractsFileTmpl } from './templates/data-contracts-file.tmpl.js';
 import { endpointPerFileTmpl } from './templates/endpoint-per-file.tmpl.js';
-import { indexTsForRequestPerFileTmpl } from './templates/index-ts-for-request-per-file.tmpl.js';
+import { indexTsForEndpointPerFileTmpl } from './templates/index-ts-for-endpoint-per-file.tmpl.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 export const generateApi = async (params) => {
@@ -171,7 +171,7 @@ export const generateApi = async (params) => {
             path: path.resolve(params.output, 'endpoints'),
             fileName: 'index.ts',
             withPrefix: false,
-            content: await indexTsForRequestPerFileTmpl({
+            content: await indexTsForEndpointPerFileTmpl({
                 ...generated,
                 apiParams: params,
                 codegenProcess,
@@ -252,7 +252,7 @@ export * as ${exportGroupName} from './endpoints';
                 path: path.resolve(params.output, _.kebabCase(groupName), 'endpoints'),
                 fileName: 'index.ts',
                 withPrefix: false,
-                content: await indexTsForRequestPerFileTmpl({
+                content: await indexTsForEndpointPerFileTmpl({
                     ...generated,
                     apiParams: params,
                     codegenProcess,

package/codegen/templates/all-exports.tmpl.d.ts

@@ -7,5 +7,6 @@ export interface AllExportsTmplParams {
     namespace?: Maybe<string>;
     utils: CodegenDataUtils;
 }
-export declare const allExportsTmpl: ({ collectedExportFiles, groupNames, namespace, utils: { _ }, formatTSContent, }: AllExportsTmplParams) => Promise<string>;
+export declare const formatGroupNameEnumKey: (groupName: string, { _ }: CodegenDataUtils) => Capitalize<string>;
+export declare const allExportsTmpl: ({ collectedExportFiles, groupNames, namespace, utils, formatTSContent, }: AllExportsTmplParams) => Promise<string>;
 //# sourceMappingURL=all-exports.tmpl.d.ts.map

package/codegen/templates/all-exports.tmpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"all-exports.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/all-exports.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAI/C,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAED,eAAO,MAAM,cAAc,GAAU,iFAMlC,oBAAoB,oBAgBtB,CAAC"}
+{"version":3,"file":"all-exports.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/all-exports.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAI/C,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAED,eAAO,MAAM,sBAAsB,GACjC,WAAW,MAAM,EACjB,OAAO,gBAAgB,uBACgB,CAAC;AAE1C,eAAO,MAAM,cAAc,GAAU,0EAMlC,oBAAoB,oBAgBtB,CAAC"}

package/codegen/templates/all-exports.tmpl.js

@@ -1,5 +1,6 @@
 import { LINTERS_IGNORE } from './constants.js';
-export const allExportsTmpl = async ({ collectedExportFiles, groupNames, namespace, utils: { _ }, formatTSContent, }) => {
+export const formatGroupNameEnumKey = (groupName, { _ }) => _.upperFirst(_.camelCase(groupName));
+export const allExportsTmpl = async ({ collectedExportFiles, groupNames, namespace, utils, formatTSContent, }) => {
     return await formatTSContent(`${LINTERS_IGNORE}
   export * from './data-contracts';
   ${collectedExportFiles.map((fileName) => `export * from './${fileName}';`).join('\n')}
@@ -8,7 +9,7 @@ export const allExportsTmpl = async ({ collectedExportFiles, groupNames, namespa
   ${groupNames?.length
         ? `
 export const enum Group {
-  ${groupNames.map((groupName) => `${_.upperFirst(_.camelCase(groupName))} = "${groupName}"`).join(',\n')}
+  ${groupNames.map((groupName) => `${formatGroupNameEnumKey(groupName, utils)} = "${groupName}"`).join(',\n')}
 }
     `
         : ''}

package/codegen/templates/endpoint-per-file.tmpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"endpoint-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/endpoint-per-file.tmpl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,yBAA0B,SAAQ,SAAS;IAC1D,KAAK,EAAE,SAAS,CAAC;IACjB,aAAa,EAAE,SAAS,CAAC;IACzB,SAAS,EAAE,sBAAsB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,KAAK,EAAE,gBAAgB,CAAC;IACxB,yBAAyB,EAAE,MAAM,CAAC;IAClC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,eAAO,MAAM,mBAAmB,GAAU,iIAUvC,yBAAyB;;;EAuG3B,CAAC"}
+{"version":3,"file":"endpoint-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/endpoint-per-file.tmpl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,yBAA0B,SAAQ,SAAS;IAC1D,KAAK,EAAE,SAAS,CAAC;IACjB,aAAa,EAAE,SAAS,CAAC;IACzB,SAAS,EAAE,sBAAsB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,KAAK,EAAE,gBAAgB,CAAC;IACxB,yBAAyB,EAAE,MAAM,CAAC;IAClC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,eAAO,MAAM,mBAAmB,GAAU,iIAUvC,yBAAyB;;;EAyG3B,CAAC"}

package/codegen/templates/endpoint-per-file.tmpl.js

@@ -31,6 +31,8 @@ export const endpointPerFileTmpl = async ({ route, configuration, apiParams, for
       import { ${importFileParams.endpoint.exportName} } from "${importFileParams.endpoint.path}";
       import { ${importFileParams.httpClient.exportName} } from "${importFileParams.httpClient.path}";
       import { ${importFileParams.queryClient.exportName} } from "${importFileParams.queryClient.path}";
+      import { ${[groupName && 'Group', namespace && 'namespace'].filter(Boolean).join(',')} } from "../../__exports";
+
       ${configuration.modelTypes.length > 0
             ? `
       import { ${configuration.modelTypes

package/codegen/templates/index-ts-for-endpoint-per-file.tmpl.d.ts

@@ -0,0 +1,10 @@
+import { AnyObject } from 'yummies/utils/types';
+import { CodegenProcess, GenerateQueryApiParams } from '../index.js';
+export interface IndexTsForEndpointPerFileTmplParams extends AnyObject {
+    configuration: AnyObject;
+    apiParams: GenerateQueryApiParams;
+    codegenProcess: CodegenProcess;
+    generatedRequestFileNames: string[];
+}
+export declare const indexTsForEndpointPerFileTmpl: ({ generatedRequestFileNames, }: IndexTsForEndpointPerFileTmplParams) => Promise<string>;
+//# sourceMappingURL=index-ts-for-endpoint-per-file.tmpl.d.ts.map

package/codegen/templates/index-ts-for-endpoint-per-file.tmpl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index-ts-for-endpoint-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/index-ts-for-endpoint-per-file.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAIrE,MAAM,WAAW,mCAAoC,SAAQ,SAAS;IACpE,aAAa,EAAE,SAAS,CAAC;IACzB,SAAS,EAAE,sBAAsB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,EAAE,MAAM,EAAE,CAAC;CACrC;AAED,eAAO,MAAM,6BAA6B,GAAU,gCAEjD,mCAAmC,oBAIrC,CAAC"}

package/codegen/templates/{index-ts-for-request-per-file.tmpl.js → index-ts-for-endpoint-per-file.tmpl.js}

@@ -1,5 +1,5 @@
 import { LINTERS_IGNORE } from './constants.js';
-export const indexTsForRequestPerFileTmpl = async ({ generatedRequestFileNames, }) => {
+export const indexTsForEndpointPerFileTmpl = async ({ generatedRequestFileNames, }) => {
     return `${LINTERS_IGNORE}
 ${generatedRequestFileNames.map((fileName) => `export * from './${fileName.replace('.ts', '')}';`).join('\n')}
 `;

package/codegen/templates/new-endpoint.tmpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-endpoint.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/new-endpoint.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,SAAS,CAAC;IACjB,aAAa,EAAE,SAAS,CAAC;IACzB,SAAS,EAAE,sBAAsB,CAAC;IAClC,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,KAAK,EAAE,gBAAgB,CAAC;IACxB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CAC3B;AAiBD,eAAO,MAAM,eAAe,GAAI,sEAO7B,qBAAqB;;;;;;;;CAwMvB,CAAC"}
+{"version":3,"file":"new-endpoint.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/new-endpoint.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAIrB,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,SAAS,CAAC;IACjB,aAAa,EAAE,SAAS,CAAC;IACzB,SAAS,EAAE,sBAAsB,CAAC;IAClC,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,KAAK,EAAE,gBAAgB,CAAC;IACxB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CAC3B;AAiBD,eAAO,MAAM,eAAe,GAAI,sEAO7B,qBAAqB;;;;;;;;CAwMvB,CAAC"}

package/codegen/templates/new-endpoint.tmpl.js

@@ -1,3 +1,4 @@
+import { formatGroupNameEnumKey } from './all-exports.tmpl.js';
 // RequestParams["type"]
 const requestContentKind = {
     URL_ENCODED: '"application/x-www-form-urlencoded"',
@@ -152,8 +153,8 @@ new ${importFileParams.endpoint.exportName}<
             .filter(Boolean)
             .map((it) => `"${it}"`)}],
         tags: [${tags.map((tag) => `"${tag}"`)}],
-        ${groupName ? `group: "${groupName}",` : ''}
-        ${namespace ? `namespace: "${namespace}",` : ''}
+        ${groupName ? `group: Group.${formatGroupNameEnumKey(groupName, utils)},` : ''}
+        ${namespace ? `namespace,` : ''}
         meta: ${requestInfoMeta?.tmplData ?? '{} as any'},
     },
     ${importFileParams.queryClient.exportName},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-tanstack-query-api",
-  "version": "0.0.64",
+  "version": "0.0.66",
   "keywords": [],
   "author": "js2me",
   "license": "MIT",
@@ -97,10 +97,10 @@
       "default": "./codegen/templates/endpoint-per-file.tmpl.js",
       "types": "./codegen/templates/endpoint-per-file.tmpl.d.ts"
     },
-    "./codegen/templates/index-ts-for-request-per-file.tmpl": {
-      "import": "./codegen/templates/index-ts-for-request-per-file.tmpl.js",
-      "default": "./codegen/templates/index-ts-for-request-per-file.tmpl.js",
-      "types": "./codegen/templates/index-ts-for-request-per-file.tmpl.d.ts"
+    "./codegen/templates/index-ts-for-endpoint-per-file.tmpl": {
+      "import": "./codegen/templates/index-ts-for-endpoint-per-file.tmpl.js",
+      "default": "./codegen/templates/index-ts-for-endpoint-per-file.tmpl.js",
+      "types": "./codegen/templates/index-ts-for-endpoint-per-file.tmpl.d.ts"
     },
     "./codegen/templates/new-endpoint.tmpl": {
       "import": "./codegen/templates/new-endpoint.tmpl.js",

package/runtime/endpoint-query-client.d.ts

@@ -2,6 +2,6 @@ import { InvalidateOptions } from '@tanstack/query-core';
 import { QueryClient } from 'mobx-tanstack-query';
 import { InvalidateEndpointsFilters } from './endpoint-query-client.types.js';
 export declare class EndpointQueryClient extends QueryClient {
-    invalidateEndpoints({ group, namespace, operationId, tag, predicate, ...queryFilters }: InvalidateEndpointsFilters, options?: InvalidateOptions): Promise<void>;
+    invalidateEndpoints({ group, namespace, operationId, tag, predicate, endpoint, ...queryFilters }: InvalidateEndpointsFilters, options?: InvalidateOptions): Promise<void>;
 }
 //# sourceMappingURL=endpoint-query-client.d.ts.map

package/runtime/endpoint-query-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"endpoint-query-client.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-query-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAEL,0BAA0B,EAC3B,MAAM,kCAAkC,CAAC;AAG1C,qBAAa,mBAAoB,SAAQ,WAAW;IAClD,mBAAmB,CACjB,EACE,KAAK,EACL,SAAS,EACT,WAAW,EACX,GAAG,EACH,SAAS,EACT,GAAG,YAAY,EAChB,EAAE,0BAA0B,EAC7B,OAAO,CAAC,EAAE,iBAAiB;CAkD9B"}
+{"version":3,"file":"endpoint-query-client.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-query-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAEL,0BAA0B,EAC3B,MAAM,kCAAkC,CAAC;AAG1C,qBAAa,mBAAoB,SAAQ,WAAW;IAClD,mBAAmB,CACjB,EACE,KAAK,EACL,SAAS,EACT,WAAW,EACX,GAAG,EACH,SAAS,EACT,QAAQ,EACR,GAAG,YAAY,EAChB,EAAE,0BAA0B,EAC7B,OAAO,CAAC,EAAE,iBAAiB;CAgE9B"}

package/runtime/endpoint-query-client.js

@@ -1,6 +1,6 @@
 import { QueryClient } from 'mobx-tanstack-query';
 export class EndpointQueryClient extends QueryClient {
-    invalidateEndpoints({ group, namespace, operationId, tag, predicate, ...queryFilters }, options) {
+    invalidateEndpoints({ group, namespace, operationId, tag, predicate, endpoint, ...queryFilters }, options) {
         return this.invalidateQueries({
             ...queryFilters,
             // eslint-disable-next-line sonarjs/no-invariant-returns
@@ -9,6 +9,14 @@ export class EndpointQueryClient extends QueryClient {
                     return false;
                 }
                 const meta = query.meta;
+                if (endpoint) {
+                    const endpointsToFilter = Array.isArray(endpoint)
+                        ? endpoint
+                        : [endpoint];
+                    if (endpointsToFilter.every((endpoint) => meta.endpointId !== endpoint.endpointId)) {
+                        return false;
+                    }
+                }
                 if (namespace &&
                     meta.namespace &&
                     !applyStringFilter(namespace, meta.namespace)) {

package/codegen/templates/index-ts-for-request-per-file.tmpl.d.ts

@@ -1,10 +0,0 @@
-import { AnyObject } from 'yummies/utils/types';
-import { CodegenProcess, GenerateQueryApiParams } from '../index.js';
-export interface IndexTsForRequestPerFileTmplParams extends AnyObject {
-    configuration: AnyObject;
-    apiParams: GenerateQueryApiParams;
-    codegenProcess: CodegenProcess;
-    generatedRequestFileNames: string[];
-}
-export declare const indexTsForRequestPerFileTmpl: ({ generatedRequestFileNames, }: IndexTsForRequestPerFileTmplParams) => Promise<string>;
-//# sourceMappingURL=index-ts-for-request-per-file.tmpl.d.ts.map

package/codegen/templates/index-ts-for-request-per-file.tmpl.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index-ts-for-request-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/index-ts-for-request-per-file.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAIrE,MAAM,WAAW,kCAAmC,SAAQ,SAAS;IACnE,aAAa,EAAE,SAAS,CAAC;IACzB,SAAS,EAAE,sBAAsB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,EAAE,MAAM,EAAE,CAAC;CACrC;AAED,eAAO,MAAM,4BAA4B,GAAU,gCAEhD,kCAAkC,oBAIpC,CAAC"}