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

package/src/modular/buildClientContext.ts

@@ -4,7 +4,9 @@ import { importCredential } from "./helpers/credentialHelpers.js";
 import { getClientName } from "./helpers/namingHelpers.js";
 import { Client, Parameter } 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 { importModels } from "./buildOperations.js";
+import { SdkContext } from "../utils/interfaces.js";
 
 /**
  * This function creates the file containing the modular client context
@@ -19,12 +21,13 @@ export function buildClientContext(
   const { description, parameters } = client;
   const name = getClientName(client);
   const clientContextFile = project.createSourceFile(
-    `${srcPath}/src/${
+    `${srcPath}/${
       subfolder && subfolder !== "" ? subfolder + "/" : ""
     }/api/${name}Context.ts`
   );
 
   let factoryFunction;
+  importModels(srcPath, clientContextFile, project, subfolder);
   clientContextFile.addImportDeclaration({
     moduleSpecifier: "@azure-rest/core-client",
     namedImports: ["ClientOptions"]
@@ -47,7 +50,7 @@ export function buildClientContext(
       namedExports: [`Client`]
     });
     factoryFunction = clientContextFile.addFunction({
-      docs: [description],
+      docs: getDocsFromDescription(description),
       name: `create${name}`,
       returnType: `Client.${client.name}`,
       parameters: getClientParameters(client),
@@ -70,7 +73,7 @@ export function buildClientContext(
     });
 
     factoryFunction = clientContextFile.addFunction({
-      docs: [description],
+      docs: getDocsFromDescription(description),
       name: `create${name}`,
       returnType: `${rlcClientName}`,
       parameters: getClientParameters(client),
@@ -86,22 +89,28 @@ export function buildClientContext(
     (p) => p.location === "endpointPath"
   );
 
-  let baseUrl: string | undefined = "endpoint";
   if (baseUrlParam) {
+    let baseUrl: string | undefined = "endpoint";
     baseUrl =
       baseUrlParam.type.type === "constant"
         ? baseUrlParam.type.value
         : baseUrlParam.clientName;
+    factoryFunction.addStatements([`const baseUrl = ${baseUrl}`]);
   }
 
-  factoryFunction.addStatements([`const baseUrl = ${baseUrl}`]);
-  let getClientStatement = `const clientContext = getClient(baseUrl, options)`;
+  let getClientStatement = `const clientContext = getClient(options)`;
+
+  if (baseUrlParam) {
+    getClientStatement = `const clientContext = getClient(baseUrl, options)`;
+  }
 
   // If the client needs credentials we need to pass those to getClient
   if (credentialsParam) {
     importCredential(credentialsParam.type, clientContextFile);
     addCredentialOptionsStatement(credentialsParam, factoryFunction);
-    getClientStatement = `const clientContext = getClient(baseUrl, credential, options)`;
+    getClientStatement = baseUrlParam
+      ? `const clientContext = getClient(baseUrl, credential, options)`
+      : `const clientContext = getClient(credential, options)`;
   }
 
   factoryFunction.addStatements([getClientStatement, "return clientContext;"]);
@@ -129,6 +138,7 @@ export function buildClientContext(
     { importModuleSpecifierEnding: "js" }
   );
 
+  clientContextFile.fixUnusedIdentifiers();
   return clientContextFile;
 }
 

package/src/modular/buildCodeModel.ts

@@ -37,6 +37,7 @@ import {
   IntrinsicType,
   getProjectedName,
   isNullType,
+  getEncode,
   isTemplateDeclarationOrInstance
 } from "@typespec/compiler";
 import {
@@ -65,7 +66,6 @@ import {
   getDefaultApiVersion,
   getClientNamespaceString,
   createSdkContext,
-  SdkContext,
   getSdkUnion,
   getAllModels,
   SdkSimpleType,
@@ -90,6 +90,7 @@ import {
   getOperationGroupName,
   getOperationName
 } from "../utils/operationUtil.js";
+import { SdkContext } from "../utils/interfaces.js";
 
 interface HttpServerParameter {
   type: "endpointPath";
@@ -460,7 +461,8 @@ function emitParameter(
     location: parameter.type,
     type: type,
     implementation: implementation,
-    skipUrlEncoding: parameter.type === "endpointPath"
+    skipUrlEncoding: parameter.type === "endpointPath",
+    format: (parameter as any).format
   };
 
   if (paramMap.type.type === "constant") {
@@ -844,6 +846,10 @@ function emitProperty(
     clientDefaultValue = property.default.value;
   }
 
+  if (propertyDefaultKind === "EnumMember") {
+    clientDefaultValue = property.default.value ?? property.default.name;
+  }
+
   // const [clientName, jsonName] = getPropertyNames(context, property);
   const clientName = property.name;
   const jsonName =
@@ -895,9 +901,35 @@ function emitModel(context: SdkContext, type: Model): Record<string, any> {
     baseModel = getType(context, type.baseModel);
   }
   const effectiveName = getEffectiveSchemaType(context.program, type).name;
-  const modelName = effectiveName
-    ? effectiveName
-    : getName(context.program, type);
+  const overridedModelName =
+    getProjectedName(context.program, type, "javascript") ??
+    getProjectedName(context.program, type, "client") ??
+    getFriendlyName(context.program, type);
+  let modelName =
+    overridedModelName ??
+    (effectiveName ? effectiveName : getName(context.program, type));
+  if (
+    !overridedModelName &&
+    type.templateMapper &&
+    type.templateMapper.args &&
+    type.templateMapper.args.length > 0 &&
+    getPagedResult(context.program, type)
+  ) {
+    modelName =
+      type.templateMapper.args
+        .map((it) => {
+          switch (it.kind) {
+            case "Model":
+              return it.name;
+            case "String":
+              return it.value;
+            default:
+              return "";
+          }
+        })
+        .join("") + "List";
+  }
+
   return {
     type: "model",
     name: modelName,
@@ -996,11 +1028,12 @@ function emitCredentialUnion(cred_types: CredentialTypeUnion) {
 }
 
 function emitStdScalar(
+  program: Program,
   scalar: Scalar & { name: IntrinsicScalarName }
 ): Record<string, any> {
   switch (scalar.name) {
     case "bytes":
-      return { type: "byte-array", format: "byte" };
+      return { type: "byte-array", format: getEncode(program, scalar) };
     case "int8":
     case "int16":
     case "int32":
@@ -1095,7 +1128,7 @@ function applyIntrinsicDecorators(
 function emitScalar(program: Program, scalar: Scalar): Record<string, any> {
   let result: Record<string, any> = {};
   if (program.checker.isStdType(scalar)) {
-    result = emitStdScalar(scalar);
+    result = emitStdScalar(program, scalar);
   } else if (scalar.baseScalar) {
     result = emitScalar(program, scalar.baseScalar);
   }
@@ -1286,9 +1319,38 @@ function emitOperationGroups(
       operations: clientOperations
     });
   }
+  resolveConflictIfExist(operationGroups);
   return operationGroups;
 }
 
+function resolveConflictIfExist(operationGroups: OperationGroup[]) {
+  if (operationGroups.length < 2) {
+    return;
+  }
+
+  const nameSet = new Set<string>();
+  const hasConflict = operationGroups.some((g) =>
+    g.operations.some((op) => {
+      if (nameSet.has(op.name)) {
+        return true;
+      } else {
+        nameSet.add(op.name);
+        return false;
+      }
+    })
+  );
+  if (!hasConflict) {
+    return;
+  }
+  // Append operation group prefix
+  operationGroups.forEach((g) =>
+    g.operations.forEach((op) => {
+      op.oriName = op.name;
+      op.name = `${g.propertyName}_${op.name}`;
+    })
+  );
+}
+
 function getServerHelper(
   program: Program,
   namespace: Namespace
@@ -1313,7 +1375,7 @@ function emitServerParams(
         clientName: "endpoint",
         clientDefaultValue: null,
         restApiName: "$host",
-        location: "path",
+        location: "endpointPath",
         type: { type: "string" },
         implementation: "Client",
         inOverload: false
@@ -1509,11 +1571,7 @@ export function emitCodeModel(
     getClientNamespaceString(dpgContext)?.toLowerCase();
   // Get types
   const codeModel: ModularCodeModel = {
-    options: transformRLCOptions(
-      context.options as any,
-      context.emitterOutputDir,
-      dpgContext
-    ),
+    options: transformRLCOptions(context.options as any, dpgContext),
     namespace: clientNamespaceString,
     subnamespaceToClients: {},
     clients: [],

package/src/modular/buildOperations.ts

@@ -1,4 +1,5 @@
 import { Project, SourceFile } from "ts-morph";
+import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { buildType } from "./helpers/typeHelpers.js";
 import {
   getOperationFunction,
@@ -8,7 +9,8 @@ import {
 } from "./helpers/operationHelpers.js";
 import { Client, Operation } 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";
 
 /**
  * This function creates a file under /api for each operation group.
@@ -24,14 +26,15 @@ export function buildOperationFiles(
   needUnexpectedHelper: boolean = true
 ) {
   for (const operationGroup of client.operationGroups) {
+    const importSet: Map<string, Set<string>> = new Map<string, Set<string>>();
     const fileName = operationGroup.className
-      ? `${operationGroup.className}`
+      ? `${normalizeName(operationGroup.className, NameType.File)}`
       : // When the program has no operation groups defined all operations are put
         // into a nameless operation group. We'll call this operations.
         "operations";
 
     const operationGroupFile = project.createSourceFile(
-      `${srcPath}/src/${
+      `${srcPath}/${
         subfolder && subfolder !== "" ? subfolder + "/" : ""
       }api/${fileName}.ts`
     );
@@ -69,17 +72,18 @@ export function buildOperationFiles(
         }
       ]);
     }
-    const modelOptionsFile = project.createSourceFile(
-      `${srcPath}/src/${subfolder}/models/options.ts`
-    );
     operationGroup.operations.forEach((o) => {
-      buildOperationOptions(o, modelOptionsFile);
       const operationDeclaration = getOperationFunction(o, clientType);
-      const sendOperationDeclaration = getSendPrivateFunction(o, clientType);
+      const sendOperationDeclaration = getSendPrivateFunction(
+        o,
+        clientType,
+        importSet
+      );
       const deserializeOperationDeclaration = getDeserializePrivateFunction(
         o,
         isRLCMultiEndpoint(dpgContext),
-        needUnexpectedHelper
+        needUnexpectedHelper,
+        importSet
       );
       operationGroupFile.addFunctions([
         sendOperationDeclaration,
@@ -97,41 +101,30 @@ export function buildOperationFiles(
         ]
       }
     ]);
-    modelOptionsFile.addImportDeclarations([
-      {
-        moduleSpecifier: "@azure-rest/core-client",
-        namedImports: ["OperationOptions"]
+    if (importSet.size > 0) {
+      for (const [moduleName, imports] of importSet.entries()) {
+        operationGroupFile.addImportDeclarations([
+          {
+            moduleSpecifier: moduleName,
+            namedImports: [...imports.values()]
+          }
+        ]);
       }
-    ]);
-
-    modelOptionsFile.fixMissingImports();
-    modelOptionsFile
-      .getImportDeclarations()
-      .filter((id) => {
-        return (
-          id.isModuleSpecifierRelative() &&
-          !id.getModuleSpecifierValue().endsWith(".js")
-        );
-      })
-      .map((id) => {
-        id.setModuleSpecifier(id.getModuleSpecifierValue() + ".js");
-        return id;
-      });
-
+    }
     operationGroupFile.fixMissingImports();
     // have to fixUnusedIdentifiers after everything get generated.
     operationGroupFile.fixUnusedIdentifiers();
   }
 }
 
-function importModels(
+export function importModels(
   srcPath: string,
   sourceFile: SourceFile,
   project: Project,
   subfolder: string = ""
 ) {
   const modelsFile = project.getSourceFile(
-    `${srcPath}/src/${
+    `${srcPath}/${
       subfolder && subfolder !== "" ? subfolder + "/" : ""
     }models/models.ts`
   );
@@ -141,10 +134,12 @@ function importModels(
     models.push(entry[0]);
   }
 
-  sourceFile.addImportDeclaration({
-    moduleSpecifier: "../models/models.js",
-    namedImports: models
-  });
+  if (models.length > 0) {
+    sourceFile.addImportDeclaration({
+      moduleSpecifier: "../models/models.js",
+      namedImports: models
+    });
+  }
 
   // Import all models and then let ts-morph clean up the unused ones
   // we can't fixUnusedIdentifiers here because the operaiton files are still being generated.
@@ -174,7 +169,7 @@ export function buildOperationOptions(
     extends: ["OperationOptions"],
     properties: options.map((p) => {
       return {
-        docs: [p.description],
+        docs: getDocsFromDescription(p.description),
         hasQuestionToken: true,
         ...buildType(p.clientName, p.type)
       };