Merge branch 'main' into template

Author: maririos

.chronus/changes/fix-typo-in-privateLinkResourcenName-2025-1-7-11-23-20.md

@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-azure-resource-manager"
+---
+
+Fix common-types privatelink typo in `@key("privateLinkResourcenName") from privateLinkResourcenName to privateLinkResourceName`

.chronus/changes/fix_override_doc-2025-1-7-17-45-35.md

@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-client-generator-core"
+---
+
+Fix wrong example doc of `@override` decorator.

.chronus/changes/introduce-cache-for-model-property-2025-1-5-7-5-5.md

@@ -0,0 +1,8 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-client-generator-core"
+---
+
+add cache for `SdkModelPropertyType` in TCGCContext

.chronus/changes/uptake-versioning-mutators-2025-1-5-13-20-16.md

@@ -0,0 +1,6 @@
+---
+changeKind: internal
+packages:
+  - "@azure-tools/typespec-client-generator-core"
+---
+

.chronus/changes/uptake-versioning-mutators-2025-1-5-21-0-31.md

@@ -0,0 +1,9 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: feature
+packages:
+  - "@azure-tools/typespec-autorest"
+  - "@azure-tools/typespec-azure-resource-manager"
+---
+
+Update versioning handling to use new mutator approach

.chronus/changes/x-ms-identifiers-alternatives-2024-11-12-14-15-30.md

@@ -0,0 +1,8 @@
+---
+changeKind: feature
+packages:
+  - "@azure-tools/typespec-autorest"
+  - "@azure-tools/typespec-azure-resource-manager"
+---
+
+Use the `@identifiers` decorator to identify and utilize identifiers for `x-ms-identifiers`. Additionally, use the `@key` decorator to identify identifiers.

core

@@ -1,22 +1,25 @@
 import { createTCGCContext } from "@azure-tools/typespec-client-generator-core";
 import {
+  compilerAssert,
   EmitContext,
-  Namespace,
-  NoTarget,
-  Program,
-  Service,
   emitFile,
   getDirectoryPath,
   getNamespaceFullName,
   getService,
   interpolatePath,
   listServices,
-  projectProgram,
+  NoTarget,
+  Program,
   reportDeprecated,
   resolvePath,
+  Service,
 } from "@typespec/compiler";
+import {
+  unsafe_mutateSubgraphWithNamespace,
+  unsafe_MutatorWithNamespace,
+} from "@typespec/compiler/experimental";
 import { resolveInfo } from "@typespec/openapi";
