chore: restructure folder

tests/package.json

@@ -7,7 +7,8 @@
   "scripts": {
     "build": "tsc",
     "lint:fix": "yarn workspace javascript-tests lint:fix",
-    "generate": "node dist/tests/src/main.js ${0:-javascript} ${1:-search}",
+    "generate": "yarn generate:methods:requets ${0:-javascript} ${1:-search}",
+    "generate:methods:requets": "node dist/tests/src/methods/requests/main.js ${0:-javascript} ${1:-search}",
     "start": "yarn build && yarn generate ${0:-javascript} ${1:-search} && yarn lint:fix"
   },
   "devDependencies": {

tests/src/cts.ts → tests/src/methods/requests/cts.ts

@@ -4,7 +4,7 @@ import SwaggerParser from '@apidevtools/swagger-parser';
 import type { OpenAPIV3 } from 'openapi-types';
 
 import type { CTS, CTSBlock, Tests } from './types';
-import { removeObjectName, walk } from './utils';
+import { removeObjectName, walk } from '../../utils';
 
 async function loadRequestsCTS(client: string): Promise<CTSBlock[]> {
   // load the list of operations from the spec
@@ -19,7 +19,7 @@ async function loadRequestsCTS(client: string): Promise<CTSBlock[]> {
 
   const ctsClient: CTSBlock[] = [];
 
-  for await (const file of walk(`./CTS/clients/${client}/requests`)) {
+  for await (const file of walk(`./CTS/methods/requests/${client}`)) {
     if (!file.name.endsWith('json')) {
       continue;
     }

tests/src/generate.ts → tests/src/methods/requests/generate.ts

@@ -5,12 +5,16 @@ import Mustache from 'mustache';
 import { loadCTS } from './cts';
 import { loadRequestsTemplate } from './templates';
 import type { CTSBlock } from './types';
-import { extensionForLanguage } from './types';
-import { createClientName, packageNames } from './utils';
+import {
+  createClientName,
+  packageNames,
+  extensionForLanguage,
+} from '../../utils';
 
 async function createOutputDir(language: string): Promise<void> {
-  await fsp.mkdir(`output/${language}`, { recursive: true });
-  await fsp.mkdir(`output/${language}/tests`, { recursive: true });
+  await fsp.mkdir(`output/${language}/tests/methods/requests`, {
+    recursive: true,
+  });
 }
 
 async function generateRequestsTests(
@@ -35,7 +39,7 @@ async function generateRequestsTests(
     ].includes(client),
   });
   await fsp.writeFile(
-    `output/${language}/tests/${client}Requests.${extensionForLanguage[language]}`,
+    `output/${language}/tests/methods/requests/${client}.${extensionForLanguage[language]}`,
     code
   );
 }

tests/src/main.ts → tests/src/methods/requests/main.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 
 import { generateTests } from './generate';
-import { packageNames } from './utils';
+import { packageNames } from '../../utils';
 
 function printUsage(): void {
   console.log(`usage: generateCTS language client`);

tests/src/templates.ts → tests/src/methods/requests/templates.ts

@@ -2,6 +2,6 @@ import fsp from 'fs/promises';
 
 export async function loadRequestsTemplate(language: string): Promise<string> {
   return (
-    await fsp.readFile(`CTS/templates/${language}/requests.mustache`)
+    await fsp.readFile(`CTS/methods/templates/${language}/requests.mustache`)
   ).toString();
 }

tests/src/types.ts → tests/src/methods/requests/types.ts

@@ -30,8 +30,3 @@ export type CTSBlock = {
 export type CTS = {
   requests: CTSBlock[];
 };
-
-export const extensionForLanguage: Record<string, string> = {
-  javascript: 'test.ts',
-  java: 'java',
-};

tests/src/utils.ts

@@ -56,3 +56,8 @@ export function removeObjectName(obj: Record<string, any>): void {
     }
   }
 }
+
+export const extensionForLanguage: Record<string, string> = {
+  javascript: 'test.ts',
+  java: 'java',
+};