@autorest/typescript 6.0.0-alpha.16.20220105.1 → 6.0.0-alpha.16.20220119.1

package/dist/src/restLevelClient/generateTopLevelIndexFile.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateTopLevelIndexFile = void 0;
+const path = require("path");
+const autorestSession_1 = require("../autorestSession");
+const nameUtils_1 = require("../utils/nameUtils");
+const batchOutputFolder = [];
+function generateTopLevelIndexFile(model, project) {
+    const { batch, srcPath } = autorestSession_1.getAutorestOptions();
+    if (srcPath) {
+        const clientName = model.language.default.name;
+        const moduleName = nameUtils_1.normalizeName(clientName, nameUtils_1.NameType.File);
+        const relativePath = srcPath.replace('/src', '');
+        batchOutputFolder.push([relativePath, clientName, moduleName]);
+    }
+    if (batch && batch.length > 1 && batchOutputFolder.length === batch.length) {
+        const { srcPath } = autorestSession_1.getAutorestOptions();
+        const fileDirectory = path.join(srcPath, '../../');
+        const file = project.createSourceFile('/src/index.ts', undefined, {
+            overwrite: true
+        });
+        file.moveToDirectory(fileDirectory);
+        const allModules = [];
+        batchOutputFolder.forEach(item => {
+            file.addImportDeclaration({
+                namespaceImport: item[1],
+                moduleSpecifier: `${item[0]}`
+            });
+            file.addExportDeclaration({
+                moduleSpecifier: `${item[0]}/${item[2]}`,
+                namedExports: [`${item[1]} as ${item[1]}Client`]
+            });
+            allModules.push(item[1]);
+        });
+        file.addExportDeclaration({
+            namedExports: [...allModules]
+        });
+    }
+}
+exports.generateTopLevelIndexFile = generateTopLevelIndexFile;
+//# sourceMappingURL=generateTopLevelIndexFile.js.map

package/dist/src/restLevelClient/generateTopLevelIndexFile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateTopLevelIndexFile.js","sourceRoot":"","sources":["../../../src/restLevelClient/generateTopLevelIndexFile.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAC7B,wDAAwD;AAExD,kDAA6D;AAE7D,MAAM,iBAAiB,GAA+B,EAAE,CAAC;AAEzD,SAAgB,yBAAyB,CAAC,KAAgB,EAAE,OAAgB;IACxE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,oCAAkB,EAAE,CAAC;IAChD,IAAI,OAAO,EAAE;QACT,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/C,MAAM,UAAU,GAAG,yBAAa,CAAC,UAAU,EAAE,oBAAQ,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACjD,iBAAiB,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;KAClE;IAED,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,iBAAiB,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;QACxE,MAAM,EAAE,OAAO,EAAE,GAAG,oCAAkB,EAAE,CAAC;QACzC,MAAM,aAAa,GAAE,IAAI,CAAC,IAAI,CAAC,OAAiB,EAAE,QAAQ,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,eAAe,EAAE,SAAS,EAAE;YAC9D,SAAS,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;QACpC,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC7B,IAAI,CAAC,oBAAoB,CAAC;gBACtB,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC;gBACxB,eAAe,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;aAChC,CAAC,CAAC;YACH,IAAI,CAAC,oBAAoB,CAAC;gBACtB,eAAe,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE;gBACxC,YAAY,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC;aACnD,CAAC,CAAA;YACF,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,oBAAoB,CAAC;YACtB,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC;SAChC,CAAC,CAAC;KACN;AACL,CAAC;AAhCD,8DAgCC"}

package/dist/src/utils/autorestOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"autorestOptions.d.ts","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAuB,MAAM,oBAAoB,CAAC;AAK1E;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC,CAsDvE;AAgLD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA8B/B"}
+{"version":3,"file":"autorestOptions.d.ts","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAuB,MAAM,oBAAoB,CAAC;AAK1E;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC,CAwDvE;AAgLD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA8B/B"}

package/dist/src/utils/autorestOptions.js

@@ -42,6 +42,7 @@ function extractAutorestOptions() {
         const headAsBoolean = yield getHeadAsBoolean(host);
         const isTestPackage = yield getIsTestPackage(host);
         const generateTest = yield getGenerateTest(host);
+        const batch = yield getBatch(host);
         const generateSample = yield getGenerateSample(host);
         return {
             azureArm,
@@ -67,6 +68,7 @@ function extractAutorestOptions() {
             headAsBoolean,
             isTestPackage,
             generateTest,
+            batch,
             generateSample
         };
     });
