@azure-tools/typespec-rust 0.32.0 → 0.34.0

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

@@ -1 +1 @@
-{"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,CAuRxE"}
+{"version":3,"file":"clients.d.ts","sourceRoot":"","sources":["../../../src/codegen/clients.ts"],"names":[],"mappings":"AASA,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,CA+RxE"}

package/dist/src/codegen/clients.js

@@ -3,15 +3,13 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 // 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';
 import { Use } from './use.js';
 import * as rust from '../codemodel/index.js';
-import * as shared from '../shared/shared.js';
+import * as utils from '../utils/utils.js';
 /**
  * emits the content for all client files
  *
@@ -26,9 +24,13 @@ export function emitClients(crate) {
     const clientOptionsImplDefault = function (constructable) {
         // only implement Default when there's more than one field (i.e. more than just client_options)
         // and the field(s) contain a client default value.
-        return constructable.options.type.fields.length > 1 && values(constructable.options.type.fields)
-            .where((field) => field.name !== 'client_options')
-            .where((field) => field.defaultValue !== undefined).any();
+        if (constructable.suppressed) {
+            return false;
+        }
+        const optionsType = constructable.options.type;
+        return optionsType.fields.length > 1 && optionsType.fields.some((field) => {
+            return field.name !== 'client_options' && field.defaultValue !== undefined;
+        });
     };
     const clientModules = new Array();
     // emit the clients, one file per client
@@ -113,9 +115,9 @@ export function emitClients(crate) {
                 // propagate the required client params to the initializer
                 // NOTE: we do this on a sorted copy of the client params as we must preserve their order.
                 // exclude endpoint params as they aren't propagated to clients (they're consumed when creating the complete endpoint)
-                const sortedParams = values([...constructor.params]
-                    .sort((a, b) => { return helpers.sortAscending(a.name, b.name); }))
-                    .where((each) => each.kind !== 'clientSupplementalEndpoint' && each.kind !== 'clientCredential').toArray();
+                const sortedParams = [...constructor.params]
+                    .filter((each) => each.kind !== 'clientSupplementalEndpoint' && each.kind !== 'clientCredential')
+                    .sort((a, b) => { return helpers.sortAscending(a.name, b.name); });
                 for (const param of sortedParams) {
                     if (param.optional) {
                         continue;
@@ -159,7 +161,7 @@ export function emitClients(crate) {
         // we don't model this as the implementation isn't dynamic.
         body += `${indent.get()}/// Returns the Url associated with this client.\n`;
         body += `${indent.get()}pub fn endpoint(&self) -> &Url {\n`;
-        body += `${indent.push().get()}&self.${getEndpointFieldName(client)}\n`;
+        body += `${indent.push().get()}&self.${client.endpoint.name}\n`;
         body += `${indent.pop().get()}}\n\n`;
         for (let i = 0; i < client.methods.length; ++i) {
             const method = client.methods[i];
@@ -260,8 +262,12 @@ export function emitClients(crate) {
         let content = helpers.contentPreamble();
         content += use.text();
         content += body;
-        const clientMod = codegen.deconstruct(client.name).join('_');
-        clientModules.push({ name: clientMod, content: content });
+        const clientMod = utils.deconstruct(client.name).join('_');
+        clientModules.push({
+            name: clientMod,
+            content: content,
+            visibility: 'pubUse',
+        });
     }
     return {
         modules: clientModules,
@@ -271,6 +277,7 @@ export function emitClients(crate) {
 function getMethodOptions(crate) {
     const use = new Use('modelsOther');
     const indent = new helpers.indentation();
+    const visTracker = new helpers.VisibilityTracker();
     let body = '';
     for (const client of crate.clients) {
         for (let i = 0; i < client.methods.length; ++i) {
@@ -281,7 +288,8 @@ function getMethodOptions(crate) {
             body += helpers.formatDocComment(method.options.type.docs);
             use.add('azure_core::fmt', 'SafeDebug');
             body += '#[derive(Clone, Default, SafeDebug)]\n';
-            body += `${helpers.emitVisibility(method.visibility)}struct ${helpers.getTypeDeclaration(method.options.type)} {\n`;
+            body += `${helpers.emitVisibility(method.options.type.visibility)}struct ${helpers.getTypeDeclaration(method.options.type)} {\n`;
+            visTracker.update(method.options.type.visibility);
             for (let i = 0; i < method.options.type.fields.length; ++i) {
                 const field = method.options.type.fields[i];
                 use.addForType(field.type);
@@ -327,6 +335,7 @@ function getMethodOptions(crate) {
     return {
         name: 'method_options',
         content: content,
+        visibility: visTracker.get(),
     };
 }
 /**
@@ -430,7 +439,7 @@ function getMethodParamsCountAndSig(method, use) {
             }
             // don't add client or optional params to the method param sig
             if (param.location === 'method' && !param.optional) {
-                use.addForType(param.type);
+                use.addForType(param.kind === 'partialBody' ? param.paramType : param.type);
                 paramsSig.push(`${param.name}: ${formatParamTypeName(param)}`);
                 ++count;
             }
@@ -491,7 +500,7 @@ function getHeaderTraitDocComment(indent, crate, method) {
  */
 function getAuthPolicy(ctor, use) {
     for (const param of ctor.params) {
-        const arcTokenCred = shared.asTypeOf(param.type, 'tokenCredential', 'arc');
+        const arcTokenCred = utils.asTypeOf(param.type, 'tokenCredential', 'arc');
         if (arcTokenCred) {
             use.add('azure_core::http::policies', 'auth::BearerTokenAuthorizationPolicy', 'Policy');
             const scopes = new Array();
@@ -533,29 +542,6 @@ function formatParamTypeName(param) {
     }
     return format;
 }
-/**
- * returns the name of the endpoint field within the client
- *
- * @param client the client in which to find the endpoint field
- * @returns the name of the endpoint field
- */
-function getEndpointFieldName(client) {
-    // find the endpoint field. it's the only one that's
-    // a Url. the name will be uniform across clients
-    let endpointFieldName;
-    for (const field of client.fields) {
-        if (field.type.kind === 'Url') {
-            if (endpointFieldName) {
-                throw new CodegenError('InternalError', `found multiple URL fields in client ${client.name} which is unexpected`);
-            }
-            endpointFieldName = field.name;
-        }
-    }
-    if (!endpointFieldName) {
-        throw new CodegenError('InternalError', `didn't find URI field for client ${client.name}`);
-    }
-    return endpointFieldName;
-}
 /**
  * constructs the body for a client accessor method
  *
@@ -663,10 +649,16 @@ function getMethodParamGroup(method) {
  */
 function getParamValueHelper(indent, param, setter, optionsPrefix = 'options.') {
     if (param.optional && param.type.kind !== 'literal') {
-        const asRef = nonCopyableType(param.type) || isEnumString(param.type) ? '.as_ref()' : '';
+        let asRefOrClone = ''; // Empty value is ok as well, depending on what is needed.
+        if (param.type.kind === 'requestContent') {
+            asRefOrClone = '.clone()';
+        }
+        else if (nonCopyableType(param.type) || isEnumString(param.type)) {
+            asRefOrClone = '.as_ref()';
+        }
         // optional params are in the unwrapped options local var
         const op = indent.get() + helpers.buildIfBlock(indent, {
-            condition: `let Some(${param.name}) = ${param.location === 'client' ? 'self.' : optionsPrefix}${param.name}${asRef}`,
+            condition: `let Some(${param.name}) = ${param.location === 'client' ? 'self.' : optionsPrefix}${param.name}${asRefOrClone}`,
             body: setter,
         });
         return op + '\n';
@@ -833,7 +825,7 @@ function constructUrl(indent, use, method, paramGroups, urlVarName) {
                 const valueVar = queryParam.name[0];
                 let text = `${indent.get()}for ${valueVar} in ${queryParam.name}.iter() {\n`;
                 // if queryParam is a &[&str] then we'll need to deref the iterator
-                const deref = shared.asTypeOf(queryParam.type, 'str', 'ref', 'slice', 'ref') ? '*' : '';
+                const deref = utils.asTypeOf(queryParam.type, 'str', 'ref', 'slice', 'ref') ? '*' : '';
                 text += `${indent.push().get()}query_builder.append_pair("${queryParam.key}", ${deref}${getHeaderPathQueryParamValue(use, queryParam, !queryParam.optional, false, valueVar)});\n`;
                 text += `${indent.pop().get()}}\n`;
                 return text;
@@ -890,7 +882,7 @@ function applyHeaderParams(indent, use, method, paramGroups, inClosure, requestV
             body += `${indent.get()}let ${headerParam.name} = ` + helpers.buildMatch(indent, headerParam.name, [
                 {
                     pattern: `PagerState::More(${headerParam.name})`,
-                    body: (indent) => `${indent.get()}&Some(${headerParam.name})\n`,
+                    body: (indent) => `${indent.get()}&Some(${headerParam.name}.into())\n`,
                 },
                 {
                     pattern: 'PagerState::Initial',
@@ -944,7 +936,7 @@ function constructRequest(indent, use, method, paramGroups, inClosure, urlVarNam
     // when constructing the request var name we need to ensure
     // that it doesn't collide with any parameter name.
     const requestVarName = helpers.getUniqueVarName(method.params, ['request', 'core_req']);
-    let body = `${indent.get()}let ${(forceMut || paramGroups.header.length > 0) ? 'mut ' : ''}${requestVarName} = Request::new(${urlVarName}${cloneUrl ? '.clone()' : ''}, Method::${codegen.capitalize(method.httpMethod)});\n`;
+    let body = `${indent.get()}let ${(forceMut || paramGroups.header.length > 0) ? 'mut ' : ''}${requestVarName} = Request::new(${urlVarName}${cloneUrl ? '.clone()' : ''}, Method::${utils.capitalize(method.httpMethod)});\n`;
     body += applyHeaderParams(indent, use, method, paramGroups, inClosure, requestVarName);
     let optionalContentTypeParam;
     for (const headerParam of paramGroups.header) {
@@ -968,17 +960,25 @@ function constructRequest(indent, use, method, paramGroups, inClosure, urlVarNam
         // all partial body params should point to the same underlying model type.
         const requestContentType = paramGroups.partialBody[0].type;
         use.addForType(requestContentType);
-        body += `${indent.get()}let body: ${helpers.getTypeDeclaration(requestContentType)} = ${requestContentType.content.type.name} {\n`;
+        if (inClosure) {
+            body += `${indent.get()}let body: Result<${helpers.getTypeDeclaration(requestContentType)}> = ${requestContentType.content.type.name} {\n`;
+        }
+        else {
+            body += `${indent.get()}let body: ${helpers.getTypeDeclaration(requestContentType)} = ${requestContentType.content.type.name} {\n`;
+        }
         indent.push();
         for (const partialBodyParam of paramGroups.partialBody) {
             if (partialBodyParam.type.content.type !== requestContentType.content.type) {
                 throw new CodegenError('InternalError', `spread param ${partialBodyParam.name} has conflicting model type ${partialBodyParam.type.content.type.name}, expected model type ${requestContentType.content.type.name}`);
             }
             if (partialBodyParam.optional) {
-                body += `${indent.get()}${partialBodyParam.name}: options.${partialBodyParam.name},\n`;
+                body += `${indent.get()}${partialBodyParam.name}: options.${partialBodyParam.name}${inClosure ? '.clone()' : ''},\n`;
                 continue;
             }
             let initializer = partialBodyParam.name;
+            if (inClosure) {
+                initializer = initializer + '.clone()';
+            }
             if (requestContentType.content.type.visibility === 'pub') {
                 // spread param maps to a non-internal model, so it must be wrapped in Some()
                 initializer = `Some(${initializer})`;
@@ -989,8 +989,14 @@ function constructRequest(indent, use, method, paramGroups, inClosure, urlVarNam
             }
             body += `${indent.get()}${initializer},\n`;
         }
-        body += `${indent.pop().get()}}.try_into()?;\n`;
-        body += `${indent.get()}${requestVarName}.set_body(body);\n`;
+        if (inClosure) {
+            body += `${indent.pop().get()}}.try_into();\n`;
+            body += `${indent.get()}if let Ok(body) = body { ${requestVarName}.set_body(body); }\n`;
+        }
+        else {
+            body += `${indent.pop().get()}}.try_into()?;\n`;
+            body += `${indent.get()}${requestVarName}.set_body(body);\n`;
+        }
     }
     return {
         requestVarName: requestVarName,
@@ -1077,7 +1083,7 @@ function getAsyncMethodBody(indent, use, client, method) {
     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)}${urlVarName} = self.${getEndpointFieldName(client)}.clone();\n`;
+    body += `${indent.get()}let ${urlVarNeedsMut(paramGroups, method)}${urlVarName} = self.${client.endpoint.name}.clone();\n`;
     body += constructUrl(indent, use, method, paramGroups, urlVarName);
     const requestResult = constructRequest(indent, use, method, paramGroups, false, urlVarName);
     body += requestResult.content;
@@ -1114,7 +1120,7 @@ function getPageableMethodBody(indent, use, client, method) {
     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 += `${indent.get()}let ${urlVarNeedsMut(paramGroups, method)}${urlVar} = self.${client.endpoint.name}.clone();\n`;
     body += constructUrl(indent, use, method, paramGroups, urlVar);
     // passed to constructRequest. we only need to
     // clone it for the non-continuation case.
@@ -1130,7 +1136,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}::new(move |${reqTokenParam}: PagerState<String>, pager_options| {\n`;
+                body += `${indent.get()}Ok(${method.returns.type.name}::new(move |${reqTokenParam}: PagerState, pager_options| {\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,
@@ -1142,7 +1148,7 @@ function getPageableMethodBody(indent, use, client, method) {
                         condition: `let PagerState::More(${reqTokenParam}) = ${reqTokenParam}`,
                         body: (indent) => {
                             return `${indent.get()}let mut query_builder = url.query_builder();\n`
-                                + `${indent.get()}query_builder.set_pair("${reqTokenValue}", &${reqTokenParam});\n`
+                                + `${indent.get()}query_builder.set_pair("${reqTokenValue}", ${reqTokenParam}.as_ref());\n`
                                 + `${indent.get()}query_builder.build();\n`;
                         }
                     })}\n`;
@@ -1153,22 +1159,25 @@ function getPageableMethodBody(indent, use, client, method) {
             case 'nextLink': {
                 const nextLinkName = method.strategy.nextLinkPath[method.strategy.nextLinkPath.length - 1].name;
                 const reinjectedParams = method.strategy.reinjectedParams;
-                body += `${indent.get()}Ok(${method.returns.type.name}::new(move |${nextLinkName}: PagerState<Url>, pager_options| {\n`;
+                body += `${indent.get()}Ok(${method.returns.type.name}::new(move |${nextLinkName}: PagerState, pager_options| {\n`;
                 body += `${indent.push().get()}let url = ` + helpers.buildMatch(indent, nextLinkName, [{
                         pattern: `PagerState::More(${nextLinkName})`,
                         body: (indent) => {
-                            const cloneNextLink = `${indent.get()}let mut ${nextLinkName} = ${nextLinkName}.clone();\n`;
+                            const cloneNextLink = `${indent.get()}let mut ${nextLinkName}: Url = ${nextLinkName}.try_into().expect("expected Url");\n`;
                             let content = '';
                             let hasQueryBuilder = false;
+                            let needsTryInto = true;
                             if (paramGroups.apiVersion && paramGroups.apiVersion.kind === 'queryScalar') {
                                 content += cloneNextLink;
                                 hasQueryBuilder = true;
+                                needsTryInto = false;
                                 use.add('azure_core::http', 'UrlExt');
                                 content += `${indent.get()}let mut query_builder = ${nextLinkName}.query_builder();\n`;
                                 content += `${indent.get()}query_builder.set_pair("${paramGroups.apiVersion.key}", &${paramGroups.apiVersion.name});\n`;
                             }
                             else if (reinjectedParams.length > 0) {
-                                // if we didn't clone it above, we'll need to clone it for this case
+                                // if we didn't try_into above, we'll need to do it for this case
+                                needsTryInto = false;
                                 content += cloneNextLink;
                             }
                             // add query params for reinjection
@@ -1185,7 +1194,7 @@ function getPageableMethodBody(indent, use, client, method) {
                             if (hasQueryBuilder) {
                                 content += `${indent.get()}query_builder.build();\n`;
                             }
-                            content += `${indent.get()}${nextLinkName}\n`;
+                            content += `${indent.get()}${nextLinkName}${needsTryInto ? '.try_into().expect("expected Url")' : ''}\n`;
                             return content;
                         }
                     }, {
@@ -1200,7 +1209,7 @@ function getPageableMethodBody(indent, use, client, method) {
     }
     else {
         // no next link when there's no strategy
-        body += `${indent.get()}Ok(${method.returns.type.name}::new(move |_: PagerState<Url>, pager_options| {\n`;
+        body += `${indent.get()}Ok(${method.returns.type.name}::new(move |_: PagerState, pager_options| {\n`;
         indent.push();
         cloneUrl = true;
         srcUrlVar = urlVar;
@@ -1243,6 +1252,7 @@ function getPageableMethodBody(indent, use, client, method) {
             }
             return fullPath;
         };
+        use.add('azure_core::http::pager', 'PagerContinuation');
         let srcNextPage;
         let nextPageValue;
         let continuation;
@@ -1262,13 +1272,13 @@ function getPageableMethodBody(indent, use, client, method) {
                         srcNextPage = `rsp.${method.strategy.responseToken.name}()?`;
                         break;
                 }
-                continuation = nextPageValue;
+                continuation = `PagerContinuation::Token(${nextPageValue})`;
                 break;
             case 'nextLink': {
                 const lastFieldName = method.strategy.nextLinkPath[method.strategy.nextLinkPath.length - 1].name;
                 nextPageValue = lastFieldName;
                 srcNextPage = `res.${buildNextLinkPath(method.strategy.nextLinkPath)}`;
-                continuation = `${lastFieldName}.parse()?`;
+                continuation = `PagerContinuation::Link(${lastFieldName}.parse()?)`;
                 break;
             }
         }
@@ -1321,7 +1331,7 @@ function getLroMethodBody(crate, 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.add('azure_core::http::poller', 'get_retry_after', 'PollerContinuation', 'PollerResult', 'PollerState', 'PollerStatus', 'StatusMonitor');
     if (pollingStepHeaderName !== undefined || method.finalResultStrategy.kind !== 'originalUri') {
         use.add('azure_core::http::headers', 'HeaderName');
     }
@@ -1331,24 +1341,13 @@ function getLroMethodBody(crate, indent, use, client, method) {
     const urlVar = helpers.getUniqueVarName(method.params, ['url', 'url_var']);
     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 += `${indent.get()}let ${urlVarNeedsMut(paramGroups, method)}${urlVar} = self.${client.endpoint.name}.clone();\n`;
     body += constructUrl(indent, use, method, paramGroups, urlVar);
     if (paramGroups.apiVersion) {
         body += `${indent.get()}let ${paramGroups.apiVersion.name} = ${getHeaderPathQueryParamValue(use, paramGroups.apiVersion, true, true)}.clone();\n`;
     }
     // we call this eagerly so that we have access to the request var name
     const initialRequestResult = constructRequest(indent, use, method, paramGroups, true, urlVar, true, false);
-    const applyApiVersionParam = function (indent, paramGroups, newLinkVarName, existingLinkVarAccessor) {
-        var _a;
-        if (((_a = paramGroups.apiVersion) === null || _a === void 0 ? void 0 : _a.kind) === 'queryScalar') {
-            use.add('azure_core::http', 'UrlExt');
-            return `${indent.get()}let mut ${newLinkVarName} = ${existingLinkVarAccessor}.clone();\n`
-                + `${indent.get()}let mut query_builder = ${newLinkVarName}.query_builder();\n`
-                + `${indent.get()}query_builder.set_pair("${paramGroups.apiVersion.key}", &${paramGroups.apiVersion.name});\n`
-                + `${indent.get()}query_builder.build();\n`;
-        }
-        return '';
-    };
     const declareRequest = function (indent, use, method, paramGroups, requestVarName, linkExpr, forceMut, optionsPrefix) {
         let mutRequest = '';
         // if the only header is optional Content-Type it will not be used
@@ -1359,48 +1358,46 @@ function getLroMethodBody(crate, indent, use, client, method) {
         return `${indent.get()}let ${mutRequest}${requestVarName} = Request::new(${linkExpr}, Method::Get);\n`
             + applyHeaderParams(indent, use, method, paramGroups, true, requestVarName, optionsPrefix);
     };
-    let stateVarName = 'next_link';
-    let stateVarType = 'Url';
-    let progressVarName = 'next_link';
-    let stateNextLinkAccessor = 'next_link';
-    let pollerStateMoreReturn = 'next_link';
-    let pollerStateInitialReturn = `${urlVar}.clone()`;
-    let pollerStatusInProgressReturn = 'next_link';
-    if (method.finalResultStrategy.kind === 'header' && method.finalResultStrategy.headerName !== pollingStepHeaderName) {
-        // A case when the initial response contains two headers - one (usually, 'azure-asyncoperation') to poll operation status
-        // and another (usually, 'location') to collect the final result. Both values are URLs.
-        // But only the initial response will have these headers, i.e. responses from 'azure-asyncoperation' URL won't have the 'location'.
-        // Therefore, we need to preserve both URLs and pass them between poller states, up to the moment when the operation status
-        // is Succeeded, so that when operation is Succeeded, the poller can send a request to 'location' to collect the result.
-        body += `${indent.get()}struct Progress{ next_link: Url, final_link: Url, }`;
-        body += `${indent.get()}impl AsRef<str> for Progress{ fn as_ref(&self) -> &str{ self.next_link.as_ref() }}\n`;
-        stateVarName = 'state';
-        stateVarType = 'Progress';
-        progressVarName = 'progress';
-        stateNextLinkAccessor = 'progress.next_link';
-        pollerStateMoreReturn = 'Progress{next_link, final_link: progress.final_link}';
-        pollerStateInitialReturn = `Progress{next_link: ${urlVar}.clone(), final_link: ${urlVar}.clone()}`;
-        pollerStatusInProgressReturn = 'Progress{next_link, final_link}';
-    }
-    body += `${indent.get()}Ok(${method.returns.type.name}::from_callback(\n`;
-    body += `${indent.push().get()}move |${stateVarName}: PollerState<${stateVarType}>, poller_options| {\n`;
-    body += `${indent.push().get()}let (mut ${initialRequestResult.requestVarName}, ${progressVarName}) = ${helpers.buildMatch(indent, stateVarName, [{
-            pattern: `PollerState::More(${progressVarName})`,
+    body += `${indent.get()}Ok(${method.returns.type.name}::new(\n`;
+    body += `${indent.push().get()}move |poller_state: PollerState, poller_options| {\n`;
+    body += `${indent.push().get()}let (mut ${initialRequestResult.requestVarName}, continuation) = ${helpers.buildMatch(indent, 'poller_state', [{
+            pattern: `PollerState::More(continuation)`,
             body: (indent) => {
-                return applyApiVersionParam(indent, paramGroups, 'next_link', stateNextLinkAccessor)
-                    + declareRequest(indent, use, method, paramGroups, initialRequestResult.requestVarName, 'next_link.clone()')
-                    + `${indent.get()}(${initialRequestResult.requestVarName}, ${pollerStateMoreReturn})\n`;
+                var _a, _b;
+                const mutNextLink = ((_a = paramGroups.apiVersion) === null || _a === void 0 ? void 0 : _a.kind) === 'queryScalar' ? 'mut ' : '';
+                const continuationMatchExpr = (!paramGroups.body && paramGroups.partialBody.length === 0) ? 'continuation.clone()' : 'continuation';
+                let body = `${indent.get()}let (${mutNextLink}next_link, final_link) = ${helpers.buildMatch(indent, continuationMatchExpr, [{
+                        pattern: 'PollerContinuation::Links { next_link, final_link }',
+                        body: (indent) => `${indent.get()}(next_link, final_link)\n`,
+                    }, {
+                        pattern: '_',
+                        body: (indent) => `${indent.get()}unreachable!()\n`,
+                    }])};\n`;
+                if (((_b = paramGroups.apiVersion) === null || _b === void 0 ? void 0 : _b.kind) === 'queryScalar') {
+                    use.add('azure_core::http', 'UrlExt');
+                    body += `${indent.get()}let mut query_builder = next_link.query_builder();\n`;
+                    body += `${indent.get()}query_builder.set_pair("${paramGroups.apiVersion.key}", &${paramGroups.apiVersion.name});\n`;
+                    body += `${indent.get()}query_builder.build();\n`;
+                }
+                body += declareRequest(indent, use, method, paramGroups, initialRequestResult.requestVarName, 'next_link.clone()');
+                body += `${indent.get()}(${initialRequestResult.requestVarName}, PollerContinuation::Links { next_link, final_link })\n`;
+                return body;
             },
         }, {
             pattern: 'PollerState::Initial',
             body: (indent) => {
                 let body = initialRequestResult.content;
-                body += `${indent.get()}(${initialRequestResult.requestVarName}, ${pollerStateInitialReturn})\n`;
+                body += `${indent.get()}(${initialRequestResult.requestVarName}, PollerContinuation::Links { next_link: url.clone(), final_link: None, })\n`;
                 return body;
             },
         }])};\n`;
     body += `${indent.get()}let ctx = poller_options.context.clone();\n`;
     body += `${indent.get()}let pipeline = pipeline.clone();\n`;
+    if (method.finalResultStrategy.kind === 'header' && method.finalResultStrategy.headerName !== pollingStepHeaderName) {
+        // Avoid moving the poller closure's captured `url` into the async block.
+        // We shadow it with a per-iteration clone so the outer closure can remain `Fn`.
+        body += `${indent.get()}let url = url.clone();\n`;
+    }
     if (method.finalResultStrategy.kind === 'originalUri') {
         body += `${indent.get()}let final_link = url.clone();\n`;
         for (const headerParam of paramGroups.header.filter(h => h.type.kind !== 'literal' && !isOptionalContentTypeHeader(h))) {
@@ -1450,7 +1447,7 @@ function getLroMethodBody(crate, indent, use, client, method) {
     if (isArmPutLro || isArmPatchLro) {
         body += 'let original_url = url.clone();\n';
     }
-    body += `${indent.get()}async move {\n`;
+    body += `${indent.get()}Box::pin(async move {\n`;
     body += `${indent.push().get()}let rsp = pipeline.send(&ctx, &mut ${initialRequestResult.requestVarName}, ${getPipelineOptions(indent, use, method)}).await?;\n`;
     const needsMutBody = isArmPutLro || isArmPatchLro || isArmPostLro || isArmDeleteLro;
     body += `${indent.get()}let (status, headers, ${needsMutBody ? 'mut' : ''} body) = rsp.deconstruct();\n`;
@@ -1465,20 +1462,32 @@ function getLroMethodBody(crate, indent, use, client, method) {
         body += `${indent.pop().get()}}\n`;
     }
     if (pollingStepHeaderName !== undefined) {
-        body += `${indent.get()}let next_link = ${helpers.buildMatch(indent, `headers.get_optional_string(&HeaderName::from_static("${pollingStepHeaderName}"))`, [{
-                pattern: 'Some(operation_location)',
-                body: (indent) => {
-                    return `${indent.get()}Url::parse(&operation_location)?\n`;
-                }
-            }, {
-                pattern: 'None',
-                body: (indent) => {
-                    return `${indent.get()}${stateNextLinkAccessor}`;
-                }
-            }])};\n`;
+        body += `${indent.get()}let continuation = ${helpers.buildIfBlock(indent, {
+            condition: `let Some(operation_location) = headers.get_optional_string(&HeaderName::from_static("${pollingStepHeaderName}"))`,
+            body: (indent) => {
+                let body = `${indent.get()}let next_link = Url::parse(&operation_location)?;\n`;
+                body += `${indent.get()}${helpers.buildMatch(indent, 'continuation', [{
+                        pattern: 'PollerContinuation::Links { final_link, .. }',
+                        body: (indent) => `${indent.get()}PollerContinuation::Links { next_link, final_link }\n`,
+                    }, {
+                        pattern: '_',
+                        body: (indent) => `${indent.get()}unreachable!()\n`,
+                    }])}\n`;
+                return body;
+            }
+        }, {
+            body: (indent) => `${indent.get()}continuation\n`
+        })};\n`;
     }
     if (isArmPutLro || isArmPatchLro) {
         use.add('azure_core::http', 'StatusCode');
+        body += `${indent.get()}let next_link = ${helpers.buildMatch(indent, '&continuation', [{
+                pattern: 'PollerContinuation::Links { next_link, .. }',
+                body: (indent) => `${indent.get()}next_link\n`,
+            }, {
+                pattern: '_',
+                body: (indent) => `${indent.get()}unreachable!()\n`,
+            }])};\n`;
         body += `${indent.get()}let mut final_body = None;\n`;
         body += `${indent.get()}if status == StatusCode::Ok && next_link.as_str() == original_url.as_str() {\n`;
         body += `${indent.push().get()}final_body = Some(body);\n`;
@@ -1486,16 +1495,28 @@ function getLroMethodBody(crate, indent, use, client, method) {
         body += `${indent.pop().get()}}\n`;
     }
     if (method.finalResultStrategy.kind === 'header' && method.finalResultStrategy.headerName !== pollingStepHeaderName) { // separate link for picking up the result
-        body += `${indent.get()}let final_link = ${helpers.buildMatch(indent, `headers.get_optional_string(&HeaderName::from_static("${method.finalResultStrategy.headerName}"))`, [{
-                pattern: 'Some(final_link)',
-                body: (indent) => {
-                    return `${indent.get()}Url::parse(&final_link)?\n`;
-                }
+        body += `${indent.get()}let continuation = ${helpers.buildIfBlock(indent, {
+            condition: `let Some(final_link) = headers.get_optional_string(&HeaderName::from_static("${method.finalResultStrategy.headerName}"))`,
+            body: (indent) => {
+                let body = `${indent.get()}let final_link = Url::parse(&final_link)?;\n`;
+                body += `${indent.get()}${helpers.buildMatch(indent, 'continuation', [{
+                        pattern: 'PollerContinuation::Links { next_link, .. }',
+                        body: (indent) => `${indent.get()}PollerContinuation::Links { next_link, final_link: Some(final_link) }\n`,
+                    }, {
+                        pattern: '_',
+                        body: (indent) => `${indent.get()}unreachable!()\n`,
+                    }])}\n`;
+                return body;
+            }
+        }, {
+            body: (indent) => `${indent.get()}continuation\n`
+        })};\n`;
+        body += `${indent.get()}let final_link = ${helpers.buildMatch(indent, '&continuation', [{
+                pattern: 'PollerContinuation::Links { final_link, .. }',
+                body: (indent) => `${indent.get()}final_link.clone().unwrap_or_else(|| url.clone())\n`,
             }, {
-                pattern: 'None',
-                body: (indent) => {
-                    return `${indent.get()}progress.final_link`;
-                }
+                pattern: '_',
+                body: (indent) => `${indent.get()}unreachable!()\n`,
             }])};\n`;
     }
     body += `${indent.get()}let retry_after = get_retry_after(&headers, &[X_MS_RETRY_AFTER_MS, RETRY_AFTER_MS, RETRY_AFTER], &poller_options);\n`;
@@ -1524,7 +1545,7 @@ function getLroMethodBody(crate, indent, use, client, method) {
     const arms = [{
             pattern: `PollerStatus::InProgress`,
             body: (indent) => {
-                return `${indent.get()}response: rsp, retry_after, next: ${pollerStatusInProgressReturn}\n`;
+                return `${indent.get()}response: rsp, retry_after, continuation\n`;
             },
             returns: 'PollerResult::InProgress'
         }];
@@ -1559,9 +1580,9 @@ function getLroMethodBody(crate, indent, use, client, method) {
         returns: 'PollerResult::Done'
     });
     body += `${indent.get()}Ok(${helpers.buildMatch(indent, 'res.status()', arms)})\n`;
-    body += `${indent.pop().get()}}\n`; // end async move
+    body += `${indent.pop().get()}})\n`; // end async move
     body += `${indent.pop().get()}},\n`; // end move
-    body += `${indent.pop().get()} Some(options.method_options),))`; // end Ok/Poller::from_callback
+    body += `${indent.pop().get()} Some(options.method_options),))`; // end Ok/Poller::new
     return body;
 }
 /**
@@ -1665,7 +1686,7 @@ function getHeaderPathQueryParamValue(use, param, fromSelf, neverBorrow, overrid
                 default:
                     strConv = '|i| i.to_string()';
             }
-            paramValue = `${param.name}.iter().map(${strConv}).collect::<Vec<String>>().join("${getCollectionDelimiter(param.format)}")`;
+            paramValue = `${paramName}.iter().map(${strConv}).collect::<Vec<String>>().join("${getCollectionDelimiter(param.format)}")`;
         }
     }
     else {
@@ -1681,7 +1702,8 @@ function getHeaderPathQueryParamValue(use, param, fromSelf, neverBorrow, overrid
                 mustBorrow = false;
                 break;
             case 'decimal':
-                paramValue = `${param.name}.to_string()`;
+            case 'Etag':
+                paramValue = `${paramName}.to_string()`;
                 break;
             case 'encodedBytes':
                 paramValue = encodeBytes(paramType, paramName);
@@ -1690,7 +1712,7 @@ function getHeaderPathQueryParamValue(use, param, fromSelf, neverBorrow, overrid
             case 'scalar':
                 if (isEnumString(paramType) && (helpers.isPathParameter(param) || helpers.isQueryParameter(param))) {
                     // append_pair and path.replace() want a reference to the string
-                    paramValue = `${paramName}.as_ref()`;
+                    paramValue = (param.location === 'client' && fromSelf) ? `${paramName}.as_str()` : `${paramName}.as_ref()`;
                     // as_ref() elides the need to borrow
                     mustBorrow = false;
                 }
@@ -1705,7 +1727,7 @@ function getHeaderPathQueryParamValue(use, param, fromSelf, neverBorrow, overrid
                 paramValue = `"${paramType.value}"`;
                 break;
             case 'offsetDateTime':
-                paramValue = encodeDateTime(paramType, param.name);
+                paramValue = encodeDateTime(paramType, paramName);
                 break;
             default:
                 throw new CodegenError('InternalError', `unhandled ${param.kind} param type kind ${paramType.kind}`);
@@ -1742,7 +1764,7 @@ function getCollectionDelimiter(format) {
 }
 /** returns true if the type isn't copyable thus needs to be cloned or borrowed */
 function nonCopyableType(type) {
-    const unwrappedType = shared.unwrapOption(type);
+    const unwrappedType = utils.unwrapOption(type);
     switch (unwrappedType.kind) {
         case 'String':
         case 'Url':