@azure-tools/typespec-ts 0.14.0 → 0.15.0-alpha.20230822.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.14.0",
+  "version": "0.15.0-alpha.20230822.1",
   "description": "An experimental CADL emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -22,30 +22,31 @@
     "ts-node": "^10.9.1",
     "typescript": "~5.0.0",
     "prettier": "~2.7.1",
-    "@azure-tools/cadl-ranch-specs": "^0.17.1",
-    "@azure-tools/cadl-ranch-expect": "^0.5.0",
-    "@azure-tools/cadl-ranch": "^0.6.0",
+    "@azure-tools/cadl-ranch-specs": "^0.18.0",
+    "@azure-tools/cadl-ranch-expect": "^0.6.0",
+    "@azure-tools/cadl-ranch": "^0.7.0",
     "chalk": "^4.0.0",
     "@azure-rest/core-client": "^1.1.4",
     "@azure/core-auth": "^1.3.2",
     "cross-env": "^7.0.3",
     "@azure/core-paging": "^1.5.0",
     "@azure/core-lro": "^2.5.4",
-    "@azure/core-rest-pipeline": "^1.9.2",
-    "@azure/logger": "^1.0.4"
+    "@azure/core-rest-pipeline": "^1.12.0",
+    "@azure/logger": "^1.0.4",
+    "@azure/core-util": "^1.4.0"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.32.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.32.0 <1.0.0",
-    "@typespec/compiler": ">=0.46.0 <1.0.0",
-    "@typespec/http": ">=0.46.0 <1.0.0",
-    "@typespec/rest": ">=0.46.0 <1.0.0",
-    "@typespec/versioning": ">=0.46.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.33.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.33.0 <1.0.0",
+    "@typespec/compiler": ">=0.47.0 <1.0.0",
+    "@typespec/http": ">=0.47.0 <1.0.0",
+    "@typespec/rest": ">=0.47.0 <1.0.0",
+    "@typespec/versioning": ">=0.47.0 <1.0.0"
   },
   "dependencies": {
     "prettier": "^2.6.1",
     "tslib": "^2.3.1",
-    "@azure-tools/rlc-common": "^0.14.0",
+    "@azure-tools/rlc-common": "^0.15.0",
     "ts-morph": "^15.1.0",
     "fs-extra": "^11.1.0"
   },
@@ -76,12 +77,21 @@
     "check-format": "npm run prettier -- --check",
     "prettier": "prettier --config ./.prettierrc src/**/*.ts",
     "check:tree": "ts-node ./test/commands/check-clean-tree.ts",
-    "integration-test-ci": "npm run start-test-server & npm run copy:typespec && npm run generate-and-run",
-    "start-test-server": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-rlc.json",
+    "integration-test-ci": "npm run integration-test-ci:rlc && npm run integration-test-ci:modular",
+    "integration-test-ci:rlc": "npm run start-test-server:rlc & npm run copy:typespec && npm run generate-and-run:rlc",
+    "integration-test-ci:modular": "npm run start-test-server:modular & npm run copy:typespec && npm run generate-and-run:modular",
+    "start-test-server": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript.json",
+    "start-test-server:rlc": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-rlc.json",
+    "start-test-server:modular": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-modular.json",
     "copy:typespec": "rm -rf temp && mkdirp -p temp && cp -r ./node_modules/@azure-tools/cadl-ranch-specs/http ./temp && cp -r ./test/integration/typespec/* ./temp/http",