@@ -268,4 +270,10 @@ function getAzureOutputDirectoryPath(host) {
             : undefined;
     });
 }
+function getBatch(host) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const batch = yield host.getValue('batch');
+        return batch;
+    });
+}
 //# sourceMappingURL=autorestOptions.js.map

package/dist/src/utils/autorestOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"autorestOptions.js","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"autorestOptions.js","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@autorest/typescript",
-    "version": "6.0.0-alpha.16.20220105.1",
+    "version": "6.0.0-alpha.16.20220119.1",
     "scripts": {
         "build": "tsc -p . && npm run copyFiles",
         "build:test:browser": "tsc -p tsconfig.browser-test.json && webpack --config webpack.config.test.js",
@@ -38,7 +38,7 @@
     "dependencies": {
         "@autorest/codemodel": "^4.17.0",
         "@autorest/extension-base": "^3.4.1",
-        "@azure-rest/core-client": "1.0.0-alpha.20211206.10",
+        "@azure-rest/core-client": "1.0.0-alpha.20220112.1",
         "@autorest/testmodeler": "^1.0.4",
         "@azure-tools/codegen": "^2.5.294",
         "@azure/core-client": "^1.3.0",

package/src/autorestSession.ts

@@ -32,6 +32,7 @@ export interface AutorestOptions {
   headAsBoolean?: boolean;
   isTestPackage?: boolean;
   generateTest?: boolean;
+  batch?: [string, any][];
   generateSample?: boolean;
 }
 

package/src/generators/indexGenerator.ts

@@ -12,7 +12,7 @@ export function generateIndexFile(
   project: Project,
   clientDetails?: ClientDetails
 ) {
-  const { restLevelClient, srcPath } = getAutorestOptions();
+  const { restLevelClient, srcPath, batch } = getAutorestOptions();
   const indexFile = project.createSourceFile(`${srcPath}/index.ts`, undefined, {
     overwrite: true
   });
@@ -24,11 +24,79 @@ export function generateIndexFile(
       );
     }
     generateHLCIndex(clientDetails, indexFile);
-  } else {
+  } else if (!batch || batch?.length === 1) {
+    // if we are generate single client package for RLC
     generateRLCIndex(indexFile);
+  } else {
+    generateRLCIndexForMultiClient(indexFile);
   }
 }
 
+// to generate a index.ts for each single module inside the multi client RLC package
+function generateRLCIndexForMultiClient(file: SourceFile) {
+  const { model } = getSession();
+  const clientName = model.language.default.name;
+  const moduleName = normalizeName(clientName, NameType.File);
+
+  file.addImportDeclaration({
+    namespaceImport: "Parameters",
+    moduleSpecifier: "./parameters"
+  });
+
+  file.addImportDeclaration({
+    namespaceImport: "Responses",
+    moduleSpecifier: "./responses"
+  });
+
+  file.addImportDeclaration({
+    namespaceImport: "Client",
+    moduleSpecifier: "./clientDefinitions"
+  })
+
+  const exports = ['Parameters', 'Responses', 'Client'];
+  if (hasInputModels(model)) {
+    file.addImportDeclaration({
+      namespaceImport: "Models",
+      moduleSpecifier: "./models",
+    });
+    exports.push("Models");
+  }
+
+  if (hasOutputModels(model)) {
+    file.addImportDeclaration({
+      namespaceImport: "OutputModels",
+      moduleSpecifier: "./outputModels",
+    });
+    exports.push("OutputModels");
+  }
+
+  if (hasPagingOperations(model)) {
+    file.addImportDeclaration({
+      namespaceImport: "PaginateHelper",
+      moduleSpecifier: './paginateHelper',
+    });
+    exports.push("PaginateHelper");
+  }
+
+  if (hasPollingOperations(model)) {
+    file.addImportDeclaration({
+      namespaceImport: 'PollingHelper',
+      moduleSpecifier: './pollingHelper',
+    })
+    exports.push("PollingHelper");
+  }
+
+  file.addExportDeclarations([
+    {
+      moduleSpecifier: `./${moduleName}`,
+      namedExports: [`${clientName} as ${clientName}Client`],
+    },
+    {
+      namedExports: [...exports]
+    }
+  ]);
+}
+
 function generateRLCIndex(file: SourceFile) {
   const { model } = getSession();
   const clientName = model.language.default.name;
@@ -41,13 +109,16 @@ function generateRLCIndex(file: SourceFile) {
 
   file.addExportDeclarations([
     {
-      moduleSpecifier: `./${moduleName}`
+      moduleSpecifier: `./${moduleName}`,
     },
     {
       moduleSpecifier: "./parameters"
     },
     {
       moduleSpecifier: "./responses"
+    },
+    {
+      moduleSpecifier: "./clientDefinitions"
     }
   ]);
 
@@ -82,7 +153,7 @@ function generateRLCIndex(file: SourceFile) {
       }
     ]);
   }
