@azure-tools/typespec-ts 0.33.0 → 0.34.0

package/dist/src/modular/buildClientContext.js

@@ -1,43 +1,55 @@
-import { getImportSpecifier, isAzurePackage, NameType, normalizeName } from "@azure-tools/rlc-common";
-import { importModels } from "./buildOperations.js";
-import { buildGetClientCredentialParam, buildGetClientEndpointParam, buildGetClientOptionsParam, getClientParameters, importCredential } from "./helpers/clientHelpers.js";
-import { getDocsFromDescription } from "./helpers/docsHelpers.js";
+import { NameType, isAzurePackage, normalizeName } from "@azure-tools/rlc-common";
+import { buildGetClientCredentialParam, buildGetClientEndpointParam, buildGetClientOptionsParam, getClientParameterName, getClientParameters, getClientParametersDeclaration } from "./helpers/clientHelpers.js";
 import { getClientName } from "./helpers/namingHelpers.js";
-import { getType } from "./helpers/typeHelpers.js";
+import { getDocsFromDescription } from "./helpers/docsHelpers.js";
+import { getTypeExpression } from "./type-expressions/get-type-expression.js";
+import { resolveReference } from "../framework/reference.js";
+import { useDependencies } from "../framework/hooks/useDependencies.js";
+import { buildEnumTypes, getApiVersionEnum } from "./emitModels.js";
 /**
- * This function creates the file containing the modular client context
+ * This function gets the path of the file containing the modular client context
  */
-export function buildClientContext(client, dpgContext, codeModel) {
-    const { description, subfolder } = client;
+export function getClientContextPath(_client, codeModel) {
+    const { subfolder, tcgcClient: client } = _client;
     const name = getClientName(client);
-    const params = getClientParameters(client, dpgContext);
     const srcPath = codeModel.modularOptions.sourceRoot;
-    const clientContextFile = codeModel.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}/api/${normalizeName(name, NameType.File)}Context.ts`);
-    importCredential(codeModel.runtimeImports, clientContextFile);
-    importModels(srcPath, clientContextFile, codeModel.project, subfolder);
-    clientContextFile.addImportDeclaration({
-        moduleSpecifier: getImportSpecifier("restClient", codeModel.runtimeImports),
-        namedImports: ["ClientOptions", "Client", "getClient"]
+    const contentPath = `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}api/${normalizeName(name, NameType.File)}Context.ts`;
+    return contentPath;
+}
+/**
+ * This function creates the file containing the modular client context
+ */
+export function buildClientContext(_client, dpgContext, codeModel) {
+    const { description, tcgcClient: client } = _client;
+    const dependencies = useDependencies();
+    const name = getClientName(client);
+    const requiredParams = getClientParametersDeclaration(_client, dpgContext, {
+        onClientOnly: false,
+        requiredOnly: true
     });
+    const clientContextFile = codeModel.project.createSourceFile(getClientContextPath(_client, codeModel));
     clientContextFile.addInterface({
         isExported: true,
-        name: `${client.rlcClientName}`,
-        extends: ["Client"]
+        name: `${_client.rlcClientName}`,
+        extends: [resolveReference(dependencies.Client)],
+        docs: getDocsFromDescription(description)
     });
     clientContextFile.addInterface({
         name: `${name}ClientOptionalParams`,
         isExported: true,
-        extends: ["ClientOptions"],
-        properties: client.parameters
-            .filter((p) => {
-            return (p.optional || (p.type.type !== "constant" && p.clientDefaultValue));
+        extends: [resolveReference(dependencies.ClientOptions)],
+        properties: getClientParameters(_client, dpgContext, {
+            optionalOnly: true
         })
+            .filter((p) => p.name !== "endpoint")
             .map((p) => {
             return {
-                name: p.clientName,
-                type: getType(p.type).name,
+                name: normalizeName(p.name, NameType.Parameter),
+                type: p.name.toLowerCase() === "apiversion"
+                    ? "string"
+                    : getTypeExpression(dpgContext, p.type),
                 hasQuestionToken: true,
-                docs: getDocsFromDescription(p.description)
+                docs: getDocsWithKnownVersion(dpgContext, p)
             };
         }),
         docs: ["Optional parameters for the client."]
@@ -53,22 +65,18 @@ export function buildClientContext(client, dpgContext, codeModel) {
     const factoryFunction = clientContextFile.addFunction({
         docs: getDocsFromDescription(description),
         name: `create${name}`,
-        returnType: `${client.rlcClientName}`,
-        parameters: params,
+        returnType: `${_client.rlcClientName}`,
+        parameters: requiredParams,
         isExported: true
     });
-    const endpointParam = buildGetClientEndpointParam(factoryFunction, client);
-    const credentialParam = buildGetClientCredentialParam(client, codeModel);
+    const endpointParam = buildGetClientEndpointParam(factoryFunction, dpgContext, _client);
+    const credentialParam = buildGetClientCredentialParam(_client, codeModel);
     const optionsParam = buildGetClientOptionsParam(factoryFunction, codeModel, endpointParam);
-    factoryFunction.addStatements(`const clientContext = getClient(${endpointParam}, ${credentialParam}, ${optionsParam});`);
+    factoryFunction.addStatements(`const clientContext = ${resolveReference(dependencies.getClient)}(${endpointParam}, ${credentialParam}, ${optionsParam});`);
     const { customHttpAuthHeaderName, customHttpAuthSharedKeyPrefix } = codeModel.options;
     if (customHttpAuthHeaderName && customHttpAuthSharedKeyPrefix) {
-        clientContextFile.addImportDeclaration({
-            moduleSpecifier: getImportSpecifier("coreAuth", codeModel.runtimeImports),
-            namedImports: ["isKeyCredential"]
-        });
         factoryFunction.addStatements(`
