@azure-tools/typespec-ts 0.36.0 → 0.37.0

package/dist/src/modular/helpers/classicalOperationHelpers.js

@@ -1,58 +1,53 @@
 import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { StructureKind } from "ts-morph";
-import { getClassicalLayerPrefix, getClientName } from "./namingHelpers.js";
+import { getClassicalLayerPrefix } from "./namingHelpers.js";
 import { getOperationFunction } from "./operationHelpers.js";
-export function shouldPromoteSubscriptionId(dpgContext, operationGroup) {
-    var _a;
-    const hasSubscriptionIdParameter = operationGroup.operations.some((op) => op.parameters.some((p) => p.clientName === "subscriptionId"));
-    return ((_a = dpgContext === null || dpgContext === void 0 ? void 0 : dpgContext.rlcOptions) === null || _a === void 0 ? void 0 : _a.azureArm) && hasSubscriptionIdParameter;
-}
-export function getClassicalOperation(dpgContext, client, classicFile, operationGroup, layer = operationGroup.namespaceHierarchies.length - 1) {
-    var _a, _b, _c, _d;
-    // TODO: remove this logic once client-level parameter design is finalized
-    // https://github.com/Azure/autorest.typescript/issues/2618
-    const hasSubscriptionIdPromoted = shouldPromoteSubscriptionId(dpgContext, operationGroup);
-    const modularClientName = `${getClientName(client.tcgcClient)}Context`;
+import { getModularClientOptions } from "../../utils/clientUtils.js";
+export function getClassicalOperation(dpgContext, client, classicFile, operationGroup, layer = operationGroup[0].length - 1) {
+    var _a, _b, _c;
+    const prefixes = operationGroup[0];
+    const operations = operationGroup[1];
+    const { rlcClientName } = getModularClientOptions(dpgContext, client);
     const hasClientContextImport = classicFile
         .getImportDeclarations()
         .filter((i) => {
         return (i.getModuleSpecifierValue() ===
-            `${"../".repeat(layer + 2)}api/${normalizeName(modularClientName, NameType.File)}.js`);
+            `${"../".repeat(layer + 2)}api/${normalizeName(rlcClientName, NameType.File)}.js`);
     });
     if (!hasClientContextImport || hasClientContextImport.length === 0) {
         classicFile.addImportDeclaration({
-            namedImports: [client.rlcClientName],
-            moduleSpecifier: `${"../".repeat(layer + 2)}api/${normalizeName(modularClientName, NameType.File)}.js`
+            namedImports: [rlcClientName],
+            moduleSpecifier: `${"../".repeat(layer + 2)}api/${normalizeName(rlcClientName, NameType.File)}.js`
         });
     }
     const operationMap = new Map();
-    const operationDeclarations = operationGroup.operations.map((operation) => {
-        const declarations = getOperationFunction(dpgContext, operation, modularClientName);
+    const operationDeclarations = operations.map((operation) => {
+        const declarations = getOperationFunction(dpgContext, [prefixes, operation], rlcClientName);
         operationMap.set(declarations, operation.oriName);
         return declarations;
     });
-    const interfaceNamePrefix = getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer);
+    const interfaceNamePrefix = getClassicalLayerPrefix(prefixes, NameType.Interface, "", layer);
     const interfaceName = `${interfaceNamePrefix}Operations`;
     const existInterface = classicFile
         .getInterfaces()
         .filter((i) => i.getName() === interfaceName)[0];
     const properties = [];
-    if (layer !== operationGroup.namespaceHierarchies.length - 1) {
+    if (layer !== prefixes.length - 1) {
         properties.push({
             kind: StructureKind.PropertySignature,
-            name: (_b = normalizeName((_a = (layer === operationGroup.namespaceHierarchies.length - 1
-                ? operationGroup.namespaceHierarchies[layer]
-                : operationGroup.namespaceHierarchies[layer + 1])) !== null && _a !== void 0 ? _a : "", NameType.Property)) !== null && _b !== void 0 ? _b : operationGroup.propertyName,
-            type: `${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer + 1)}Operations`
+            name: normalizeName((_a = (layer === prefixes.length - 1
+                ? prefixes[layer]
+                : prefixes[layer + 1])) !== null && _a !== void 0 ? _a : "", NameType.Property),
+            type: `${getClassicalLayerPrefix(prefixes, NameType.Interface, "", layer + 1)}Operations`
         });
     }
     else {
         operationDeclarations.forEach((d) => {
-            var _a, _b;
+            var _a;
             properties.push({
                 kind: StructureKind.PropertySignature,
                 name: getClassicalMethodName(d),
-                type: `(${(_b = (_a = d.parameters) === null || _a === void 0 ? void 0 : _a.filter((p) => p.name !== "context")) === null || _b === void 0 ? void 0 : _b.filter((p) => !(hasSubscriptionIdPromoted && p.name === "subscriptionId")).map((p) => {
+                type: `(${(_a = d.parameters) === null || _a === void 0 ? void 0 : _a.filter((p) => p.name !== "context").map((p) => {
                     var _a;
                     return p.name +
                         (((_a = p.type) === null || _a === void 0 ? void 0 : _a.toString().endsWith("OptionalParams")) ||
@@ -77,24 +72,21 @@ export function getClassicalOperation(dpgContext, client, classicFile, operation
             docs: [`Interface representing a ${interfaceNamePrefix} operations.`]
         });
     }
-    if (layer === operationGroup.namespaceHierarchies.length - 1) {
+    if (layer === prefixes.length - 1) {
         classicFile.addFunction({
-            name: `get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer)}`,
+            name: `get${getClassicalLayerPrefix(prefixes, NameType.Interface, "", layer)}`,
             isExported: true,
             parameters: [
                 {
                     name: "context",
-                    type: client.rlcClientName
-                },
-                ...(hasSubscriptionIdPromoted
-                    ? [{ name: "subscriptionId", type: "string" }]
-                    : [])
+                    type: rlcClientName
+                }
             ],
             statements: `return {
         ${operationDeclarations
                 .map((d) => {
-                var _a, _b, _c;
-                return `${getClassicalMethodName(d)}: (${(_b = (_a = d.parameters) === null || _a === void 0 ? void 0 : _a.filter((p) => p.name !== "context")) === null || _b === void 0 ? void 0 : _b.filter((p) => !(hasSubscriptionIdPromoted && p.name === "subscriptionId")).map((p) => {
+                var _a, _b;
+                return `${getClassicalMethodName(d)}: (${(_a = d.parameters) === null || _a === void 0 ? void 0 : _a.filter((p) => p.name !== "context").map((p) => {
                     var _a;
                     return p.name +
                         (((_a = p.type) === null || _a === void 0 ? void 0 : _a.toString().endsWith("OptionalParams")) ||
@@ -106,7 +98,7 @@ export function getClassicalOperation(dpgContext, client, classicFile, operation
                 }).join(",")}) => ${d.name}(${[
                     "context",
                     ...[
-                        (_c = d.parameters) === null || _c === void 0 ? void 0 : _c.map((p) => p.name).filter((p) => p !== "context")
+                        (_b = d.parameters) === null || _b === void 0 ? void 0 : _b.map((p) => p.name).filter((p) => p !== "context")
                     ]
                 ].join(",")})`;
             })
@@ -114,7 +106,7 @@ export function getClassicalOperation(dpgContext, client, classicFile, operation
       }`
         });
     }
-    const operationFunctionName = `get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer)}Operations`;
+    const operationFunctionName = `get${getClassicalLayerPrefix(prefixes, NameType.Interface, "", layer)}Operations`;
     const existFunction = classicFile
         .getFunctions()
         .filter((f) => f.getName() === operationFunctionName)[0];
@@ -122,37 +114,35 @@ export function getClassicalOperation(dpgContext, client, classicFile, operation
         const returnStatement = existFunction.getBodyText();
         if (returnStatement) {
             let statement = `,
-      ...get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer + 1)}Operations(context${hasSubscriptionIdPromoted ? ", subscriptionId" : ""})}`;
-            if (layer !== operationGroup.namespaceHierarchies.length - 1) {
+      ...get${getClassicalLayerPrefix(prefixes, NameType.Interface, "", layer + 1)}Operations(context)}`;
+            if (layer !== prefixes.length - 1) {
                 statement = `,
-        ${normalizeName((_c = operationGroup.namespaceHierarchies[layer + 1]) !== null && _c !== void 0 ? _c : "FIXME", NameType.Property)}: get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer + 1)}Operations(context${hasSubscriptionIdPromoted ? ", subscriptionId" : ""})}`;
+        ${normalizeName((_b = prefixes[layer + 1]) !== null && _b !== void 0 ? _b : "FIXME", NameType.Property)}: get${getClassicalLayerPrefix(prefixes, NameType.Interface, "", layer + 1)}Operations(context)}`;
             }
             const newReturnStatement = returnStatement.replace(/}$/, statement);
             existFunction.setBodyText(newReturnStatement);
         }
     }
     else {
-        classicFile.addFunction({
+        const functions = {
             name: operationFunctionName,
             isExported: true,
             parameters: [
                 {
                     name: "context",
-                    type: client.rlcClientName
-                },
-                ...(hasSubscriptionIdPromoted
-                    ? [{ name: "subscriptionId", type: "string" }]
-                    : [])
+                    type: rlcClientName
+                }
             ],
-            returnType: `${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer)}Operations`,
-            statements: layer !== operationGroup.namespaceHierarchies.length - 1
+            returnType: `${getClassicalLayerPrefix(prefixes, NameType.Interface, "", layer)}Operations`,
+            statements: layer !== prefixes.length - 1
                 ? `return {
-            ${normalizeName((_d = operationGroup.namespaceHierarchies[layer + 1]) !== null && _d !== void 0 ? _d : "FIXME", NameType.Property)}: get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer + 1)}Operations(context)   
+            ${normalizeName((_c = prefixes[layer + 1]) !== null && _c !== void 0 ? _c : "FIXME", NameType.Property)}: get${getClassicalLayerPrefix(prefixes, NameType.Interface, "", layer + 1)}Operations(context)   
       }`
                 : `return {
-        ...get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer)}(context${hasSubscriptionIdPromoted ? ", subscriptionId" : ""})
+        ...get${getClassicalLayerPrefix(prefixes, NameType.Interface, "", layer)}(context)
       }`
-        });
+        };
+        classicFile.addFunction(functions);
     }
     function getClassicalMethodName(declaration) {
         var _a, _b, _c;

package/dist/src/modular/helpers/classicalOperationHelpers.js.map

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

package/dist/src/modular/helpers/clientHelpers.d.ts

@@ -1,16 +1,19 @@
-import { Client, ModularCodeModel } from "../modularCodeModel.js";
+import { ModularEmitterOptions } from "../interfaces.js";
 import { OptionalKind, ParameterDeclarationStructure, StatementedNode } from "ts-morph";
-import { SdkHttpParameter, SdkParameter } from "@azure-tools/typespec-client-generator-core";
+import { SdkClientType, SdkHttpParameter, SdkParameter, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
 import { SdkContext } from "../../utils/interfaces.js";
 interface ClientParameterOptions {
     onClientOnly?: boolean;
     requiredOnly?: boolean;
     optionalOnly?: boolean;
+    skipArmSpecific?: boolean;
+    skipEndpointTemplate?: boolean;
+    apiVersionAsRequired?: boolean;
 }
-export declare function getClientParameters(_client: Client, dpgContext: SdkContext, options?: ClientParameterOptions): (SdkParameter | SdkHttpParameter)[];
-export declare function getClientParametersDeclaration(_client: Client, dpgContext: SdkContext, options?: ClientParameterOptions): OptionalKind<ParameterDeclarationStructure>[];
+export declare function getClientParameters(client: SdkClientType<SdkServiceOperation>, dpgContext: SdkContext, options?: ClientParameterOptions): (SdkParameter | SdkHttpParameter)[];
+export declare function getClientParametersDeclaration(client: SdkClientType<SdkServiceOperation>, dpgContext: SdkContext, options?: ClientParameterOptions): OptionalKind<ParameterDeclarationStructure>[];
 export declare function getClientParameterName(parameter: SdkParameter | SdkHttpParameter): string;
-export declare function buildGetClientEndpointParam(context: StatementedNode, dpgContext: SdkContext, client: Client): string;
+export declare function buildGetClientEndpointParam(context: StatementedNode, dpgContext: SdkContext, client: SdkClientType<SdkServiceOperation>): string;
 /**
  * Builds the options to be passed to getClient
  *
@@ -18,8 +21,8 @@ export declare function buildGetClientEndpointParam(context: StatementedNode, dp
  *                  to help build the options shape
  * @returns - an expression representing the options to be passed in to getClient
  */
-export declare function buildGetClientOptionsParam(context: StatementedNode, codeModel: ModularCodeModel, endpointParam: string): string;
-export declare function buildGetClientCredentialParam(client: Client, codeModel: ModularCodeModel): string;
-export declare function buildUserAgentOptions(context: StatementedNode, codeModel: ModularCodeModel, sdkUserAgentPrefix: string): string;
+export declare function buildGetClientOptionsParam(context: StatementedNode, emitterOptions: ModularEmitterOptions, endpointParam: string): string;
+export declare function buildGetClientCredentialParam(client: SdkClientType<SdkServiceOperation>, emitterOptions: ModularEmitterOptions): string;
+export declare function buildUserAgentOptions(context: StatementedNode, emitterOptions: ModularEmitterOptions, sdkUserAgentPrefix: string): string;
 export {};
 //# sourceMappingURL=clientHelpers.d.ts.map

package/dist/src/modular/helpers/clientHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EACL,YAAY,EACZ,6BAA6B,EAC7B,eAAe,EAChB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,gBAAgB,EAChB,YAAY,EACb,MAAM,6CAA6C,CAAC;AAOrD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAKvD,UAAU,sBAAsB;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,sBAIR,uCA6CF;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,sBAIR,GACA,YAAY,CAAC,6BAA6B,CAAC,EAAE,CAwB/C;AAqBD,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,YAAY,GAAG,gBAAgB,UAa3C;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,eAAe,EACxB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,GACb,MAAM,CA6CR;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,MAAM,GACpB,MAAM,CA2BR;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,gBAAgB,GAC1B,MAAM,CAaR;AAuCD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,gBAAgB,EAC3B,kBAAkB,EAAE,MAAM,GACzB,MAAM,CAqCR"}
+{"version":3,"file":"clientHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EACL,YAAY,EACZ,6BAA6B,EAC7B,eAAe,EAChB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAOrD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAKvD,UAAU,sBAAsB;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,sBAOR,uCAqDF;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,sBAMR,GACA,YAAY,CAAC,6BAA6B,CAAC,EAAE,CAuB/C;AAqBD,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,YAAY,GAAG,gBAAgB,UAa3C;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,eAAe,EACxB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,GACzC,MAAM,CA8DR;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,eAAe,EACxB,cAAc,EAAE,qBAAqB,EACrC,aAAa,EAAE,MAAM,GACpB,MAAM,CA2BR;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,GACpC,MAAM,CAaR;AAuCD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,eAAe,EACxB,cAAc,EAAE,qBAAqB,EACrC,kBAAkB,EAAE,MAAM,GACzB,MAAM,CAqCR"}

package/dist/src/modular/helpers/clientHelpers.js

@@ -2,34 +2,43 @@ import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { getClientName } from "./namingHelpers.js";
 import { getTypeExpression } from "../type-expressions/get-type-expression.js";
 import { isCredentialType } from "./typeHelpers.js";
-export function getClientParameters(_client, dpgContext, options = {
+export function getClientParameters(client, dpgContext, options = {
     requiredOnly: false,
     onClientOnly: false,
-    optionalOnly: false
+    optionalOnly: false,
+    skipArmSpecific: false,
+    skipEndpointTemplate: false,
+    apiVersionAsRequired: true
 }) {
     var _a, _b;
-    const client = _client.tcgcClient;
     const clientParams = [];
     for (const property of client.initialization.properties) {
         if (property.type.kind === "union" &&
             ((_a = property.type.variantTypes[0]) === null || _a === void 0 ? void 0 : _a.kind) === "endpoint") {
-            clientParams.push(...property.type.variantTypes[0].templateArguments);
+            if (options.skipEndpointTemplate) {
+                clientParams.push(property);
+            }
+            else {
+                clientParams.push(...property.type.variantTypes[0].templateArguments);
+            }
         }
         else if (property.type.kind === "endpoint") {
-            clientParams.push(...property.type.templateArguments);
+            clientParams.push(property);
         }
         else if (!clientParams.find((p) => p.name === property.name)) {
             clientParams.push(property);
         }
     }
     const hasDefaultValue = (p) => { var _a; return p.clientDefaultValue || ((_a = p.__raw) === null || _a === void 0 ? void 0 : _a.defaultValue) || p.type.kind === "constant"; };
-    const isRequired = (p) => !p.optional && !hasDefaultValue(p);
+    const isRequired = (p) => !p.optional &&
+        ((!hasDefaultValue(p) &&
+            !(p.type.kind === "endpoint" &&
+                p.type.templateArguments[0] &&
+                hasDefaultValue(p.type.templateArguments[0]))) ||
+            (options.apiVersionAsRequired && p.isApiVersionParam));
     const isOptional = (p) => p.optional || hasDefaultValue(p);
     const skipCredentials = (p) => p.kind !== "credential";
-    const skipMethodParam = (p) => p.kind !== "method" ||
-        (p.kind === "method" &&
-            p.isApiVersionParam &&
-            _client.parameters.find((p) => p.isApiVersion));
+    const skipMethodParam = (p) => p.kind !== "method";
     const armSpecific = (p) => !(p.kind === "endpoint" && dpgContext.arm);
     const filters = [
         options.requiredOnly ? isRequired : undefined,
@@ -38,17 +47,18 @@ export function getClientParameters(_client, dpgContext, options = {
             : undefined,
         options.optionalOnly ? isOptional : undefined,
         options.onClientOnly ? skipMethodParam : undefined,
-        armSpecific
+        options.skipArmSpecific ? undefined : armSpecific
     ];
     const params = clientParams.filter((p) => filters.every((filter) => !filter || filter(p)));
     return params;
 }
-export function getClientParametersDeclaration(_client, dpgContext, options = {
+export function getClientParametersDeclaration(client, dpgContext, options = {
     optionalOnly: false,
     requiredOnly: false,
-    onClientOnly: false
+    onClientOnly: false,
+    skipArmSpecific: false,
+    apiVersionAsRequired: false
 }) {
-    const client = _client.tcgcClient;
     const name = getClientName(client);
     const optionsParam = {
         name: "options",
@@ -56,7 +66,7 @@ export function getClientParametersDeclaration(_client, dpgContext, options = {
         initializer: "{}"
     };
     const params = [
-        ...getClientParameters(_client, dpgContext, options).map((p) => {
+        ...getClientParameters(client, dpgContext, options).map((p) => {
             const typeExpression = getClientParameterTypeExpression(dpgContext, p);
             const name = getClientParameterName(p);
             return {
@@ -92,41 +102,58 @@ export function getClientParameterName(parameter) {
     return normalizeName(parameter.name, NameType.Parameter, true);
 }
 export function buildGetClientEndpointParam(context, dpgContext, client) {
-    var _a;
+    var _a, _b, _c;
+    let coreEndpointParam = "";
+    if (((_a = dpgContext.rlcOptions) === null || _a === void 0 ? void 0 : _a.flavor) === "azure") {
+        coreEndpointParam = `options.endpoint ?? options.baseUrl`;
+    }
+    else {
+        // unbranded does not have the deprecated baseUrl parameter
+        coreEndpointParam = `options.endpoint`;
+    }
     // Special case: endpoint URL not defined
-    if (client.url === "") {
-        const endpointParam = getClientParameters(client, dpgContext, {
-            onClientOnly: true
-        }).find((x) => x.kind === "endpoint" || x.kind === "path");
-        if (endpointParam) {
-            if (((_a = dpgContext.rlcOptions) === null || _a === void 0 ? void 0 : _a.flavor) === "azure") {
-                return `options.endpoint ?? options.baseUrl ?? String(${getClientParameterName(endpointParam)})`;
-            }
-            else {
-                // unbranded does not have the deprecated baseUrl parameter
-                return `options.endpoint ?? String(${getClientParameterName(endpointParam)})`;
+    const endpointParam = getClientParameters(client, dpgContext, {
+        onClientOnly: true,
+        skipEndpointTemplate: true,
+        skipArmSpecific: true
+    }).find((x) => x.kind === "endpoint" || x.kind === "path");
+    if (endpointParam) {
+        if (endpointParam.type.kind === "union" &&
+            ((_b = endpointParam.type.variantTypes[0]) === null || _b === void 0 ? void 0 : _b.kind) === "endpoint") {
+            const params = endpointParam.type.variantTypes[0].templateArguments;
+            let parameterizedEndpointUrl = endpointParam.type.variantTypes[0].serverUrl;
+            for (const templateParam of params) {
+                const paramName = getClientParameterName(templateParam);
+                if (templateParam.clientDefaultValue) {
+                    const defaultValue = typeof templateParam.clientDefaultValue === "string"
+                        ? `"${templateParam.clientDefaultValue}"`
+                        : templateParam.clientDefaultValue;
+                    context.addStatements(`const ${paramName} = options.${paramName} ?? ${defaultValue};`);
+                }
+                else if (templateParam.optional) {
+                    context.addStatements(`const ${paramName} = options.${paramName};`);
+                }
+                parameterizedEndpointUrl = parameterizedEndpointUrl.replace(`{${templateParam.name}}`, `\${${getClientParameterName(templateParam)}}`);
             }
+            const endpointUrl = `const endpointUrl = ${coreEndpointParam} ?? \`${parameterizedEndpointUrl}\`;`;
+            context.addStatements(endpointUrl);
+            return "endpointUrl";
         }
-    }
-    const urlParams = getClientParameters(client, dpgContext).filter((x) => x.kind === "endpoint" || x.kind === "path");
-    for (const param of urlParams) {
-        const paramName = getClientParameterName(param);
-        if (param.clientDefaultValue) {
-            const defaultValue = typeof param.clientDefaultValue === "string"
-                ? `"${param.clientDefaultValue}"`
-                : param.clientDefaultValue;
-            context.addStatements(`const ${paramName} = options.${paramName} ?? ${defaultValue};`);
-        }
-        else if (param.optional) {
-            context.addStatements(`const ${paramName} = options.${paramName};`);
+        else if (endpointParam.type.kind === "endpoint") {
+            const clientDefaultValue = (_c = endpointParam.type.templateArguments[0]) === null || _c === void 0 ? void 0 : _c.clientDefaultValue;
+            const defaultValueStr = clientDefaultValue && typeof clientDefaultValue === "string"
+                ? `"${clientDefaultValue}"`
+                : clientDefaultValue
+                    ? clientDefaultValue
+                    : `String(${getClientParameterName(endpointParam)})`;
+            const endpointUrl = `const endpointUrl = ${coreEndpointParam} ?? ${defaultValueStr};`;
+            context.addStatements(endpointUrl);
+            return "endpointUrl";
         }
+        const endpointUrl = `const endpointUrl = ${coreEndpointParam} ?? String(${getClientParameterName(endpointParam)});`;
+        context.addStatements(endpointUrl);
+        return "endpointUrl";
     }
-    let parameterizedEndpointUrl = client.url;
-    for (const param of urlParams) {
-        parameterizedEndpointUrl = parameterizedEndpointUrl.replace(`{${param.serializedName}}`, `\${${getClientParameterName(param)}}`);
-    }
-    const endpointUrl = `const endpointUrl = options.endpoint ?? options.baseUrl ?? \`${parameterizedEndpointUrl}\``;
-    context.addStatements(endpointUrl);
     return "endpointUrl";
 }
 /**
@@ -136,10 +163,10 @@ export function buildGetClientEndpointParam(context, dpgContext, client) {
  *                  to help build the options shape
  * @returns - an expression representing the options to be passed in to getClient
  */
-export function buildGetClientOptionsParam(context, codeModel, endpointParam) {
-    const userAgentOptions = buildUserAgentOptions(context, codeModel, "azsdk-js-api");
-    const loggingOptions = buildLoggingOptions(codeModel.options.flavor);
-    const credentials = buildCredentials(codeModel, endpointParam);
+export function buildGetClientOptionsParam(context, emitterOptions, endpointParam) {
+    const userAgentOptions = buildUserAgentOptions(context, emitterOptions, "azsdk-js-api");
+    const loggingOptions = buildLoggingOptions(emitterOptions.options.flavor);
+    const credentials = buildCredentials(emitterOptions, endpointParam);
     let expr = "const { apiVersion: _, ...updatedOptions } = {";
     expr += "...options,";
     if (userAgentOptions) {
@@ -155,22 +182,22 @@ export function buildGetClientOptionsParam(context, codeModel, endpointParam) {
     context.addStatements(expr);
     return "updatedOptions";
 }
-export function buildGetClientCredentialParam(client, codeModel) {
+export function buildGetClientCredentialParam(client, emitterOptions) {
     var _a, _b;
-    if (codeModel.options.addCredentials &&
-        (codeModel.options.credentialScopes ||
-            codeModel.options.credentialKeyHeaderName)) {
-        return ((_b = (_a = client.parameters.find((x) => isCredentialType(x.type))) === null || _a === void 0 ? void 0 : _a.clientName) !== null && _b !== void 0 ? _b : "undefined");
+    if (emitterOptions.options.addCredentials &&
+        (emitterOptions.options.credentialScopes ||
+            emitterOptions.options.credentialKeyHeaderName)) {
+        return ((_b = (_a = client.initialization.properties.find((x) => isCredentialType(x))) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : "undefined");
     }
     else {
         return "undefined";
     }
 }
-function buildCredentials(codeModel, endpointParam) {
-    if (!codeModel.options.addCredentials) {
+function buildCredentials(emitterOptions, endpointParam) {
+    if (!emitterOptions.options.addCredentials) {
         return undefined;
     }
-    const { credentialScopes, credentialKeyHeaderName } = codeModel.options;
+    const { credentialScopes, credentialKeyHeaderName } = emitterOptions.options;
     const scopesString = credentialScopes
         ? credentialScopes.map((cs) => `"${cs}"`).join(", ") ||
             `\`\${${endpointParam}}/.default\``
@@ -192,13 +219,13 @@ function buildLoggingOptions(flavor) {
     }
     return `{ logger: options.loggingOptions?.logger ?? logger.info }`;
 }
-export function buildUserAgentOptions(context, codeModel, sdkUserAgentPrefix) {
+export function buildUserAgentOptions(context, emitterOptions, sdkUserAgentPrefix) {
     var _a, _b, _c, _d, _e, _f;
     const userAgentStatements = [];
     const prefixFromOptions = "const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;";
     userAgentStatements.push(prefixFromOptions);
-    const clientPackageName = (_d = (_b = (_a = codeModel.options.packageDetails) === null || _a === void 0 ? void 0 : _a.nameWithoutScope) !== null && _b !== void 0 ? _b : (_c = codeModel.options.packageDetails) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : "";
-    const packageVersion = (_f = (_e = codeModel.options.packageDetails) === null || _e === void 0 ? void 0 : _e.version) !== null && _f !== void 0 ? _f : "";
+    const clientPackageName = (_d = (_b = (_a = emitterOptions.options.packageDetails) === null || _a === void 0 ? void 0 : _a.nameWithoutScope) !== null && _b !== void 0 ? _b : (_c = emitterOptions.options.packageDetails) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : "";
+    const packageVersion = (_f = (_e = emitterOptions.options.packageDetails) === null || _e === void 0 ? void 0 : _e.version) !== null && _f !== void 0 ? _f : "";
     const userAgentInfoStatement = packageVersion && clientPackageName && sdkUserAgentPrefix.includes("api")
         ? "const userAgentInfo = `azsdk-js-" +
             clientPackageName +

package/dist/src/modular/helpers/clientHelpers.js.map

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

package/dist/src/modular/helpers/namingHelpers.d.ts

@@ -1,19 +1,16 @@
 import { NameType } from "@azure-tools/rlc-common";
-import { SdkClient, SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
-import { SdkContext } from "../../utils/interfaces.js";
-import { Client, ModularCodeModel, Operation, OperationGroup } from "../modularCodeModel.js";
+import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
+import { ServiceOperation } from "../../utils/operationUtil.js";
 export declare function getClientName(client: SdkClientType<SdkServiceOperation>): string;
 export declare function getClassicalClientName(client: SdkClientType<SdkServiceOperation>): string;
 export interface GuardedName {
     name: string;
     fixme?: string[];
 }
-export declare function getOperationName(operation: Operation, options?: {
+export declare function getOperationName(operation: ServiceOperation, options?: {
     casing: "camel" | "pascal";
 }): GuardedName;
 export declare function isReservedName(name: string, nameType: NameType): boolean;
-export declare function getClassicalLayerPrefix(operationGroup: OperationGroup | Operation, nameType: NameType, separator?: string, layer?: number): string;
+export declare function getClassicalLayerPrefix(prefixes: string[], nameType: NameType, separator?: string, layer?: number): string;
 export declare function isDefined<T>(thing: T | undefined | null): thing is T;
-export declare function getRLCIndexFilePath(dpgContext: SdkContext, client: Client | SdkClient, ext?: "js" | "ts"): string;
-export declare function getModularModelFilePath(codeModel: ModularCodeModel, client: Client | SdkClient, ext?: "js" | "ts"): string;
 //# sourceMappingURL=namingHelpers.d.ts.map

package/dist/src/modular/helpers/namingHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"namingHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,SAAS,EACT,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,cAAc,EACf,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,aAAa,CAC3B,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,GACzC,MAAM,CAER;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,GACzC,MAAM,CAER;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,EACpB,OAAO,GAAE;IAAE,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAA;CAAwB,GAC5D,WAAW,CAgBb;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAMxE;AAED,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,QAAQ,EAAE,QAAQ,EAClB,SAAS,GAAE,MAAW,EACtB,KAAK,GAAE,MAAuD,GAC7D,MAAM,CAiBR;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,KAAK,IAAI,CAAC,CAEpE;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,GAAG,GAAE,IAAI,GAAG,IAAW,GACtB,MAAM,CAQR;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,GAAG,GAAE,IAAI,GAAG,IAAW,GACtB,MAAM,CASR"}
+{"version":3,"file":"namingHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,wBAAgB,aAAa,CAC3B,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,GACzC,MAAM,CAER;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,GACzC,MAAM,CAER;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,gBAAgB,EAC3B,OAAO,GAAE;IAAE,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAA;CAAwB,GAC5D,WAAW,CAgBb;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAMxE;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAAE,EAClB,QAAQ,EAAE,QAAQ,EAClB,SAAS,GAAE,MAAW,EACtB,KAAK,GAAE,MAA4B,GAClC,MAAM,CAYR;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,KAAK,IAAI,CAAC,CAEpE"}