mobx-tanstack-query-api 0.0.33 → 0.0.34

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/codegen/index.d.ts +1 -0
  2. package/codegen/index.d.ts.map +1 -1
  3. package/codegen/index.js +29 -25
  4. package/package.json +1 -1
package/codegen/index.d.ts CHANGED
@@ -14,6 +14,7 @@ export interface GenerateQueryApiParams {
14
14
  requestPathPrefix?: string;
15
15
  requestPathSuffix?: string;
16
16
  requestInfoPrefix?: string;
17
+ formatExportGroupName?: (groupName: string, utils: CodegenDataUtils) => string;
17
18
  /**
18
19
  * Group endpoints and collect it into object
19
20
  */
package/codegen/index.d.ts.map CHANGED
@@ -1 +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;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"}
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;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,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,gBAAgB,KACpB,MAAM,CAAC;IAEZ;;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,CAgXd,CAAC"}
package/codegen/index.js CHANGED
@@ -37,7 +37,7 @@ export const generateApi = async (params) => {
37
37
  requestInfoClass: path.resolve(__dirname, 'templates/request-info-class.ejs'),
38
38
  httpClient: path.resolve(__dirname, 'templates/http-client.ejs'),
39
39
  createRequestInfoInstance: path.resolve(__dirname, 'templates/create-request-info-instance.ejs'),
40
- outputDir: params.output,
40
+ outputDir: path.resolve(process.cwd(), params.output),
41
41
  };
42
42
  const codegenParams = {
43
43
  httpClientType: 'fetch',
@@ -115,7 +115,9 @@ export const generateApi = async (params) => {
115
115
  .flat()
116
116
  .flatMap((routeGroup) => 'routes' in routeGroup ? routeGroup.routes : routeGroup);
117
117
  const reservedDataContractNamesMap = new Map();
118
+ const collectedExportFiles = [];
118
119
  if (params.groupBy == null) {
120
+ collectedExportFiles.push('endpoints');
119
121
  // #region кодогенерация 1 эндпоинт - 1 файл без группировки
120
122
  codegenFs.createDir(path.resolve(params.output, 'endpoints'));
121
123
  const fileNamesWithRequestInfo = [];
@@ -173,7 +175,7 @@ export const generateApi = async (params) => {
173
175
  group = route.raw?.tags?.[tagIndex] ?? undefined;
174
176
  }
175
177
  if (group == null) {
176
- group = '_other';
178
+ group = 'other';
177
179
  }
178
180
  if (!groupsMap.has(group)) {
179
181
  groupsMap.set(group, []);
@@ -207,27 +209,29 @@ export const generateApi = async (params) => {
207
209
  content: requestInfoPerFileContent,
208
210
  });
209
211
  }
210
- if (routes.length > 0) {
211
- codegenFs.createFile({
212
- path: path.resolve(params.output, _.kebabCase(groupName)),
213
- fileName: 'index.ts',
214
- withPrefix: false,
215
- content: `${LINTERS_IGNORE}
216
- export * from './endpoints';
217
- `,
218
- });
219
- codegenFs.createFile({
220
- path: path.resolve(params.output, _.kebabCase(groupName), 'endpoints'),
221
- fileName: 'index.ts',
222
- withPrefix: false,
223
- content: await indexTsForRequestPerFileTmpl({
224
- ...generated,
225
- apiParams: params,
226
- codegenProcess,
227
- generatedRequestFileNames: fileNamesWithRequestInfo,
228
- }),
229
- });
230
- }
212
+ const exportGroupName = params.formatExportGroupName
213
+ ? params.formatExportGroupName(_.camelCase(groupName), utils)
214
+ : _.camelCase(groupName);
215
+ codegenFs.createFile({
216
+ path: path.resolve(params.output, _.kebabCase(groupName)),
217
+ fileName: 'index.ts',
218
+ withPrefix: false,
219
+ content: `${LINTERS_IGNORE}
220
+ export * as ${exportGroupName} from './endpoints';
221
+ `,
222
+ });
223
+ codegenFs.createFile({
224
+ path: path.resolve(params.output, _.kebabCase(groupName), 'endpoints'),
225
+ fileName: 'index.ts',
226
+ withPrefix: false,
227
+ content: await indexTsForRequestPerFileTmpl({
228
+ ...generated,
229
+ apiParams: params,
230
+ codegenProcess,
231
+ generatedRequestFileNames: fileNamesWithRequestInfo,
232
+ }),
233
+ });
234
+ collectedExportFiles.push(_.kebabCase(groupName));
231
235
  }
232
236
  // #endregion
233
237
  }
@@ -256,7 +260,7 @@ export * from './endpoints';
256
260
  withPrefix: false,
257
261
  content: `${LINTERS_IGNORE}
258
262
  export * from './data-contracts';
259
- export * from './endpoints';
263
+ ${collectedExportFiles.map((fileName) => `export * from './${fileName}';`).join('\n')}
260
264
  `,
261
265
  });
262
266
  codegenFs.createFile({
@@ -275,7 +279,7 @@ export * as ${namespace} from './__exports';
275
279
  withPrefix: false,
276
280
  content: `${LINTERS_IGNORE}
277
281
  export * from './data-contracts';
278
- export * from './endpoints';
282
+ ${collectedExportFiles.map((fileName) => `export * from './${fileName}';`).join('\n')}
279
283
  `,
280
284
  });
281
285
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mobx-tanstack-query-api",
3
- "version": "0.0.33",
3
+ "version": "0.0.34",
4
4
  "keywords": [],
5
5
  "author": "js2me",
6
6
  "license": "MIT",