-    "generate-and-run": "npm run generate-cadl-only && npm run integration-test:alone && npm run stop-test-server",
-    "generate-cadl-only": "ts-node ./test/commands/gen-cadl-ranch.ts",
-    "integration-test:alone": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 4000 ./test/integration/*.spec.ts",
+    "generate-and-run:rlc": "npm run generate-cadl-only:rlc && npm run integration-test:alone:rlc && npm run stop-test-server",
+    "generate-and-run:modular": "npm run generate-cadl-only:modular && npm run integration-test:alone:modular && npm run stop-test-server",
+    "generate-cadl-only": "npm run generate-cadl-only:rlc && npm run generate-cadl-only:modular",
+    "generate-cadl-only:rlc": "ts-node ./test/commands/gen-cadl-ranch.ts --tag=rlc",
+    "generate-cadl-only:modular": "ts-node ./test/commands/gen-cadl-ranch.ts --tag=modular",
+    "integration-test:alone": "npm run integration-test:alone:rlc && npm run integration-test:alone:modular",
+    "integration-test:alone:rlc": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 4000 ./test/integration/*.spec.ts",
+    "integration-test:alone:modular": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 4000 ./test/modularIntegration/*.spec.ts",
     "stop-test-server": "npx cadl-ranch server stop",
     "unit-test": "cross-env TS_NODE_PROJECT=tsconfig.json mocha -r ts-node/register --experimental-specifier-resolution=node --experimental-modules=true  --timeout 4000 './test/unit/**/*.spec.ts'"
   }

package/src/index.ts

@@ -3,6 +3,7 @@
 
 import { Program, EmitContext } from "@typespec/compiler";
 import * as fsextra from "fs-extra";
