@azure-tools/typespec-rust 0.36.0 → 0.38.0

package/dist/src/codegen/unions.js

@@ -7,67 +7,93 @@ import * as helpers from './helpers.js';
 import * as utils from '../utils/utils.js';
 /**
  * returns the union enum types, or undefined if the
- * crate contains no union types.
+ * module contains no union types.
  *
- * @param crate the crate for which to emit unions
- * @param context the context for the provided crate
+ * @param module the module for which to emit unions
+ * @param context the context for the provided module
  * @returns the union content or undefined
  */
-export function emitUnions(crate, context) {
+export function emitUnions(module, context) {
     var _a, _b;
-    if (crate.unions.length === 0) {
+    if (module.unions.length === 0) {
         return {};
     }
-    const use = new Use('modelsOther');
+    const use = new Use(module, 'modelsOther');
     const indent = new helpers.indentation();
     const visTracker = new helpers.VisibilityTracker();
-    let body = '';
-    for (const rustUnion of crate.unions) {
+    // Collect all union entries (discriminated and untagged) so they can be sorted.
+    const entries = [];
+    for (const rustUnion of module.unions) {
         visTracker.update(rustUnion.visibility);
+        let body = '';
         const docs = helpers.formatDocComment(rustUnion.docs, true);
         if (docs.length > 0) {
             body += `${indent.get()}#[doc = r#"${docs.substring(0, docs.length - 1)}"#]\n`;
         }
-        const extensiblePolymorphicDU = ((_a = rustUnion.unionKind) === null || _a === void 0 ? void 0 : _a.kind) === 'discriminatedUnionBase' ? rustUnion.unionKind : undefined;
-        if (!extensiblePolymorphicDU) {
-            // extensible polymorphic unions define Serialize
-            use.add('serde', 'Serialize');
-        }
-        use.add('serde', 'Deserialize');
-        use.add('azure_core::fmt', 'SafeDebug');
-        body += `#[derive(Clone, Deserialize, ${!extensiblePolymorphicDU ? 'Serialize, ' : ''}SafeDebug)]\n`;
-        const content = ((_b = rustUnion.unionKind) === null || _b === void 0 ? void 0 : _b.kind) === 'discriminatedUnionEnvelope' ? `content = "${rustUnion.unionKind.envelopeName}"` : '';
-        body += `#[serde(${[content, `tag = "${rustUnion.discriminant}"`].filter(x => x !== '').join(', ')})]\n`;
-        body += `${helpers.emitVisibility(rustUnion.visibility)}enum ${rustUnion.name} {\n`;
-        for (const member of rustUnion.members) {
-            use.addForType(member.type);
-            const docs = helpers.formatDocComment(member.docs, true);
-            if (docs.length > 0) {
-                body += `${indent.get()}#[doc = r#"${docs.substring(0, docs.length - 1)}"#]\n`;
+        if (rustUnion.kind === 'discriminatedUnion') {
+            const extensiblePolymorphicDU = ((_a = rustUnion.unionKind) === null || _a === void 0 ? void 0 : _a.kind) === 'discriminatedUnionBase' ? rustUnion.unionKind : undefined;
+            if (!extensiblePolymorphicDU) {
+                // extensible polymorphic unions define Serialize
+                use.add('serde', 'Serialize');
+            }
+            use.add('serde', 'Deserialize');
+            use.add('azure_core::fmt', 'SafeDebug');
+            body += `#[derive(Clone, Deserialize, ${!extensiblePolymorphicDU ? 'Serialize, ' : ''}SafeDebug)]\n`;
+            const content = ((_b = rustUnion.unionKind) === null || _b === void 0 ? void 0 : _b.kind) === 'discriminatedUnionEnvelope' ? `content = "${rustUnion.unionKind.envelopeName}"` : '';
+            body += `#[serde(${[content, `tag = "${rustUnion.discriminant}"`].filter(x => x !== '').join(', ')})]\n`;
+            body += `${helpers.emitVisibility(rustUnion.visibility)}enum ${rustUnion.name} {\n`;
+            for (const member of rustUnion.members) {
+                // Use isn't granular enough to realize we're in unions.rs
+                // so skip adding when the member is also a DU
+                if (member.type.kind !== 'discriminatedUnion') {
+                    use.addForType(member.type);
+                }
+                const docs = helpers.formatDocComment(member.docs, true);
+                if (docs.length > 0) {
+                    body += `${indent.get()}#[doc = r#"${docs.substring(0, docs.length - 1)}"#]\n`;
+                }
+                if (member.discriminantValue !== member.type.name) {
+                    body += `#[serde(rename = "${member.discriminantValue}")]\n`;
+                }
+                body += `${indent.get()}${member.type.name}(${helpers.getTypeDeclaration(member.type)})`;
+                body += ',\n\n';
             }
-            if (member.discriminantValue !== member.type.name) {
-                body += `#[serde(rename = "${member.discriminantValue}")]\n`;
+            if (extensiblePolymorphicDU) {
+                body += `${indent.get()}#[serde(untagged)]\n`;
+                body += `${indent.get()}${getPolymorphicUnknownVariant(indent, use, extensiblePolymorphicDU, rustUnion.discriminant, false)},\n`;
             }
-            body += `${indent.get()}${member.type.name}(${helpers.getTypeDeclaration(member.type)})`;
-            body += ',\n\n';
         }
-        if (extensiblePolymorphicDU) {
-            body += `${indent.get()}#[serde(untagged)]\n`;
-            body += `${indent.get()}${getPolymorphicUnknownVariant(indent, use, extensiblePolymorphicDU, rustUnion.discriminant, false)},\n`;
+        else {
+            use.add('serde', 'Deserialize', 'Serialize');
+            use.add('azure_core::fmt', 'SafeDebug');
+            body += `#[derive(Clone, Deserialize, SafeDebug, Serialize)]\n`;
+            body += `#[serde(untagged)]\n`;
+            body += `${helpers.emitVisibility(rustUnion.visibility)}enum ${rustUnion.name} {\n`;
+            for (const variant of rustUnion.variants) {
+                use.addForType(variant.type);
+                const docs = helpers.formatDocComment(variant.docs, true);
+                if (docs.length > 0) {
+                    body += `${indent.get()}#[doc = r#"${docs.substring(0, docs.length - 1)}"#]\n`;
+                }
+                body += `${indent.get()}${variant.name}(${helpers.getTypeDeclaration(variant.type)}),\n`;
+            }
         }
-        body += '}\n\n'; // end enum declaration
+        body += '}\n\n';
+        entries.push({ name: rustUnion.name, body: body });
     }
+    // Sort all entries alphabetically by name.
+    entries.sort((a, b) => a.name.localeCompare(b.name));
     let content = helpers.contentPreamble();
     content += use.text();
-    content += body;
+    content += entries.map(e => e.body).join('');
     return {
         definitions: {
             name: 'unions',
             content: content,
             visibility: visTracker.get(),
         },
-        impls: emitUnionImpls(crate, context),
-        serde: emitUnionSerde(crate),
+        impls: emitUnionImpls(module, context),
+        serde: emitUnionSerde(module),
     };
 }
 /**
@@ -96,12 +122,14 @@ function getPolymorphicUnknownVariant(indent, use, baseType, discriminant, abbre
         if (!abbreviated) {
             unknownDef += helpers.formatDocComment(field.docs, false, undefined, indent);
         }
-        use.addForType(field.type);
         if (abbreviated) {
             unknownDef += `${field.name}, `;
         }
         else {
-            unknownDef += `${indent.get()}${field.name}: ${helpers.getTypeDeclaration(field.type)},\n\n`;
+            use.addForType(field.type);
+            // the base internal type declares its fields with refs and a lifetime.
+            // we need to omit those for the inline anonymous unknown kind definition.
+            unknownDef += `${indent.get()}${field.name}: ${helpers.getTypeDeclaration(field.type, 'omit')},\n\n`;
         }
     }
     unknownDef += `${abbreviated ? '' : indent.pop().get()}}`;
@@ -111,14 +139,16 @@ function getPolymorphicUnknownVariant(indent, use, baseType, discriminant, abbre
  * returns any trait impls for union types.
  * if no helpers are required, undefined is returned.
  *
- * @param crate the crate for which to emit model impls
- * @param context the context for the provided crate
+ * @param module the module for which to emit model impls
+ * @param context the context for the provided module
  * @returns the union impls content or undefined
  */
-function emitUnionImpls(crate, context) {
-    const use = new Use('modelsOther');
+function emitUnionImpls(module, context) {
+    const use = new Use(module, 'modelsOther');
     const entries = new Array();
-    for (const rustUnion of crate.unions) {
+    for (const rustUnion of module.unions) {
+        if (rustUnion.kind !== 'discriminatedUnion')
+            continue;
         const forReq = context.getTryFromForRequestContent(rustUnion, use);
         // helpers aren't required for all types, so only
         // add a use statement for a type if it has a helper
@@ -144,17 +174,19 @@ function emitUnionImpls(crate, context) {
  * returns the content for unions_serde.rs.
  * if no helpers are required, undefined is returned.
  *
- * @param crate the crate for which to emit model impls
+ * @param module the module for which to emit model impls
  * @returns the union serde helpers or undefined
  */
-function emitUnionSerde(crate) {
-    if (crate.unions.length === 0) {
+function emitUnionSerde(module) {
+    if (module.unions.length === 0) {
         return undefined;
     }
-    const use = new Use('modelsOther');
+    const use = new Use(module, 'modelsOther');
     const indent = new helpers.indentation();
     let body = '';
-    for (const rustUnion of crate.unions) {
+    for (const rustUnion of module.unions) {
+        if (rustUnion.kind !== 'discriminatedUnion')
+            continue;
         if (!isPolymorphicDU(rustUnion.unionKind) || rustUnion.unionKind.kind !== 'discriminatedUnionBase') {
             continue;
         }
@@ -176,21 +208,8 @@ function emitUnionSerde(crate) {
         matchArms.push({
             pattern: `${indent.get()}${rustUnion.name}::${getPolymorphicUnknownVariant(indent, use, unionBaseKind, rustUnion.discriminant, true)}`,
             body: (indent) => {
-                let content = `${indent.push().get()}#[derive(Serialize)]\n`;
-                const unknownVariantName = getPolymorphicUnknownVariantName(rustUnion.discriminant);
-                content += `${indent.get()}struct ${unknownVariantName}<'a> {\n`;
-                indent.push();
-                for (const field of unionBaseKind.baseType.fields) {
-                    if (field.kind === 'additionalProperties') {
-                        // TODO
-                        continue;
-                    }
-                    content += `${indent.get()}#[serde(skip_serializing_if = "Option::is_none")]\n`;
-                    content += `${indent.get()}${field.name}: &'a ${helpers.getTypeDeclaration(field.type)},\n`;
-                }
-                content += `${indent.pop().get()}}\n`;
-                content += `${indent.get()}${unknownVariantName}::serialize(&${unknownVariantName} { ${unionBaseKind.baseType.fields.map((field) => field.name).join(', ')} }, serializer)\n`;
-                return content;
+                use.addForType(unionBaseKind.baseType);
+                return `${indent.get()}${unionBaseKind.baseType.name}::serialize(&${unionBaseKind.baseType.name} { ${unionBaseKind.baseType.fields.map((field) => field.name).join(', ')} }, serializer)\n`;
             },
         });
         body += `${indent.get()}${helpers.buildMatch(indent, 'self', matchArms)}\n`;

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

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

package/dist/src/codegen/use.d.ts

@@ -2,18 +2,20 @@ import * as helpers from './helpers.js';
 import * as rust from '../codemodel/index.js';
 /** used to generate use statements */
 export declare class Use {
+    private readonly module;
     private readonly trees;
     private readonly scope;
     /**
      * instantiates a new instance of the Use type
      *
+     * @param module the module that contains the files in scope
      * @param scope indicates a scope in which use statements are constructed.
      * this is only applicable when constructing the path to generated types.
      *      clients - we're in generated/clients
      *       models - we're in generated/models/models.rs
      *  modelsOther - we're in generated/models but not models.rs
      */
-    constructor(scope: 'clients' | 'models' | 'modelsOther');
+    constructor(module: rust.ModuleContainer, scope: 'clients' | 'models' | 'modelsOther');
     /**
      * adds the specified module and type if not already in the list
      * e.g. ('azure_core', 'Context') or ('super::models', 'FooType')
@@ -29,7 +31,7 @@ export declare class Use {
      *
      * @param type the Rust type to add
      */
-    addForType(type: rust.Client | rust.Payload | rust.ResponseHeadersTrait | rust.Type): void;
+    addForType(type: rust.Client | rust.ResponseHeadersTrait | rust.Type): void;
     /**
      * emits Rust use statements for the contents of this Use object
      *

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

@@ -1 +1 @@
-{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../src/codegen/use.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAE9C,sCAAsC;AACtC,qBAAa,GAAG;IACd,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IACvC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuC;IAE7D;;;;;;;;OAQG;gBACS,KAAK,EAAE,SAAS,GAAG,QAAQ,GAAG,aAAa;IAKvD;;;;;;;;OAQG;IACH,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI;IAuBlD;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI;IAuG1F;;;;;OAKG;IACH,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,GAAG,MAAM;CA0C3C"}
+{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../src/codegen/use.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAG9C,sCAAsC;AACtC,qBAAa,GAAG;IACd,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IACvC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuC;IAE7D;;;;;;;;;OASG;gBACS,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,SAAS,GAAG,QAAQ,GAAG,aAAa;IAMrF;;;;;;;;OAQG;IACH,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI;IAuBlD;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI;IA8F3E;;;;;OAKG;IACH,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,GAAG,MAAM;CA0C3C"}

package/dist/src/codegen/use.js

@@ -4,18 +4,21 @@
 *--------------------------------------------------------------------------------------------*/
 import * as helpers from './helpers.js';
 import { CodegenError } from './errors.js';
+import * as utils from '../utils/utils.js';
 /** used to generate use statements */
 export class Use {
     /**
      * instantiates a new instance of the Use type
      *
+     * @param module the module that contains the files in scope
      * @param scope indicates a scope in which use statements are constructed.
      * this is only applicable when constructing the path to generated types.
      *      clients - we're in generated/clients
      *       models - we're in generated/models/models.rs
      *  modelsOther - we're in generated/models but not models.rs
      */
-    constructor(scope) {
+    constructor(module, scope) {
+        this.module = module;
         this.trees = new Array();
         this.scope = scope;
     }
@@ -59,12 +62,18 @@ export class Use {
                 return this.addForType(type.type);
             case 'client': {
                 // client type are only referenced from other things in generated/clients so we ignore any scope
-                this.add('crate::generated::clients', type.name);
+                this.add(`${utils.buildImportPath(this.module, type.module)}::clients`, type.name);
                 break;
             }
             case 'discriminatedUnion':
             case 'enum':
-                this.add(this.scope === 'clients' ? 'crate::generated::models' : 'super', type.name);
+            case 'untaggedUnion':
+                if (this.scope === 'clients' || this.module !== type.module) {
+                    this.add(`${utils.buildImportPath(this.module, type.module)}::models`, type.name);
+                }
+                else {
+                    this.add('super', type.name);
+                }
                 break;
             case 'enumValue':
                 this.addForType(type.type);
@@ -72,7 +81,8 @@ export class Use {
             case 'marker':
                 switch (this.scope) {
                     case 'clients':
-                        this.add('crate::generated::models', type.name);
+                        // marker types are always in the same module as their client method
+                        this.add(`${utils.buildImportPath(this.module, this.module)}::models`, type.name);
                         break;
                     case 'modelsOther':
                         this.add('super', type.name);
@@ -84,16 +94,11 @@ export class Use {
                 }
                 break;
             case 'model':
-                switch (this.scope) {
-                    case 'clients':
-                        this.add('crate::generated::models', type.name);
-                        break;
-                    case 'models':
-                        // we're in models so no need to bring another model into scope
-                        break;
-                    case 'modelsOther':
-                        this.add('super', type.name);
-                        break;
+                if (this.scope === 'clients' || this.module !== type.module) {
+                    this.add(`${utils.buildImportPath(this.module, type.module)}::models`, type.name);
+                }
+                else if (this.scope === 'modelsOther') {
+                    this.add('super', type.name);
                 }
                 break;
             case 'asyncResponse':
@@ -111,22 +116,12 @@ export class Use {
                     this.add('azure_core::http', type.type.format);
                 }
                 break;
-            case 'payload':
-                this.addForType(type.type);
-                break;
             case 'requestContent':
                 if (type.format !== 'JsonFormat') {
                     // JsonFormat is the default so no need to bring it into scope
                     this.add('azure_core::http', type.format);
                 }
-                switch (type.content.kind) {
-                    case 'bytes':
-                        this.addForType(type.content);
-                        break;
-                    case 'payload':
-                        this.addForType(type.content.type);
-                        break;
-                }
+                this.addForType(type.content);
                 break;
             case 'response':
                 if (type.format !== 'JsonFormat') {
@@ -138,7 +133,8 @@ export class Use {
             case 'responseHeadersTrait':
                 switch (this.scope) {
                     case 'clients':
-                        this.add(`crate::generated::models`, type.name);
+                        // header response traits are always in the same module as their client method
+                        this.add(`${utils.buildImportPath(this.module, this.module)}::models`, type.name);
                         break;
                     case 'models':
                     case 'modelsOther':

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

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

package/dist/src/codemodel/client.d.ts

@@ -1,3 +1,4 @@
+import { ModuleContainer } from './crate.js';
 import * as method from './method.js';
 import * as types from './types.js';
 /** Client is a SDK client */
@@ -29,6 +30,8 @@ export interface Client {
     fields: Array<types.StructField>;
     /** all the methods for this client */
     methods: Array<MethodType>;
+    /** the module to which this client belongs */
+    module: ModuleContainer;
     /** the parent client in a hierarchical client */
     parent?: Client;
 }
@@ -135,7 +138,8 @@ export interface PageableMethod extends HTTPMethodBase {
 export interface LroFinalResultStrategyOriginalUri {
     kind: 'originalUri';
 }
-export type LroFinalResultStrategyHeaderName = 'operation-location' | 'azure-asyncoperation' | 'location';
+/** The header containing URL to read the LRO status from. Either a pre-defined common value, or a custom string name */
+export type LroFinalResultStrategyHeaderName = 'operation-location' | 'azure-asyncoperation' | 'location' | (string & {});
 /** LRO final result gets returned via the request sent to a URL that was returned in the first response, inside the  */
 export interface LroFinalResultStrategyHeader {
     kind: 'header';
@@ -245,9 +249,17 @@ export interface HeaderScalarParameter extends HTTPParameterBase {
      */
     isApiVersion: boolean;
 }
-/** MethodOptions is the struct containing optional method params */
-export interface MethodOptions extends types.Option {
-    type: types.Struct;
+/** ParameterGroup is a group of parameters */
+export interface ParameterGroup<T extends types.Option<types.Struct> | types.Struct> {
+    /** the name of the parameter */
+    name: string;
+    /** any docs for the parameter */
+    docs: types.Docs;
+    /**
+     * the parameter group's type. for the optional
+     * params group the type will be an Option<Struct>
+     */
+    type: T;
 }
 /** PartialBodyParameter is a param that's a field within a type passed via the HTTP request body */
 export interface PartialBodyParameter extends HTTPParameterBase {
@@ -258,7 +270,7 @@ export interface PartialBodyParameter extends HTTPParameterBase {
      */
     paramType: types.Type;
     /** the model in which the partial param is placed */
-    type: types.RequestContent<types.Payload<types.Model>>;
+    type: types.RequestContent<types.Model>;
     /** the name of the field over the wire in model.fields for this param */
     serde: string;
 }
@@ -391,6 +403,8 @@ export interface ResponseHeadersTrait {
     docs: string;
     /** indicates the visibility of the trait */
     visibility: types.Visibility;
+    /** the module to which this trait belongs */
+    module: ModuleContainer;
 }
 interface ClientParameterBase {
     /** the name of the parameter */
@@ -410,7 +424,7 @@ interface HTTPMethodBase extends method.Method<types.Type> {
     /** the params passed to the method (excluding self). can be empty */
     params: Array<HTTPParameterBase>;
     /** the method options type for this method */
-    options: MethodOptions;
+    options: ParameterGroup<types.Option<types.Struct>>;
     /** the type returned by the method */
     returns: types.Result;
     /**
@@ -429,8 +443,10 @@ interface HTTPMethodBase extends method.Method<types.Type> {
 interface HTTPParameterBase extends method.Parameter {
     /** location of the parameter (e.g. client or method) */
     location: ParameterLocation;
-    /** optional params go in the method's MethodOptions type */
+    /** optional params go in the method's ParameterGroup type */
     optional: boolean;
+    /** set when this parameter belongs to a parameter group */
+    group?: ParameterGroup<types.Struct>;
 }
 declare class ClientParameterBase implements ClientParameterBase {
     constructor(name: string, type: types.Type, optional: boolean);
@@ -442,13 +458,13 @@ declare class HTTPParameterBase extends method.Parameter {
     constructor(name: string, location: ParameterLocation, optional: boolean, type: types.Type);
 }
 export declare class AsyncMethod extends HTTPMethodBase implements AsyncMethod {
-    constructor(name: string, languageIndependentName: string, client: Client, visibility: types.Visibility, options: MethodOptions, httpMethod: HTTPMethod, httpPath: string);
+    constructor(name: string, languageIndependentName: string, client: Client, visibility: types.Visibility, options: ParameterGroup<types.Option<types.Struct>>, httpMethod: HTTPMethod, httpPath: string);
 }
 export declare class BodyParameter extends HTTPParameterBase implements BodyParameter {
     constructor(name: string, location: ParameterLocation, optional: boolean, type: types.RequestContent);
 }
 export declare class Client implements Client {
-    constructor(name: string);
+    constructor(name: string, module: ModuleContainer);
 }
 export declare class ClientAccessor extends method.Method<Client> implements ClientAccessor {
     constructor(name: string, client: Client, returns: Client);
@@ -483,11 +499,8 @@ export declare class HeaderHashMapParameter extends HTTPParameterBase implements
 export declare class HeaderScalarParameter extends HTTPParameterBase implements HeaderScalarParameter {
     constructor(name: string, header: string, location: ParameterLocation, optional: boolean, type: HeaderScalarParameterType);
 }
-export declare class MethodOptions extends types.Option implements MethodOptions {
-    constructor(type: types.Struct);
-}
 export declare class PageableMethod extends HTTPMethodBase implements PageableMethod {
-    constructor(name: string, languageIndependentName: string, client: Client, visibility: types.Visibility, options: MethodOptions, httpMethod: HTTPMethod, httpPath: string);
+    constructor(name: string, languageIndependentName: string, client: Client, visibility: types.Visibility, options: ParameterGroup<types.Option<types.Struct>>, httpMethod: HTTPMethod, httpPath: string);
 }
 export declare class LroFinalResultStrategyOriginalUri implements LroFinalResultStrategyOriginalUri {
     constructor();
@@ -496,7 +509,7 @@ export declare class LroFinalResultStrategyHeader implements LroFinalResultStrat
     constructor(headerName: LroFinalResultStrategyHeaderName);
 }
 export declare class LroMethod extends HTTPMethodBase implements LroMethod {
-    constructor(name: string, languageIndependentName: string, client: Client, visibility: types.Visibility, options: MethodOptions, httpMethod: HTTPMethod, httpPath: string, finalResultStrategy: LroFinalResultStrategyKind);
+    constructor(name: string, languageIndependentName: string, client: Client, visibility: types.Visibility, options: ParameterGroup<types.Option<types.Struct>>, httpMethod: HTTPMethod, httpPath: string, finalResultStrategy: LroFinalResultStrategyKind);
 }
 export declare class PageableStrategyContinuationToken implements PageableStrategyContinuationToken {
     constructor(requestToken: HeaderScalarParameter | QueryScalarParameter, responseToken: ResponseHeaderScalar | PageableStrategyNextLink);
@@ -504,8 +517,11 @@ export declare class PageableStrategyContinuationToken implements PageableStrate
 export declare class PageableStrategyNextLink implements PageableStrategyNextLink {
     constructor(nextLinkPath: Array<types.ModelField>);
 }
+export declare class ParameterGroup<T extends types.Option<types.Struct> | types.Struct> implements ParameterGroup<T> {
+    constructor(name: string, type: T);
+}
 export declare class PartialBodyParameter extends HTTPParameterBase implements PartialBodyParameter {
-    constructor(name: string, location: ParameterLocation, optional: boolean, serde: string, paramType: types.Type, type: types.RequestContent<types.Payload<types.Model>>);
+    constructor(name: string, location: ParameterLocation, optional: boolean, serde: string, paramType: types.Type, type: types.RequestContent<types.Model>);
 }
 export declare class PathCollectionParameter extends HTTPParameterBase implements PathCollectionParameter {
     constructor(name: string, segment: string, location: ParameterLocation, optional: boolean, type: PathCollectionParameterType, encoded: boolean, style: ParameterStyle, explode: boolean);
@@ -532,7 +548,7 @@ export declare class ResponseHeaderScalar implements ResponseHeaderScalar {
     constructor(name: string, header: string, type: types.WireType);
 }
 export declare class ResponseHeadersTrait implements ResponseHeadersTrait {
-    constructor(name: string, implFor: types.AsyncResponse<types.MarkerType> | types.Response<types.MarkerType | types.Model>, docs: string, visibility: types.Visibility);
+    constructor(name: string, implFor: types.AsyncResponse<types.MarkerType> | types.Response<types.MarkerType | types.Model>, docs: string, visibility: types.Visibility, module: ModuleContainer);
 }
 export declare class SupplementalEndpoint implements SupplementalEndpoint {
     constructor(path: string);