fix: controller groupping

Author: raveclassic

src/language/typescript.ts

@@ -25,7 +25,7 @@ import {
 } from '../utils';
 import { none, Option, some } from 'fp-ts/lib/Option';
 import { getArrayMonoid, getRecordMonoid, monoidString, fold, monoidAny } from 'fp-ts/lib/Monoid';
-import { camelize } from '@devexperts/utils/dist/string/string';
+import { decapitalize } from '@devexperts/utils/dist/string/string';
 import { intercalate } from 'fp-ts/lib/Foldable2v';
 import { collect, lookup } from 'fp-ts/lib/Record';
 import { identity } from 'fp-ts/lib/function';
@@ -123,7 +123,7 @@ export const serialize: TSerializer = (name: string, swaggerObject: TSwaggerObje
 const serializeDefinitions = (definitions: TDefinitionsObject): TDirectory =>
 	directory('definitions', [...serializeDictionary(definitions, serializeDefinition)]);
 const serializePaths = (paths: TPathsObject): TDirectory =>
-	directory('paths', serializeDictionary(groupPathsByTag(paths), serializePathGroup));
+	directory('controllers', serializeDictionary(groupPathsByTag(paths), serializePathGroup));
 
 const serializeDefinition = (name: string, definition: TSchemaObject): TFile => {
 	const serialized = serializeSchemaObject(definition, './');
@@ -153,7 +153,7 @@ const serializePathGroup = (name: string, group: Record<string, TPathItemObject>
 		dependency('asks', 'fp-ts/lib/Reader'),
 		dependency('TAPIClient', '../client/client'),
 	]);
-	const groupName = name || 'Unknown';
+	const groupName = `${name}Controller`;
 	return file(
 		`${groupName}.ts`,
 		`
@@ -164,7 +164,7 @@ const serializePathGroup = (name: string, group: Record<string, TPathItemObject>
 				${serialized.type}
 			};
 			
-			export const ${camelize(groupName, true)} = asks((e: { apiClient: TAPIClient }): ${groupName} => ({
+			export const ${decapitalize(groupName)} = asks((e: { apiClient: TAPIClient }): ${groupName} => ({
 				${serialized.io}
 			}));
 		`,

src/utils.ts

@@ -14,13 +14,15 @@ import { tuple } from 'fp-ts/lib/function';
 import { setoidString } from 'fp-ts/lib/Setoid';
 import { TQueryParameterObject } from './swagger';
 import { TFSEntity } from './fs';
+import { camelize } from '@devexperts/utils/dist/string/string';
 
 export type TSerializer = (name: string, schema: TSwaggerObject) => TFSEntity;
 
 export const getOperationsFromPath = (path: TPathItemObject): TDictionary<TOperationObject> => {
 	const result: TDictionary<TOperationObject> = {};
 	const operations = array.compact([
 		path.get.map(operation => tuple('get', operation)),
+		path.post.map(operation => tuple('post', operation)),
 		path.put.map(operation => tuple('put', operation)),
 		path.delete.map(operation => tuple('delete', operation)),
 		path.head.map(operation => tuple('head', operation)),
@@ -44,9 +46,8 @@ export const groupPathsByTag = (paths: TPathsObject): TDictionary<TDictionary<TP
 	const result: TDictionary<TDictionary<TPathItemObject>> = {};
 	for (const key of keys) {
 		const path = paths[key];
-		const tag = getTagsFromPath(path)
-			.join('')
-			.replace(/\s/g, '');
+		const tags = getTagsFromPath(path);
+		const tag = camelize(tags.join('').replace(/\s/g, ''), false);
 
 		result[tag] = {
 			...(result[tag] || {}),

test/index.ts

@@ -8,7 +8,7 @@ const self = path.resolve(__dirname);
 
 generate({
 	pathToSpec: path.resolve(self, './swagger.json'),
-	out: path.resolve(self, './spec'),
+	out: path.resolve(self, './out'),
 	serialize,
 }).catch(error => {
 	console.error(error);