@azure-tools/typespec-rust 0.19.0 → 0.21.0

package/dist/src/codegen/cargotoml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cargotoml.d.ts","sourceRoot":"","sources":["../../../src/codegen/cargotoml.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,MAAM,CAgBvD"}
+{"version":3,"file":"cargotoml.d.ts","sourceRoot":"","sources":["../../../src/codegen/cargotoml.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,MAAM,CAkBvD"}

package/dist/src/codegen/cargotoml.js

@@ -14,7 +14,9 @@ export function emitCargoToml(crate) {
     content += 'edition.workspace = true\n';
     content += 'license.workspace = true\n';
     content += 'repository.workspace = true\n';
-    content += 'rust-version.workspace = true\n';
+    content += 'rust-version.workspace = true\n\n';
+    content += '[features]\n';
+    content += 'default = ["azure_core/default"]\n';
     if (crate.dependencies.length > 0) {
         content += '\n[dependencies]\n';
         for (const dependency of crate.dependencies) {

package/dist/src/codegen/cargotoml.js.map

@@ -1 +1 @@
-{"version":3,"file":"cargotoml.js","sourceRoot":"","sources":["../../../src/codegen/cargotoml.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAI/F;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,KAAiB;IAC7C,IAAI,OAAO,GAAG,sBAAsB,KAAK,CAAC,IAAI,iBAAiB,KAAK,CAAC,OAAO,KAAK,CAAC;IAClF,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,+BAA+B,CAAC;IAC3C,OAAO,IAAI,iCAAiC,CAAC;IAC7C,IAAI,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,oBAAoB,CAAC;QAChC,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YAC5C,qEAAqE;YACrE,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACpI,OAAO,IAAI,GAAG,UAAU,CAAC,IAAI,wBAAwB,QAAQ,MAAM,CAAC;QACtE,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"cargotoml.js","sourceRoot":"","sources":["../../../src/codegen/cargotoml.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAI/F;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,KAAiB;IAC7C,IAAI,OAAO,GAAG,sBAAsB,KAAK,CAAC,IAAI,iBAAiB,KAAK,CAAC,OAAO,KAAK,CAAC;IAClF,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,+BAA+B,CAAC;IAC3C,OAAO,IAAI,mCAAmC,CAAC;IAC/C,OAAO,IAAI,cAAc,CAAC;IAC1B,OAAO,IAAI,oCAAoC,CAAC;IAChD,IAAI,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,oBAAoB,CAAC;QAChC,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YAC5C,qEAAqE;YACrE,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACpI,OAAO,IAAI,GAAG,UAAU,CAAC,IAAI,wBAAwB,QAAQ,MAAM,CAAC;QACtE,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/src/codegen/clients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clients.d.ts","sourceRoot":"","sources":["../../../src/codegen/clients.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAGxC,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAG9C,yBAAyB;AACzB,MAAM,WAAW,aAAa;IAC5B,iCAAiC;IACjC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/B,uCAAuC;IACvC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC;CACzB;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,aAAa,GAAG,SAAS,CAiQxE"}
+{"version":3,"file":"clients.d.ts","sourceRoot":"","sources":["../../../src/codegen/clients.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAGxC,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAG9C,yBAAyB;AACzB,MAAM,WAAW,aAAa;IAC5B,iCAAiC;IACjC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/B,uCAAuC;IACvC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC;CACzB;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,aAAa,GAAG,SAAS,CA2QxE"}

package/dist/src/codegen/clients.js

@@ -5,6 +5,7 @@
 // cspell: ignore conv
 import * as codegen from '@azure-tools/codegen';
 import { values } from '@azure-tools/linq';
+import { emitHeaderTraitDocExample } from './docTests.js';
 import { CodegenError } from './errors.js';
 import * as helpers from './helpers.js';
 import queryString from 'query-string';
@@ -76,7 +77,7 @@ export function emitClients(crate) {
                 if (paramsDocs) {
                     body += paramsDocs;
                 }
-                body += `${indent.get()}#[tracing::new("${crate.name}")]\n`;
+                body += `${indent.get()}#[tracing::new("${client.languageIndependentName}")]\n`;
                 body += `${indent.get()}pub fn ${constructor.name}(${getConstructorParamsSig(constructor.params, client.constructable.options, use)}) -> Result<Self> {\n`;
                 body += `${indent.get()}let options = options.unwrap_or_default();\n`;
                 // by convention, the endpoint param is always the first ctor param
@@ -142,7 +143,7 @@ export function emitClients(crate) {
                 body += `${indent.get()}option_env!("CARGO_PKG_VERSION"),\n`;
                 body += `${indent.get()}options.client_options,\n`;
                 body += `${indent.get()}Vec::default(),\n`;
-                body += `${indent.get()}${authPolicy ? 'vec![auth_policy]' : 'Vec::default()'},\n`;
+                body += `${indent.get()}${authPolicy ? 'vec![auth_policy]' : 'Vec::default()'}, None,\n`;
                 body += `${indent.pop().get()}),\n`; // end Pipeline::new
                 body += `${indent.pop().get()}})\n`; // end Ok
                 body += `${indent.pop().get()}}\n`; // end constructor
@@ -183,6 +184,12 @@ export function emitClients(crate) {
                         return getPageableMethodBody(indentation, use, client, method);
                     };
                     break;
+                case 'lro':
+                    isPublicApi = true;
+                    methodBody = (indentation) => {
+                        return getLroMethodBody(indentation, use, client, method);
+                    };
+                    break;
                 case 'clientaccessor':
                     isSubclientNew = true;
                     methodBody = (indentation) => {
@@ -195,6 +202,10 @@ export function emitClients(crate) {
             if (paramsDocs) {
                 body += paramsDocs;
             }
+            // client accessors will never have response headers
+            if (method.kind !== 'clientaccessor' && method.responseHeaders) {
+                body += getHeaderTraitDocComment(indent, crate, method);
+            }
             if (isPublicApi) {
                 body += `${indent.get()}#[tracing::function("${method.languageIndependentName}")]\n`;
             }
@@ -275,7 +286,7 @@ function getMethodOptions(crate) {
                 }
             }
             body += '}\n\n'; // end options
-            if (method.kind === 'pageable') {
+            if (method.kind === 'pageable' || method.kind === 'lro') {
                 body += `impl ${helpers.getTypeDeclaration(method.options.type, true)} {\n`;
                 body += `${indent.get()}pub fn into_owned(self) -> ${method.options.type.name}<'static> {\n`;
                 body += `${indent.push().get()}${method.options.type.name} {\n`;
@@ -316,7 +327,7 @@ function getMethodOptions(crate) {
  */
 function getParamsBlockDocComment(indent, callable) {
     const formatParamBullet = function (paramName) {
-        return `* \`${paramName}\` - `;
+        return `* ${helpers.wrapInBackTicks(paramName)} - `;
     };
     let paramsContent = '';
     for (const param of callable.params) {
@@ -412,6 +423,36 @@ function getMethodParamsSig(method, use) {
     }
     return paramsSig.join(', ');
 }
+/**
+ * returns documentation for header trait access if the method has response headers.
+ *
+ * @param indent the current indentation level
+ * @param crate the crate to which method belongs
+ * @param method the method for which to generate header trait documentation
+ * @returns the header trait documentation or empty string if not applicable
+ */
+function getHeaderTraitDocComment(indent, crate, method) {
+    if (!method.responseHeaders) {
+        return '';
+    }
+    const traitName = method.responseHeaders.name;
+    let headerDocs = `${indent.get()}///\n`;
+    headerDocs += `${indent.get()}/// ## Response Headers\n`;
+    headerDocs += `${indent.get()}///\n`;
+    headerDocs += `${indent.get()}/// The returned [${helpers.wrapInBackTicks('Response')}](azure_core::http::Response) implements the [${helpers.wrapInBackTicks(traitName)}] trait, which provides\n`;
+    headerDocs += `${indent.get()}/// access to response headers. For example:\n`;
+    headerDocs += `${indent.get()}///\n`;
+    headerDocs += emitHeaderTraitDocExample(crate.name, method.responseHeaders, indent);
+    headerDocs += `${indent.get()}///\n`;
+    headerDocs += `${indent.get()}/// ### Available headers\n`;
+    // List all available headers
+    for (const header of method.responseHeaders.headers) {
+        headerDocs += `${indent.get()}/// * [${helpers.wrapInBackTicks(header.name)}()](crate::generated::models::${traitName}::${header.name}) - ${header.header}\n`;
+    }
+    headerDocs += `${indent.get()}///\n`;
+    headerDocs += `${indent.get()}/// [${helpers.wrapInBackTicks(traitName)}]: crate::generated::models::${traitName}\n`;
+    return headerDocs;
+}
 /**
  * returns the auth policy instantiation code if the ctor contains a credential param.
  * the policy will be a local var named auth_policy.
@@ -593,7 +634,7 @@ function getMethodParamGroup(method) {
  * @returns
  */
 function getParamValueHelper(indent, param, inClosure, setter) {
-    if (param.optional) {
+    if (param.optional && param.type.kind !== 'literal') {
         // optional params are in the unwrapped options local var
         const op = indent.get() + helpers.buildIfBlock(indent, {
             condition: `let Some(${param.name}) = ${inClosure ? '&' : ''}options.${param.name}`,
@@ -622,7 +663,10 @@ function constructUrl(indent, use, method, paramGroups, urlVarName = 'url') {
     }
     /** returns & if the param needs to be borrowed (which is the majority of cases), else the empty string */
     const borrowOrNot = function (param) {
-        if (param.type.kind !== 'ref' || param.type.type.kind === 'encodedBytes' || param.type.type.kind === 'slice') {
+        // for string-based enums we call .as_ref() which elides the need to borrow.
+        // for numeric-based enums the borrow will be necessary.
+        // TODO: https://github.com/Azure/typespec-rust/issues/25
+        if (param.type.kind !== 'enum' && (param.type.kind !== 'ref' || param.type.type.kind === 'encodedBytes' || param.type.type.kind === 'slice')) {
             return '&';
         }
         return '';
@@ -645,7 +689,7 @@ function constructUrl(indent, use, method, paramGroups, urlVarName = 'url') {
             body += `${indent.get()}let mut path = String::from(${path});\n`;
             for (const pathParam of paramGroups.path) {
                 let wrapSortedVec = (s) => s;
-                let paramExpression = `${borrowOrNot(pathParam)}${getHeaderPathQueryParamValue(use, pathParam, true)}`;
+                let paramExpression = getHeaderPathQueryParamValue(use, pathParam, true);
                 if (pathParam.kind === 'pathHashMap') {
                     wrapSortedVec = (s) => `${indent.get()}{`
                         + `${indent.push().get()}let mut ${pathParam.name}_vec = ${pathParam.name}.iter().collect::<Vec<_>>();\n`
@@ -706,9 +750,22 @@ function constructUrl(indent, use, method, paramGroups, urlVarName = 'url') {
                         case 'matrix':
                             paramExpression = `&format!(";${pathParam.name}={${paramExpression}}")`;
                             break;
+                        default:
+                            paramExpression = `${borrowOrNot(pathParam)}${paramExpression}`;
                     }
                 }
-                body += wrapSortedVec(`${indent.get()}path = path.replace("{${pathParam.segment}}", ${paramExpression});\n`);
+                if (pathParam.optional) {
+                    body += `${indent.get()}path = ${helpers.buildMatch(indent, `options.${pathParam.name}`, [{
+                            pattern: `Some(${pathParam.name})`,
+                            body: (indent) => wrapSortedVec(`${indent.get()}path.replace("{${pathParam.segment}}", ${paramExpression})\n`),
+                        }, {
+                            pattern: `None`,
+                            body: (indent) => `${indent.get()}path.replace("{${pathParam.segment}}", "")\n`,
+                        }])};\n`;
+                }
+                else {
+                    body += wrapSortedVec(`${indent.get()}path = path.replace("{${pathParam.segment}}", ${paramExpression});\n`);
+                }
             }
             path = '&path';
             body += `${indent.get()}${urlVarName} = ${urlVarName}.join(${path})?;\n`;
@@ -774,27 +831,19 @@ function constructUrl(indent, use, method, paramGroups, urlVarName = 'url') {
     return body;
 }
 /**
- * emits the code for building the HTTP request.
- * assumes that there's a local var 'url' which is the Url.
- * creates a mutable local 'request' which is the Request instance.
+ * emits the code for setting HTTP headers in a request.
  *
  * @param indent the indentation helper currently in scope
  * @param use the use statement builder currently in scope
  * @param method the method for which we're building the body
  * @param paramGroups the param groups for the provided method
  * @param inClosure indicates if the request is being constructed within a closure (e.g. pageable methods)
- * @returns the request construction code
+ * @returns the code which sets HTTP headers for the request
  */
-function constructRequest(indent, use, method, paramGroups, inClosure) {
+function applyHeaderParams(indent, use, method, paramGroups, inClosure) {
     var _a, _b, _c;
-    let body = `${indent.get()}let mut request = Request::new(url, Method::${codegen.capitalize(method.httpMethod)});\n`;
-    let optionalContentTypeParam;
+    let body = '';
     for (const headerParam of paramGroups.header) {
-        // if the content-type header is optional, we need to emit it inside the "if let Some(body)" clause below.
-        if (headerParam.kind === 'headerScalar' && headerParam.optional && headerParam.header.toLowerCase() === 'content-type') {
-            optionalContentTypeParam = headerParam;
-            continue;
-        }
         if (method.kind === 'pageable' && ((_a = method.strategy) === null || _a === void 0 ? void 0 : _a.kind) === 'continuationToken' && ((_b = method.strategy) === null || _b === void 0 ? void 0 : _b.requestToken.kind) === 'headerScalar' && ((_c = method.strategy) === null || _c === void 0 ? void 0 : _c.requestToken) === headerParam) {
             // we have some special handling for the header continuation token.
             // if we have a token value, i.e. from the next page, then use that value.
@@ -818,6 +867,32 @@ function constructRequest(indent, use, method, paramGroups, inClosure) {
             return `${indent.get()}request.insert_header("${headerParam.header.toLowerCase()}", ${borrow}${getHeaderPathQueryParamValue(use, headerParam, !inClosure)});\n`;
         });
     }
+    return body;
+}
+/**
+ * emits the code for building the HTTP request.
+ * assumes that there's a local var 'url' which is the Url.
+ * creates a mutable local 'request' which is the Request instance.
+ *
+ * @param indent the indentation helper currently in scope
+ * @param use the use statement builder currently in scope
+ * @param method the method for which we're building the body
+ * @param paramGroups the param groups for the provided method
+ * @param inClosure indicates if the request is being constructed within a closure (e.g. pageable methods)
+ * @param cloneUrl indicates if url should be cloned when it is passed to initialize request
+ * @param forceMut indicates whether request should get declared as 'mut' regardless of whether there are any headers to set
+ * @returns the request construction code
+ */
+function constructRequest(indent, use, method, paramGroups, inClosure, cloneUrl = false, forceMut = true) {
+    let body = `${indent.get()}let ${(forceMut || paramGroups.header.length > 0) ? 'mut ' : ''}request = Request::new(url${cloneUrl ? '.clone()' : ''}, Method::${codegen.capitalize(method.httpMethod)});\n`;
+    body += applyHeaderParams(indent, use, method, paramGroups, inClosure);
+    let optionalContentTypeParam;
+    for (const headerParam of paramGroups.header) {
+        // if the content-type header is optional, we need to emit it inside the "if let Some(body)" clause below.
+        if (headerParam.kind === 'headerScalar' && headerParam.optional && headerParam.header.toLowerCase() === 'content-type') {
+            optionalContentTypeParam = headerParam;
+        }
+    }
     const bodyParam = paramGroups.body;
     if (bodyParam) {
         body += getParamValueHelper(indent, bodyParam, inClosure, () => {
@@ -867,12 +942,13 @@ function constructRequest(indent, use, method, paramGroups, inClosure) {
  */
 function errIfNotSuccessResponse(use, indent) {
     use.add('azure_core', 'Error', 'Result');
+    use.add('azure_core::http::headers', 'ERROR_CODE');
     use.add('azure_core::error', 'ErrorKind', 'HttpError');
     return helpers.buildIfBlock(indent, {
         condition: '!rsp.status().is_success()',
         body: (indent) => {
             let body = `${indent.get()}let status = rsp.status();\n`;
-            body += `${indent.get()}let http_error = HttpError::new(rsp).await;\n`;
+            body += `${indent.get()}let http_error = HttpError::new(rsp, Some(ERROR_CODE)).await;\n`;
             body += `${indent.get()}let error_kind = ErrorKind::http_response(status, http_error.error_code().map(std::borrow::ToOwned::to_owned));\n`;
             body += `${indent.get()}return Err(Error::new(error_kind, http_error));\n`;
             return body;
@@ -891,6 +967,58 @@ function urlVarNeedsMut(paramGroups, method) {
     }
     return '';
 }
+/**
+ * emits "if path_param is empty then error" checks for string method path parameters
+ *
+ * @param indent the indentation helper currently in scope
+ * @param params the path params to enumerate, can be empty
+ * @returns the empty path param checks or the empty string if there are no checks
+ */
+function checkEmptyRequiredPathParams(indent, params) {
+    let checks = '';
+    for (const param of params) {
+        if (param.optional || param.location === 'client') {
+            continue;
+        }
+        checks += emitEmptyPathParamCheck(indent, param);
+    }
+    return checks;
+}
+/**
+ * emits the "if path_param is empty then error" check.
+ * this is only applicable when the path param's type can
+ * be empty (e.g. a string). for types that can't be empty
+ * the empty string is returned.
+ *
+ * @param indent the indentation helper currently in scope
+ * @param param the path param for which to emit the check
+ * @returns the check or the empty string
+ */
+function emitEmptyPathParamCheck(indent, param) {
+    let toString = '';
+    const paramType = param.type.kind === 'ref' ? param.type.type : param.type;
+    switch (paramType.kind) {
+        case 'String':
+        case 'str':
+            // need to check these for zero length
+            break;
+        case 'enum':
+            if (!paramType.extensible) {
+                // fixed enums will always have a value
+                return '';
+            }
+            // need to get the underlying string value
+            toString = '.as_ref()';
+            break;
+        default:
+            // no length to check so bail
+            return '';
+    }
+    return helpers.buildIfBlock(indent, {
+        condition: `${param.name}${toString}.is_empty()`,
+        body: (indent) => `${indent.get()}return Err(azure_core::Error::message(azure_core::error::ErrorKind::Other, "parameter ${param.name} cannot be empty"));`,
+    });
+}
 /**
  * constructs the body for an async client method
  *
@@ -901,10 +1029,11 @@ function urlVarNeedsMut(paramGroups, method) {
  * @returns the contents of the method body
  */
 function getAsyncMethodBody(indent, use, client, method) {
-    use.add('azure_core::http', 'Context', 'Method', 'Request');
+    use.add('azure_core::http', 'Method', 'Request');
     const paramGroups = getMethodParamGroup(method);
-    let body = 'let options = options.unwrap_or_default();\n';
-    body += `${indent.get()}let ctx = Context::with_context(&options.method_options.context);\n`;
+    let body = checkEmptyRequiredPathParams(indent, paramGroups.path);
+    body += 'let options = options.unwrap_or_default();\n';
+    body += `${indent.get()}let ctx = options.method_options.context.to_borrowed();\n`;
     body += `${indent.get()}let ${urlVarNeedsMut(paramGroups, method)}url = self.${getEndpointFieldName(client)}.clone();\n`;
     body += constructUrl(indent, use, method, paramGroups);
     body += constructRequest(indent, use, method, paramGroups, false);
@@ -931,13 +1060,15 @@ function getPageableMethodBody(indent, use, client, method) {
         throw new CodegenError('InternalError', 'paged method with no strategy NYI');
     }
     const bodyFormat = helpers.convertResponseFormat(method.returns.type.type.format);
-    use.add('azure_core::http', 'Method', 'PagerResult', 'Request', 'Url');
+    use.add('azure_core::http', 'Method', 'Request', 'Url');
+    use.add('azure_core::http::pager', 'PagerResult', 'PagerState');
     use.add('azure_core', bodyFormat, 'Result');
     use.addForType(method.returns.type);
     use.addForType(helpers.unwrapType(method.returns.type));
     const paramGroups = getMethodParamGroup(method);
     const urlVar = 'first_url';
-    let body = 'let options = options.unwrap_or_default().into_owned();\n';
+    let body = checkEmptyRequiredPathParams(indent, paramGroups.path);
+    body += 'let options = options.unwrap_or_default().into_owned();\n';
     body += `${indent.get()}let pipeline = self.pipeline.clone();\n`;
     body += `${indent.get()}let ${urlVarNeedsMut(paramGroups, method)}${urlVar} = self.${getEndpointFieldName(client)}.clone();\n`;
     body += constructUrl(indent, use, method, paramGroups, urlVar);
@@ -947,7 +1078,7 @@ function getPageableMethodBody(indent, use, client, method) {
     switch (method.strategy.kind) {
         case 'continuationToken': {
             const reqTokenParam = method.strategy.requestToken.name;
-            body += `${indent.get()}Ok(${method.returns.type.name}::from_callback(move |${reqTokenParam}: Option<String>| {\n`;
+            body += `${indent.get()}Ok(${method.returns.type.name}::from_callback(move |${reqTokenParam}: PagerState<String>| {\n`;
             body += `${indent.push().get()}let ${method.strategy.requestToken.kind === 'queryScalar' ? 'mut ' : ''}url = first_url.clone();\n`;
             if (method.strategy.requestToken.kind === 'queryScalar') {
                 // if the url already contains the token query param,
@@ -955,7 +1086,7 @@ function getPageableMethodBody(indent, use, client, method) {
                 // it before appending the token for the next page.
                 const reqTokenValue = method.strategy.requestToken.key;
                 body += `${indent.get()}${helpers.buildIfBlock(indent, {
-                    condition: `let Some(${reqTokenParam}) = ${reqTokenParam}`,
+                    condition: `let PagerState::More(${reqTokenParam}) = ${reqTokenParam}`,
                     body: (indent) => {
                         let body = indent.get() + helpers.buildIfBlock(indent, {
                             condition: `url.query_pairs().any(|(name, _)| name.eq("${reqTokenValue}"))`,
@@ -975,9 +1106,9 @@ function getPageableMethodBody(indent, use, client, method) {
         }
         case 'nextLink': {
             const nextLinkName = method.strategy.nextLink.name;
-            body += `${indent.get()}Ok(${method.returns.type.name}::from_callback(move |${nextLinkName}: Option<Url>| {\n`;
+            body += `${indent.get()}Ok(${method.returns.type.name}::from_callback(move |${nextLinkName}: PagerState<Url>| {\n`;
             body += `${indent.push().get()}let url = ` + helpers.buildMatch(indent, nextLinkName, [{
-                    pattern: `Some(${nextLinkName})`,
+                    pattern: `PagerState::More(${nextLinkName})`,
                     body: (indent) => {
                         if (paramGroups.apiVersion && paramGroups.apiVersion.kind === 'queryScalar') {
                             const apiVersionKey = `"${paramGroups.apiVersion.key}"`;
@@ -994,7 +1125,7 @@ function getPageableMethodBody(indent, use, client, method) {
                         return `${indent.get()} ${nextLinkName}\n`;
                     }
                 }, {
-                    pattern: 'None',
+                    pattern: 'PagerState::Initial',
                     body: (indent) => `${indent.get()}${urlVar}.clone()\n`
                 }]);
             body += ';\n';
@@ -1081,6 +1212,93 @@ function getPageableMethodBody(indent, use, client, method) {
     body += `${indent.pop().get()}}))`; // end Ok/Pager::from_callback
     return body;
 }
+/**
+ * constructs the body for an LRO client method
+ *
+ * @param indent the indentation helper currently in scope
+ * @param use the use statement builder currently in scope
+ * @param client the client to which the method belongs
+ * @param method the method for the body to build
+ * @returns the contents of the method body
+ */
+function getLroMethodBody(indent, use, client, method) {
+    const bodyFormat = helpers.convertResponseFormat(method.returns.type.type.format);
+    use.add('azure_core::http', 'Method', 'RawResponse', 'Request', 'Url');
+    use.add('azure_core::http::headers', 'RETRY_AFTER', 'X_MS_RETRY_AFTER_MS', 'RETRY_AFTER_MS');
+    use.add('azure_core::http::poller', 'get_retry_after', 'PollerResult', 'PollerState', 'PollerStatus', 'StatusMonitor as _');
+    use.addForType(method.returns.type);
+    use.addForType(helpers.unwrapType(method.returns.type));
+    const paramGroups = getMethodParamGroup(method);
+    const urlVar = 'url';
+    let body = 'let options = options.unwrap_or_default().into_owned();\n';
+    body += `${indent.get()}let pipeline = self.pipeline.clone();\n`;
+    body += `${indent.get()}let ${urlVarNeedsMut(paramGroups, method)}${urlVar} = self.${getEndpointFieldName(client)}.clone();\n`;
+    body += `${constructUrl(indent, use, method, paramGroups, urlVar)}\n\n`;
+    if (paramGroups.apiVersion) {
+        body += `${indent.get()}let ${paramGroups.apiVersion.name} = ${getHeaderPathQueryParamValue(use, paramGroups.apiVersion, true)}.clone();\n\n`;
+    }
+    body += `${indent.get()}Ok(${method.returns.type.name}::from_callback(\n`;
+    body += `${indent.push().get()}move |next_link: PollerState<Url>| {\n`;
+    body += `${indent.push().get()}let (mut request, next_link) = ${helpers.buildMatch(indent, 'next_link', [{
+            pattern: `PollerState::More(next_link)`,
+            body: (indent) => {
+                let body = '';
+                if (paramGroups.apiVersion) {
+                    body += `${indent.get()}let qp = next_link.query_pairs().filter(|(name, _)| name.ne("api-version"));\n`;
+                }
+                body += `${indent.get()}let mut next_link = next_link.clone();\n`;
+                if (paramGroups.apiVersion) {
+                    body += `${indent.get()}next_link.query_pairs_mut().clear().extend_pairs(qp).append_pair("api-version", &${paramGroups.apiVersion.name});\n\n`;
+                }
+                body += `${indent.get()}let ${paramGroups.header.length > 0 ? 'mut ' : ''}request = Request::new(next_link.clone(), Method::Get);`;
+                body += `\n${applyHeaderParams(indent, use, method, paramGroups, true)}\n\n`;
+                body += `${indent.get()}(request, next_link)\n`;
+                return body;
+            },
+        }, {
+            pattern: 'PollerState::Initial',
+            body: (indent) => {
+                let body = `${constructRequest(indent, use, method, paramGroups, true, true, false)}\n`;
+                body += `${indent.get()}(request, url.clone())\n`;
+                return body;
+            },
+        }])};\n\n`;
+    body += `${indent.get()}let ctx = options.method_options.context.clone();\n`;
+    body += `${indent.get()}let pipeline = pipeline.clone();\n`;
+    body += `${indent.get()}async move {\n`;
+    body += `${indent.push().get()}let rsp: RawResponse = pipeline.send(&ctx, &mut request).await?;\n`;
+    body += `${indent.get()}let (status, headers, body) = rsp.deconstruct();\n`;
+    body += `${indent.get()}let retry_after = get_retry_after(&headers, &[X_MS_RETRY_AFTER_MS, RETRY_AFTER_MS, RETRY_AFTER], &options.poller_options);\n`;
+    body += `${indent.get()}let bytes = body.collect().await?;\n`;
+    let deserialize = '';
+    if (bodyFormat === 'json') {
+        use.add('azure_core', 'json');
+        deserialize = 'json::from_json';
+    }
+    else {
+        deserialize = 'xml::read_xml';
+    }
+    body += `${indent.get()}let res: ${helpers.getTypeDeclaration(helpers.unwrapType(method.returns.type))} = ${deserialize}(&bytes)?;\n`;
+    body += `${indent.get()}let rsp = RawResponse::from_bytes(status, headers, bytes).into();\n`;
+    body += `${indent.get()}Ok(${helpers.buildMatch(indent, 'res.status()', [{
+            pattern: `PollerStatus::InProgress`,
+            body: (indent) => {
+                return `${indent.get()}response: rsp, retry_after, next: next_link\n`;
+            },
+            returns: 'PollerResult::InProgress'
+        }, {
+            pattern: '_',
+            body: (indent) => {
+                return `${indent.get()}response: rsp`;
+            },
+            returns: 'PollerResult::Done'
+        }])})\n`;
+    body += `${indent.pop().get()}}\n`; // end async move
+    body += `${indent.pop().get()}},\n`; // end move
+    body += `${indent.get()}None,\n`;
+    body += `${indent.pop().get()}))`; // end Ok/Poller::from_callback
+    return body;
+}
 /**
  * contains the code to use when populating a client endpoint parameter value
  * from a parameter of that type.
@@ -1179,8 +1397,8 @@ function getHeaderPathQueryParamValue(use, param, fromSelf) {
             return encodeBytes(paramType, paramName);
         case 'enum':
         case 'scalar':
-            if (paramType.kind === 'enum' && param.kind === 'queryScalar') {
-                // append_pair wants a reference to the string
+            if (paramType.kind === 'enum' && (param.kind === 'pathScalar' || param.kind === 'queryScalar')) {
+                // append_pair and path.replace() want a reference to the string
                 // TODO: https://github.com/Azure/typespec-rust/issues/25
                 return `${paramName}.as_ref()`;
             }