diff --git a/core b/core index b2dc52555f..e80bdce699 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b2dc52555f2b00250860821f37f1e5eafaa941bb +Subproject commit e80bdce69982922b79cc59229432c769e93fe8c8 diff --git a/packages/typespec-azure-core/generated-defs/Azure.Core.Traits.ts b/packages/typespec-azure-core/generated-defs/Azure.Core.Traits.ts index 621fadfa8f..d7247bd244 100644 --- a/packages/typespec-azure-core/generated-defs/Azure.Core.Traits.ts +++ b/packages/typespec-azure-core/generated-defs/Azure.Core.Traits.ts @@ -1,15 +1,5 @@ import type { DecoratorContext, EnumMember, Model, ModelProperty, Type } from "@typespec/compiler"; -/** - * `@trait` marks a model type as representing a 'trait' and performs basic validation - * checks. - * - * @param target The model type to mark as a trait. - * @param traitName An optional name to uniquely identify the trait. If unspecified, - * the model type name is used. - */ -export type TraitDecorator = (context: DecoratorContext, target: Model, traitName?: string) => void; - /** * `@traitLocation` sets the applicable location for a trait on its envelope property. * @@ -36,6 +26,16 @@ export type TraitContextDecorator = ( contexts: Type, ) => void; +/** + * `@trait` marks a model type as representing a 'trait' and performs basic validation + * checks. + * + * @param target The model type to mark as a trait. + * @param traitName An optional name to uniquely identify the trait. If unspecified, + * the model type name is used. + */ +export type TraitDecorator = (context: DecoratorContext, target: Model, traitName?: string) => void; + /** * Sets the version for when the trait was added to the specification. Can be applied * to either a trait model type or its envelope property. @@ -49,8 +49,8 @@ export type TraitAddedDecorator = ( ) => void; export type AzureCoreTraitsDecorators = { - trait: TraitDecorator; traitLocation: TraitLocationDecorator; traitContext: TraitContextDecorator; + trait: TraitDecorator; traitAdded: TraitAddedDecorator; }; diff --git a/packages/typespec-azure-core/generated-defs/Azure.Core.ts b/packages/typespec-azure-core/generated-defs/Azure.Core.ts index 9cf312dbd0..391c141f11 100644 --- a/packages/typespec-azure-core/generated-defs/Azure.Core.ts +++ b/packages/typespec-azure-core/generated-defs/Azure.Core.ts @@ -45,11 +45,6 @@ export type PollingLocationDecorator = ( options?: Type, ) => void; -/** - * Marks a Model as a paged collection. - */ -export type PagedResultDecorator = (context: DecoratorContext, entity: Model) => void; - /** * Identifies the ModelProperty that contains the paged items. Can only be used on a Model marked with `@pagedResult`. */ @@ -60,6 +55,11 @@ export type ItemsDecorator = (context: DecoratorContext, entity: ModelProperty) */ export type NextLinkDecorator = (context: DecoratorContext, entity: ModelProperty) => void; +/** + * Marks a Model as a paged collection. + */ +export type PagedResultDecorator = (context: DecoratorContext, entity: Model) => void; + /** * Marks an Enum as being fixed since enums in Azure are * assumed to be extensible. @@ -193,9 +193,9 @@ export type AzureCoreDecorators = { lroStatus: LroStatusDecorator; finalLocation: FinalLocationDecorator; pollingLocation: PollingLocationDecorator; - pagedResult: PagedResultDecorator; items: ItemsDecorator; nextLink: NextLinkDecorator; + pagedResult: PagedResultDecorator; fixed: FixedDecorator; lroSucceeded: LroSucceededDecorator; lroCanceled: LroCanceledDecorator; diff --git a/packages/typespec-azure-resource-manager/generated-defs/Azure.ResourceManager.Private.ts b/packages/typespec-azure-resource-manager/generated-defs/Azure.ResourceManager.Private.ts index ad42a3d056..285b3bd163 100644 --- a/packages/typespec-azure-resource-manager/generated-defs/Azure.ResourceManager.Private.ts +++ b/packages/typespec-azure-resource-manager/generated-defs/Azure.ResourceManager.Private.ts @@ -4,24 +4,24 @@ import type { DecoratorContext, Model, ModelProperty, Operation, Type } from "@t * * * - * @param propertyName Name of the property to omit + * @param values Values */ -export type ResourceBaseParametersOfDecorator = ( +export type ResourceParameterBaseForDecorator = ( context: DecoratorContext, - target: Model, - propertyName: Model, + target: ModelProperty, + values: Type, ) => void; /** * * * - * @param values Values + * @param propertyName Name of the property to omit */ -export type ResourceParameterBaseForDecorator = ( +export type ResourceBaseParametersOfDecorator = ( context: DecoratorContext, - target: ModelProperty, - values: Type, + target: Model, + propertyName: Model, ) => void; /** @@ -32,6 +32,19 @@ export type ResourceParameterBaseForDecorator = ( */ export type AzureResourceBaseDecorator = (context: DecoratorContext, target: Model) => void; +/** + * Please DO NOT USE in RestAPI specs. + * Internal decorator that deprecated direct usage of `x-ms-client-flatten` OpenAPI extension. + * It will programatically enabled/disable client flattening with + * + * @flattenProperty with autorest + * emitter flags to maintain compatibility in swagger. + */ +export type ConditionalClientFlattenDecorator = ( + context: DecoratorContext, + target: ModelProperty, +) => void; + /** * Omit a property in the target model. * @@ -46,19 +59,6 @@ export type OmitIfEmptyDecorator = ( propertyName: string, ) => void; -/** - * Please DO NOT USE in RestAPI specs. - * Internal decorator that deprecated direct usage of `x-ms-client-flatten` OpenAPI extension. - * It will programatically enabled/disable client flattening with - * - * @flattenProperty with autorest - * emitter flags to maintain compatibility in swagger. - */ -export type ConditionalClientFlattenDecorator = ( - context: DecoratorContext, - target: ModelProperty, -) => void; - /** * * @@ -154,11 +154,11 @@ export type ArmResourcePropertiesOptionalityDecorator = ( ) => void; export type AzureResourceManagerPrivateDecorators = { - resourceBaseParametersOf: ResourceBaseParametersOfDecorator; resourceParameterBaseFor: ResourceParameterBaseForDecorator; + resourceBaseParametersOf: ResourceBaseParametersOfDecorator; azureResourceBase: AzureResourceBaseDecorator; - omitIfEmpty: OmitIfEmptyDecorator; conditionalClientFlatten: ConditionalClientFlattenDecorator; + omitIfEmpty: OmitIfEmptyDecorator; assignProviderNameValue: AssignProviderNameValueDecorator; armUpdateProviderNamespace: ArmUpdateProviderNamespaceDecorator; armResourceInternal: ArmResourceInternalDecorator;