-      if(isKeyCredential(credential)) {
+      if(${resolveReference(dependencies.isKeyCredential)}(credential)) {
         clientContext.pipeline.addPolicy({ 
           name: "customKeyCredentialPolicy",
           sendRequest(request, next) {
@@ -81,10 +89,10 @@ export function buildClientContext(client, dpgContext, codeModel) {
     }
     let apiVersionPolicyStatement = `clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });`;
     if (dpgContext.hasApiVersionInClient) {
-        const apiVersionParam = client.parameters.find((x) => x.isApiVersion);
-        if ((apiVersionParam === null || apiVersionParam === void 0 ? void 0 : apiVersionParam.location) === "query") {
+        const apiVersionParam = getClientParameters(_client, dpgContext).find((x) => x.isApiVersionParam && x.kind === "method");
+        if (apiVersionParam) {
             if (apiVersionParam.clientDefaultValue) {
-                apiVersionPolicyStatement += `const ${apiVersionParam.clientName} = options.${apiVersionParam.clientName} ?? "${apiVersionParam.clientDefaultValue}";`;
+                apiVersionPolicyStatement += `const apiVersion = options.apiVersion ?? "${apiVersionParam.clientDefaultValue}";`;
             }
             apiVersionPolicyStatement += `
       clientContext.pipeline.addPolicy({
@@ -96,7 +104,7 @@ export function buildClientContext(client, dpgContext, codeModel) {
           if (!url.searchParams.get("api-version")) {
             req.url = \`\${req.url}\${
               Array.from(url.searchParams.keys()).length > 0 ? "&" : "?"
-            }api-version=\${${apiVersionParam.clientName}}\`;
+            }api-version=\${${getClientParameterName(apiVersionParam)}}\`;
           }
     
           return next(req);
@@ -122,4 +130,16 @@ export function buildClientContext(client, dpgContext, codeModel) {
     clientContextFile.fixUnusedIdentifiers();
     return clientContextFile;
 }
+function getDocsWithKnownVersion(dpgContext, param) {
+    const docs = getDocsFromDescription(param.doc);
+    if (param.name.toLowerCase() !== "apiversion") {
+        return docs;
+    }
+    const apiVersionEnum = getApiVersionEnum(dpgContext);
+    if (apiVersionEnum) {
+        const [_, knownValuesEnum] = buildEnumTypes(dpgContext, apiVersionEnum);
+        docs.push(`Known values of {@link ${knownValuesEnum.name}} that the service accepts.`);
+    }
+    return docs;
+}
 //# sourceMappingURL=buildClientContext.js.map

package/dist/src/modular/buildClientContext.js.map

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

package/dist/src/modular/buildCodeModel.d.ts

@@ -1,7 +1,18 @@
+import { Model, Type, UsageFlags } from "@typespec/compiler";
 import { ModularCodeModel } from "./modularCodeModel.js";
+import { HttpAuth } from "@typespec/http";
 import { RLCModel } from "@azure-tools/rlc-common";
 import { Project } from "ts-morph";
 import { SdkContext } from "../utils/interfaces.js";
+interface CredentialType {
+    kind: "Credential";
+    scheme: HttpAuth;
+}
+interface CredentialTypeUnion {
+    kind: "CredentialTypeUnion";
+    types: CredentialType[];
+}
+type EmitterType = Type | CredentialType | CredentialTypeUnion;
 export interface EmitterOptions {
     "basic-setup-py"?: boolean;
     "package-version"?: string;
@@ -10,7 +21,14 @@ export interface EmitterOptions {
     "package-mode"?: string;
     debug?: boolean;
 }
+interface EmitTypeOptions {
+    disableEffectiveModel?: boolean;
+    usage?: UsageFlags;
+}
+export declare function getType(context: SdkContext, type: EmitterType, options?: EmitTypeOptions): any;
+export declare function emitModel(context: SdkContext, type: Model, options?: EmitTypeOptions): Record<string, any>;
 export declare function emitCodeModel(dpgContext: SdkContext, rlcModelsMap: Map<string, RLCModel>, modularSourcesRoot: string, project: Project, options?: {
     casing: "snake" | "camel";
 }): ModularCodeModel;
+export {};
 //# sourceMappingURL=buildCodeModel.d.ts.map

package/dist/src/modular/buildCodeModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildCodeModel.d.ts","sourceRoot":"","sources":["../../../src/modular/buildCodeModel.ts"],"names":[],"mappings":"AAoCA,OAAO,EAKL,gBAAgB,EAKjB,MAAM,uBAAuB,CAAC;AAY/B,OAAO,EAEL,QAAQ,EAKT,MAAM,yBAAyB,CAAC;AA2CjC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA6BpD,MAAM,WAAW,cAAc;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA6oDD,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EACnC,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;IAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAA;CAAwB,GAC3D,gBAAgB,CA6ClB"}
+{"version":3,"file":"buildCodeModel.d.ts","sourceRoot":"","sources":["../../../src/modular/buildCodeModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,EAOL,IAAI,EAEJ,UAAU,EAwBX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAKL,gBAAgB,EAKjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,QAAQ,EAST,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,QAAQ,EAIT,MAAM,yBAAyB,CAAC;AA4CjC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAepD,UAAU,cAAc;IACtB,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,EAAE,QAAQ,CAAC;CAClB;AAED,UAAU,mBAAmB;IAC3B,IAAI,EAAE,qBAAqB,CAAC;IAC5B,KAAK,EAAE,cAAc,EAAE,CAAC;CACzB;AAED,KAAK,WAAW,GAAG,IAAI,GAAG,cAAc,GAAG,mBAAmB,CAAC;AAI/D,MAAM,WAAW,cAAc;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAqKD,UAAU,eAAe;IACvB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,wBAAgB,OAAO,CACrB,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,WAAW,EACjB,OAAO,GAAE,eAAoB,GAC5B,GAAG,CAqFL;AAsoBD,wBAAgB,SAAS,CACvB,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,KAAK,EACX,OAAO,GAAE,eAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAqErB;AAgwBD,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EACnC,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;IAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAA;CAAwB,GAC3D,gBAAgB,CA6ClB"}

package/dist/src/modular/buildCodeModel.js

@@ -1,8 +1,8 @@
-import { UsageFlags, getDiscriminator, getDoc, getEncode, getFriendlyName, getMaxItems, getMaxLength, getMaxValue, getMinItems, getMinLength, getMinValue, getPattern, getPropertyType, getSummary, getVisibility, isErrorModel, isNeverType, isNullType, isNumericType, isStringType, isTemplateDeclarationOrInstance, isType, isVoidType, listServices } from "@typespec/compiler";
+import { NoTarget, UsageFlags, getDiscriminator, getDoc, getEncode, getFriendlyName, getMaxItems, getMaxLength, getMaxValue, getMinItems, getMinLength, getMinValue, getPattern, getPropertyType, getSummary, getVisibility, isErrorModel, isNeverType, isNullType, isNumericType, isStringType, isTemplateDeclarationOrInstance, isType, isVoidType, listServices } from "@typespec/compiler";
 import { getAuthentication, getServers, isSharedRoute } from "@typespec/http";
-import { NameType, buildRuntimeImports, getClientName, isAzurePackage, normalizeName } from "@azure-tools/rlc-common";
+import { NameType, buildRuntimeImports, isAzurePackage, normalizeName } from "@azure-tools/rlc-common";
 import { getAllModels, getClientNamespaceString, getClientType, getDefaultApiVersion, getHttpOperationWithCache, getLibraryName, getSdkUnion, getWireName, isApiVersion, listClients, listOperationGroups, listOperationsInOperationGroup } from "@azure-tools/typespec-client-generator-core";
-import { buildCoreTypeInfo, getBodyType, getDefaultApiVersionString, getEffectiveSchemaType, isAzureCoreErrorType, isSchemaProperty } from "../utils/modelUtils.js";
+import { buildCoreTypeInfo, getBodyType, getDefaultApiVersionString, getEffectiveSchemaType, isAzureCoreErrorType, isBodyRequired, isSchemaProperty } from "../utils/modelUtils.js";
 import { camelToSnakeCase, toCamelCase } from "../utils/casingUtils.js";
 import { extractPagedMetadataNested, getOperationGroupName, getOperationName, isBinaryPayload, isIgnoredHeaderParam, isLongRunningOperation, parseItemName, parseNextLinkName } from "../utils/operationUtil.js";
 import { getLroMetadata, getPagedResult } from "@azure-tools/typespec-azure-core";
@@ -10,9 +10,9 @@ import { getAddedOnVersions } from "@typespec/versioning";
 import { getModelNamespaceName } from "../utils/namespaceUtils.js";
 import { getSupportedHttpAuth } from "../utils/credentialUtils.js";
 import { getType as getTypeName } from "./helpers/typeHelpers.js";
-import { isModelWithAdditionalProperties } from "./emitModels.js";
 import { reportDiagnostic } from "../lib.js";
 import { useContext } from "../contextManager.js";
+import { normalizeModelName } from "./emitModels.js";
 let CASING = "snake";
 function applyCasing(name, options = { casing: "snake" }) {
     if (options.casing === "camel") {
@@ -61,6 +61,7 @@ function handleDiscriminator(context, type, usage) {
         const discriminatorValues = [];
         const aliases = [];
         const discriminatedSubtypes = [];
+        let discriminatorTcgcType = undefined;
         for (const childModel of type.derivedModels) {
             const modelType = getType(context, childModel, { usage });
             aliases.push(modelType.name);
@@ -68,6 +69,7 @@ function handleDiscriminator(context, type, usage) {
                 if (property.restApiName === discriminator.propertyName) {
                     modelType.discriminatorValue = property.type.value;
                     discriminatorValues.push(modelType.discriminatorValue);
+                    discriminatorTcgcType = getClientType(context, property.type);
                 }
             }
             discriminatedSubtypes.push(modelType);
@@ -76,7 +78,7 @@ function handleDiscriminator(context, type, usage) {
             description: discriminatorValues.length > 0
                 ? `the discriminator possible values: ${discriminatorValues.join(", ")}`
                 : "discriminator property",
-            type: { type: "string" },
+            type: { type: "string", tcgcType: discriminatorTcgcType },
             restApiName: discriminator.propertyName,
             clientName: discriminator.propertyName,
             name: discriminator.propertyName,
@@ -109,7 +111,8 @@ function processModelProperties(context, newValue, model, usage) {
             newProperty = {
                 ...newProperty,
                 ...discriminatorInfo,
-                type: newProperty["type"]
+                type: newProperty["type"],
+                tcgcType: getClientType(context, property)
             };
         }
         newValue.properties.push(newProperty);
@@ -124,8 +127,8 @@ function processModelProperties(context, newValue, model, usage) {
         if (newValue.name) {
             newValue.name = normalizeName(newValue.name, NameType.Interface);
             discriminatorInfo === null || discriminatorInfo === void 0 ? void 0 : discriminatorInfo.aliases.push(`${newValue.name}`);
-            newValue.alias = `${newValue.name}`;
-            newValue.name = `${newValue.name}Union`;
+            newValue.alias = `${newValue.name.replace(/Union$/g, "")}`;
+            newValue.name = `${newValue.name}`;
             newValue.aliasType = discriminatorInfo === null || discriminatorInfo === void 0 ? void 0 : discriminatorInfo.aliases.join(" | ");
             newValue.types = discriminatorInfo === null || discriminatorInfo === void 0 ? void 0 : discriminatorInfo.discriminatedSubtypes;
             newValue.isPolymorphicBaseModel = true;
@@ -142,7 +145,7 @@ function isEmptyAnonymousModel(type) {
         type.derivedModels.length === 0 &&
         !type.indexer);
 }
-function getType(context, type, options = {}) {
+export function getType(context, type, options = {}) {
     var _a, _b;
     const modularMetatree = useContext("modularMetaTree");
     // don't cache simple type(string, int, etc) since decorators may change the result
@@ -157,24 +160,30 @@ function getType(context, type, options = {}) {
             return cached;
         }
     }
-    let newValue;
+    let newValue = { __raw: type };
     if (isEmptyAnonymousModel(type)) {
         // do not generate model for empty model, treat it as any
         newValue = { type: "any" };
     }
     else {
-        newValue = emitType(context, type, options.usage);
+        newValue = emitType(context, type, options);
     }
     if (type.kind === "ModelProperty" || type.kind === "Scalar") {
         newValue = applyEncoding(context.program, type, newValue);
     }
     if (isTypespecType(type)) {
-        newValue.tcgcType = getClientType(context, type);
+        newValue.tcgcType = getClientType(context, effectiveModel);
+        newValue.name = !newValue.tcgcType.isGeneratedName
+            ? normalizeModelName(context, newValue.tcgcType)
+            : newValue.name;
         newValue.__raw = type;
         modularMetatree.set(type, newValue);
     }
     if (enableCache) {
         if (!options.disableEffectiveModel) {
+            if (newValue.__raw === undefined) {
+                newValue.__raw = type;
+            }
             typesMap.set(effectiveModel, newValue);
         }
         if (type.kind === "Union") {
@@ -188,7 +197,7 @@ function getType(context, type, options = {}) {
             // need to do properties after insertion to avoid infinite recursion
             processModelProperties(context, newValue, type, options.usage);
             if (newValue.type === "dict") {
-                newValue = { ...emitModel(context, type, options.usage), ...newValue };
+                newValue = { ...emitModel(context, type, options), ...newValue };
                 typesMap.set(effectiveModel, newValue);
             }
         }
@@ -205,7 +214,7 @@ function getType(context, type, options = {}) {
         }
     }
     if (type.kind === "Model" &&
-        isModelWithAdditionalProperties(newValue) &&
+        newValue.tcgcType.additionalProperties &&
         !((_a = context.rlcOptions) === null || _a === void 0 ? void 0 : _a.compatibilityMode)) {
         reportDiagnostic(context.program, {
             code: "compatible-additional-properties",
@@ -215,6 +224,7 @@ function getType(context, type, options = {}) {
             target: type
         });
     }
+    typesMap.set(effectiveModel, newValue);
     return newValue;
 }
 function isTypespecType(type) {
@@ -277,7 +287,8 @@ function emitBodyParameter(context, httpOperation) {
             type,
             location: "body",
             ...base,
-            isBinaryPayload: isBinaryPayload(context, body.type, contentTypes)
+            isBinaryPayload: isBinaryPayload(context, body.type, contentTypes),
+            optional: !isBodyRequired(httpOperation.parameters)
         };
     }
     return undefined;
@@ -294,15 +305,22 @@ function emitParameter(context, parameter, implementation) {
         /// We don't want constant types for content types, so we make sure if it's
         /// a constant, we make it not constant
         clientDefaultValue = type["value"];
-        type = type["valueType"];
+        type = {
+            ...type["valueType"],
+            tcgcType: base.tcgcType.kind === "constant"
+                ? base.tcgcType.valueType
+                : base.tcgcType
+        };
     }
     const paramMap = {
         restApiName: parameter.name,
         location: parameter.type,
         type: base.format ? { ...type, format: base.format } : type,
         implementation: implementation,
-        skipUrlEncoding: parameter.type === "endpointPath",
-        format: (_a = parameter.format) !== null && _a !== void 0 ? _a : base.format
+        skipUrlEncoding: parameter.type === "endpointPath" ||
+            (parameter.type === "path" && parameter.allowReserved),
+        format: (_a = parameter.format) !== null && _a !== void 0 ? _a : base.format,
+        tcgcType: base.tcgcType
     };
     if (paramMap.type.type === "constant") {
         clientDefaultValue = paramMap.type.value;
@@ -464,10 +482,31 @@ function addLroInformation(context, operation, emittedOperation) {
         finalResult: (metadata === null || metadata === void 0 ? void 0 : metadata.finalResult) === "void" || (metadata === null || metadata === void 0 ? void 0 : metadata.finalResult) === undefined
             ? undefined
             : getType(context, metadata.finalResult),
-        finalStateVia: metadata === null || metadata === void 0 ? void 0 : metadata.finalStateVia,
+        finalStateVia: getFinalStateVia(context, operation, metadata),
         finalResultPath: metadata === null || metadata === void 0 ? void 0 : metadata.finalResultPath
     };
 }
+function getFinalStateVia(context, operation, metadata) {
+    if (!metadata) {
+        return undefined;
+    }
+    switch (metadata.finalStateVia) {
+        case "azure-async-operation":
+        case "location":
+        case "operation-location":
+        case "original-uri":
+            return metadata.finalStateVia;
+        default:
+            reportDiagnostic(context.program, {
+                code: "un-supported-finalStateVia",
+                format: {
+                    finalStateVia: metadata.finalStateVia
+                },
+                target: operation
+            });
+            return undefined;
+    }
+}
 function addPagingInformation(context, operation, emittedOperation) {
     emittedOperation["discriminator"] = "paging";
     const pagedResult = getPagedResult(context.program, operation);
@@ -624,7 +663,7 @@ function isReadOnly(program, type) {
     }
 }
 function emitProperty(context, property, usage) {
-    var _a, _b;
+    var _a, _b, _c;
     const newProperty = applyEncoding(context.program, property, property);
     let clientDefaultValue = undefined;
     const propertyDefaultKind = (_a = property.default) === null || _a === void 0 ? void 0 : _a.kind;
@@ -645,7 +684,9 @@ function emitProperty(context, property, usage) {
     }
     const type = getType(context, property.type, { usage });
     return {
-        clientName: applyCasing(clientName, { casing: CASING }),
+        clientName: ((_c = context.rlcOptions) === null || _c === void 0 ? void 0 : _c.ignorePropertyNameNormalize)
+            ? clientName
+            : normalizeName(clientName, NameType.Property),
         restApiName: jsonName,
         type: newProperty.format ? { ...type, format: newProperty.format } : type,
         optional: property.optional,
@@ -676,15 +717,17 @@ function getName(program, type) {
         }
     }
 }
-function emitModel(context, type, usage) {
+export function emitModel(context, type, options = {}) {
     var _a, _b;
     // Now we know it's a defined model
     const properties = [];
     let baseModel = undefined;
     if (type.baseModel) {
-        baseModel = getType(context, type.baseModel, { usage });
+        baseModel = getType(context, type.baseModel, options);
     }
-    const effectiveName = getEffectiveSchemaType(context.program, type).name;
+    const effectiveName = !options.disableEffectiveModel
+        ? getEffectiveSchemaType(context.program, type).name
+        : undefined;
     const overridedModelName = normalizeName((_a = getLibraryName(context, type)) !== null && _a !== void 0 ? _a : getFriendlyName(context.program, type), NameType.Interface, true);
     const fullNamespaceName = getModelNamespaceName(context, type.namespace)
         .map((nsName) => {
@@ -733,7 +776,7 @@ function emitModel(context, type, usage) {
             : modelName,
         base: modelName === "" ? "json" : "dpg",
         coreTypeInfo: buildCoreTypeInfo(context.program, type),
-        usage
+        usage: options.usage
     };
 }
 function intOrFloat(value) {
@@ -753,6 +796,9 @@ function emitEnum(context, type) {
             description: getDocStr(program, m)
         });
     }
+    if (enumValues.length === 0) {
+        throw new Error(`Expecting enum values but got none`);
+    }
     const name = normalizeName(getLibraryName(context, type) ? getLibraryName(context, type) : type.name, NameType.Interface);
     return {
         type: "enum",
@@ -867,7 +913,7 @@ function emitStdScalar(program, scalar) {
                 format: {
                     propertyName: (_c = newScalar === null || newScalar === void 0 ? void 0 : newScalar.name) !== null && _c !== void 0 ? _c : ""
                 },
-                target: newScalar !== null && newScalar !== void 0 ? newScalar : scalar
+                target: NoTarget
             });
             return { type: "integer", format: newScalar.format };
         default:
@@ -997,7 +1043,7 @@ function emitUnion(context, type, usage) {
             ? getLibraryName(context, type)
             : type.name;
         const discriminatorPropertyName = (_a = getDiscriminator(context.program, type)) === null || _a === void 0 ? void 0 : _a.propertyName;
-        const variantTypes = sdkType.values.map((x) => {
+        const variantTypes = sdkType.variantTypes.map((x) => {
             const valueType = getType(context, x.__raw, { usage });
             if (valueType.properties && discriminatorPropertyName) {
                 valueType.discriminatorValue = valueType.properties.filter((p) => p.clientName === discriminatorPropertyName)[0].type.value;
@@ -1036,7 +1082,7 @@ function emitUnion(context, type, usage) {
         return {
             name: typeName,
             nullable: isNull,
-            description: sdkType.description || `Type of ${typeName}`,
+            description: sdkType.doc || `Type of ${typeName}`,
             internal: true,
             type: sdkType.kind,
             valueType: emitSimpleType(sdkType.valueType),
@@ -1049,13 +1095,13 @@ function emitUnion(context, type, usage) {
     }
     else if (nonNullOptions.length === 1 && nonNullOptions[0]) {
         return {
-            ...emitType(context, nonNullOptions[0], usage),
+            ...emitType(context, nonNullOptions[0], { usage }),
             nullable: isNull
         };
     }
     else {
         return {
-            ...emitType(context, sdkType.__raw, usage),
+            ...emitType(context, sdkType.__raw, { usage }),
             nullable: isNull
         };
     }
@@ -1089,14 +1135,14 @@ function emitSimpleType(type) {
         format: undefined
     };
 }
-function emitType(context, type, usage) {
+function emitType(context, type, options = {}) {
     if (type.kind === "Credential") {
         return emitCredential(type.scheme);
     }
     if (type.kind === "CredentialTypeUnion") {
         return emitCredentialUnion(type);
     }
-    const builtinType = mapTypeSpecType(context, type, usage);
+    const builtinType = mapTypeSpecType(context, type, options.usage);
     if (builtinType !== undefined) {
         // add in description elements for types derived from primitive types (SecureString, etc.)
         const doc = getDoc(context.program, type);
@@ -1109,13 +1155,13 @@ function emitType(context, type, usage) {
         case "Intrinsic":
             return { type: type.name };
         case "Model":
-            return emitModel(context, type, usage);
+            return emitModel(context, type, options);
         case "Scalar":
             return emitScalar(context.program, type);
         case "Union":
-            return emitUnion(context, type, usage);
+            return emitUnion(context, type, options.usage);
         case "UnionVariant":
-            return emitType(context, type.type, usage);
+            return emitType(context, type.type, options);
         case "Enum":
             return emitEnum(context, type);
         case "EnumMember":
@@ -1140,7 +1186,7 @@ function emitOperationGroups(context, client, rlcModels) {
         const overrideName = getLibraryName(context, operationGroup.type);
         const name = ((_a = context.rlcOptions) === null || _a === void 0 ? void 0 : _a.hierarchyClient) ||
             ((_b = context.rlcOptions) === null || _b === void 0 ? void 0 : _b.enableOperationGroup)
-            ? overrideName !== null && overrideName !== void 0 ? overrideName : operationGroup.type.name
+            ? (overrideName !== null && overrideName !== void 0 ? overrideName : operationGroup.type.name)
             : "";
         const hierarchies = ((_c = context.rlcOptions) === null || _c === void 0 ? void 0 : _c.hierarchyClient) ||
             ((_d = context.rlcOptions) === null || _d === void 0 ? void 0 : _d.enableOperationGroup)
@@ -1205,14 +1251,14 @@ function getServerHelper(program, namespace) {
 }
 function emitServerParams(context, namespace) {
     const server = getServerHelper(context.program, namespace);
-    if (server === undefined) {
+    if (server === undefined || server.parameters.size === 0) {
         return [
             {
                 optional: false,
                 description: "Service host",
-                clientName: "endpoint",
+                clientName: "endpointParam",
                 clientDefaultValue: null,
-                restApiName: "$host",
+                restApiName: "endpoint",
                 location: "endpointPath",
                 type: { type: "string" },
                 implementation: "Client",
@@ -1244,9 +1290,9 @@ function emitServerParams(context, namespace) {
             {
                 optional: false,
                 description: "Service host",
-                clientName: "endpoint",
+                clientName: "endpointParam",
                 clientDefaultValue: server.url,
-                restApiName: "$host",
+                restApiName: "endpoint",
                 location: "path",
                 type: { type: "string" },
                 implementation: "Client",
@@ -1317,6 +1363,12 @@ function emitClients(context, rlcModelsMap) {
     const retval = [];
     methodApiVersionParam = undefined;
     for (const client of clients) {
+        const sdkPackageClient = context.sdkPackage.clients.find((p) => {
+            return p.name === client.name;
+        });
+        if (!sdkPackageClient) {
+            throw new Error(`Client ${client.name} not found in the SDK package`);
+        }
         const clientName = client.name.replace("Client", "");
         const server = getServerHelper(program, client.service);
         const rlcModels = rlcModelsMap.get(client.service.name);
@@ -1328,9 +1380,10 @@ function emitClients(context, rlcModelsMap) {
             description: getDocStr(program, client.type),
             parameters: emitGlobalParameters(context, client.service),
             operationGroups: emitOperationGroups(context, client, rlcModels),
+            tcgcClient: sdkPackageClient,
             url: server ? server.url : "",
             apiVersions: [],
-            rlcClientName: rlcModels ? getClientName(rlcModels) : client.name,
+            rlcClientName: `${client.name.replace("Client", "")}Context`,
             subfolder: "",
             rlcHelperDetails: rlcModels && rlcModels.helperDetails ? rlcModels.helperDetails : {}
         };