mobx-tanstack-query-api 0.0.31 → 0.0.33

package/cli/bin.js

@@ -2,6 +2,7 @@
 import { existsSync } from 'node:fs';
 import path from 'node:path';
 import { generateApi } from '../codegen/index.js';
+import { defineConfig } from './define-config.js';
 const projectDir = process.cwd();
 let generateApiParams;
 let module;
@@ -17,10 +18,10 @@ else if (existsSync(path.resolve(projectDir, 'api-codegen.config.json'))) {
 else {
     throw new Error('api-codegen.config.(js|mjs|json) not found');
 }
-if (module.default && 'links' in module.default) {
+if (module.default) {
     generateApiParams = module.default;
 }
 else {
-    throw new Error('api-codegen.config.(js|mjs|json) is not valid');
+    throw new Error('api-codegen.config.(js|mjs|json) is not valid, This file should return object - result of the defineConfig function');
 }
-generateApi(generateApiParams);
+defineConfig(generateApiParams).forEach(generateApi);

package/cli/bin.mjs

@@ -2,6 +2,7 @@
 import { existsSync } from 'node:fs';
 import path from 'node:path';
 import { generateApi } from '../codegen/index.js';
+import { defineConfig } from './define-config.js';
 const projectDir = process.cwd();
 let generateApiParams;
 let module;
@@ -17,10 +18,10 @@ else if (existsSync(path.resolve(projectDir, 'api-codegen.config.json'))) {
 else {
     throw new Error('api-codegen.config.(js|mjs|json) not found');
 }
-if (module.default && 'links' in module.default) {
+if (module.default) {
     generateApiParams = module.default;
 }
 else {
-    throw new Error('api-codegen.config.(js|mjs|json) is not valid');
+    throw new Error('api-codegen.config.(js|mjs|json) is not valid, This file should return object - result of the defineConfig function');
 }
-generateApi(generateApiParams);
+defineConfig(generateApiParams).forEach(generateApi);

package/cli/define-config.d.ts

@@ -1,3 +1,4 @@
-import { GenerateApiParams } from '../codegen/index.js';
-export declare const defineConfig: (config: GenerateApiParams) => GenerateApiParams;
+import { Maybe } from 'yummies/utils/types';
+import { GenerateQueryApiParams } from '../codegen/index.js';
+export declare const defineConfig: (...configs: Maybe<GenerateQueryApiParams | GenerateQueryApiParams[]>[]) => GenerateQueryApiParams[];
 //# sourceMappingURL=define-config.d.ts.map

package/cli/define-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"define-config.d.ts","sourceRoot":"","sources":["../../src/cli/define-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,eAAO,MAAM,YAAY,WAAY,iBAAiB,sBAErD,CAAC"}
+{"version":3,"file":"define-config.d.ts","sourceRoot":"","sources":["../../src/cli/define-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,eAAO,MAAM,YAAY,eACX,KAAK,CAAC,sBAAsB,GAAG,sBAAsB,EAAE,CAAC,EAAE,KACrE,sBAAsB,EAIxB,CAAC"}

package/cli/define-config.js

@@ -1,3 +1,5 @@
-export const defineConfig = (config) => {
-    return config;
+export const defineConfig = (...configs) => {
+    return configs
+        .flat()
+        .filter((config) => !!config);
 };

package/codegen/index.d.ts

@@ -8,15 +8,46 @@ export interface ImportFileParams {
     path: string;
     exportName: string;
 }
-export interface QueryApiParams {
+export interface GenerateQueryApiParams {
+    output: string;
+    input: string | AnyObject;
     requestPathPrefix?: string;
     requestPathSuffix?: string;
     requestInfoPrefix?: string;
-    outputType: 'request-info-per-file';
+    /**
+     * Group endpoints and collect it into object
+     */
+    groupBy?: ((route: ParsedRoute) => string) | `path-segment` | `path-segment-${number}` | `tag` | `tag-${number}`;
+    /**
+     * Collect all exports into single namespace
+     *
+     * Example:
+     * without namespace:
+     *
+     * export * from "./endpoints";
+     * export * from "./data-contracts";
+     *
+     * with namespace:
+     *
+     * export * as namespaceName from "./__exports"; // exports like above
+     *
+     *
+     * namespaceName.login.toMutation()
+     */
+    namespace?: string | ((utils: CodegenDataUtils) => string);
+    /**
+     * Example:
+     * operationId: 'getById'
+     * /api/v1/users/{userId} => /api/v1/users/1
+     *
+     * addPathSegmentToRouteName: 2 (users), 0 - api
+     *
+     * output endpoint instance name: `usersGetById` (pathSegments[2] + operationId)
+     */
     addPathSegmentToRouteName?: boolean | number;
-    queryClient: 'builtin' | ImportFileParams;
-    endpoint: 'builtin' | ImportFileParams;
-    httpClient: 'builtin' | ImportFileParams;
+    queryClient?: 'builtin' | ImportFileParams;
+    endpoint?: 'builtin' | ImportFileParams;
+    httpClient?: 'builtin' | ImportFileParams;
     getEndpointMeta?: (route: ParsedRoute, utils: CodegenDataUtils) => {
         typeName: string;
         importTypePath: string;
@@ -25,11 +56,9 @@ export interface QueryApiParams {
     getRequestMeta?: (route: ParsedRoute, utils: CodegenDataUtils) => {
         tmplData: string;
     };
+    requestOptions?: GenerateApiParamsFromSwagger['requestOptions'];
+    otherCodegenParams?: Omit<GenerateApiParamsFromSwagger, 'requestOptions' | 'output' | 'moduleNameFirstTag' | 'moduleNameIndex' | 'url' | 'input' | 'spec'>;
 }
-export type AllImportFileParams = Record<KeyOfByValue<Required<QueryApiParams>, 'builtin' | ImportFileParams>, ImportFileParams>;
-export type GenerateApiParams = Omit<GenerateApiParamsFromSwagger, 'output' | 'moduleNameFirstTag' | 'moduleNameIndex' | 'url' | 'input' | 'spec'> & {
-    output: string;
-    input: string | AnyObject;
-} & QueryApiParams;
-export declare const generateApi: (inputParams: GenerateApiParams) => Promise<void>;
+export type AllImportFileParams = Record<KeyOfByValue<Required<GenerateQueryApiParams>, 'builtin' | ImportFileParams>, ImportFileParams>;
+export declare const generateApi: (params: GenerateQueryApiParams | GenerateQueryApiParams[]) => Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/codegen/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,IAAI,4BAA4B,EACjD,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAa9D,MAAM,MAAM,cAAc,GAAG,UAAU,CACrC,OAAO,CACL,QAAQ,CAAC,OAAO,CAAC,4BAA4B,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAC3E,SAAS,CACV,CAAC,QAAQ,CAAC,CACZ,CAAC,CAAC,CAAC,CAAC;AAEL,MAAM,MAAM,gBAAgB,GAAG,UAAU,CACvC,cAAc,CAAC,uBAAuB,CAAC,CACxC,CAAC,OAAO,CAAC,CAAC;AAEX,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,uBAAuB,CAAC;IACpC,yBAAyB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE7C,WAAW,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAE1C,QAAQ,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAEvC,UAAU,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAEzC,eAAe,CAAC,EAAE,CAChB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,gBAAgB,KACpB;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,cAAc,CAAC,EAAE,CACf,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,gBAAgB,KACpB;QACH,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,CACtC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC,EACpE,gBAAgB,CACjB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,4BAA4B,EAC5B,QAAQ,GAAG,oBAAoB,GAAG,iBAAiB,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,CAC/E,GAAG;IACF,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,GAAG,cAAc,CAAC;AAEnB,eAAO,MAAM,WAAW,gBAAuB,iBAAiB,kBAgO/D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,IAAI,4BAA4B,EACjD,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAc9D,MAAM,MAAM,cAAc,GAAG,UAAU,CACrC,OAAO,CACL,QAAQ,CAAC,OAAO,CAAC,4BAA4B,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAC3E,SAAS,CACV,CAAC,QAAQ,CAAC,CACZ,CAAC,CAAC,CAAC,CAAC;AAEL,MAAM,MAAM,gBAAgB,GAAG,UAAU,CACvC,cAAc,CAAC,uBAAuB,CAAC,CACxC,CAAC,OAAO,CAAC,CAAC;AAEX,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,OAAO,CAAC,EACJ,CAAC,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,CAAC,GAChC,cAAc,GACd,gBAAgB,MAAM,EAAE,GACxB,KAAK,GACL,OAAO,MAAM,EAAE,CAAC;IAEpB;;;;;;;;;;;;;;;OAeG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,gBAAgB,KAAK,MAAM,CAAC,CAAC;IAE3D;;;;;;;;OAQG;IACH,yBAAyB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE7C,WAAW,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAC3C,QAAQ,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC;IACxC,UAAU,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAE1C,eAAe,CAAC,EAAE,CAChB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,gBAAgB,KACpB;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,cAAc,CAAC,EAAE,CACf,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,gBAAgB,KACpB;QACH,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IAEF,cAAc,CAAC,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,CAAC;IAEhE,kBAAkB,CAAC,EAAE,IAAI,CACvB,4BAA4B,EAC1B,gBAAgB,GAChB,QAAQ,GACR,oBAAoB,GACpB,iBAAiB,GACjB,KAAK,GACL,OAAO,GACP,MAAM,CACT,CAAC;CACH;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,CACtC,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC,EAC5E,gBAAgB,CACjB,CAAC;AAEF,eAAO,MAAM,WAAW,WACd,sBAAsB,GAAG,sBAAsB,EAAE,KACxD,OAAO,CAAC,IAAI,CA6Wd,CAAC"}

package/codegen/index.js

@@ -1,40 +1,43 @@
 import { generateApi as generateApiFromSwagger, } from 'swagger-typescript-api';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { dataContractsTmpl } from './templates/data-contracts.tmpl.js';
+import { LINTERS_IGNORE } from './templates/constants.js';
+import { dataContractsFileTmpl } from './templates/data-contracts-file.tmpl.js';
 import { indexTsForRequestPerFileTmpl } from './templates/index-ts-for-request-per-file.tmpl.js';
 import { requestInfoPerFileTmpl } from './templates/request-info-per-file.tmpl.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-export const generateApi = async (inputParams) => {
-    const { output, input, ...params } = inputParams;
+export const generateApi = async (params) => {
+    if (Array.isArray(params)) {
+        await Promise.all(params.map((param) => generateApi(param)));
+        return;
+    }
     const importFileParams = {
-        queryClient: typeof inputParams.queryClient === 'string'
+        queryClient: !params.queryClient || typeof params.queryClient === 'string'
             ? {
                 exportName: 'queryClient',
                 path: 'mobx-tanstack-query-api/builtin',
             }
-            : inputParams.queryClient,
-        endpoint: typeof inputParams.endpoint === 'string'
+            : params.queryClient,
+        endpoint: !params.endpoint || typeof params.endpoint === 'string'
             ? {
                 exportName: 'Endpoint',
                 path: 'mobx-tanstack-query-api',
             }
-            : inputParams.endpoint,
-        httpClient: typeof inputParams.httpClient === 'string'
+            : params.endpoint,
+        httpClient: !params.httpClient || typeof params.httpClient === 'string'
             ? {
                 exportName: 'http',
                 path: 'mobx-tanstack-query-api/builtin',
             }
-            : inputParams.httpClient,
+            : params.httpClient,
     };
     const paths = {
         templates: path.resolve(__dirname, 'templates'),
         requestInfoClass: path.resolve(__dirname, 'templates/request-info-class.ejs'),
         httpClient: path.resolve(__dirname, 'templates/http-client.ejs'),
         createRequestInfoInstance: path.resolve(__dirname, 'templates/create-request-info-instance.ejs'),
-        outputDir: output,
-        outputEndpoints: path.resolve(output, 'endpoints'),
+        outputDir: params.output,
     };
     const codegenParams = {
         httpClientType: 'fetch',
@@ -59,19 +62,20 @@ export const generateApi = async (inputParams) => {
                 ...constructs,
                 object: () => `Record<string, any>`,
                 float: () => `number`,
-                ...params?.primitiveTypeConstructs?.(constructs),
+                ...params.otherCodegenParams?.primitiveTypeConstructs?.(constructs),
             };
         },
-        ...params,
+        requestOptions: params.requestOptions,
+        ...params.otherCodegenParams,
     };
     let codegenProcess;
     const inputData = {};
-    if (typeof input === 'string') {
-        inputData.input = input;
-        inputData.url = input;
+    if (typeof params.input === 'string') {
+        inputData.input = params.input;
+        inputData.url = params.input;
     }
     else {
-        inputData.spec = input;
+        inputData.spec = params.input;
     }
     const generated = await generateApiFromSwagger({
         ...codegenParams,
@@ -89,10 +93,10 @@ export const generateApi = async (inputParams) => {
             },
             onFormatRouteName: (routeInfo, usageRouteName) => {
                 let formattedRouteName = usageRouteName;
-                if (inputParams.addPathSegmentToRouteName === true ||
-                    typeof inputParams.addPathSegmentToRouteName === 'number') {
-                    const pathSegmentForSuffix = typeof inputParams.addPathSegmentToRouteName === 'number'
-                        ? inputParams.addPathSegmentToRouteName
+                if (params.addPathSegmentToRouteName === true ||
+                    typeof params.addPathSegmentToRouteName === 'number') {
+                    const pathSegmentForSuffix = typeof params.addPathSegmentToRouteName === 'number'
+                        ? params.addPathSegmentToRouteName
                         : 0;
                     const pathSegments = routeInfo.route.split('/').filter(Boolean);
                     const { _ } = codegenProcess.getRenderTemplateData().utils;
@@ -105,41 +109,134 @@ export const generateApi = async (inputParams) => {
     const utils = codegenProcess.getRenderTemplateData().utils;
     const { _ } = utils;
     const codegenFs = codegenProcess.fileSystem;
-    codegenFs.cleanDir(output);
-    codegenFs.createDir(output);
-    codegenFs.createDir(paths.outputEndpoints);
+    codegenFs.cleanDir(params.output);
+    codegenFs.createDir(params.output);
     const allRoutes = Object.values(generated.configuration.routes)
         .flat()
         .flatMap((routeGroup) => 'routes' in routeGroup ? routeGroup.routes : routeGroup);
     const reservedDataContractNamesMap = new Map();
-    const fileNamesWithRequestInfo = [];
-    for await (const route of allRoutes) {
-        const { content: requestInfoPerFileContent, reservedDataContractNames } = await requestInfoPerFileTmpl({
-            ...generated,
-            route,
-            apiParams: inputParams,
-            codegenProcess,
-            importFileParams,
-            utils,
-        });
-        reservedDataContractNames.forEach((name) => {
-            reservedDataContractNamesMap.set(name, (reservedDataContractNamesMap.get(name) ?? 0) + 1);
-        });
-        const fileName = `${_.kebabCase(route.routeName.usage)}.ts`;
-        fileNamesWithRequestInfo.push(fileName);
+    if (params.groupBy == null) {
+        // #region кодогенерация 1 эндпоинт - 1 файл без группировки
+        codegenFs.createDir(path.resolve(params.output, 'endpoints'));
+        const fileNamesWithRequestInfo = [];
+        for await (const route of allRoutes) {
+            const { content: requestInfoPerFileContent, reservedDataContractNames } = await requestInfoPerFileTmpl({
+                ...generated,
+                route,
+                apiParams: params,
+                codegenProcess,
+                importFileParams,
+                utils,
+                relativePathDataContracts: '../data-contracts',
+            });
+            reservedDataContractNames.forEach((name) => {
+                reservedDataContractNamesMap.set(name, (reservedDataContractNamesMap.get(name) ?? 0) + 1);
+            });
+            const fileName = `${_.kebabCase(route.routeName.usage)}.ts`;
+            fileNamesWithRequestInfo.push(fileName);
+            codegenFs.createFile({
+                path: path.resolve(params.output, 'endpoints'),
+                fileName,
+                withPrefix: false,
+                content: requestInfoPerFileContent,
+            });
+        }
         codegenFs.createFile({
-            path: paths.outputEndpoints,
-            fileName,
+            path: path.resolve(params.output, 'endpoints'),
+            fileName: 'index.ts',
             withPrefix: false,
-            content: requestInfoPerFileContent,
+            content: await indexTsForRequestPerFileTmpl({
+                ...generated,
+                apiParams: params,
+                codegenProcess,
+                generatedRequestFileNames: fileNamesWithRequestInfo,
+            }),
         });
+        // #endregion
+    }
+    else {
+        // #region кодогенерация с группировкой
+        // #region разбиение роутов по группам
+        const groupsMap = new Map();
+        allRoutes.forEach((route) => {
+            let group;
+            if (typeof params.groupBy === 'function') {
+                group = params.groupBy(route);
+            }
+            else if (params.groupBy?.includes('path-segment')) {
+                const segmentIndex = +params.groupBy.replaceAll(/path-segment-?/g, '') || 0;
+                group =
+                    route.request.path?.split('/')?.filter(Boolean)?.[segmentIndex] || undefined;
+            }
+            else if (params.groupBy?.includes('tag')) {
+                const tagIndex = +params.groupBy.replaceAll(/tag-?/g, '') || 0;
+                group = route.raw?.tags?.[tagIndex] ?? undefined;
+            }
+            if (group == null) {
+                group = '_other';
+            }
+            if (!groupsMap.has(group)) {
+                groupsMap.set(group, []);
+            }
+            groupsMap.get(group)?.push(route);
+        });
+        // #endregion
+        for await (const [groupName, routes] of groupsMap) {
+            const fileNamesWithRequestInfo = [];
+            codegenFs.createDir(path.resolve(params.output, _.kebabCase(groupName)));
+            codegenFs.createDir(path.resolve(params.output, _.kebabCase(groupName), 'endpoints'));
+            for await (const route of routes) {
+                const { content: requestInfoPerFileContent, reservedDataContractNames, } = await requestInfoPerFileTmpl({
+                    ...generated,
+                    route,
+                    apiParams: params,
+                    codegenProcess,
+                    importFileParams,
+                    utils,
+                    relativePathDataContracts: '../../data-contracts',
+                });
+                reservedDataContractNames.forEach((name) => {
+                    reservedDataContractNamesMap.set(name, (reservedDataContractNamesMap.get(name) ?? 0) + 1);
+                });
+                const fileName = `${_.kebabCase(route.routeName.usage)}.ts`;
+                fileNamesWithRequestInfo.push(fileName);
+                codegenFs.createFile({
+                    path: path.resolve(params.output, _.kebabCase(groupName), 'endpoints'),
+                    fileName,
+                    withPrefix: false,
+                    content: requestInfoPerFileContent,
+                });
+            }
+            if (routes.length > 0) {
+                codegenFs.createFile({
+                    path: path.resolve(params.output, _.kebabCase(groupName)),
+                    fileName: 'index.ts',
+                    withPrefix: false,
+                    content: `${LINTERS_IGNORE}
+export * from './endpoints';    
+  `,
+                });
+                codegenFs.createFile({
+                    path: path.resolve(params.output, _.kebabCase(groupName), 'endpoints'),
+                    fileName: 'index.ts',
+                    withPrefix: false,
+                    content: await indexTsForRequestPerFileTmpl({
+                        ...generated,
+                        apiParams: params,
+                        codegenProcess,
+                        generatedRequestFileNames: fileNamesWithRequestInfo,
+                    }),
+                });
+            }
+        }
+        // #endregion
     }
     const excludedDataContractNames = Array.from(reservedDataContractNamesMap.entries())
         .filter(([_, count]) => count === 1)
         .map(([name]) => name);
-    const dataContractsContent = await dataContractsTmpl({
+    const dataContractsContent = await dataContractsFileTmpl({
         ...generated,
-        apiParams: inputParams,
+        apiParams: params,
         codegenProcess,
         excludedDataContractNames,
     });
@@ -149,26 +246,37 @@ export const generateApi = async (inputParams) => {
         withPrefix: false,
         content: dataContractsContent,
     });
-    codegenFs.createFile({
-        path: paths.outputEndpoints,
-        fileName: 'index.ts',
-        withPrefix: false,
-        content: await indexTsForRequestPerFileTmpl({
-            ...generated,
-            apiParams: inputParams,
-            codegenProcess,
-            generatedRequestFileNames: fileNamesWithRequestInfo,
-        }),
-    });
-    codegenFs.createFile({
-        path: paths.outputDir,
-        fileName: 'index.ts',
-        withPrefix: false,
-        content: `
-/* eslint-disable */
-/* tslint:disable */
+    if (params.namespace) {
+        const namespace = typeof params.namespace === 'function'
+            ? params.namespace(utils)
+            : params.namespace;
+        codegenFs.createFile({
+            path: paths.outputDir,
+            fileName: '__exports.ts',
+            withPrefix: false,
+            content: `${LINTERS_IGNORE}
 export * from './data-contracts';
 export * from './endpoints';    
+  `,
+        });
+        codegenFs.createFile({
+            path: paths.outputDir,
+            fileName: 'index.ts',
+            withPrefix: false,
+            content: `${LINTERS_IGNORE}
+export * as ${namespace} from './__exports';
 `,
-    });
+        });
+    }
+    else {
+        codegenFs.createFile({
+            path: paths.outputDir,
+            fileName: 'index.ts',
+            withPrefix: false,
+            content: `${LINTERS_IGNORE}
+export * from './data-contracts';
+export * from './endpoints';    
+`,
+        });
+    }
 };

package/codegen/templates/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const LINTERS_IGNORE = "/* eslint-disable */\n/* tslint:disable */";
+//# sourceMappingURL=constants.d.ts.map

package/codegen/templates/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,+CACN,CAAC"}

package/codegen/templates/constants.js

@@ -0,0 +1,2 @@
+export const LINTERS_IGNORE = `/* eslint-disable */
+/* tslint:disable */`;

package/codegen/templates/data-contracts-file.tmpl.d.ts

@@ -0,0 +1,10 @@
+import { GenerateApiConfiguration, GenerateApiOutput } from 'swagger-typescript-api';
+import type { CodegenProcess, GenerateQueryApiParams } from '../index.js';
+export interface DataContractsTmplParams extends GenerateApiOutput {
+    configuration: GenerateApiConfiguration;
+    apiParams: GenerateQueryApiParams;
+    codegenProcess: CodegenProcess;
+    excludedDataContractNames?: string[];
+}
+export declare const dataContractsFileTmpl: ({ configuration, formatTSContent, excludedDataContractNames, }: DataContractsTmplParams) => Promise<string>;
+//# sourceMappingURL=data-contracts-file.tmpl.d.ts.map

package/codegen/templates/data-contracts-file.tmpl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-contracts-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/data-contracts-file.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAK1E,MAAM,WAAW,uBAAwB,SAAQ,iBAAiB;IAChE,aAAa,EAAE,wBAAwB,CAAC;IACxC,SAAS,EAAE,sBAAsB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;CACtC;AAED,eAAO,MAAM,qBAAqB,mEAI/B,uBAAuB,oBA6BzB,CAAC"}

package/codegen/templates/{data-contracts.tmpl.js → data-contracts-file.tmpl.js}

@@ -1,5 +1,6 @@
+import { LINTERS_IGNORE } from './constants.js';
 import { dataContractTmpl } from './data-contract.tmpl.js';
-export const dataContractsTmpl = async ({ configuration, formatTSContent, excludedDataContractNames, }) => {
+export const dataContractsFileTmpl = async ({ configuration, formatTSContent, excludedDataContractNames, }) => {
     const { config, modelTypes } = configuration;
     const contractDefinitions = [];
     if (config.internalTemplateOptions?.addUtilRequiredKeysType) {
@@ -15,8 +16,7 @@ export const dataContractsTmpl = async ({ configuration, formatTSContent, exclud
             addExportKeyword: true,
         }));
     }
-    return await formatTSContent(`/* eslint-disable */
-/* tslint:disable */
+    return await formatTSContent(`${LINTERS_IGNORE}
 
 ${contractDefinitions.join('\n\n')}
   `);

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

@@ -1,8 +1,8 @@
 import { GenerateApiConfiguration, GenerateApiOutput } from 'swagger-typescript-api';
-import { CodegenProcess, QueryApiParams } from '../index.js';
+import { CodegenProcess, GenerateQueryApiParams } from '../index.js';
 export interface IndexTsForRequestPerFileTmplParams extends GenerateApiOutput {
     configuration: GenerateApiConfiguration;
-    apiParams: QueryApiParams;
+    apiParams: GenerateQueryApiParams;
     codegenProcess: CodegenProcess;
     generatedRequestFileNames: string[];
 }

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

@@ -1 +1 @@
-{"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,EACL,wBAAwB,EACxB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7D,MAAM,WAAW,kCAAmC,SAAQ,iBAAiB;IAC3E,aAAa,EAAE,wBAAwB,CAAC;IACxC,SAAS,EAAE,cAAc,CAAC;IAC1B,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,EAAE,MAAM,EAAE,CAAC;CACrC;AAED,eAAO,MAAM,4BAA4B,mCAEtC,kCAAkC,oBAKpC,CAAC"}
+{"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,EACL,wBAAwB,EACxB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAIrE,MAAM,WAAW,kCAAmC,SAAQ,iBAAiB;IAC3E,aAAa,EAAE,wBAAwB,CAAC;IACxC,SAAS,EAAE,sBAAsB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,EAAE,MAAM,EAAE,CAAC;CACrC;AAED,eAAO,MAAM,4BAA4B,mCAEtC,kCAAkC,oBAIpC,CAAC"}

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

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

package/codegen/templates/new-request-info.tmpl.d.ts

@@ -1,9 +1,9 @@
 import { GenerateApiConfiguration, ParsedRoute } from 'swagger-typescript-api';
-import type { AllImportFileParams, CodegenDataUtils, QueryApiParams } from '../index.js';
+import type { AllImportFileParams, CodegenDataUtils, GenerateQueryApiParams } from '../index.js';
 export interface NewRequestInfoTmplParams {
     route: ParsedRoute;
     configuration: GenerateApiConfiguration;
-    apiParams: QueryApiParams;
+    apiParams: GenerateQueryApiParams;
     importFileParams: AllImportFileParams;
     utils: CodegenDataUtils;
 }

package/codegen/templates/new-request-info.tmpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-request-info.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/new-request-info.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG/E,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACf,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,WAAW,CAAC;IACnB,aAAa,EAAE,wBAAwB,CAAC;IACxC,SAAS,EAAE,cAAc,CAAC;IAC1B,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAiBD,eAAO,MAAM,kBAAkB,mDAK5B,wBAAwB;;;CAqO1B,CAAC"}
+{"version":3,"file":"new-request-info.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/new-request-info.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG/E,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,WAAW,CAAC;IACnB,aAAa,EAAE,wBAAwB,CAAC;IACxC,SAAS,EAAE,sBAAsB,CAAC;IAClC,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAiBD,eAAO,MAAM,kBAAkB,mDAK5B,wBAAwB;;;CAqO1B,CAAC"}

package/codegen/templates/request-info-jsdoc.tmpl.d.ts

@@ -1,9 +1,9 @@
 import { ParsedRoute, GenerateApiConfiguration } from 'swagger-typescript-api';
-import { QueryApiParams } from '../index.js';
+import { GenerateQueryApiParams } from '../index.js';
 export interface RequestInfoJSDocTmplParams {
     route: ParsedRoute;
     configuration: GenerateApiConfiguration;
-    apiParams: QueryApiParams;
+    apiParams: GenerateQueryApiParams;
     offset?: number;
 }
 export declare const requestInfoJSDocTmpl: ({ route, configuration, offset, }: RequestInfoJSDocTmplParams) => string;

package/codegen/templates/request-info-jsdoc.tmpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-info-jsdoc.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/request-info-jsdoc.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAG/E,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,WAAW,CAAC;IACnB,aAAa,EAAE,wBAAwB,CAAC;IACxC,SAAS,EAAE,cAAc,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,oBAAoB,sCAI9B,0BAA0B,WAkH5B,CAAC"}
+{"version":3,"file":"request-info-jsdoc.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/request-info-jsdoc.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAG/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,WAAW,CAAC;IACnB,aAAa,EAAE,wBAAwB,CAAC;IACxC,SAAS,EAAE,sBAAsB,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,oBAAoB,sCAI9B,0BAA0B,WAkH5B,CAAC"}

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

@@ -1,14 +1,15 @@
 import { ParsedRoute, GenerateApiConfiguration, GenerateApiOutput } from 'swagger-typescript-api';
-import type { AllImportFileParams, CodegenDataUtils, CodegenProcess, QueryApiParams } from '../index.js';
+import type { AllImportFileParams, CodegenDataUtils, CodegenProcess, GenerateQueryApiParams } from '../index.js';
 export interface RequestInfoPerFileTmplParams extends GenerateApiOutput {
     route: ParsedRoute;
     configuration: GenerateApiConfiguration;
-    apiParams: QueryApiParams;
+    apiParams: GenerateQueryApiParams;
     codegenProcess: CodegenProcess;
     importFileParams: AllImportFileParams;
     utils: CodegenDataUtils;
+    relativePathDataContracts: string;
 }
-export declare const requestInfoPerFileTmpl: ({ route, configuration, apiParams, formatTSContent, importFileParams, utils, }: RequestInfoPerFileTmplParams) => Promise<{
+export declare const requestInfoPerFileTmpl: ({ route, configuration, apiParams, formatTSContent, importFileParams, utils, relativePathDataContracts, }: RequestInfoPerFileTmplParams) => Promise<{
     reservedDataContractNames: string[];
     content: string;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"request-info-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/request-info-per-file.tmpl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,wBAAwB,EACxB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,cAAc,EACf,MAAM,aAAa,CAAC;AAMrB,MAAM,WAAW,4BAA6B,SAAQ,iBAAiB;IACrE,KAAK,EAAE,WAAW,CAAC;IACnB,aAAa,EAAE,wBAAwB,CAAC;IACxC,SAAS,EAAE,cAAc,CAAC;IAC1B,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAED,eAAO,MAAM,sBAAsB,mFAOhC,4BAA4B;;;EA8E9B,CAAC"}
+{"version":3,"file":"request-info-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/request-info-per-file.tmpl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,wBAAwB,EACxB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,4BAA6B,SAAQ,iBAAiB;IACrE,KAAK,EAAE,WAAW,CAAC;IACnB,aAAa,EAAE,wBAAwB,CAAC;IACxC,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;CACnC;AAED,eAAO,MAAM,sBAAsB,8GAQhC,4BAA4B;;;EA6E9B,CAAC"}

package/codegen/templates/request-info-per-file.tmpl.js

@@ -1,7 +1,8 @@
+import { LINTERS_IGNORE } from './constants.js';
 import { dataContractTmpl } from './data-contract.tmpl.js';
 import { newRequestInfoTmpl } from './new-request-info.tmpl.js';
 import { requestInfoJSDocTmpl } from './request-info-jsdoc.tmpl.js';
-export const requestInfoPerFileTmpl = async ({ route, configuration, apiParams, formatTSContent, importFileParams, utils, }) => {
+export const requestInfoPerFileTmpl = async ({ route, configuration, apiParams, formatTSContent, importFileParams, utils, relativePathDataContracts, }) => {
     const { _ } = utils;
     const { content: requestInfoInstanceContent, reservedDataContractNames } = newRequestInfoTmpl({
         route,
@@ -19,8 +20,7 @@ export const requestInfoPerFileTmpl = async ({ route, configuration, apiParams,
     });
     return {
         reservedDataContractNames: dataContractNamesInThisFile,
-        content: await formatTSContent(`/* eslint-disable */
-      /* tslint:disable */
+        content: await formatTSContent(`${LINTERS_IGNORE}
       import { RequestParams } from "mobx-tanstack-query-api";
       import { ${importFileParams.endpoint.exportName} } from "${importFileParams.endpoint.path}";
       import { ${importFileParams.httpClient.exportName} } from "${importFileParams.httpClient.path}";
@@ -30,7 +30,7 @@ export const requestInfoPerFileTmpl = async ({ route, configuration, apiParams,
       import { ${configuration.modelTypes
                 .map((it) => it.name)
                 .filter((it) => !dataContractNamesInThisFile.includes(it))
-                .join(', ')} } from "../data-contracts";
+                .join(', ')} } from "${relativePathDataContracts}";
       `
             : ''}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-tanstack-query-api",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "keywords": [],
   "author": "js2me",
   "license": "MIT",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "swagger-typescript-api": "13.0.23",
-    "yummies": "^3.0.36"
+    "yummies": "^3.0.37"
   },
   "devDependencies": {
     "@types/node": "^20.17.11",
@@ -30,6 +30,7 @@
     "js2me-eslint-config": "^1.0.7",
     "js2me-exports-post-build-script": "^2.0.17",
     "jsdom": "^26.0.0",
+    "nodemon": "^3.1.9",
     "rimraf": "^6.0.1",
     "typescript": "^5.7.2",
     "unplugin-swc": "^1.5.1",
@@ -61,15 +62,20 @@
       "default": "./codegen/index.js",
       "types": "./codegen/index.d.ts"
     },
+    "./codegen/templates/constants": {
+      "import": "./codegen/templates/constants.js",
+      "default": "./codegen/templates/constants.js",
+      "types": "./codegen/templates/constants.d.ts"
+    },
     "./codegen/templates/data-contract.tmpl": {
       "import": "./codegen/templates/data-contract.tmpl.js",
       "default": "./codegen/templates/data-contract.tmpl.js",
       "types": "./codegen/templates/data-contract.tmpl.d.ts"
     },
-    "./codegen/templates/data-contracts.tmpl": {
-      "import": "./codegen/templates/data-contracts.tmpl.js",
-      "default": "./codegen/templates/data-contracts.tmpl.js",
-      "types": "./codegen/templates/data-contracts.tmpl.d.ts"
+    "./codegen/templates/data-contracts-file.tmpl": {
+      "import": "./codegen/templates/data-contracts-file.tmpl.js",
+      "default": "./codegen/templates/data-contracts-file.tmpl.js",
+      "types": "./codegen/templates/data-contracts-file.tmpl.d.ts"
     },
     "./codegen/templates/index-ts-for-request-per-file.tmpl": {
       "import": "./codegen/templates/index-ts-for-request-per-file.tmpl.js",
@@ -134,6 +140,7 @@
     "ts:check": "tsc --noEmit",
     "check": "npm run lint:check && npm run ts:check",
     "prebuild": "npm run clean && npm run check",
+    "build:watch": "npm run build && nodemon --watch src --ext ts --exec \"tsc && node ./post-build.mjs\"",
     "build": "tsc && node ./post-build.mjs",
     "pub": "PUBLISH=true pnpm run build",
     "pub:patch": "PUBLISH=true PUBLISH_VERSION=patch pnpm run build",

package/codegen/templates/data-contracts.tmpl.d.ts

@@ -1,10 +0,0 @@
-import { GenerateApiConfiguration, GenerateApiOutput } from 'swagger-typescript-api';
-import type { CodegenProcess, QueryApiParams } from '../index.js';
-export interface DataContractsTmplParams extends GenerateApiOutput {
-    configuration: GenerateApiConfiguration;
-    apiParams: QueryApiParams;
-    codegenProcess: CodegenProcess;
-    excludedDataContractNames?: string[];
-}
-export declare const dataContractsTmpl: ({ configuration, formatTSContent, excludedDataContractNames, }: DataContractsTmplParams) => Promise<string>;
-//# sourceMappingURL=data-contracts.tmpl.d.ts.map

package/codegen/templates/data-contracts.tmpl.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"data-contracts.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/data-contracts.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlE,MAAM,WAAW,uBAAwB,SAAQ,iBAAiB;IAChE,aAAa,EAAE,wBAAwB,CAAC;IACxC,SAAS,EAAE,cAAc,CAAC;IAC1B,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;CACtC;AAED,eAAO,MAAM,iBAAiB,mEAI3B,uBAAuB,oBA8BzB,CAAC"}