+import { existsSync } from "fs";
 import {
   buildClientDefinitions,
   buildResponseTypes,
@@ -34,11 +35,7 @@ import {
 } from "@azure-tools/rlc-common";
 import { transformRLCModel } from "./transform/transform.js";
 import { emitContentByBuilder, emitModels } from "./utils/emitUtil.js";
-import {
-  SdkContext,
-  createSdkContext
-} from "@azure-tools/typespec-client-generator-core";
-import * as path from "path";
+import { createSdkContext } from "@azure-tools/typespec-client-generator-core";
 import { Project, SyntaxKind } from "ts-morph";
 import { buildClientContext } from "./modular/buildClientContext.js";
 import { emitCodeModel } from "./modular/buildCodeModel.js";
@@ -46,142 +43,260 @@ import {
   buildRootIndex,
   buildSubClientIndexFile
 } from "./modular/buildRootIndex.js";
-import { buildModels } from "./modular/emitModels.js";
+import { buildModels, buildModelsOptions } from "./modular/emitModels.js";
 import { buildOperationFiles } from "./modular/buildOperations.js";
 import { buildSubpathIndexFile } from "./modular/buildSubpathIndex.js";
 import { buildClassicalClient } from "./modular/buildClassicalClient.js";
 import { emitPackage, emitTsConfig } from "./modular/buildProjectFiles.js";
 import { getRLCClients } from "./utils/clientUtils.js";
+import { join } from "path";
+import { GenerationDirDetail, SdkContext } from "./utils/interfaces.js";
+import { transformRLCOptions } from "./transform/transfromRLCOptions.js";
+import { ModularCodeModel } from "./modular/modularCodeModel.js";
 
-export interface RLCSdkContext extends SdkContext {
-  options: RLCOptions;
-}
+export * from "./lib.js";
 
 export async function $onEmit(context: EmitContext) {
+  /** Shared status */
   const program: Program = context.program;
-  const options: RLCOptions = context.options;
-  const dpgContext = createSdkContext(context);
-  const clients = getRLCClients(dpgContext);
-  const srcPath: string = context.emitterOutputDir;
-  let count = -1;
-
+  const emitterOptions: RLCOptions = context.options;
+  const dpgContext = createSdkContext(context) as SdkContext;
   const needUnexpectedHelper: Map<string, boolean> = new Map<string, boolean>();
   const serviceNameToRlcModelsMap: Map<string, RLCModel> = new Map<
     string,
     RLCModel
   >();
-  for (const client of clients) {
-    count++;
-    const rlcModels = await transformRLCModel(
-      program,
-      options,
-      client,
-      context.emitterOutputDir,
-      dpgContext
-    );
-    serviceNameToRlcModelsMap.set(client.service.name, rlcModels);
-    const pathToClear = rlcModels.srcPath;
-    needUnexpectedHelper.set(client.name, hasUnexpectedHelper(rlcModels));
-    clearSrcFolder(
-      pathToClear,
-      count,
-      options.multiClient,
-      options.isModularLibrary
-    );
-    await emitModels(rlcModels, program);
-    await emitContentByBuilder(program, buildClientDefinitions, rlcModels);
-    await emitContentByBuilder(program, buildResponseTypes, rlcModels);
-    await emitContentByBuilder(program, buildClient, rlcModels);
-    await emitContentByBuilder(program, buildParameterTypes, rlcModels);
-    await emitContentByBuilder(program, buildIsUnexpectedHelper, rlcModels);
-    await emitContentByBuilder(program, buildIndexFile, rlcModels);
-    await emitContentByBuilder(program, buildLogger, rlcModels);
-    await emitContentByBuilder(program, buildTopLevelIndex, rlcModels);
-    await emitContentByBuilder(program, buildPaginateHelper, rlcModels);
-    await emitContentByBuilder(program, buildPollingHelper, rlcModels);
-    // buildSerializeHelper
-    await emitContentByBuilder(program, buildSerializeHelper, rlcModels);
-    // build metadata relevant files
-    await emitContentByBuilder(
-      program,
-      [
-        buildEsLintConfig,
-        buildRollupConfig,
-        buildApiExtractorConfig,
-        buildReadmeFile,
-        buildPackageFile,
-        buildTsConfig
-      ],
-      rlcModels,
-      context.emitterOutputDir
-    );
-    // build test relevant files
-    await emitContentByBuilder(
-      program,
-      [
-        buildKarmaConfigFile,
-        buildEnvFile,
-        buildEnvBrowserFile,
-        buildRecordedClientFile,
-        buildSampleTest
-      ],
-      rlcModels,
-      context.emitterOutputDir
+  const rlcCodeModels: RLCModel[] = [];
+  let modularCodeModel: ModularCodeModel;
+  // 1. Enrich the dpg context with path detail and common options
+  await enrichDpgContext();
+  // 2. Clear sources folder
+  await clearSrcFolder();
+  // 3. Generate RLC sources
+  await generateRLCSources();
+  // 4. Generate Modular sources
+  await generateModularSources();
+  // 5. Generate metadata and test files
+  await generateMetadataAndTest();
+
+  async function enrichDpgContext() {
+    const generationPathDetail: GenerationDirDetail =
+      await calculateGenerationDir();
+    dpgContext.generationPathDetail = generationPathDetail;
+    const options: RLCOptions = transformRLCOptions(emitterOptions, dpgContext);
+    dpgContext.rlcOptions = options;
+  }
+
+  async function calculateGenerationDir(): Promise<GenerationDirDetail> {
+    const projectRoot = context.emitterOutputDir ?? "";
+    let sourcesRoot = join(projectRoot, "src");
+    const customizationFolder = join(projectRoot, "sources");
+    if (await fsextra.pathExists(customizationFolder)) {
+      sourcesRoot = join(customizationFolder, "generated", "src");
+    }
+    return {
+      rootDir: projectRoot,
+      metadataDir: projectRoot,
+      rlcSourcesDir: join(
+        sourcesRoot,
+        emitterOptions.isModularLibrary ? "rest" : "" // When generating modular library, RLC has to go under rest folder
+      ),
+      modularSourcesDir: emitterOptions.isModularLibrary
+        ? sourcesRoot
+        : undefined
+    };
+  }
+
+  async function clearSrcFolder() {
+    await fsextra.emptyDir(
+      dpgContext.generationPathDetail?.modularSourcesDir ??
+        dpgContext.generationPathDetail?.rlcSourcesDir ??
+        ""
     );
   }
 
-  if (options.isModularLibrary) {
-    // TODO: Emit modular parts of the library
-    const project = new Project();
-    const modularCodeModel = emitCodeModel(context, serviceNameToRlcModelsMap, {
-      casing: "camel"
-    });
-    const rootIndexFile = project.createSourceFile(
-      `${srcPath}/src/index.ts`,
-      "",
-      {
-        overwrite: true
+  async function generateRLCSources() {
+    const clients = getRLCClients(dpgContext);
+    for (const client of clients) {
+      const rlcModels = await transformRLCModel(client, dpgContext);
+      rlcCodeModels.push(rlcModels);
+      serviceNameToRlcModelsMap.set(client.service.name, rlcModels);
+      needUnexpectedHelper.set(client.name, hasUnexpectedHelper(rlcModels));
+
+      await emitModels(rlcModels, program);
+      await emitContentByBuilder(program, buildClientDefinitions, rlcModels);
+      await emitContentByBuilder(program, buildResponseTypes, rlcModels);
+      await emitContentByBuilder(program, buildClient, rlcModels);
+      await emitContentByBuilder(program, buildParameterTypes, rlcModels);
+      await emitContentByBuilder(program, buildIsUnexpectedHelper, rlcModels);
+      await emitContentByBuilder(program, buildIndexFile, rlcModels);
+      await emitContentByBuilder(program, buildLogger, rlcModels);
+      await emitContentByBuilder(program, buildTopLevelIndex, rlcModels);
+      await emitContentByBuilder(program, buildPaginateHelper, rlcModels);
+      await emitContentByBuilder(program, buildPollingHelper, rlcModels);
+      await emitContentByBuilder(program, buildSerializeHelper, rlcModels);
+    }
+  }
+
+  async function generateModularSources() {
+    if (emitterOptions.isModularLibrary) {
+      // TODO: Emit modular parts of the library
+      const modularSourcesRoot =
+        dpgContext.generationPathDetail?.modularSourcesDir ?? "src";
+      const project = new Project();
+      modularCodeModel = emitCodeModel(context, serviceNameToRlcModelsMap, {
+        casing: "camel"
+      });
+      const rootIndexFile = project.createSourceFile(
+        `${modularSourcesRoot}/index.ts`,
+        "",
+        {
+          overwrite: true
+        }
+      );
+      for (const subClient of modularCodeModel.clients) {
+        let subfolder = "";
+        if (modularCodeModel.clients.length > 1) {
+          subfolder = normalizeName(
+            subClient.name.replace("Client", ""),
+            NameType.File
+          );
+        }
+
+        buildModels(modularCodeModel, project, modularSourcesRoot, subfolder);
+        buildModelsOptions(subClient, project, modularSourcesRoot, subfolder);
+        const hasClientUnexpectedHelper =
+          needUnexpectedHelper.get(
+            subClient.rlcClientName.replace("Context", "Client")
+          ) ?? false;
+        buildOperationFiles(
+          dpgContext,
+          subClient,
+          project,
+          modularSourcesRoot,
+          subfolder,
+          hasClientUnexpectedHelper
+        );
+        buildClientContext(
+          dpgContext,
+          subClient,
+          project,
+          modularSourcesRoot,
+          subfolder
+        );
+        buildSubpathIndexFile(project, modularSourcesRoot, "models", subfolder);
+        buildSubpathIndexFile(project, modularSourcesRoot, "api", subfolder);
+        buildClassicalClient(
+          dpgContext,
+          subClient,
+          project,
+          modularSourcesRoot,
+          subfolder
+        );
+        if (modularCodeModel.clients.length > 1) {
+          buildSubClientIndexFile(
+            subClient,
+            project,
+            modularSourcesRoot,
+            subfolder
+          );
+        }
+        buildRootIndex(
+          subClient,
+          project,
+          rootIndexFile,
+          modularSourcesRoot,
+          subfolder
+        );
       }
-    );
-    for (const subClient of modularCodeModel.clients) {
-      let subfolder = "";
-      if (modularCodeModel.clients.length > 1) {
-        subfolder = normalizeName(
-          subClient.name.replace("Client", ""),
-          NameType.File
+
+      removeUnusedInterfaces(project);
+
+      for (const file of project.getSourceFiles()) {
+        await emitContentByBuilder(
+          program,
+          () => ({ content: file.getFullText(), path: file.getFilePath() }),
+          modularCodeModel as any
         );
+        // emitFile(program, { content: hrlcClient.content, path: hrlcClient.path });
       }
+    }
+  }
 
-      buildClientContext(dpgContext, subClient, project, srcPath, subfolder);
-      buildModels(modularCodeModel, project, srcPath, subfolder);
-      buildOperationFiles(
-        dpgContext,
-        subClient,
-        project,
-        srcPath,
-        subfolder,
-        needUnexpectedHelper.get(subClient.name + "Client")
+  async function generateMetadataAndTest() {
+    if (rlcCodeModels.length === 0 || !rlcCodeModels[0]) {
+      return;
+    }
+    const rlcClient: RLCModel = rlcCodeModels[0];
+    const option = dpgContext.rlcOptions!;
+    // Generate metadata
+    const hasPackageFile = await existsSync(
+      join(dpgContext.generationPathDetail?.metadataDir ?? "", "package.json")
+    );
+    const shouldGenerateMetadata =
+      option.generateMetadata === true ||
+      (option.generateMetadata === undefined && !hasPackageFile);
+    const commonBuilders = [
+      buildEsLintConfig,
+      buildRollupConfig,
+      buildApiExtractorConfig,
+      buildReadmeFile
+    ];
+    if (!option.isModularLibrary) {
+      commonBuilders.push(buildPackageFile);
+      commonBuilders.push(buildTsConfig);
+    }
+    if (shouldGenerateMetadata) {
+      // build metadata relevant files
+      await emitContentByBuilder(
+        program,
+        commonBuilders,
+        rlcClient,
+        dpgContext.generationPathDetail?.metadataDir
       );
-      buildSubpathIndexFile(project, srcPath, "models", subfolder);
-      buildSubpathIndexFile(project, srcPath, "api", subfolder);
-      buildClassicalClient(dpgContext, subClient, project, srcPath, subfolder);
-      if (modularCodeModel.clients.length > 1) {
-        buildSubClientIndexFile(subClient, project, srcPath, subfolder);
+
+      if (option.isModularLibrary) {
+        const project = new Project();
+        emitPackage(
+          project,
+          dpgContext.generationPathDetail?.metadataDir ?? "",
+          modularCodeModel
+        );
+        emitTsConfig(
+          project,
+          dpgContext.generationPathDetail?.metadataDir ?? "",
+          modularCodeModel
+        );
+        for (const file of project.getSourceFiles()) {
+          await emitContentByBuilder(
+            program,
+            () => ({ content: file.getFullText(), path: file.getFilePath() }),
+            modularCodeModel as any
+          );
+        }
       }
-      buildRootIndex(subClient, project, rootIndexFile, srcPath, subfolder);
     }
 
-    emitPackage(project, srcPath, modularCodeModel);
-    emitTsConfig(project, srcPath, modularCodeModel);
-    removeUnusedInterfaces(project);
-
-    for (const file of project.getSourceFiles()) {
+    // Generate test relevant files
+    const hasTestFolder = await fsextra.pathExists(
+      join(dpgContext.generationPathDetail?.metadataDir ?? "", "test")
+    );
+    const shouldGenerateTest =
+      option.generateTest === true ||
+      (option.generateTest === undefined && !hasTestFolder);
+    if (shouldGenerateTest) {
       await emitContentByBuilder(
         program,
-        () => ({ content: file.getFullText(), path: file.getFilePath() }),
-        modularCodeModel as any
+        [
+          buildKarmaConfigFile,
+          buildEnvFile,
+          buildEnvBrowserFile,
+          buildRecordedClientFile,
+          buildSampleTest
+        ],
+        rlcClient,
+        dpgContext.generationPathDetail?.metadataDir
       );
-      // emitFile(program, { content: hrlcClient.content, path: hrlcClient.path });
     }
   }
 }
@@ -223,7 +338,9 @@ export function removeUnusedInterfaces(project: Project) {
     });
 
     // Get the index.ts file
-    const indexFiles = project.getSourceFiles("**/index.ts"); // Adjust the path to your index.ts file
+    const indexFiles = project.getSourceFiles().filter((file) => {
+      return file.getFilePath().endsWith("index.ts");
+    }); // Adjust the path to your index.ts file
     // to make sure the top level index file is in the last
     const sortedIndexFiles = indexFiles.sort((idx1, idx2) => {
       return (
@@ -267,18 +384,3 @@ export function removeUnusedInterfaces(project: Project) {
     interfaceDeclaration.interfaceDeclaration.remove();
   });
 }
-
-function clearSrcFolder(
-  srcPath: string,
-  count: number,
-  isMultiClient: boolean = false,
-  isModularLibrary: boolean = false
-) {
-  fsextra.emptyDirSync(srcPath);
-  if ((isMultiClient || isModularLibrary) && count === 0) {
-    const folderPath = path.join(
-      srcPath.substring(0, srcPath.lastIndexOf(path.sep + "src") + 4)
-    );
-    fsextra.emptyDirSync(folderPath);
-  }
-}

package/src/lib.ts

@@ -30,9 +30,9 @@ export const RLCOptionsSchema: JSONSchemaType<RLCOptions> = {
         scopeName: { type: "string", nullable: true },
         nameWithoutScope: { type: "string", nullable: true },
         description: { type: "string", nullable: true },
-        version: { type: "string", nullable: false }
+        version: { type: "string", nullable: true }
       },
-      required: ["name", "version"],
+      required: ["name"],
       nullable: true
     },
     addCredentials: { type: "boolean", nullable: true },
@@ -42,6 +42,8 @@ export const RLCOptionsSchema: JSONSchemaType<RLCOptions> = {
       items: { type: "string" }
     },
     credentialKeyHeaderName: { type: "string", nullable: true },
+    customHttpAuthHeaderName: { type: "string", nullable: true },
+    customHttpAuthSharedKeyPrefix: { type: "string", nullable: true },
     generateMetadata: { type: "boolean", nullable: true },
     generateTest: { type: "boolean", nullable: true },
     generateSample: { type: "boolean", nullable: true },

package/src/modular/buildClassicalClient.ts

@@ -14,7 +14,8 @@ import { getClientName } from "./helpers/namingHelpers.js";
 import { getOperationFunction } from "./helpers/operationHelpers.js";
 import { Client } from "./modularCodeModel.js";
 import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
-import { SdkContext } from "@azure-tools/typespec-client-generator-core";
+import { getDocsFromDescription } from "./helpers/docsHelpers.js";
+import { SdkContext } from "../utils/interfaces.js";
 
 export function buildClassicalClient(
   dpgContext: SdkContext,
@@ -29,7 +30,7 @@ export function buildClassicalClient(
   const params = getClientParameters(client);
 
   const clientFile = project.createSourceFile(
-    `${srcPath}/src/${
+    `${srcPath}/${
       subfolder !== "" ? subfolder + "/" : ""
     }${classicalClientname}.ts`
   );
@@ -61,7 +62,7 @@ export function buildClassicalClient(
 
   // TODO: We may need to generate constructor overloads at some point. Here we'd do that.
   const constructor = clientClass.addConstructor({
-    docs: [description],
+    docs: getDocsFromDescription(description),
     parameters: params
   });
   constructor.addStatements([
@@ -84,7 +85,7 @@ function importAllApis(
 ) {
   const project = clientFile.getProject();
   const apiModels = project.getSourceFile(
-    `${srcPath}/src/${subfolder !== "" ? subfolder + "/" : ""}api/index.ts`
+    `${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}api/index.ts`
   );
 
   if (!apiModels) {
@@ -106,7 +107,7 @@ function importAllModels(
 ) {
   const project = clientFile.getProject();
   const apiModels = project.getSourceFile(
-    `${srcPath}/src/${subfolder !== "" ? subfolder + "/" : ""}models/models.ts`
+    `${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}models/models.ts`
   );
 
   if (!apiModels) {
@@ -115,13 +116,15 @@ function importAllModels(
 
   const exported = [...apiModels.getExportedDeclarations().keys()];
 
-  clientFile.addImportDeclaration({
-    moduleSpecifier: `./models/models.js`,
-    namedImports: exported
-  });
+  if (exported.length > 0) {
+    clientFile.addImportDeclaration({
+      moduleSpecifier: `./models/models.js`,
+      namedImports: exported
+    });
+  }
 
   const apiModelsOptions = project.getSourceFile(
-    `${srcPath}/src/${subfolder !== "" ? subfolder + "/" : ""}models/options.ts`
+    `${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}models/options.ts`
   );
 
   if (!apiModelsOptions) {
@@ -150,6 +153,10 @@ function buildClientOperationGroups(
   clientClass: ClassDeclaration,
   subfolder: string
 ) {
+  const operationMap = new Map<
+    OptionalKind<FunctionDeclarationStructure>,
+    string | undefined
+  >();
   for (const operationGroup of client.operationGroups) {
     const operationGroupName = toCamelCase(operationGroup.propertyName);
     let clientType = "Client";
@@ -157,9 +164,11 @@ function buildClientOperationGroups(
       clientType = `Client.${clientClass.getName()}`;
     }
     const operationDeclarations: OptionalKind<FunctionDeclarationStructure>[] =
-      operationGroup.operations.map((operation) =>
-        getOperationFunction(operation, clientType)
-      );
+      operationGroup.operations.map((operation) => {
+        const declarations = getOperationFunction(operation, clientType);
+        operationMap.set(declarations, operation.oriName);
+        return declarations;
+      });
 
     if (operationGroupName && operationGroupName !== "") {
       clientClass.addProperty({
@@ -167,9 +176,11 @@ function buildClientOperationGroups(
         initializer: `
       {
         ${operationDeclarations.map((d) => {
-          return `${d.name}: (${d.parameters
+          return `${getClassicalMethodName(d)}: (${d.parameters
             ?.filter((p) => p.name !== "context")
-            .map((p) => p.name + ": " + p.type)
+            .map(
+              (p) => p.name + (p.name === "options" ? "?" : "") + ": " + p.type
+            )
             .join(",")}): ${d.returnType} => {return ${d.name}(${[
             "this._client",
             ...[d.parameters?.map((p) => p.name).filter((p) => p !== "context")]
@@ -183,7 +194,7 @@ function buildClientOperationGroups(
         operationDeclarations.map((d) => {
           const method: MethodDeclarationStructure = {
             docs: d.docs,
-            name: d.name ?? "FIXME",
+            name: getClassicalMethodName(d),
             kind: StructureKind.Method,
             returnType: d.returnType,
             parameters: d.parameters?.filter((p) => p.name !== "context"),
@@ -200,4 +211,10 @@ function buildClientOperationGroups(
       );
     }
   }
+
+  function getClassicalMethodName(
+    declaration: OptionalKind<FunctionDeclarationStructure>
+  ) {
+    return operationMap.get(declaration) ?? declaration.name ?? "FIXME";
+  }
 }