@azure-tools/typespec-ts 0.29.0 → 0.30.0

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

@@ -1,9 +1,17 @@
+import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { StructureKind } from "ts-morph";
 import { getClassicalLayerPrefix, getClientName } from "./namingHelpers.js";
-import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { getOperationFunction } from "./operationHelpers.js";
-export function getClassicalOperation(classicFile, client, operationGroup, layer = operationGroup.namespaceHierarchies.length - 1) {
+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)}Context`;
     const hasClientContextImport = classicFile
         .getImportDeclarations()
@@ -39,11 +47,11 @@ export function getClassicalOperation(classicFile, client, operationGroup, layer
     }
     else {
         operationDeclarations.forEach((d) => {
-            var _a;
+            var _a, _b;
             properties.push({
                 kind: StructureKind.PropertySignature,
                 name: getClassicalMethodName(d),
-                type: `(${(_a = d.parameters) === null || _a === void 0 ? void 0 : _a.filter((p) => p.name !== "context").map((p) => {
+                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) => {
                     var _a;
                     return p.name +
                         (((_a = p.type) === null || _a === void 0 ? void 0 : _a.toString().endsWith("OptionalParams")) ||
@@ -74,13 +82,16 @@ export function getClassicalOperation(classicFile, client, operationGroup, layer
                 {
                     name: "context",
                     type: client.rlcClientName
-                }
+                },
+                ...(hasSubscriptionIdPromoted
+                    ? [{ name: "subscriptionId", type: "string" }]
+                    : [])
             ],
             statements: `return {
         ${operationDeclarations
                 .map((d) => {
-                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, _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;
                     return p.name +
                         (((_a = p.type) === null || _a === void 0 ? void 0 : _a.toString().endsWith("OptionalParams")) ||
@@ -92,7 +103,7 @@ export function getClassicalOperation(classicFile, client, operationGroup, layer
                 }).join(",")}) => ${d.name}(${[
                     "context",
                     ...[
-                        (_b = d.parameters) === null || _b === void 0 ? void 0 : _b.map((p) => p.name).filter((p) => p !== "context")
+                        (_c = d.parameters) === null || _c === void 0 ? void 0 : _c.map((p) => p.name).filter((p) => p !== "context")
                     ]
                 ].join(",")})`;
             })
@@ -108,10 +119,10 @@ export function getClassicalOperation(classicFile, client, operationGroup, layer
         const returnStatement = existFunction.getBodyText();
         if (returnStatement) {
             let statement = `,
-      ...get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer + 1)}Operations(context)}`;
+      ...get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer + 1)}Operations(context${hasSubscriptionIdPromoted ? ", subscriptionId" : ""})}`;
             if (layer !== operationGroup.namespaceHierarchies.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)}`;
+        ${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" : ""})}`;
             }
             const newReturnStatement = returnStatement.replace(/}$/, statement);
             existFunction.setBodyText(newReturnStatement);
@@ -125,7 +136,10 @@ export function getClassicalOperation(classicFile, client, operationGroup, layer
                 {
                     name: "context",
                     type: client.rlcClientName
-                }
+                },
+                ...(hasSubscriptionIdPromoted
+                    ? [{ name: "subscriptionId", type: "string" }]
+                    : [])
             ],
             returnType: `${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer)}Operations`,
             statements: layer !== operationGroup.namespaceHierarchies.length - 1
