Remove reference to autorest from arm library

.chronus/changes/remove-autorest-arm-dep-2024-4-9-17-15-8.md

@@ -0,0 +1,8 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: feature
+packages:
+  - "@azure-tools/typespec-azure-resource-manager"
+---
+
+Remove dependency on `typespec-autorest` emitter

.chronus/changes/remove-autorest-arm-dep-2024-4-9-17-15-82.md

@@ -0,0 +1,8 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: feature
+packages:
+  - "@azure-tools/typespec-autorest"
+---
+
+Add dependency on typespec-azure-resource-manager to resolve the spec repo common types paths

packages/samples/specs/resource-manager/liftr.confluent/confluent.tsp

@@ -8,7 +8,6 @@ using TypeSpec.Http;
 using TypeSpec.Rest;
 using TypeSpec.Versioning;
 using Azure.ResourceManager;
-using Autorest;
 
 @armProviderNamespace
 @service({

packages/typespec-autorest/package.json

@@ -55,6 +55,7 @@
   ],
   "peerDependencies": {
     "@azure-tools/typespec-azure-core": "workspace:~",
+    "@azure-tools/typespec-azure-resource-manager": "workspace:~",
     "@azure-tools/typespec-client-generator-core": "workspace:~",
     "@typespec/compiler": "workspace:~",
     "@typespec/http": "workspace:~",
@@ -64,6 +65,7 @@
   },
   "devDependencies": {
     "@azure-tools/typespec-azure-core": "workspace:~",
+    "@azure-tools/typespec-azure-resource-manager": "workspace:~",
     "@azure-tools/typespec-client-generator-core": "workspace:~",
     "@types/node": "~18.11.19",
     "@typespec/compiler": "workspace:~",

packages/typespec-autorest/src/decorators.ts

@@ -1,4 +1,4 @@
-import { DecoratorContext, Model, ModelProperty, Program, Service, Type } from "@typespec/compiler";
+import { DecoratorContext, Model, ModelProperty, Program, Type } from "@typespec/compiler";
 import { createStateSymbol, reportDiagnostic } from "./lib.js";
 
 export const namespace = "Autorest";
@@ -47,24 +47,6 @@ export function getExamples(program: Program, entity: Type): Example[] | undefin
   return program.stateMap(exampleKey).get(entity);
 }
 
-/**
- * Parameters that may be passed to a RefProducer function.  Specific RefProducer
- * functions may define additional parameters.
- */
-export interface RefProducerParams {
-  service?: Service;
-  version?: string;
-}
-
-/**
- * A function that can produce a ref path at the time it is requested.
- */
-export type RefProducer = (
-  program: Program,
-  entity: Model | ModelProperty,
-  params: RefProducerParams
-) => string | undefined;
-
 const refTargetsKey = createStateSymbol("autorest.ref");
 /**
  * `@useRef` - is used to replace the TypeSpec model type in emitter output with a pre-existing named OpenAPI schema such as ARM common types.
@@ -77,31 +59,7 @@ export function $useRef(context: DecoratorContext, entity: Model | ModelProperty
   context.program.stateMap(refTargetsKey).set(entity, jsonRef);
 }
 
-/**
- * Configures a "ref producer" for the given entity.  A ref producer is a
- * function that returns a ref path for the given entity, possibly altered by
- * the options provided to the function (like the service and version).
- *
- * @param {function} param producer - path or Uri to an OpenAPI schema.
- *
- */
-export function setRefProducer(
-  program: Program,
-  entity: Model | ModelProperty,
-  refProducer: RefProducer
-) {
-  program.stateMap(refTargetsKey).set(entity, refProducer);
-}
-
-export function getRef(
-  program: Program,
-  entity: Type,
-  params?: RefProducerParams
-): string | undefined {
+export function getRef(program: Program, entity: Type): string | undefined {
   const refOrProducer = program.stateMap(refTargetsKey).get(entity);
-  if (typeof refOrProducer === "function") {
-    return refOrProducer(program, entity, params ?? {});
-  } else {
-    return refOrProducer;
-  }
+  return refOrProducer;
 }

packages/typespec-autorest/src/openapi.ts

@@ -9,6 +9,10 @@ import {
   getUnionAsEnum,
   isFixed,
 } from "@azure-tools/typespec-azure-core";
+import {
+  getArmCommonTypeOpenAPIRef,
+  isArmCommonType,
+} from "@azure-tools/typespec-azure-resource-manager";
 import { shouldFlattenProperty } from "@azure-tools/typespec-client-generator-core";
 import {
   ArrayModelType,
@@ -764,7 +768,7 @@ export async function getOpenAPIForService(
     return header;
   }
 
-  function resolveRef(ref: string) {
+  function expandRef(ref: string) {
     const absoluteRef = interpolatePath(ref, {
       "arm-types-dir": options.armTypesDir,
     });
@@ -775,14 +779,33 @@ export async function getOpenAPIForService(
     return getRelativePathFromDirectory(getDirectoryPath(context.outputFile), absoluteRef, false);
   }
 
-  function getSchemaOrRef(type: Type, schemaContext: SchemaContext): any {
-    const refUrl = getRef(program, type, { version: context.version, service: context.service });
+  function resolveExternalRef(type: Type) {
+    const refUrl = getRef(program, type);
     if (refUrl) {
       return {
-        $ref: resolveRef(refUrl),
+        $ref: expandRef(refUrl),
       };
     }
 
+    if (isArmCommonType(type) && (type.kind === "Model" || type.kind === "ModelProperty")) {
+      const ref = getArmCommonTypeOpenAPIRef(program, type, {
+        version: context.version,
+        service: context.service,
+      });
+      if (ref) {
+        return {
+          $ref: expandRef(ref),
+        };
+      }
+    }
+    return undefined;
+  }
+  function getSchemaOrRef(type: Type, schemaContext: SchemaContext): any {
+    const ref = resolveExternalRef(type);
+    if (ref) {
+      return ref;
+    }
+
     if (type.kind === "Scalar" && program.checker.isStdType(type)) {
       return getSchemaForScalar(type);
     }
@@ -870,14 +893,9 @@ export async function getOpenAPIForService(
       }
     }
 
-    const refUrl = getRef(program, property, {
-      version: context.version,
-      service: context.service,
-    });
-    if (refUrl) {
-      return {
-        $ref: resolveRef(refUrl),
-      };
+    const ref = resolveExternalRef(property);
+    if (ref) {
+      return ref;
     }
 
     const parameter = params.get(property);