-import { buildVersionProjections } from "@typespec/versioning";
+import { getVersioningMutators } from "@typespec/versioning";
 import { AutorestEmitterOptions, getTracer, reportDiagnostic } from "./lib.js";
 import {
   AutorestDocumentEmitterOptions,
@@ -123,31 +126,13 @@ export async function getAllServicesAtAllVersions(
 
   const serviceRecords: AutorestServiceRecord[] = [];
   for (const service of services) {
-    const originalProgram = program;
-    const versions = buildVersionProjections(program, service.type).filter(
-      (v) => !options.version || options.version === v.version,
-    );
-
-    if (versions.length === 0) {
-      reportDiagnostic(program, { code: "no-matching-version-found", target: service.type });
-    }
+    const versions = getVersioningMutators(program, service.type);
 
-    if (versions.length === 1 && versions[0].version === undefined) {
-      let projectedProgram;
-      if (versions[0].projections.length > 0) {
-        projectedProgram = program = projectProgram(originalProgram, versions[0].projections);
-      }
-      const projectedServiceNs: Namespace = projectedProgram
-        ? (projectedProgram.projector.projectedTypes.get(service.type) as Namespace)
-        : service.type;
-      const projectedService =
-        projectedServiceNs === program.getGlobalNamespaceType()
-          ? { type: program.getGlobalNamespaceType() }
-          : getService(program, projectedServiceNs)!;
+    if (versions === undefined) {
       const context: AutorestEmitterContext = {
         program,
         outputFile: resolveOutputFile(program, service, services.length > 1, options),
-        service: projectedService,
+        service: service,
         tcgcSdkContext,
       };
 
@@ -157,42 +142,55 @@ export async function getAllServicesAtAllVersions(
         versioned: false,
         ...result,
       });
+    } else if (versions.kind === "transient") {
+      const context: AutorestEmitterContext = {
+        program,
+        outputFile: resolveOutputFile(program, service, services.length > 1, options),
+        service: service,
+        tcgcSdkContext,
+      };
+
+      const result = await getVersionSnapshotDocument(context, versions.mutator, options);
+      serviceRecords.push({
+        service,
+        versioned: false,
+        ...result,
+      });
     } else {
+      const filteredVersions = versions.snapshots.filter(
+        (v) => !options.version || options.version === v.version?.value,
+      );
+
+      if (filteredVersions.length === 0 && options.version) {
+        reportDiagnostic(program, { code: "no-matching-version-found", target: service.type });
+      }
       const serviceRecord: AutorestVersionedServiceRecord = {
         service,
         versioned: true,
         versions: [],
       };
       serviceRecords.push(serviceRecord);
 
-      for (const record of versions) {
-        const projectedProgram = (program = projectProgram(originalProgram, record.projections));
-
-        const projectedServiceNs: Namespace = projectedProgram
-          ? (projectedProgram.projector.projectedTypes.get(service.type) as Namespace)
-          : service.type;
-        const projectedService =
-          projectedServiceNs === program.getGlobalNamespaceType()
-            ? { type: program.getGlobalNamespaceType() }
-            : getService(program, projectedServiceNs)!;
+      for (const record of filteredVersions) {
         const context: AutorestEmitterContext = {
           program,
           outputFile: resolveOutputFile(
             program,
-            projectedService,
+            service,
             services.length > 1,
             options,
-            record.version,
+            record.version?.value,
           ),
-          service: projectedService,
-          version: record.version,
+          service,
+          version: record.version?.value,
           tcgcSdkContext,
         };
-        const result = await getOpenAPIForService(context, options);
+
+        const result = await getVersionSnapshotDocument(context, record.mutator, options);
         serviceRecord.versions.push({
           ...result,
-          service: projectedService,
-          version: record.version!,
+          service,
+          version: record.version!.value,
         });
       }
     }
@@ -201,6 +199,26 @@ export async function getAllServicesAtAllVersions(
   return serviceRecords;
 }
 
+async function getVersionSnapshotDocument(
+  context: AutorestEmitterContext,
+  mutator: unsafe_MutatorWithNamespace,
+  options: ResolvedAutorestEmitterOptions,
+) {
+  const subgraph = unsafe_mutateSubgraphWithNamespace(
+    context.program,
+    [mutator],
+    context.service.type,
+  );
+
+  compilerAssert(subgraph.type.kind === "Namespace", "Should not have mutated to another type");
+  const document = await getOpenAPIForService(
+    { ...context, service: getService(context.program, subgraph.type)! },
+    options,
+  );
+
+  return document;
+}
+
 async function emitAllServiceAtAllVersions(
   program: Program,
   options: ResolvedAutorestEmitterOptions,

packages/typespec-autorest/src/emit.ts

@@ -12,8 +12,10 @@ import {
 } from "@azure-tools/typespec-azure-core";
 import {
   getArmCommonTypeOpenAPIRef,
+  getArmIdentifiers,
   getExternalTypeRef,
   isArmCommonType,
+  isArmProviderNamespace,
   isAzureResource,
   isConditionallyFlattened,
 } from "@azure-tools/typespec-azure-resource-manager";
@@ -458,6 +460,7 @@ export async function getOpenAPIForService(
         prop.type.kind === "Scalar" &&
         ignoreDiagnostics(
           program.checker.isTypeAssignableTo(
+            // eslint-disable-next-line @typescript-eslint/no-deprecated
             prop.type.projectionBase ?? prop.type,
             program.checker.getStdType("url"),
             prop.type,
@@ -750,6 +753,7 @@ export async function getOpenAPIForService(
   }
 
   function isBytes(type: Type) {
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
     const baseType = type.projectionBase ?? type;
     return ignoreDiagnostics(
       program.checker.isTypeAssignableTo(baseType, program.checker.getStdType("bytes"), type),
@@ -963,7 +967,7 @@ export async function getOpenAPIForService(
     }
     return undefined;
   }
-  function getSchemaOrRef(type: Type, schemaContext: SchemaContext): any {
+  function getSchemaOrRef(type: Type, schemaContext: SchemaContext, namespace?: Namespace): any {
     let schemaNameOverride: ((name: string, visibility: Visibility) => string) | undefined =
       undefined;
     const ref = resolveExternalRef(type);
@@ -1013,7 +1017,7 @@ export async function getOpenAPIForService(
     const name = getOpenAPITypeName(program, type, typeNameOptions);
 
     if (shouldInline(program, type)) {
-      const schema = getSchemaForInlineType(type, name, schemaContext);
+      const schema = getSchemaForInlineType(type, name, schemaContext, namespace);
 
       if (schema === undefined && isErrorType(type)) {
         // Exit early so that syntax errors are exposed.  This error will
@@ -1040,7 +1044,12 @@ export async function getOpenAPIForService(
       return { $ref: pending.ref };
     }
   }
-  function getSchemaForInlineType(type: Type, name: string, context: SchemaContext) {
+  function getSchemaForInlineType(
+    type: Type,
+    name: string,
+    context: SchemaContext,
+    namespace?: Namespace,
+  ) {
     if (inProgressInlineTypes.has(type)) {
       reportDiagnostic(program, {
         code: "inline-cycle",
@@ -1050,7 +1059,7 @@ export async function getOpenAPIForService(
       return {};
     }
     inProgressInlineTypes.add(type);
-    const schema = getSchemaForType(type, context);
+    const schema = getSchemaForType(type, context, namespace);
     inProgressInlineTypes.delete(type);
     return schema;
   }
@@ -1627,17 +1636,20 @@ export async function getOpenAPIForService(
     }
   }
 
-  function getSchemaForType(type: Type, schemaContext: SchemaContext): OpenAPI2Schema | undefined {
+  function getSchemaForType(
+    type: Type,
+    schemaContext: SchemaContext,
+    namespace?: Namespace,
+  ): OpenAPI2Schema | undefined {
     const builtinType = getSchemaForLiterals(type);
     if (builtinType !== undefined) {
       return builtinType;
     }
-
     switch (type.kind) {
       case "Intrinsic":
         return getSchemaForIntrinsicType(type);
       case "Model":
-        return getSchemaForModel(type, schemaContext);
+        return getSchemaForModel(type, schemaContext, namespace);
       case "ModelProperty":
         return getSchemaForType(type.type, schemaContext);
       case "Scalar":
@@ -1843,6 +1855,10 @@ export async function getOpenAPIForService(
     );
   }
 
+  function ifArmIdentifiersDefault(armIdentifiers: string[]) {
+    return armIdentifiers.every((identifier) => identifier === "id" || identifier === "name");
+  }
+
   function getSchemaForUnionVariant(
     variant: UnionVariant,
     schemaContext: SchemaContext,
@@ -1887,8 +1903,8 @@ export async function getOpenAPIForService(
     return undefined;
   }
 
-  function getSchemaForModel(model: Model, schemaContext: SchemaContext) {
-    const array = getArrayType(model, schemaContext);
+  function getSchemaForModel(model: Model, schemaContext: SchemaContext, namespace?: Namespace) {
+    const array = getArrayType(model, schemaContext, namespace);
     if (array) {
       return array;
     }
@@ -2073,7 +2089,7 @@ export async function getOpenAPIForService(
         propSchema = getSchemaOrRef(prop.type, context);
       }
     } else {
-      propSchema = getSchemaOrRef(prop.type, context);
+      propSchema = getSchemaOrRef(prop.type, context, prop.model?.namespace);
     }
 
     if (options.armResourceFlattening && isConditionallyFlattened(program, prop)) {
@@ -2375,7 +2391,11 @@ export async function getOpenAPIForService(
   /**
    * If the model is an array model return the OpenAPI2Schema for the array type.
    */
-  function getArrayType(typespecType: Model, context: SchemaContext): OpenAPI2Schema | undefined {
+  function getArrayType(
+    typespecType: Model,
+    context: SchemaContext,
+    namespace?: Namespace,
+  ): OpenAPI2Schema | undefined {
     if (isArrayModelType(program, typespecType)) {
       const array: OpenAPI2Schema = {
         type: "array",
@@ -2384,14 +2404,27 @@ export async function getOpenAPIForService(
           visibility: context.visibility | Visibility.Item,
         }),
       };
-      if (!ifArrayItemContainsIdentifier(program, typespecType as any)) {
+
+      const armIdentifiers = getArmIdentifiers(program, typespecType);
+      if (isArmProviderNamespace(program, namespace) && hasValidArmIdentifiers(armIdentifiers)) {
+        array["x-ms-identifiers"] = armIdentifiers;
+      } else if (!ifArrayItemContainsIdentifier(program, typespecType as any)) {
         array["x-ms-identifiers"] = [];
       }
+
       return applyIntrinsicDecorators(typespecType, array);
     }
     return undefined;
   }
 
+  function hasValidArmIdentifiers(armIdentifiers: string[] | undefined) {
+    return (
+      armIdentifiers !== undefined &&
+      armIdentifiers.length > 0 &&
+      !ifArmIdentifiersDefault(armIdentifiers)
+    );
+  }
+
   function getSchemaForScalar(scalar: Scalar): OpenAPI2Schema {
     let result: OpenAPI2Schema = {};
     const isStd = program.checker.isStdType(scalar);