@@ -133,7 +147,7 @@ export function getClassicalOperation(classicFile, client, operationGroup, layer
             ${normalizeName((_d = operationGroup.namespaceHierarchies[layer + 1]) !== null && _d !== void 0 ? _d : "FIXME", NameType.Property)}: get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer + 1)}Operations(context)   
       }`
                 : `return {
-        ...get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer)}(context)
+        ...get${getClassicalLayerPrefix(operationGroup, NameType.Interface, "", layer)}(context${hasSubscriptionIdPromoted ? ", subscriptionId" : ""})
       }`
         });
     }

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,6 +1,7 @@
+import { Imports as RuntimeImports } from "@azure-tools/rlc-common";
 import { OptionalKind, ParameterDeclarationStructure, SourceFile } from "ts-morph";
 import { Client } from "../modularCodeModel.js";
-import { Imports as RuntimeImports } from "@azure-tools/rlc-common";
-export declare function getClientParameters(client: Client): OptionalKind<ParameterDeclarationStructure>[];
+import { SdkContext } from "../../utils/interfaces.js";
+export declare function getClientParameters(client: Client, dpgContext: SdkContext, isClassicalClient?: boolean): OptionalKind<ParameterDeclarationStructure>[];
 export declare function importCredential(runtimeImports: RuntimeImports, clientSourceFile: SourceFile): void;
 //# 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,EACL,YAAY,EACZ,6BAA6B,EAC7B,UAAU,EACX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAGpE,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,GACb,YAAY,CAAC,6BAA6B,CAAC,EAAE,CAgC/C;AAED,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,UAAU,GAC3B,IAAI,CAKN"}
+{"version":3,"file":"clientHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,IAAI,cAAc,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,YAAY,EACZ,6BAA6B,EAC7B,UAAU,EACX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,iBAAiB,UAAQ,GACxB,YAAY,CAAC,6BAA6B,CAAC,EAAE,CAwC/C;AAED,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,UAAU,GAC3B,IAAI,CAKN"}

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

@@ -1,7 +1,8 @@
-import { getType } from "./typeHelpers.js";
-import { getClientName } from "./namingHelpers.js";
 import { getImportSpecifier } from "@azure-tools/rlc-common";
-export function getClientParameters(client) {
+import { getClientName } from "./namingHelpers.js";
+import { getType } from "./typeHelpers.js";
+export function getClientParameters(client, dpgContext, isClassicalClient = false) {
+    var _a;
     const { parameters } = client;
     const name = getClientName(client);
     const optionsParam = {
@@ -24,9 +25,17 @@ export function getClientParameters(client) {
                 name: p.clientName,
                 type: typeName
             };
-        }),
-        optionsParam
+        })
     ];
+    // Add promoted client-level parameters for classical clients
+    if (isClassicalClient && ((_a = dpgContext.rlcOptions) === null || _a === void 0 ? void 0 : _a.azureArm)) {
+        // added subscriptionId parameter for ARM clients
+        params.push({
+            name: "subscriptionId",
+            type: `string`
+        });
+    }
+    params.push(optionsParam);
     return params;
 }
 export function importCredential(runtimeImports, clientSourceFile) {

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

@@ -1 +1 @@
-{"version":3,"file":"clientHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,UAAU,mBAAmB,CACjC,MAAc;IAEd,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAC9B,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG;QACnB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,GAAG,IAAI,eAAe;QAC5B,WAAW,EAAE,IAAI;KAClB,CAAC;IAEF,MAAM,MAAM,GAAkD;QAC5D,GAAG,UAAU;aACV,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,QAAQ,KAAK,KAAK;YACpB,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU;YAC1B,CAAC,CAAC,CAAC,kBAAkB,KAAK,IAAI,IAAI,CAAC,CAAC,kBAAkB,KAAK,SAAS,CAAC,CACxE;aACA,GAAG,CAA8C,CAAC,CAAC,EAAE,EAAE;YACtD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC;YACjC,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAC1B,QAAQ,GAAG,GAAG,QAAQ,SAAS,CAAC;YAClC,CAAC;YACD,OAAO;gBACL,IAAI,EAAE,CAAC,CAAC,UAAU;gBAClB,IAAI,EAAE,QAAQ;aACf,CAAC;QACJ,CAAC,CAAC;QACJ,YAAY;KACb,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,cAA8B,EAC9B,gBAA4B;IAE5B,gBAAgB,CAAC,oBAAoB,CAAC;QACpC,eAAe,EAAE,kBAAkB,CAAC,UAAU,EAAE,cAAc,CAAC;QAC/D,YAAY,EAAE,CAAC,iBAAiB,EAAE,eAAe,CAAC;KACnD,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"clientHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAEnB,MAAM,yBAAyB,CAAC;AAOjC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG3C,MAAM,UAAU,mBAAmB,CACjC,MAAc,EACd,UAAsB,EACtB,iBAAiB,GAAG,KAAK;;IAEzB,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAC9B,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG;QACnB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,GAAG,IAAI,eAAe;QAC5B,WAAW,EAAE,IAAI;KAClB,CAAC;IAEF,MAAM,MAAM,GAAkD;QAC5D,GAAG,UAAU;aACV,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,QAAQ,KAAK,KAAK;YACpB,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU;YAC1B,CAAC,CAAC,CAAC,kBAAkB,KAAK,IAAI,IAAI,CAAC,CAAC,kBAAkB,KAAK,SAAS,CAAC,CACxE;aACA,GAAG,CAA8C,CAAC,CAAC,EAAE,EAAE;YACtD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC;YACjC,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAC1B,QAAQ,GAAG,GAAG,QAAQ,SAAS,CAAC;YAClC,CAAC;YACD,OAAO;gBACL,IAAI,EAAE,CAAC,CAAC,UAAU;gBAClB,IAAI,EAAE,QAAQ;aACf,CAAC;QACJ,CAAC,CAAC;KACL,CAAC;IACF,6DAA6D;IAC7D,IAAI,iBAAiB,KAAI,MAAA,UAAU,CAAC,UAAU,0CAAE,QAAQ,CAAA,EAAE,CAAC;QACzD,iDAAiD;QACjD,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAE1B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,cAA8B,EAC9B,gBAA4B;IAE5B,gBAAgB,CAAC,oBAAoB,CAAC;QACpC,eAAe,EAAE,kBAAkB,CAAC,UAAU,EAAE,cAAc,CAAC;QAC/D,YAAY,EAAE,CAAC,iBAAiB,EAAE,eAAe,CAAC;KACnD,CAAC,CAAC;AACL,CAAC"}

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

@@ -1,5 +1,7 @@
-import { Client, Operation, OperationGroup } from "../modularCodeModel.js";
 import { NameType } from "@azure-tools/rlc-common";
+import { SdkClient } from "@azure-tools/typespec-client-generator-core";
+import { SdkContext } from "../../utils/interfaces.js";
+import { Client, ModularCodeModel, Operation, OperationGroup } from "../modularCodeModel.js";
 export declare function getClientName(client: Client): string;
 export interface GuardedName {
     name: string;
@@ -10,4 +12,6 @@ export declare function getOperationName(operation: Operation, options?: {
 }): 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 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":"AACA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,EAEL,QAAQ,EAET,MAAM,yBAAyB,CAAC;AAEjC,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,UAE3C;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"}
+{"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,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAC;AAIxE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,cAAc,EACf,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,UAE3C;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,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"}

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

@@ -1,5 +1,7 @@
+import { NameType, normalizeName, ReservedModelNames } from "@azure-tools/rlc-common";
+import { isDefined } from "@azure/core-util";
+import * as path from "path";
 import { toCamelCase, toPascalCase } from "../../utils/casingUtils.js";
-import { ReservedModelNames, NameType, normalizeName } from "@azure-tools/rlc-common";
 export function getClientName(client) {
     return client.name.replace(/Client$/, "");
 }
@@ -37,4 +39,26 @@ export function getClassicalLayerPrefix(operationGroup, nameType, separator = ""
     }
     return prefix.join(separator);
 }
+export function getRLCIndexFilePath(dpgContext, client, ext = "ts") {
+    var _a;
+    return path.join(...[
+        (_a = dpgContext.generationPathDetail) === null || _a === void 0 ? void 0 : _a.rlcSourcesDir,
+        getSubfolder(client, dpgContext),
+        `index.${ext}`
+    ].filter(isDefined));
+}
+export function getModularModelFilePath(codeModel, client, ext = "ts") {
+    return path.join(...[
+        codeModel.modularOptions.sourceRoot,
+        getSubfolder(client),
+        "models",
+        `models.${ext}`
+    ].filter(isDefined));
+}
+function getSubfolder(client, dpgContext) {
+    var _a, _b;
+    return ((_a = client.subfolder) !== null && _a !== void 0 ? _a : ((dpgContext === null || dpgContext === void 0 ? void 0 : dpgContext.rlcOptions.batch) && ((_b = dpgContext === null || dpgContext === void 0 ? void 0 : dpgContext.rlcOptions.batch) === null || _b === void 0 ? void 0 : _b.length) > 1
+        ? normalizeName(client.name.replace("Client", ""), NameType.File)
+        : undefined));
+}
 //# sourceMappingURL=namingHelpers.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"namingHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EACL,kBAAkB,EAClB,QAAQ,EACR,aAAa,EACd,MAAM,yBAAyB,CAAC;AAEjC,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAC5C,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAC9B,SAAoB,EACpB,UAA0C,EAAE,MAAM,EAAE,OAAO,EAAE;IAE7D,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC;IACzE,IAAI,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACvD,OAAO;YACL,IAAI,EAAE,IAAI,SAAS,CAAC,IAAI,EAAE;YAC1B,KAAK,EAAE;gBACL,GAAG,SAAS,CAAC,IAAI;;yDAEgC;aAClD;SACF,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;KACxE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,QAAkB;IAC7D,OAAO,kBAAkB,CAAC,IAAI,CAC5B,CAAC,YAAY,EAAE,EAAE,CACf,YAAY,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE;QACxC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAC9C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,cAA0C,EAC1C,QAAkB,EAClB,YAAoB,EAAE,EACtB,QAAgB,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC;;IAE9D,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACd,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;IACD,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,OAAO,aAAa,CAClB,MAAA,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC,mCAAI,EAAE,EAC5C,QAAQ,CACT,CAAC;IACJ,CAAC;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QAChC,MAAM,CAAC,IAAI,CACT,aAAa,CAAC,MAAA,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC,mCAAI,EAAE,EAAE,QAAQ,CAAC,CACtE,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"namingHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"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"}

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

@@ -1,7 +1,7 @@
+import { Imports as RuntimeImports } from "@azure-tools/rlc-common";
+import { SdkContext, SdkModelType, SdkType } from "@azure-tools/typespec-client-generator-core";
 import { FunctionDeclarationStructure, OptionalKind } from "ts-morph";
 import { Client, ModularCodeModel, Operation, Parameter, Property, Type } from "../modularCodeModel.js";
-import { Imports as RuntimeImports } from "@azure-tools/rlc-common";
-import { SdkContext } from "@azure-tools/typespec-client-generator-core";
 export declare function getSendPrivateFunction(dpgContext: SdkContext, operation: Operation, clientType: string, runtimeImports: RuntimeImports): OptionalKind<FunctionDeclarationStructure>;
 export declare function getDeserializePrivateFunction(operation: Operation, needSubClient: boolean, needUnexpectedHelper: boolean, runtimeImports: RuntimeImports): OptionalKind<FunctionDeclarationStructure>;
 /**
@@ -20,7 +20,11 @@ export declare function getParameterMap(param: Parameter | Property, runtimeImpo
  * This function helps translating an HLC request to RLC request,
  * extracting properties from body and headers and building the RLC response object
  */
-export declare function getRequestModelMapping(modelPropertyType: Type, propertyPath: string | undefined, runtimeImports: RuntimeImports, typeStack?: Type[]): string[];
+interface RequestModelMappingResult {
+    propertiesStr: string[];
+    directAssignment?: boolean;
+}
+export declare function getRequestModelMapping(modelPropertyType: Type, propertyPath: string | undefined, runtimeImports: RuntimeImports, typeStack?: Type[]): RequestModelMappingResult;
 /**
  * This function helps translating an RLC response to an HLC response,
  * extracting properties from body and headers and building the HLC response object
@@ -45,4 +49,8 @@ export declare function hasPagingOnlyOperation(codeModel: ModularCodeModel, need
 export declare function isPagingOnlyOperation(op: Operation): boolean;
 export declare function getAllProperties(type: Type, parents?: Type[]): Property[];
 export declare function getAllAncestors(type: Type): Type[];
+export declare function getPropertySerializationPrefix(modularType: Property | Parameter, propertyPath?: string): string;
+export declare function getPropertyFullName(modularType: Property | Parameter, propertyPath?: string): string;
+export declare function isDiscriminatedUnion(type?: SdkType): type is SdkModelType;
+export {};
 //# sourceMappingURL=operationHelpers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"operationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/operationHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,YAAY,EAEb,MAAM,UAAU,CAAC;AAElB,OAAO,EAEL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,IAAI,EACL,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,OAAO,IAAI,cAAc,EAK1B,MAAM,yBAAyB,CAAC;AAiBjC,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AA+BzE,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,cAAc,GAC7B,YAAY,CAAC,4BAA4B,CAAC,CAoC5C;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,OAAO,EACtB,oBAAoB,EAAE,OAAO,EAC7B,cAAc,EAAE,cAAc,GAC7B,YAAY,CAAC,4BAA4B,CAAC,CAqI5C;AAkDD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,GACjB,YAAY,CAAC,4BAA4B,CAAC,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAiDxE;AAkHD,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,gBAAgB,UAAQ,UAQzB;AAgMD;;GAEG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,SAAS,GAAG,QAAQ,EAC3B,cAAc,EAAE,cAAc,GAC7B,MAAM,CAmBR;AA0MD;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,IAAI,EACvB,YAAY,oBAAiB,EAC7B,cAAc,EAAE,cAAc,EAC9B,SAAS,GAAE,IAAI,EAAO,YAiGvB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,YAAY,oBAAwB,EACpC,cAAc,EAAE,cAAc,EAC9B,SAAS,GAAE,IAAI,EAAO,YAyFvB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,OAAO,EACjB,SAAS,GAAE,IAAI,EAAO,EACtB,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,CA8ER;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,OAAO,EACjB,SAAS,GAAE,IAAI,EAAO,EACtB,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,CA+FR;AAWD,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAE9D;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAEzD;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC;AACX,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,gBAAgB,EAC3B,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC;AAoBX,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAE5D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,CAczE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAAE,CAOlD"}
+{"version":3,"file":"operationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/operationHelpers.ts"],"names":[],"mappings":"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"}