@azure-tools/typespec-ts 0.36.0 → 0.37.0-alpha.20241230.1

package/dist/src/modular/buildClassicalClient.js

@@ -1,29 +1,27 @@
 import { Scope, StructureKind } from "ts-morph";
 import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { buildUserAgentOptions, getClientParametersDeclaration } from "./helpers/clientHelpers.js";
-import { getClassicalClientName, getClassicalLayerPrefix, getClientName } from "./helpers/namingHelpers.js";
+import { getClassicalClientName, getClientName } from "./helpers/namingHelpers.js";
 import { getDocsFromDescription } from "./helpers/docsHelpers.js";
 import { getOperationFunction } from "./helpers/operationHelpers.js";
-import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
+import { getModularClientOptions, isRLCMultiEndpoint } from "../utils/clientUtils.js";
 import { resolveReference } from "../framework/reference.js";
-import { shouldPromoteSubscriptionId } from "./helpers/classicalOperationHelpers.js";
 import { useDependencies } from "../framework/hooks/useDependencies.js";
-export function buildClassicalClient(_client, dpgContext, codeModel) {
-    var _a;
-    const { description, tcgcClient: client } = _client;
+import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
+export function buildClassicalClient(dpgContext, client, emitterOptions) {
     const dependencies = useDependencies();
     const modularClientName = getClientName(client);
     const classicalClientName = `${getClassicalClientName(client)}`;
-    const classicalParams = getClientParametersDeclaration(_client, dpgContext, {
+    const classicalParams = getClientParametersDeclaration(client, dpgContext, {
         requiredOnly: true
     });
-    const contextParams = getClientParametersDeclaration(_client, dpgContext, {
-        onClientOnly: true,
+    const contextParams = getClientParametersDeclaration(client, dpgContext, {
+        onClientOnly: false,
         requiredOnly: true
     });
-    const srcPath = codeModel.modularOptions.sourceRoot;
-    const subfolder = (_a = _client.subfolder) !== null && _a !== void 0 ? _a : "";
-    const clientFile = codeModel.project.createSourceFile(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}${normalizeName(classicalClientName, NameType.File)}.ts`);
+    const srcPath = emitterOptions.modularOptions.sourceRoot;
+    const { subfolder, rlcClientName } = getModularClientOptions(dpgContext, client);
+    const clientFile = emitterOptions.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}${normalizeName(classicalClientName, NameType.File)}.ts`);
     clientFile.addExportDeclaration({
         namedExports: [`${classicalClientName}OptionalParams`],
         moduleSpecifier: `./api/${normalizeName(modularClientName, NameType.File)}Context.js`
@@ -36,14 +34,14 @@ export function buildClassicalClient(_client, dpgContext, codeModel) {
     if (isRLCMultiEndpoint(dpgContext)) {
         clientClass.addProperty({
             name: "_client",
-            type: `Client.${_client.rlcClientName}`,
+            type: `Client.${rlcClientName}`,
             scope: Scope.Private
         });
     }
     else {
         clientClass.addProperty({
             name: "_client",
-            type: `${_client.rlcClientName}`,
+            type: `${rlcClientName}`,
             scope: Scope.Private
         });
     }
@@ -57,14 +55,14 @@ export function buildClassicalClient(_client, dpgContext, codeModel) {
     });
     // TODO: We may need to generate constructor overloads at some point. Here we'd do that.
     const constructor = clientClass.addConstructor({
-        docs: getDocsFromDescription(description),
+        docs: getDocsFromDescription(client.doc),
         parameters: classicalParams
     });
     const paramNames = (contextParams !== null && contextParams !== void 0 ? contextParams : [])
         .map((p) => p.name)
         .map((x) => {
         if (x === "options") {
-            return `{...options, userAgentOptions: ${buildUserAgentOptions(constructor, codeModel, "azsdk-js-client")}}`;
+            return `{...options, userAgentOptions: ${buildUserAgentOptions(constructor, emitterOptions, "azsdk-js-client")}}`;
         }
         else {
             return x;
@@ -74,14 +72,14 @@ export function buildClassicalClient(_client, dpgContext, codeModel) {
         `this._client = create${modularClientName}(${paramNames.join(",")});`
     ]);
     constructor.addStatements(`this.pipeline = this._client.pipeline;`);
-    buildClientOperationGroups(clientFile, _client, dpgContext, clientClass);
-    importAllApis(clientFile, srcPath, subfolder);
+    buildClientOperationGroups(clientFile, client, dpgContext, clientClass);
+    importAllApis(clientFile, srcPath, subfolder !== null && subfolder !== void 0 ? subfolder : "");
     clientFile.fixUnusedIdentifiers();
     return clientFile;
 }
 function importAllApis(clientFile, srcPath, subfolder) {
     const project = clientFile.getProject();
-    const apiModels = project.getSourceFile(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}api/index.ts`);
+    const apiModels = project.getSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}api/index.ts`);
     if (!apiModels) {
         return;
     }
@@ -91,58 +89,62 @@ function importAllApis(clientFile, srcPath, subfolder) {
         namedImports: exported
     });
 }
+function generateMethod(context, clientType, method) {
+    var _a, _b, _c, _d;
+    const declarations = getOperationFunction(context, method, clientType);
+    const result = {
+        docs: declarations.docs,
+        name: (_b = (_a = declarations.propertyName) !== null && _a !== void 0 ? _a : declarations.name) !== null && _b !== void 0 ? _b : "FIXME",
+        kind: StructureKind.Method,
+        returnType: declarations.returnType,
+        parameters: (_c = declarations.parameters) === null || _c === void 0 ? void 0 : _c.filter((p) => p.name !== "context"),
+        statements: `return ${declarations.name}(${[
+            "this._client",
+            ...[
+                (_d = declarations.parameters) === null || _d === void 0 ? void 0 : _d.map((p) => p.name).filter((p) => p !== "context")
+            ]
+        ].join(",")})`
+    };
+    return result;
+}
 function buildClientOperationGroups(clientFile, client, dpgContext, clientClass) {
-    var _a, _b, _c;
+    var _a, _b;
     let clientType = "Client";
-    const subfolder = (_a = client.subfolder) !== null && _a !== void 0 ? _a : "";
+    const { subfolder } = getModularClientOptions(dpgContext, client);
     if (subfolder && subfolder !== "") {
         clientType = `Client.${clientClass.getName()}`;
     }
-    for (const operationGroup of client.operationGroups) {
-        const groupName = normalizeName((_b = operationGroup.namespaceHierarchies[0]) !== null && _b !== void 0 ? _b : operationGroup.propertyName, NameType.Property);
-        // TODO: remove this logic once client-level parameter design is finalized
-        // https://github.com/Azure/autorest.typescript/issues/2618
-        const hasSubscriptionIdPromoted = shouldPromoteSubscriptionId(dpgContext, operationGroup);
-        if (groupName === "") {
-            operationGroup.operations.forEach((op) => {
-                var _a, _b, _c, _d;
-                const declarations = getOperationFunction(dpgContext, op, clientType);
-                const method = {
-                    docs: declarations.docs,
-                    name: (_b = (_a = declarations.propertyName) !== null && _a !== void 0 ? _a : declarations.name) !== null && _b !== void 0 ? _b : "FIXME",
-                    kind: StructureKind.Method,
-                    returnType: declarations.returnType,
-                    parameters: (_c = declarations.parameters) === null || _c === void 0 ? void 0 : _c.filter((p) => p.name !== "context"),
-                    statements: `return ${declarations.name}(${[
-                        "this._client",
-                        ...[
-                            (_d = declarations.parameters) === null || _d === void 0 ? void 0 : _d.map((p) => p.name).filter((p) => p !== "context")
-                        ]
-                    ].join(",")})`
-                };
+    const methodMap = getMethodHierarchiesMap(dpgContext, client);
+    for (const [prefixKey, operations] of methodMap) {
+        const prefixes = prefixKey.split("/");
+        if (prefixKey === "") {
+            operations.forEach((op) => {
+                const method = generateMethod(dpgContext, clientType, [prefixes, op]);
                 clientClass.addMethod(method);
             });
-            continue;
         }
-        const operationName = `get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", 0)}Operations`;
-        const propertyType = `${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", 0)}Operations`;
-        const existProperty = clientClass.getProperties().filter((p) => {
-            return p.getName() === groupName;
-        });
-        if (!existProperty || existProperty.length === 0) {
-            clientFile.addImportDeclaration({
-                namedImports: [operationName, propertyType],
-                moduleSpecifier: `./classic/${getClassicalLayerPrefix(operationGroup, NameType.File, "/", 0)}/index.js`
-            });
-            clientClass.addProperty({
-                name: groupName,
-                type: propertyType,
-                scope: Scope.Public,
-                isReadonly: true,
-                docs: ["The operation groups for " + operationGroup.propertyName]
+        else {
+            const groupName = normalizeName((_a = prefixes[0]) !== null && _a !== void 0 ? _a : "", NameType.Property);
+            const operationName = `get${normalizeName(groupName, NameType.OperationGroup)}Operations`;
+            const propertyType = `${normalizeName(groupName, NameType.OperationGroup)}Operations`;
+            const existProperty = clientClass.getProperties().filter((p) => {
+                return p.getName() === groupName;
             });
-            (_c = clientClass
-                .getConstructors()[0]) === null || _c === void 0 ? void 0 : _c.addStatements(`this.${groupName} = get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", 0)}Operations(this._client${hasSubscriptionIdPromoted ? ", subscriptionId" : ""})`);
+            if (!existProperty || existProperty.length === 0) {
+                clientFile.addImportDeclaration({
+                    namedImports: [operationName, propertyType],
+                    moduleSpecifier: `./classic/${normalizeName(groupName, NameType.File)}/index.js`
+                });
+                clientClass.addProperty({
+                    name: groupName,
+                    type: propertyType,
+                    scope: Scope.Public,
+                    isReadonly: true,
+                    docs: ["The operation groups for " + groupName]
+                });
+                (_b = clientClass
+                    .getConstructors()[0]) === null || _b === void 0 ? void 0 : _b.addStatements(`this.${groupName} = get${normalizeName(groupName, NameType.OperationGroup)}Operations(this._client)`);
+            }
         }
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"buildClassicalClient.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildClassicalClient.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,EAEL,aAAa,EACd,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EACL,qBAAqB,EACrB,8BAA8B,EAC/B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,sBAAsB,EACtB,aAAa,EACd,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAMxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,UAAU,oBAAoB,CAClC,UAAsB,EACtB,MAA0C,EAC1C,cAAqC;IAErC,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,iBAAiB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,mBAAmB,GAAG,GAAG,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC;IAChE,MAAM,eAAe,GAAG,8BAA8B,CAAC,MAAM,EAAE,UAAU,EAAE;QACzE,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,8BAA8B,CAAC,MAAM,EAAE,UAAU,EAAE;QACvE,YAAY,EAAE,KAAK;QACnB,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,cAAc,CAAC,cAAc,CAAC,UAAU,CAAC;IACzD,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,uBAAuB,CAC1D,UAAU,EACV,MAAM,CACP,CAAC;IAEF,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,gBAAgB,CACxD,GAAG,OAAO,IAAI,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,CAChF,mBAAmB,EACnB,QAAQ,CAAC,IAAI,CACd,KAAK,CACP,CAAC;IAEF,UAAU,CAAC,oBAAoB,CAAC;QAC9B,YAAY,EAAE,CAAC,GAAG,mBAAmB,gBAAgB,CAAC;QACtD,eAAe,EAAE,SAAS,aAAa,CACrC,iBAAiB,EACjB,QAAQ,CAAC,IAAI,CACd,YAAY;KACd,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC;QACtC,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,GAAG,mBAAmB,EAAE;KAC/B,CAAC,CAAC;IAEH,2EAA2E;IAC3E,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,WAAW,CAAC,WAAW,CAAC;YACtB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,UAAU,aAAa,EAAE;YAC/B,KAAK,EAAE,KAAK,CAAC,OAAO;SACrB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,WAAW,CAAC;YACtB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,GAAG,aAAa,EAAE;YACxB,KAAK,EAAE,KAAK,CAAC,OAAO;SACrB,CAAC,CAAC;IACL,CAAC;IACD,+DAA+D;IAC/D,WAAW,CAAC,WAAW,CAAC;QACtB,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC;QAC7C,KAAK,EAAE,KAAK,CAAC,MAAM;QACnB,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,CAAC,mDAAmD,CAAC;KAC5D,CAAC,CAAC;IAEH,wFAAwF;IACxF,MAAM,WAAW,GAAG,WAAW,CAAC,cAAc,CAAC;QAC7C,IAAI,EAAE,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC;QACxC,UAAU,EAAE,eAAe;KAC5B,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,CAAC,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,EAAE,CAAC;SACrC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SAClB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YACpB,OAAO,kCAAkC,qBAAqB,CAC5D,WAAW,EACX,cAAc,EACd,iBAAiB,CAClB,GAAG,CAAC;QACP,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,CAAC;QACX,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,WAAW,CAAC,aAAa,CAAC;QACxB,wBAAwB,iBAAiB,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;KACtE,CAAC,CAAC;IACH,WAAW,CAAC,aAAa,CAAC,wCAAwC,CAAC,CAAC;IAEpE,0BAA0B,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACxE,aAAa,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,CAAC;IACpD,UAAU,CAAC,oBAAoB,EAAE,CAAC;IAClC,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,aAAa,CACpB,UAAsB,EACtB,OAAe,EACf,SAAiB;IAEjB,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IACxC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CACrC,GAAG,OAAO,IAAI,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,cAAc,CACjF,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAEjE,UAAU,CAAC,oBAAoB,CAAC;QAC9B,eAAe,EAAE,gBAAgB;QACjC,YAAY,EAAE,QAAQ;KACvB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CACrB,OAAmB,EACnB,UAAkB,EAClB,MAAyD;;IAEzD,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IACvE,MAAM,MAAM,GAA+B;QACzC,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,IAAI,EAAE,MAAA,MAAA,YAAY,CAAC,YAAY,mCAAI,YAAY,CAAC,IAAI,mCAAI,OAAO;QAC/D,IAAI,EAAE,aAAa,CAAC,MAAM;QAC1B,UAAU,EAAE,YAAY,CAAC,UAAU;QACnC,UAAU,EAAE,MAAA,YAAY,CAAC,UAAU,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;QACxE,UAAU,EAAE,UAAU,YAAY,CAAC,IAAI,IAAI;YACzC,cAAc;YACd,GAAG;gBACD,MAAA,YAAY,CAAC,UAAU,0CACnB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;aAClC;SACF,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;KACf,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AACD,SAAS,0BAA0B,CACjC,UAAsB,EACtB,MAA0C,EAC1C,UAAsB,EACtB,WAA6B;;IAE7B,IAAI,UAAU,GAAG,QAAQ,CAAC;IAC1B,MAAM,EAAE,SAAS,EAAE,GAAG,uBAAuB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAClE,IAAI,SAAS,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;QAClC,UAAU,GAAG,UAAU,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;IACjD,CAAC;IACD,MAAM,SAAS,GAAG,uBAAuB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC9D,KAAK,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,SAAS,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;YACrB,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBACxB,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;gBACtE,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,aAAa,CAAC,MAAA,QAAQ,CAAC,CAAC,CAAC,mCAAI,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACtE,MAAM,aAAa,GAAG,MAAM,aAAa,CACvC,SAAS,EACT,QAAQ,CAAC,cAAc,CACxB,YAAY,CAAC;YACd,MAAM,YAAY,GAAG,GAAG,aAAa,CACnC,SAAS,EACT,QAAQ,CAAC,cAAc,CACxB,YAAY,CAAC;YACd,MAAM,aAAa,GAAG,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC7D,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,SAAS,CAAC;YACnC,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjD,UAAU,CAAC,oBAAoB,CAAC;oBAC9B,YAAY,EAAE,CAAC,aAAa,EAAE,YAAY,CAAC;oBAC3C,eAAe,EAAE,aAAa,aAAa,CACzC,SAAS,EACT,QAAQ,CAAC,IAAI,CACd,WAAW;iBACb,CAAC,CAAC;gBACH,WAAW,CAAC,WAAW,CAAC;oBACtB,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,YAAY;oBAClB,KAAK,EAAE,KAAK,CAAC,MAAM;oBACnB,UAAU,EAAE,IAAI;oBAChB,IAAI,EAAE,CAAC,2BAA2B,GAAG,SAAS,CAAC;iBAChD,CAAC,CAAC;gBACH,MAAA,WAAW;qBACR,eAAe,EAAE,CAAC,CAAC,CAAC,0CACnB,aAAa,CACb,QAAQ,SAAS,SAAS,aAAa,CACrC,SAAS,EACT,QAAQ,CAAC,cAAc,CACxB,0BAA0B,CAC5B,CAAC;YACN,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

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

@@ -1,5 +1,6 @@
 import { SourceFile } from "ts-morph";
-import { Client, ModularCodeModel } from "./modularCodeModel.js";
+import { ModularEmitterOptions } from "./interfaces.js";
 import { SdkContext } from "../utils/interfaces.js";
-export declare function buildClassicOperationFiles(dpgContext: SdkContext, codeModel: ModularCodeModel, client: Client): Map<string, SourceFile>;
+import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
+export declare function buildClassicOperationFiles(dpgContext: SdkContext, client: SdkClientType<SdkServiceOperation>, emitterOptions: ModularEmitterOptions): Map<string, SourceFile>;
 //# sourceMappingURL=buildClassicalOperationGroups.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildClassicalOperationGroups.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,OAAO,EACL,MAAM,EACN,gBAAgB,EAEjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,2BA6Ef"}
+{"version":3,"file":"buildClassicalOperationGroups.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EACL,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAGrD,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,2BAqFtC"}

package/dist/src/modular/buildClassicalOperationGroups.js

@@ -1,53 +1,61 @@
 import { NameType } from "@azure-tools/rlc-common";
 import { getClassicalOperation } from "./helpers/classicalOperationHelpers.js";
 import { getClassicalLayerPrefix } from "./helpers/namingHelpers.js";
-export function buildClassicOperationFiles(dpgContext, codeModel, client) {
+import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
+import { getModularClientOptions } from "../utils/clientUtils.js";
+export function buildClassicOperationFiles(dpgContext, client, emitterOptions) {
     var _a, _b;
+    // const sdkPackage = dpgContext.sdkPackage;
+    const { subfolder } = getModularClientOptions(dpgContext, client);
     const classicOperationFiles = new Map();
-    for (const operationGroup of client.operationGroups) {
-        if (operationGroup.namespaceHierarchies.length > 0) {
-            const classicOperationFileName = operationGroup.namespaceHierarchies.length > 0
-                ? `${getClassicalLayerPrefix(operationGroup, NameType.File, "/", operationGroup.namespaceHierarchies.length - 1)}/index`
+    const methodMap = getMethodHierarchiesMap(dpgContext, client);
+    for (const [prefixKey, operations] of methodMap) {
+        const prefixes = prefixKey.split("/");
+        if (prefixes.length > 0 && prefixKey !== "") {
+            const classicOperationFileName = prefixes.length > 0
+                ? `${getClassicalLayerPrefix(prefixes, NameType.File, "/", prefixes.length - 1)}/index`
                 : // When the program has no operation groups defined all operations are put
                     // into a nameless operation group. We'll call this operations.
                     "index";
-            const subfolder = client.subfolder;
-            const srcPath = codeModel.modularOptions.sourceRoot;
-            const classicFile = (_a = classicOperationFiles.get(classicOperationFileName)) !== null && _a !== void 0 ? _a : codeModel.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}classic/${classicOperationFileName}.ts`);
-            getClassicalOperation(dpgContext, client, classicFile, operationGroup);
-            importApis(classicFile, client, codeModel, operationGroup);
+            const srcPath = emitterOptions.modularOptions.sourceRoot;
+            const classicFile = (_a = classicOperationFiles.get(classicOperationFileName)) !== null && _a !== void 0 ? _a : emitterOptions.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}classic/${classicOperationFileName}.ts`);
+            getClassicalOperation(dpgContext, client, classicFile, [
+                prefixes,
+                operations
+            ]);
+            importApis(dpgContext, classicFile, client, emitterOptions, prefixes);
             // We need to import the paging helpers and types explicitly because ts-morph may not be able to find them.
             classicOperationFiles.set(classicOperationFileName, classicFile);
         }
     }
-    for (const operationGroup of client.operationGroups) {
-        if (operationGroup.namespaceHierarchies.length > 0) {
-            for (let layer = 0; layer < operationGroup.namespaceHierarchies.length - 1; layer++) {
-                const classicOperationFileName = operationGroup.namespaceHierarchies.length > 0
-                    ? `${getClassicalLayerPrefix(operationGroup, NameType.File, "/", layer)}/index`
+    for (const [prefixKey, operations] of methodMap) {
+        const prefixes = prefixKey.split("/");
+        if (prefixes.length > 0 && prefixKey !== "") {
+            for (let layer = 0; layer < prefixes.length - 1; layer++) {
+                const classicOperationFileName = prefixes.length > 0
+                    ? `${getClassicalLayerPrefix(prefixes, NameType.File, "/", layer)}/index`
                     : // When the program has no operation groups defined all operations are put
                         // into a nameless operation group. We'll call this operations.
                         "index";
-                const subfolder = client.subfolder;
-                const srcPath = codeModel.modularOptions.sourceRoot;
-                const classicFile = (_b = classicOperationFiles.get(classicOperationFileName)) !== null && _b !== void 0 ? _b : codeModel.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}classic/${classicOperationFileName}.ts`);
-                getClassicalOperation(dpgContext, client, classicFile, operationGroup, layer);
-                importApis(classicFile, client, codeModel, operationGroup, layer);
+                const srcPath = emitterOptions.modularOptions.sourceRoot;
+                const classicFile = (_b = classicOperationFiles.get(classicOperationFileName)) !== null && _b !== void 0 ? _b : emitterOptions.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}classic/${classicOperationFileName}.ts`);
+                getClassicalOperation(dpgContext, client, classicFile, [prefixes, operations], layer);
+                importApis(dpgContext, classicFile, client, emitterOptions, prefixes, layer);
                 classicOperationFiles.set(classicOperationFileName, classicFile);
             }
         }
     }
     return classicOperationFiles;
 }
-function importApis(classicFile, client, modularCodeModel, operationGroup, layer = operationGroup.namespaceHierarchies.length - 1) {
-    const classicOperationFileName = operationGroup.namespaceHierarchies.length > 0
-        ? `${getClassicalLayerPrefix(operationGroup, NameType.File, "/", layer)}/index`
+function importApis(context, classicFile, client, emitterOptions, prefixes, layer = prefixes.length - 1) {
+    const { subfolder } = getModularClientOptions(context, client);
+    const classicOperationFileName = prefixes.length > 0 && prefixes[0] !== ""
+        ? `${getClassicalLayerPrefix(prefixes, NameType.File, "/", layer)}/index`
         : // When the program has no operation groups defined all operations are put
             // into a nameless operation group. We'll call this operations.
             "index";
-    const subfolder = client.subfolder;
-    const srcPath = modularCodeModel.modularOptions.sourceRoot;
-    const apiFile = modularCodeModel.project.getSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}api/${classicOperationFileName}.ts`);
+    const srcPath = emitterOptions.modularOptions.sourceRoot;
+    const apiFile = emitterOptions.project.getSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}api/${classicOperationFileName}.ts`);
     if (!apiFile) {
         return;
     }
@@ -61,7 +69,7 @@ function importApis(classicFile, client, modularCodeModel, operationGroup, layer
     })[0];
     if (exported.length > 0 && !existApiImport) {
         classicFile.addImportDeclaration({
-            moduleSpecifier: `${"../".repeat(operationGroup.namespaceHierarchies.length + 1)}api/${classicOperationFileName}.js`,
+            moduleSpecifier: `${"../".repeat(prefixes.length + 1)}api/${classicOperationFileName}.js`,
             namedImports: exported
         });
     }

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

@@ -1 +1 @@
-{"version":3,"file":"buildClassicalOperationGroups.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAQrE,MAAM,UAAU,0BAA0B,CACxC,UAAsB,EACtB,SAA2B,EAC3B,MAAc;;IAEd,MAAM,qBAAqB,GAA4B,IAAI,GAAG,EAG3D,CAAC;IACJ,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QACpD,IAAI,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,wBAAwB,GAC5B,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC;gBAC5C,CAAC,CAAC,GAAG,uBAAuB,CACxB,cAAc,EACd,QAAQ,CAAC,IAAI,EACb,GAAG,EACH,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAC/C,QAAQ;gBACX,CAAC,CAAC,0EAA0E;oBAC1E,+DAA+D;oBAC/D,OAAO,CAAC;YAEd,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YACnC,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;YACpD,MAAM,WAAW,GACf,MAAA,qBAAqB,CAAC,GAAG,CAAC,wBAAwB,CAAC,mCACnD,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAChC,GAAG,OAAO,IACR,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EACpD,WAAW,wBAAwB,KAAK,CACzC,CAAC;YACJ,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;YAEvE,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;YAC3D,2GAA2G;YAC3G,qBAAqB,CAAC,GAAG,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IACD,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QACpD,IAAI,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnD,KACE,IAAI,KAAK,GAAG,CAAC,EACb,KAAK,GAAG,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,EACtD,KAAK,EAAE,EACP,CAAC;gBACD,MAAM,wBAAwB,GAC5B,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC;oBAC5C,CAAC,CAAC,GAAG,uBAAuB,CACxB,cAAc,EACd,QAAQ,CAAC,IAAI,EACb,GAAG,EACH,KAAK,CACN,QAAQ;oBACX,CAAC,CAAC,0EAA0E;wBAC1E,+DAA+D;wBAC/D,OAAO,CAAC;gBAEd,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;gBACnC,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;gBACpD,MAAM,WAAW,GACf,MAAA,qBAAqB,CAAC,GAAG,CAAC,wBAAwB,CAAC,mCACnD,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAChC,GAAG,OAAO,IACR,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EACpD,WAAW,wBAAwB,KAAK,CACzC,CAAC;gBACJ,qBAAqB,CACnB,UAAU,EACV,MAAM,EACN,WAAW,EACX,cAAc,EACd,KAAK,CACN,CAAC;gBACF,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;gBAClE,qBAAqB,CAAC,GAAG,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC;YACnE,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAED,SAAS,UAAU,CACjB,WAAuB,EACvB,MAAc,EACd,gBAAkC,EAClC,cAA8B,EAC9B,QAAgB,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC;IAE9D,MAAM,wBAAwB,GAC5B,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC;QAC5C,CAAC,CAAC,GAAG,uBAAuB,CACxB,cAAc,EACd,QAAQ,CAAC,IAAI,EACb,GAAG,EACH,KAAK,CACN,QAAQ;QACX,CAAC,CAAC,0EAA0E;YAC1E,+DAA+D;YAC/D,OAAO,CAAC;IAEd,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACnC,MAAM,OAAO,GAAG,gBAAgB,CAAC,cAAc,CAAC,UAAU,CAAC;IAC3D,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,aAAa,CACpD,GAAG,OAAO,IACR,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EACpD,OAAO,wBAAwB,KAAK,CACrC,CAAC;IAEF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QAC1E,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,WAAW,CAAC,qBAAqB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACtE,OAAO,CAAC;aACL,uBAAuB,EAAE;aACzB,QAAQ,CAAC,UAAU,wBAAwB,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACN,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QAC3C,WAAW,CAAC,oBAAoB,CAAC;YAC/B,eAAe,EAAE,GAAG,KAAK,CAAC,MAAM,CAC9B,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAC/C,OAAO,wBAAwB,KAAK;YACrC,YAAY,EAAE,QAAQ;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"buildClassicalOperationGroups.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"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"}

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

@@ -1,12 +1,13 @@
-import { Client, ModularCodeModel } from "./modularCodeModel.js";
+import { ModularEmitterOptions } from "./interfaces.js";
 import { SdkContext } from "../utils/interfaces.js";
 import { SourceFile } from "ts-morph";
+import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
 /**
  * This function gets the path of the file containing the modular client context
  */
-export declare function getClientContextPath(_client: Client, codeModel: ModularCodeModel): string;
+export declare function getClientContextPath(context: SdkContext, client: SdkClientType<SdkServiceOperation>, emitterOptions: ModularEmitterOptions): string;
 /**
  * This function creates the file containing the modular client context
  */
-export declare function buildClientContext(_client: Client, dpgContext: SdkContext, codeModel: ModularCodeModel): SourceFile;
+export declare function buildClientContext(dpgContext: SdkContext, client: SdkClientType<SdkServiceOperation>, emitterOptions: ModularEmitterOptions): SourceFile;
 //# sourceMappingURL=buildClientContext.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildClientContext.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAejE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAYtC;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,gBAAgB,GAC1B,MAAM,CAQR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,GAC1B,UAAU,CAiJZ"}
+{"version":3,"file":"buildClientContext.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAexD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAOtC,OAAO,EACL,aAAa,EAGb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAGrD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,GACpC,MAAM,CAQR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,GACpC,UAAU,CAsMZ"}

package/dist/src/modular/buildClientContext.js

@@ -6,45 +6,66 @@ 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";
+import { getModularClientOptions } from "../utils/clientUtils.js";
 /**
  * This function gets the path of the file containing the modular client context
  */
-export function getClientContextPath(_client, codeModel) {
-    const { subfolder, tcgcClient: client } = _client;
+export function getClientContextPath(context, client, emitterOptions) {
+    const { subfolder } = getModularClientOptions(context, client);
     const name = getClientName(client);
-    const srcPath = codeModel.modularOptions.sourceRoot;
+    const srcPath = emitterOptions.modularOptions.sourceRoot;
     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;
+export function buildClientContext(dpgContext, client, emitterOptions) {
+    var _a;
     const dependencies = useDependencies();
     const name = getClientName(client);
-    const requiredParams = getClientParametersDeclaration(_client, dpgContext, {
+    const { rlcClientName } = getModularClientOptions(dpgContext, client);
+    const requiredParams = getClientParametersDeclaration(client, dpgContext, {
         onClientOnly: false,
-        requiredOnly: true
+        requiredOnly: true,
+        apiVersionAsRequired: true
     });
-    const clientContextFile = codeModel.project.createSourceFile(getClientContextPath(_client, codeModel));
+    const clientContextFile = emitterOptions.project.createSourceFile(getClientContextPath(dpgContext, client, emitterOptions));
     clientContextFile.addInterface({
         isExported: true,
-        name: `${_client.rlcClientName}`,
+        name: `${rlcClientName}`,
         extends: [resolveReference(dependencies.Client)],
-        docs: getDocsFromDescription(description)
+        docs: getDocsFromDescription(client.doc),
+        properties: getClientParameters(client, dpgContext, {
+            onClientOnly: false,
+            requiredOnly: true,
+            apiVersionAsRequired: true
+        })
+            .filter((p) => {
+            const clientParamName = getClientParameterName(p);
+            return (clientParamName !== "endpointParam" &&
+                clientParamName !== "credential");
+        })
+            .map((p) => {
+            return {
+                name: getClientParameterName(p),
+                type: getTypeExpression(dpgContext, p.type),
+                hasQuestionToken: false,
+                docs: getDocsWithKnownVersion(dpgContext, p)
+            };
+        })
     });
     clientContextFile.addInterface({
         name: `${name}ClientOptionalParams`,
         isExported: true,
         extends: [resolveReference(dependencies.ClientOptions)],
-        properties: getClientParameters(_client, dpgContext, {
+        properties: getClientParameters(client, dpgContext, {
             optionalOnly: true
         })
             .filter((p) => p.name !== "endpoint")
             .map((p) => {
             return {
-                name: normalizeName(p.name, NameType.Parameter),
+                name: getClientParameterName(p),
                 type: p.name.toLowerCase() === "apiversion"
                     ? "string"
                     : getTypeExpression(dpgContext, p.type),
@@ -56,24 +77,29 @@ export function buildClientContext(_client, dpgContext, codeModel) {
     });
     // TODO use binder here
     // (for now) now logger for unbranded pkgs
-    if (isAzurePackage(codeModel)) {
+    if (isAzurePackage(emitterOptions)) {
         clientContextFile.addImportDeclaration({
-            moduleSpecifier: codeModel.clients.length > 1 ? "../../logger.js" : "../logger.js",
+            moduleSpecifier: dpgContext.sdkPackage.clients.length > 1
+                ? "../../logger.js"
+                : "../logger.js",
             namedImports: ["logger"]
         });
     }
     const factoryFunction = clientContextFile.addFunction({
-        docs: getDocsFromDescription(description),
+        docs: getDocsFromDescription(client.doc),
         name: `create${name}`,
-        returnType: `${_client.rlcClientName}`,
-        parameters: requiredParams,
+        returnType: `${rlcClientName}`,
+        parameters: getClientParametersDeclaration(client, dpgContext, {
+            onClientOnly: false,
+            requiredOnly: true
+        }),
         isExported: true
     });
-    const endpointParam = buildGetClientEndpointParam(factoryFunction, dpgContext, _client);
-    const credentialParam = buildGetClientCredentialParam(_client, codeModel);
-    const optionsParam = buildGetClientOptionsParam(factoryFunction, codeModel, endpointParam);
+    const endpointParam = buildGetClientEndpointParam(factoryFunction, dpgContext, client);
+    const credentialParam = buildGetClientCredentialParam(client, emitterOptions);
+    const optionsParam = buildGetClientOptionsParam(factoryFunction, emitterOptions, endpointParam);
     factoryFunction.addStatements(`const clientContext = ${resolveReference(dependencies.getClient)}(${endpointParam}, ${credentialParam}, ${optionsParam});`);
-    const { customHttpAuthHeaderName, customHttpAuthSharedKeyPrefix } = codeModel.options;
+    const { customHttpAuthHeaderName, customHttpAuthSharedKeyPrefix } = emitterOptions.options;
     if (customHttpAuthHeaderName && customHttpAuthSharedKeyPrefix) {
         factoryFunction.addStatements(`
       if(${resolveReference(dependencies.isKeyCredential)}(credential)) {
@@ -88,12 +114,23 @@ export function buildClientContext(_client, dpgContext, codeModel) {
       `);
     }
     let apiVersionPolicyStatement = `clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });`;
-    if (dpgContext.hasApiVersionInClient) {
-        const apiVersionParam = getClientParameters(_client, dpgContext).find((x) => x.isApiVersionParam && x.kind === "method");
-        if (apiVersionParam) {
-            if (apiVersionParam.clientDefaultValue) {
-                apiVersionPolicyStatement += `const apiVersion = options.apiVersion ?? "${apiVersionParam.clientDefaultValue}";`;
-            }
+    const apiVersionParam = getClientParameters(client, dpgContext).find((x) => x.isApiVersionParam);
+    const endpointParameter = getClientParameters(client, dpgContext, {
+        onClientOnly: false,
+        requiredOnly: true,
+        skipEndpointTemplate: true
+    }).find((x) => x.kind === "endpoint");
+    if (apiVersionParam) {
+        const templateArguments = endpointParameter && endpointParameter.type.kind === "endpoint"
+            ? endpointParameter.type.templateArguments
+            : endpointParameter && endpointParameter.type.kind === "union"
+                ? (_a = endpointParameter.type.variantTypes[0]) === null || _a === void 0 ? void 0 : _a.templateArguments
+                : [];
+        const apiVersionInEndpoint = templateArguments && templateArguments.find((p) => p.isApiVersionParam);
+        if (!apiVersionInEndpoint && apiVersionParam.clientDefaultValue) {
+            apiVersionPolicyStatement += `const apiVersion = options.apiVersion ?? "${apiVersionParam.clientDefaultValue}";`;
+        }
+        if (apiVersionParam.kind === "method") {
             apiVersionPolicyStatement += `
       clientContext.pipeline.addPolicy({
         name: 'ClientApiVersionPolicy',
@@ -112,20 +149,32 @@ export function buildClientContext(_client, dpgContext, codeModel) {
       });`;
         }
     }
-    else if (isAzurePackage(codeModel)) {
+    else if (isAzurePackage(emitterOptions)) {
         apiVersionPolicyStatement += `
-      if (options.apiVersion) {
-        logger.warning("This client does not support client api-version, please change it at the operation level");
-      }`;
+        if (options.apiVersion) {
+          logger.warning("This client does not support client api-version, please change it at the operation level");
+        }`;
     }
     else {
         apiVersionPolicyStatement += `
-      if (options.apiVersion) {
-        console.warn("This client does not support client api-version, please change it at the operation level");
-      }`;
+        if (options.apiVersion) {
+          console.warn("This client does not support client api-version, please change it at the operation level");
+        }`;
     }
     factoryFunction.addStatements(apiVersionPolicyStatement);
-    factoryFunction.addStatements("return clientContext;");
+    const contextRequiredParam = requiredParams.filter((p) => p.name !== "endpointParam" &&
+        p.name !== "credential" &&
+        p.name !== "options");
+    if (contextRequiredParam.length) {
+        factoryFunction.addStatements(`return { ...clientContext, ${contextRequiredParam
+            .map((p) => {
+            return p.name;
+        })
+            .join(", ")}} as ${rlcClientName};`);
+    }
+    else {
+        factoryFunction.addStatements(`return clientContext;`);
+    }
     clientContextFile.fixMissingImports({}, { importModuleSpecifierEnding: "js" });
     clientContextFile.fixUnusedIdentifiers();
     return clientContextFile;