@azure-tools/typespec-ts 0.28.0 → 0.29.0-alpha.20240531.1

package/dist/src/modular/emitModels.js

@@ -7,19 +7,37 @@ import { getImportSpecifier } from "@azure-tools/rlc-common";
 function isAzureCoreErrorSdkType(t) {
     return (t.name &&
         ["error", "errormodel", "innererror", "errorresponse"].includes(t.name.toLowerCase()) &&
-        t.isCoreErrorType === true);
+        t.coreTypeInfo === "ErrorType");
+}
+function isAzureCoreLroSdkType(t) {
+    return (t.name &&
+        ["operationstate"].includes(t.name.toLowerCase()) &&
+        t.coreTypeInfo === "LroType");
+}
+function isAnonymousModel(t) {
+    return t.type === "model" && t.name === "";
+}
+export function isModelWithAdditionalProperties(t) {
+    return t.type === "dict" && t.name !== "Record";
 }
 function getCoreClientErrorType(name, coreClientTypes) {
     const coreClientType = name === "Error" ? "ErrorModel" : name;
     coreClientTypes.add(coreClientType);
     return coreClientType;
 }
+function getCoreLroType(name, coreLroTypes) {
+    const coreLroType = name === "OperationState" ? "CoreOperationStatus" : name;
+    coreLroTypes.add(coreLroType);
+    return coreLroType;
+}
 // ====== TYPE EXTRACTION ======
 function extractModels(codeModel) {
     var _a;
-    const models = codeModel.types.filter((t) => (t.type === "model" || t.type === "enum") &&
+    const models = codeModel.types.filter((t) => ((t.type === "model" || t.type === "enum") &&
         !isAzureCoreErrorSdkType(t) &&
-        !(t.type == "model" && t.name === ""));
+        !isAzureCoreLroSdkType(t) &&
+        !isAnonymousModel(t)) ||
+        isModelWithAdditionalProperties(t));
     for (const model of codeModel.types) {
         if (model.type === "combined" && model.nullable) {
             for (const unionModel of (_a = model.types) !== null && _a !== void 0 ? _a : []) {
@@ -37,7 +55,10 @@ function extractModels(codeModel) {
  * 2. alias from unions, where we also need to use typescript union to combine all the union variants
  */
 export function extractAliases(codeModel) {
-    const models = codeModel.types.filter((t) => (t.type === "model" || t.type === "combined") && t.alias && t.aliasType);
+    const models = codeModel.types.filter((t) => ((t.type === "model" || t.type === "combined") &&
+        t.alias &&
+        t.aliasType) ||
+        (isModelWithAdditionalProperties(t) && t.alias && t.aliasType));
     return models;
 }
 // ====== TYPE BUILDERS ======
@@ -82,9 +103,10 @@ export function buildModelInterface(model, cache) {
             const propertyMetadata = getType(p.type, p.format);
             let propertyTypeName = propertyMetadata.name;
             if (isAzureCoreErrorSdkType(p.type)) {
-                propertyTypeName = isAzureCoreErrorSdkType(p.type)
-                    ? getCoreClientErrorType(propertyTypeName, cache.coreClientTypes)
-                    : propertyTypeName;
+                propertyTypeName = getCoreClientErrorType(propertyTypeName, cache.coreClientTypes);
+            }
+            if (isAzureCoreLroSdkType(p.type)) {
+                propertyTypeName = getCoreLroType(propertyTypeName, cache.coreLroTypes);
             }
             return {
                 name: `"${p.clientName}"`,
@@ -105,6 +127,7 @@ export function buildModels(subClient, codeModel) {
     var _a, _b;
     // We are generating both models and enums here
     const coreClientTypes = new Set();
+    const coreLroTypes = new Set();
     // filter out the models/enums that are anonymous
     const models = extractModels(codeModel).filter((m) => !!m.name);
     const aliases = extractAliases(codeModel);
@@ -124,10 +147,14 @@ export function buildModels(subClient, codeModel) {
             modelsFile.addTypeAlias(enumAlias);
         }
         else {
-            const modelInterface = buildModelInterface(model, { coreClientTypes });
-            model.type === "model"
-                ? (_b = model.parents) === null || _b === void 0 ? void 0 : _b.forEach((p) => { var _a; return modelInterface.extends.push((_a = p.alias) !== null && _a !== void 0 ? _a : getType(p, p.format).name); })
-                : undefined;
+            const modelInterface = buildModelInterface(model, {
+                coreClientTypes,
+                coreLroTypes
+            });
+            (_b = model.parents) === null || _b === void 0 ? void 0 : _b.forEach((p) => { var _a; return modelInterface.extends.push((_a = p.alias) !== null && _a !== void 0 ? _a : getType(p, p.format).name); });
+            if (isModelWithAdditionalProperties(model)) {
+                addExtendedDictInfo(model, modelInterface, codeModel.modularOptions.compatibilityMode);
+            }
             modelsFile.addInterface(modelInterface);
         }
     }
@@ -139,11 +166,46 @@ export function buildModels(subClient, codeModel) {
             }
         ]);
     }
+    if (coreLroTypes.size > 0) {
+        modelsFile.addImportDeclarations([
+            {
+                moduleSpecifier: getImportSpecifier("azureCoreLro", codeModel.runtimeImports),
+                namedImports: Array.from(coreLroTypes).map((t) => t === "CoreOperationStatus"
+                    ? "OperationStatus as CoreOperationStatus"
+                    : t)
+            }
+        ]);
+    }
     aliases.forEach((alias) => {
         modelsFile.addTypeAlias(buildModelTypeAlias(alias));
     });
     return modelsFile;
 }
+function addExtendedDictInfo(model, modelInterface, compatibilityMode = false) {
+    var _a, _b, _c, _d, _e;
+    if ((model.properties &&
+        model.properties.length > 0 &&
+        model.elementType &&
+        ((_a = model.properties) === null || _a === void 0 ? void 0 : _a.every((p) => {
+            var _a;
+            return (_a = getType(model.elementType)) === null || _a === void 0 ? void 0 : _a.name.includes(getType(p.type).name);
+        }))) ||
+        (((_b = model.properties) === null || _b === void 0 ? void 0 : _b.length) === 0 && model.elementType)) {
+        modelInterface.extends.push(`Record<string, ${(_c = getType(model.elementType).name) !== null && _c !== void 0 ? _c : "any"}>`);
+    }
+    else if (compatibilityMode) {
+        modelInterface.extends.push(`Record<string, any>`);
+    }
+    else {
+        (_d = modelInterface.properties) === null || _d === void 0 ? void 0 : _d.push({
+            name: "additionalProperties",
+            docs: ["Additional properties"],
+            hasQuestionToken: true,
+            isReadonly: false,
+            type: `Record<string, ${(_e = getType(model.elementType).name) !== null && _e !== void 0 ? _e : "any"}>`
+        });
+    }
+}
 export function buildModelTypeAlias(model) {
     return {
         name: model.name,

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

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

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

@@ -38,11 +38,11 @@ export declare function deserializeResponseValue(type: Type, restValue: string,
  * deserialized correctly
  */
 export declare function serializeRequestValue(type: Type, clientValue: string, runtimeImports: RuntimeImports, required: boolean, typeStack?: Type[], format?: string): string;
-export declare function hasLROOperation(codeModel: ModularCodeModel, needRLC?: boolean): boolean;
-export declare function isLROOperation(op: Operation): boolean;
-export declare function hasPagingOperation(client: Client, needRLC?: boolean): boolean;
-export declare function hasPagingOperation(codeModel: ModularCodeModel, needRLC?: boolean): boolean;
-export declare function isPagingOperation(op: Operation): boolean;
+export declare function isLroAndPagingOperation(op: Operation): boolean;
+export declare function isLroOnlyOperation(op: Operation): boolean;
+export declare function hasPagingOnlyOperation(client: Client, needRLC?: boolean): boolean;
+export declare function hasPagingOnlyOperation(codeModel: ModularCodeModel, needRLC?: boolean): boolean;
+export declare function isPagingOnlyOperation(op: Operation): boolean;
 export declare function getAllProperties(type: Type, parents?: Type[]): Property[];
 export declare function getAllAncestors(type: Type): Type[];
 //# 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;AAsBzE,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,CA6F5C;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,CA8DxE;AAgBD,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,gBAAgB,UAAQ,UAQzB;AAyLD;;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,eAAe,CAC7B,SAAS,EAAE,gBAAgB,EAC3B,OAAO,GAAE,OAAe,WASzB;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAErD;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;AAC/E,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,gBAAgB,EAC3B,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC;AAoBX,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAExD;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":"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"}

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

@@ -19,6 +19,13 @@ function getRLCResponseType(rlcResponse) {
         return (_a = resp.predefinedName) !== null && _a !== void 0 ? _a : getResponseTypeName(baseResponseName);
     }).join(" | ");
 }
+function getRLCLroLogicalResponse(rlcResponse) {
+    var _a;
+    const logicalResponse = ((_a = rlcResponse === null || rlcResponse === void 0 ? void 0 : rlcResponse.responses) !== null && _a !== void 0 ? _a : []).filter((r) => r.predefinedName && r.predefinedName.endsWith(`LogicalResponse`));
+    return logicalResponse.length > 0
+        ? logicalResponse[0].predefinedName
+        : "any";
+}
 export function getSendPrivateFunction(dpgContext, operation, clientType, runtimeImports) {
     var _a;
     const parameters = getOperationSignatureParameters(operation, clientType);
@@ -50,10 +57,16 @@ export function getDeserializePrivateFunction(operation, needSubClient, needUnex
             type: getRLCResponseType(operation.rlcResponse)
         }
     ];
+    // TODO: Support LRO + paging operation
+    // https://github.com/Azure/autorest.typescript/issues/2313
+    const isLroOnly = isLroOnlyOperation(operation);
     // TODO: Support operation overloads
     const response = operation.responses[0];
     let returnType;
-    if ((_a = response === null || response === void 0 ? void 0 : response.type) === null || _a === void 0 ? void 0 : _a.type) {
+    if (isLroOnly && operation.method.toLowerCase() !== "patch") {
+        returnType = buildLroReturnType(operation);
+    }
+    else if ((_a = response === null || response === void 0 ? void 0 : response.type) === null || _a === void 0 ? void 0 : _a.type) {
         returnType = buildType(response.type.name, response.type, response.type.format);
     }
     else {
@@ -84,21 +97,52 @@ export function getDeserializePrivateFunction(operation, needSubClient, needUnex
             addImportToSpecifier("restClient", runtimeImports, "createRestError");
         }
     }
-    const allParents = getAllAncestors(response.type);
-    const properties = (_b = getAllProperties(response.type, allParents)) !== null && _b !== void 0 ? _b : [];
-    if (((_c = response === null || response === void 0 ? void 0 : response.type) === null || _c === void 0 ? void 0 : _c.type) === "any" ||
+    let deserializedType = isLroOnly
+        ? (_b = operation === null || operation === void 0 ? void 0 : operation.lroMetadata) === null || _b === void 0 ? void 0 : _b.finalResult
+        : response.type;
+    let hasLroSubPath = ((_c = operation === null || operation === void 0 ? void 0 : operation.lroMetadata) === null || _c === void 0 ? void 0 : _c.finalResultPath) !== undefined;
+    let deserializedRoot = hasLroSubPath
+        ? `result.body.${(_d = operation === null || operation === void 0 ? void 0 : operation.lroMetadata) === null || _d === void 0 ? void 0 : _d.finalResultPath}`
+        : "result.body";
+    // TODO: Hard-coded for LRO PATCH case for now
+    // https://github.com/Azure/autorest.typescript/issues/2314
+    if (isLroOnly && operation.method.toLowerCase() === "patch") {
+        deserializedType = response.type;
+        hasLroSubPath = false;
+        deserializedRoot = "result.body";
+    }
+    if (isLroOnly) {
+        const lroLogicalResponse = getRLCLroLogicalResponse(operation.rlcResponse);
+        statements.push(`result = result as ${lroLogicalResponse};`);
+        if (hasLroSubPath) {
+            statements.push(`if(${deserializedRoot.split(".").join("?.")} === undefined) {
+          throw createRestError(\`Expected a result in the response at position "${deserializedRoot}"\`, result);
+        }
+        `);
+        }
+    }
+    const allParents = deserializedType ? getAllAncestors(deserializedType) : [];
+    const properties = deserializedType
+        ? getAllProperties(deserializedType, allParents)
+        : [];
+    if ((deserializedType === null || deserializedType === void 0 ? void 0 : deserializedType.type) === "any" ||
+        (deserializedType === null || deserializedType === void 0 ? void 0 : deserializedType.type) === "dict" ||
+        ((deserializedType === null || deserializedType === void 0 ? void 0 : deserializedType.type) === "model" &&
+            allParents.some((p) => p.type === "dict")) ||
         response.isBinaryPayload ||
-        ((_d = response === null || response === void 0 ? void 0 : response.type) === null || _d === void 0 ? void 0 : _d.aliasType)) {
+        (deserializedType === null || deserializedType === void 0 ? void 0 : deserializedType.aliasType)) {
         statements.push(`return result.body`);
     }
-    else if (properties.length > 0) {
-        statements.push(`return {`, getResponseMapping(response.type, "result.body", runtimeImports).join(","), `}`);
+    else if (deserializedType && properties.length > 0) {
+        statements.push(`return {`, getResponseMapping(deserializedType, deserializedRoot, runtimeImports).join(","), `}`);
     }
-    else if (returnType.type === "void") {
+    else if (returnType.type === "void" || deserializedType === undefined) {
         statements.push(`return;`);
     }
     else {
-        statements.push(`return ${deserializeResponseValue(response.type, "result.body", runtimeImports, response.type.nullable !== undefined ? !response.type.nullable : false, [response.type], response.type.format)}`);
+        statements.push(`return ${deserializeResponseValue(deserializedType, deserializedRoot, runtimeImports, deserializedType.nullable !== undefined
+            ? !deserializedType.nullable
+            : false, [deserializedType], deserializedType.format)}`);
     }
     return {
         ...functionStatement,
@@ -140,17 +184,25 @@ function getOperationSignatureParameters(operation, clientType) {
  */
 export function getOperationFunction(operation, clientType) {
     var _a, _b;
+    if (isPagingOnlyOperation(operation)) {
+        // Case 1: paging-only operation
+        return getPagingOnlyOperationFunction(operation, clientType);
+    }
+    else if (isLroOnlyOperation(operation)) {
+        // Case 2: lro-only operation
+        return getLroOnlyOperationFunction(operation, clientType);
+    }
+    else if (isLroAndPagingOperation(operation)) {
+        // Case 3: both paging + lro operation is not supported yet so handle them as normal operation and customization may be needed
+        // https://github.com/Azure/autorest.typescript/issues/2313
+    }
     // Extract required parameters
     const parameters = getOperationSignatureParameters(operation, clientType);
-    const isPaging = isPagingOperation(operation);
     // TODO: Support operation overloads
     const response = operation.responses[0];
     let returnType = { name: "", type: "void" };
     if ((_a = response.type) === null || _a === void 0 ? void 0 : _a.type) {
-        let type = response.type;
-        if (isPaging) {
-            type = (_b = extractPagingType(type, operation.itemName)) !== null && _b !== void 0 ? _b : type;
-        }
+        const type = (_b = extractPagingType(response.type, operation.itemName)) !== null && _b !== void 0 ? _b : response.type;
         returnType = buildType(type.name, type, type.format);
     }
     const { name, fixme = [] } = getOperationName(operation);
@@ -159,37 +211,101 @@ export function getOperationFunction(operation, clientType) {
             ...getDocsFromDescription(operation.description),
             ...getFixmeForMultilineDocs(fixme)
         ],
-        isAsync: !isPaging,
+        isAsync: true,
         isExported: true,
         name,
         propertyName: operation.name,
         parameters,
-        returnType: isPaging
-            ? `PagedAsyncIterableIterator<${returnType.type}>`
-            : `Promise<${returnType.type}>`
+        returnType: `Promise<${returnType.type}>`
     };
     const statements = [];
-    if (isPaging) {
-        const options = [];
-        if (operation.itemName) {
-            options.push(`itemName: "${operation.itemName}"`);
-        }
-        if (operation.continuationTokenName) {
-            options.push(`nextLinkName: "${operation.continuationTokenName}"`);
-        }
-        statements.push(`return buildPagedAsyncIterator(
-        context, 
-        () => _${name}Send(${parameters.map((p) => p.name).join(", ")}), 
-        _${name}Deserialize,
-        ${options.length > 0 ? `{${options.join(", ")}}` : ``}
-        );`);
+    statements.push(`const result = await _${name}Send(${parameters
+        .map((p) => p.name)
+        .join(", ")});`);
+    statements.push(`return _${name}Deserialize(result);`);
+    return {
+        ...functionStatement,
+        statements
+    };
+}
+function getLroOnlyOperationFunction(operation, clientType) {
+    // Extract required parameters
+    const parameters = getOperationSignatureParameters(operation, clientType);
+    const returnType = buildLroReturnType(operation);
+    const { name, fixme = [] } = getOperationName(operation);
+    const functionStatement = {
+        docs: [
+            ...getDocsFromDescription(operation.description),
+            ...getFixmeForMultilineDocs(fixme)
+        ],
+        isAsync: false,
+        isExported: true,
+        name,
+        propertyName: operation.name,
+        parameters,
+        returnType: `PollerLike<OperationState<${returnType.type}>, ${returnType.type}>`
+    };
+    const statements = [];
+    statements.push(`
+  return getLongRunningPoller(context, _${name}Deserialize, {
+    updateIntervalInMs: options?.updateIntervalInMs,
+    abortSignal: options?.abortSignal,
+    getInitialResponse: () => _${name}Send(${parameters
+        .map((p) => p.name)
+        .join(", ")})
+  }) as PollerLike<OperationState<${returnType.type}>, ${returnType.type}>;
+  `);
+    return {
+        ...functionStatement,
+        statements
+    };
+}
+function buildLroReturnType(operation) {
+    const metadata = operation.lroMetadata;
+    if (metadata !== undefined && metadata.finalResult !== undefined) {
+        const type = metadata.finalResult;
+        return buildType(type.name, type, type.format);
     }
-    else {
-        statements.push(`const result = await _${name}Send(${parameters
-            .map((p) => p.name)
-            .join(", ")});`);
-        statements.push(`return _${name}Deserialize(result);`);
+    return { name: "", type: "void" };
+}
+function getPagingOnlyOperationFunction(operation, clientType) {
+    var _a, _b;
+    // Extract required parameters
+    const parameters = getOperationSignatureParameters(operation, clientType);
+    // TODO: Support operation overloads
+    const response = operation.responses[0];
+    let returnType = { name: "", type: "void" };
+    if ((_a = response.type) === null || _a === void 0 ? void 0 : _a.type) {
+        const type = (_b = extractPagingType(response.type, operation.itemName)) !== null && _b !== void 0 ? _b : response.type;
+        returnType = buildType(type.name, type, type.format);
     }
+    const { name, fixme = [] } = getOperationName(operation);
+    const functionStatement = {
+        docs: [
+            ...getDocsFromDescription(operation.description),
+            ...getFixmeForMultilineDocs(fixme)
+        ],
+        isAsync: false,
+        isExported: true,
+        name,
+        propertyName: operation.name,
+        parameters,
+        returnType: `PagedAsyncIterableIterator<${returnType.type}>`
+    };
+    const statements = [];
+    const options = [];
+    if (operation.itemName) {
+        options.push(`itemName: "${operation.itemName}"`);
+    }
+    if (operation.continuationTokenName) {
+        options.push(`nextLinkName: "${operation.continuationTokenName}"`);
+    }
+    statements.push(`return buildPagedAsyncIterator(
+      context, 
+      () => _${name}Send(${parameters.map((p) => p.name).join(", ")}), 
+      _${name}Deserialize,
+      ${options.length > 0 ? `{${options.join(", ")}}` : ``}
+      );`);
     return {
         ...functionStatement,
         statements
@@ -291,7 +407,10 @@ function buildBodyParameter(bodyParameter, runtimeImports) {
     if (!bodyParameter) {
         return "";
     }
-    if (bodyParameter.type.type === "model" && !bodyParameter.type.aliasType) {
+    const allParents = getAllAncestors(bodyParameter.type);
+    if (bodyParameter.type.type === "model" &&
+        !bodyParameter.type.aliasType &&
+        !allParents.some((p) => p.type === "dict")) {
         const bodyParts = getRequestModelMapping(bodyParameter.type, bodyParameter.clientName, runtimeImports, [bodyParameter.type]);
         if (bodyParameter && bodyParts.length > 0) {
             const optionalBody = bodyParameter.optional
@@ -303,8 +422,10 @@ function buildBodyParameter(bodyParameter, runtimeImports) {
             return `\nbody: ${bodyParameter.clientName},`;
         }
     }
-    else if (bodyParameter.type.type === "model" &&
-        bodyParameter.type.aliasType) {
+    else if ((bodyParameter.type.type === "model" &&
+        (bodyParameter.type.aliasType ||
+            allParents.some((p) => p.type === "dict"))) ||
+        bodyParameter.type.type === "dict") {
         return `\nbody: ${bodyParameter.clientName},`;
     }
     if (bodyParameter.type.type === "list") {
@@ -498,7 +619,7 @@ export function getRequestModelMapping(modelPropertyType, propertyPath = "body",
         const propertyFullName = `${propertyPath}.${property.clientName}`;
         if (property.type.type === "model") {
             let definition;
-            if (property.type.isCoreErrorType) {
+            if (property.type.coreTypeInfo === "ErrorType") {
                 definition = `"${property.restApiName}": ${getNullableCheck(propertyFullName, property.type)} ${!property.optional ? "" : `!${propertyFullName} ? undefined :`} ${propertyFullName}`;
             }
             else if (typeStack.includes(property.type)) {
@@ -552,7 +673,7 @@ export function getResponseMapping(type, propertyPath = "result.body", runtimeIm
         const propertyFullName = `${propertyPath}.${property.restApiName}`;
         if (property.type.type === "model") {
             let definition;
-            if (property.type.isCoreErrorType) {
+            if (property.type.coreTypeInfo === "ErrorType") {
                 definition = `"${property.clientName}": ${getNullableCheck(propertyFullName, property.type)} ${!property.optional ? "" : `!${propertyFullName} ? undefined :`} ${propertyFullName}`;
             }
             else if (typeStack.includes(property.type)) {
@@ -743,18 +864,13 @@ function needsDeserialize(type) {
         (type === null || type === void 0 ? void 0 : type.type) === "list" ||
         (type === null || type === void 0 ? void 0 : type.type) === "byte-array");
 }
-export function hasLROOperation(codeModel, needRLC = false) {
-    var _a;
-    return ((_a = codeModel.clients) !== null && _a !== void 0 ? _a : []).some((c) => {
-        var _a;
-        return (needRLC ? c.rlcHelperDetails.hasLongRunning : false) ||
-            ((_a = c.operationGroups) !== null && _a !== void 0 ? _a : []).some((og) => { var _a; return ((_a = og.operations) !== null && _a !== void 0 ? _a : []).some(isLROOperation); });
-    });
+export function isLroAndPagingOperation(op) {
+    return op.discriminator === "lropaging";
 }
-export function isLROOperation(op) {
-    return op.discriminator === "lro" || op.discriminator === "lropaging";
+export function isLroOnlyOperation(op) {
+    return op.discriminator === "lro";
 }
-export function hasPagingOperation(clientOrCodeModel, needRLC = false) {
+export function hasPagingOnlyOperation(clientOrCodeModel, needRLC = false) {
     let clients = [];
     if (clientOrCodeModel === null || clientOrCodeModel === void 0 ? void 0 : clientOrCodeModel.operationGroups) {
         clients = [clientOrCodeModel];
@@ -765,11 +881,11 @@ export function hasPagingOperation(clientOrCodeModel, needRLC = false) {
     return clients.some((c) => {
         var _a;
         return (needRLC ? c.rlcHelperDetails.hasPaging : false) ||
-            ((_a = c.operationGroups) !== null && _a !== void 0 ? _a : []).some((og) => { var _a; return ((_a = og.operations) !== null && _a !== void 0 ? _a : []).some(isPagingOperation); });
+            ((_a = c.operationGroups) !== null && _a !== void 0 ? _a : []).some((og) => { var _a; return ((_a = og.operations) !== null && _a !== void 0 ? _a : []).some(isPagingOnlyOperation); });
     });
 }
-export function isPagingOperation(op) {
-    return op.discriminator === "paging" || op.discriminator === "lropaging";
+export function isPagingOnlyOperation(op) {
+    return op.discriminator === "paging";
 }
 export function getAllProperties(type, parents) {
     var _a;