-
+  
   file.addExportAssignment({
     expression: clientName,
     isExportEquals: false

package/src/generators/static/packageFileGenerator.ts

@@ -294,6 +294,12 @@ function regularAutorestPackage(
       docs: "echo skipped"
     },
     sideEffects: false,
+    "//metadata":{
+      constantPaths: [{
+        path: `src/${clientDetails.name}.ts`,
+        prefix: "packageDetails",
+      }],
+    },
     autoPublish: true
   };
   if (generateTest) {

package/src/restLevelClient/generateClient.ts

@@ -5,118 +5,40 @@ import {
   ImplementationLocation
 } from "@autorest/codemodel";
 
-import { getResponseTypeName } from "./operationHelpers";
-
 import {
-  CallSignatureDeclarationStructure,
   Project,
-  SourceFile,
   StatementStructures,
   StructureKind,
   VariableDeclarationKind,
   VariableStatementStructure,
-  WriterFunction,
-  Writers
+  WriterFunction
 } from "ts-morph";
+import * as path from 'path';
 
 import { getAutorestOptions, getSession } from "../autorestSession";
 import { transformBaseUrl } from "../transforms/urlTransforms";
 import { NameType, normalizeName } from "../utils/nameUtils";
-import { isConstantSchema, getElementType } from "./schemaHelpers";
+import { isConstantSchema } from "./schemaHelpers";
 import { getLanguageMetadata } from "../utils/languageHelpers";
-import {
-  buildMethodDefinitions,
-  getOperationParameters,
-  getPathParamDefinitions
-} from "./helpers/operationHelpers";
-import {
-  generateMethodShortcutImplementation,
-  generateMethodShortcuts
-} from "./generateMethodShortcuts";
-import { Methods, PathParameter, Paths } from "./interfaces";
+import { generateMethodShortcutImplementation } from "./generateMethodShortcuts";
+import { Paths } from "./interfaces";
+import { pathDictionary } from './generateClientDefinition';
 
-export function generatePathFirstClient(model: CodeModel, project: Project) {
+export function generateClient(model: CodeModel, project: Project) {
   const name = normalizeName(
     getLanguageMetadata(model.language).name,
     NameType.File
   );
-  const clientFile = project.createSourceFile(`src/${name}.ts`, undefined, {
+  const { srcPath } = getAutorestOptions();
+  const clientFile = project.createSourceFile(path.join(srcPath, `${name}.ts`), undefined, {
     overwrite: true
   });
 
   // Get all paths
-  const importedParameters = new Set<string>();
-  const importedResponses = new Set<string>();
-  const pathDictionary: Paths = {};
-  for (const operationGroup of model.operationGroups) {
-    for (const operation of operationGroup.operations) {
-      const operationName = getLanguageMetadata(operation.language).name;
-      const operationDescription = getLanguageMetadata(operation.language)
-        .description;
-      const pathParameters: PathParameter[] =
-        operation.parameters
-          ?.filter(p => p.protocol.http?.in === ParameterLocation.Path)
-          .map(p => {
-            const languageMetadata = getLanguageMetadata(p.language);
-            return {
-              name: languageMetadata.serializedName || languageMetadata.name,
-              schema: p.schema,
-              description: languageMetadata.description
-            };
-          }) || [];
-      const path: string = operation.requests?.[0].protocol.http?.path;
-      pathParameters.sort(function compare(a: PathParameter, b: PathParameter) {
-        return path.indexOf(a.name) - path.indexOf(b.name);
-      });
-
-      for (const request of operation.requests || []) {
-        const path: string = (request.protocol.http?.path as string) || "";
-        const method = request.protocol.http?.method;
-
-        if (path && method) {
-          if (!pathDictionary[path]) {
-            pathDictionary[path] = {
-              pathParameters,
-              methods: {},
-              name: operationName
-            };
-          }
-          const hasOptionalOptions = !hasRequiredOptions(operation);
-
-          const newMethod = {
-            description: operationDescription,
-            optionsName: getOperationOptionsType(operation, importedParameters),
-            hasOptionalOptions,
-            returnType: `Promise<${getOperationReturnType(
-              operation,
-              importedResponses
-            )}>`
-          };
-
-          if (pathDictionary[path].methods[`${method}`]) {
-            pathDictionary[path].methods[`${method}`].push(newMethod);
-          } else {
-            pathDictionary[path].methods[`${method}`] = [newMethod];
-          }
-        }
-      }
-    }
-  }
-
-  writeShortcutInterface(model, pathDictionary, clientFile);
-  clientFile.addInterface({
-    name: "Routes",
-    isExported: true,
-    callSignatures: getPathFirstRoutesInterfaceDefinition(
-      pathDictionary,
-      clientFile
-    )
-  });
-
   const clientName = getLanguageMetadata(model.language).name;
   const uriParameter = getClientUriParameter();
 
-  const { addCredentials, credentialKeyHeaderName } = getAutorestOptions();
+  const { addCredentials, credentialKeyHeaderName, batch } = getAutorestOptions();
   const credentialTypes = addCredentials ? ["TokenCredential"] : [];
 
   if (credentialKeyHeaderName) {
@@ -129,76 +51,28 @@ export function generatePathFirstClient(model: CodeModel, project: Project) {
       ? []
       : [{ name: "credentials", type: credentialTypes.join(" | ") }])
   ];
-  const clientIterfaceName = `${clientName}RestClient`;
+  const clientInterfaceName = `${clientName}RestClient`;
 
-  const { rlcShortcut } = getAutorestOptions();
-
-  let shortcutElements = !rlcShortcut
-    ? []
-    : model.operationGroups.map(og => {
-        const groupName = og.language.default.name;
-        const name = normalizeName(groupName, NameType.Property);
-        const interfaceName = normalizeName(
-          `${name}Operations`,
-          NameType.Interface
-        );
-        return { name, type: interfaceName };
-      });
-
-  // There may be operations without an operation group, those shortcut
-  // methods need to be handled differently.
-  const shortcutsInOperationGroup = shortcutElements.filter(s => s.name);
-
-  clientFile.addTypeAlias({
-    isExported: true,
-    name: clientIterfaceName,
-    type: Writers.intersectionType(
-      "Client",
-      Writers.objectType({
-        properties: [
-          { name: "path", type: "Routes" },
-          ...shortcutsInOperationGroup
-        ]
-      }),
-      // If the length of shortcutMethods in operation group and all shortcutMethods
-      // is the same, then we don't have any operations at the client level
-      // Otherwise we need to make the client interface name an union with the
-      // definition of all client level shortcut methods
-      ...(shortcutsInOperationGroup.length !== shortcutElements.length
-        ? [`ClientOperations`]
-        : [])
-    )
-  });
-
-  clientFile.addFunction({
+  const functionStatement = {
     isExported: true,
-    name: clientName,
+    name: `${clientName}`,
     parameters: [
       ...commonClientParams,
       { name: "options", type: "ClientOptions = {}" }
     ],
-    returnType: clientIterfaceName,
-    isDefaultExport: true,
-    statements: getClientFactoryBody(clientIterfaceName, pathDictionary)
-  });
-
-  if (importedParameters.size) {
-    clientFile.addImportDeclaration({
-      namedImports: [...importedParameters],
-      moduleSpecifier: "./parameters"
-    });
+    returnType: clientInterfaceName,
+    isDefaultExport: false,
+    statements: getClientFactoryBody(clientInterfaceName, pathDictionary)
   }
 
-  if (importedResponses.size) {
-    clientFile.addImportDeclaration({
-      namedImports: [...importedResponses],
-      moduleSpecifier: "./responses"
-    });
+  if (!batch || batch.length === 1) {
+    functionStatement.isDefaultExport = true;
   }
+  clientFile.addFunction(functionStatement);
 
   clientFile.addImportDeclarations([
     {
-      namedImports: ["getClient", "ClientOptions", "Client"],
+      namedImports: ["getClient", "ClientOptions"],
       moduleSpecifier: "@azure-rest/core-client"
     }
   ]);
@@ -207,65 +81,14 @@ export function generatePathFirstClient(model: CodeModel, project: Project) {
     {
       namedImports: credentialTypes,
       moduleSpecifier: "@azure/core-auth"
+    },
+    {
+      namedImports: [`${clientName}RestClient`],
+      moduleSpecifier: './clientDefinitions'
     }
   ]);
 }
 
-function writeShortcutInterface(
-  model: CodeModel,
-  pathDictionary: Paths,
-  clientFile: SourceFile
-) {
-  const { rlcShortcut } = getAutorestOptions();
-  if (!rlcShortcut) {
-    return;
-  }
-
-  // Create a map of Operation group descriptions
-  const descriptions = model.operationGroups.reduce((map, current) => {
-    const { name, description } = current.language.default;
-    map.set(name, description);
-
-    return map;
-  }, new Map<string, string>());
-
-  const shortcuts = generateMethodShortcuts(model, pathDictionary);
-
-  for (const group of Object.keys(shortcuts)) {
-    const groupName = normalizeName(group, NameType.Interface) || "Client";
-    const groupOperations = shortcuts[group];
-
-    clientFile.addInterface({
-      docs: [
-        descriptions.get(group) ||
-          `Contains operations for ${groupName} operations`
-      ],
-      name: `${groupName}Operations`,
-      isExported: true,
-      methods: groupOperations
-    });
-  }
-}
-
-function hasRequiredOptions(operation: Operation) {
-  return getOperationParameters(operation)
-    .filter(p => p.implementation === ImplementationLocation.Method)
-    .filter(p => ["query", "body", "headers"].includes(p.protocol.http?.in))
-    .some(p => p.required);
-}
-
-function getOperationOptionsType(
-  operation: Operation,
-  importedParameters = new Set<string>()
-) {
-  const paramsName = `${
-    getLanguageMetadata(operation.language).name
-  }Parameters`;
-  importedParameters.add(paramsName);
-
-  return paramsName;
-}
-
 function getClientFactoryBody(
   clientTypeName: string,
   paths: Paths
@@ -375,82 +198,8 @@ function getApiVersion(): string | undefined {
   return undefined;
 }
 
-function getOperationReturnType(
-  operation: Operation,
-  importedResponses = new Set<string>()
-) {
-  let returnType: string = "HttpResponse";
-  if (operation.responses && operation.responses.length) {
-    const responses = [...operation.responses, ...(operation.exceptions || [])];
-
-    const responseTypes = responses
-      .filter(
-        r => r.protocol.http?.statusCodes && r.protocol.http?.statusCodes.length
-      )
-      .map(r => {
-        const responseName = getResponseTypeName(operation, r);
-        importedResponses.add(responseName);
-        return responseName;
-      });
-
-    if (responseTypes.length) {
-      returnType = responseTypes.join(" | ");
-    }
-  }
-
-  return returnType;
-}
-
-function getPathFirstRoutesInterfaceDefinition(
-  paths: Paths,
-  sourcefile: SourceFile
-): CallSignatureDeclarationStructure[] {
-  const signatures: CallSignatureDeclarationStructure[] = [];
-  for (const key of Object.keys(paths)) {
-    generatePathFirstRouteMethodsDefinition(
-      paths[key].name,
-      paths[key].methods,
-      sourcefile
-    );
-    const pathParams = paths[key].pathParameters;
-    signatures.push({
-      docs: [
-        `Resource for '${key
-          .replace(/}/g, "\\}")
-          .replace(
-            /{/g,
-            "\\{"
-          )}' has methods for the following verbs: ${Object.keys(
-          paths[key].methods
-        ).join(", ")}`
-      ],
-      parameters: [
-        { name: "path", type: `"${key}"` },
-        ...getPathParamDefinitions(pathParams)
-      ],
-      returnType: paths[key].name,
-      kind: StructureKind.CallSignature
-    });
-  }
-  return signatures;
-}
-
 function getClientUriParameter() {
   const { model } = getSession();
   const { parameterName } = transformBaseUrl(model);
   return parameterName;
-}
-
-function generatePathFirstRouteMethodsDefinition(
-  operationName: string,
-  methods: Methods,
-  file: SourceFile
-): void {
-  const methodDefinitions = buildMethodDefinitions(methods);
-
-  file.addInterface({
-    methods: methodDefinitions,
-    name: operationName,
-    isExported: true
-  });
-}
+}