@azure-tools/typespec-ts 0.54.2 → 0.55.0-dev.10

package/src/lib.ts

@@ -3,7 +3,7 @@
 
 import { createTypeSpecLibrary, JSONSchemaType, paramMessage } from "@typespec/compiler";
 import { Options } from "prettier";
-import { DependencyInfo, PackageDetails, PackageFlavor, ServiceInfo } from "./rlc-common/index.js";
+import { PackageDetails } from "./rlc-common/index.js";
 
 export interface EmitterOptions {
   /**
@@ -13,9 +13,6 @@ export interface EmitterOptions {
    * currently affected by this option.
    */
   "include-headers-in-response"?: boolean;
-  "include-shortcuts"?: boolean;
-  "multi-client"?: boolean;
-  batch?: any[];
   "package-details"?: PackageDetails;
   "add-credentials"?: boolean;
   /** Three possible values:
@@ -42,19 +39,9 @@ export interface EmitterOptions {
    */
   "generate-test"?: boolean;
   "generate-sample"?: boolean;
-  "azure-sdk-for-js"?: boolean;
-  "azure-output-directory"?: string;
   "is-typespec-test"?: boolean;
-  title?: string;
-  "dependency-info"?: DependencyInfo;
-  "product-doc-link"?: string;
-  "service-info"?: ServiceInfo;
   "azure-arm"?: boolean;
-  "source-from"?: "TypeSpec" | "Swagger";
-  "is-modular-library"?: boolean;
-  "module-kind"?: "esm";
   "enable-operation-group"?: boolean;
-  flavor?: PackageFlavor;
   "enable-model-namespace"?: boolean;
   "hierarchy-client"?: boolean;
   "compatibility-mode"?: boolean;
@@ -63,10 +50,8 @@ export interface EmitterOptions {
   "clear-output-folder"?: boolean;
   "ignore-property-name-normalize"?: boolean;
   "compatibility-query-multi-format"?: boolean;
-  branded?: boolean;
   "typespec-title-map"?: Record<string, string>;
   "ignore-enum-member-name-normalize"?: boolean;
-  "default-value-object"?: boolean;
   //TODO should remove this after finish the release tool test
   "should-use-pnpm-dep"?: boolean;
   "ignore-nullable-on-optional"?: boolean;
@@ -93,7 +78,6 @@ export interface EmitterOptions {
   /**
    * When set to true, generates React Native build targets (tsconfig, warp target,
    * package.json exports). Defaults to `false`.
-   * Only applicable when `azure-sdk-for-js` is `true`.
    */
   "generate-react-native-target"?: boolean;
 }
@@ -108,24 +92,6 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "This option is used to indicate whether to include response headers in the generated response type. When set to true, the generated response type will include response headers as properties.",
     },
-    "include-shortcuts": {
-      type: "boolean",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
-    "multi-client": {
-      type: "boolean",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
-    batch: {
-      type: "array",
-      nullable: true,
-      items: {
-        type: "string",
-      },
-      description: "Deprecated option for RLC legacy generation.",
-    },
     "package-details": {
       type: "object",
       additionalProperties: true,
@@ -145,18 +111,18 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
     "add-credentials": {
       type: "boolean",
       nullable: true,
-      description: `
-      We support two types of authentication: Azure Key Credential(AzureKey) and Token credential(AADToken), any other will need to be handled manually.
-
-      There are two ways to set up our credential details
-
-      - To use \`@useAuth\` decorator in TypeSpec
-      - To config in yaml file
-
-      Please notice defining in TypeSpec is recommended and also has higher priority than second one.
-
-      To enable credential in \`tspconfig.yaml\` and we need to provide more details to let codegen know types.
-      `,
+      description: [
+        "We support two types of authentication: Azure Key Credential(AzureKey) and Token credential(AADToken), any other will need to be handled manually.",
+        "",
+        "There are two ways to set up our credential details",
+        "",
+        "- To use `@useAuth` decorator in TypeSpec",
+        "- To config in yaml file",
+        "",
+        "Please notice defining in TypeSpec is recommended and also has higher priority than second one.",
+        "",
+        "To enable credential in `tspconfig.yaml` and we need to provide more details to let codegen know types.",
+      ].join("\n"),
     },
     "credential-scopes": {
       type: "array",
@@ -186,20 +152,18 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
     "generate-metadata": {
       type: "boolean",
       nullable: true,
-      description: `
-      Whether to generate metadata files which includes package.json, README.md and tsconfig.json etc. Defaults to \`undefined\`. If there's not a package.json under package-dir, defaults to \`true\`. but if you'd like to disable this feature you could set it as \`false\`.
-      `,
+      description:
+        "Whether to generate metadata files which includes package.json, README.md and tsconfig.json etc. Defaults to `undefined`. If there's not a package.json under package-dir, defaults to `true`. but if you'd like to disable this feature you could set it as `false`.",
     },
     "generate-test": {
       type: "boolean",
       nullable: true,
-      description: `
-      Whether to generate test files, for basic testing of your generated sdks. Defaults to \`undefined\`.
-      other cases:
-      - If azure-sdk-for-js is \`false\`. Defaults to \`false\`.
-      - If azure-sdk-for-js is \`true\` but there's a test folder under package-dir. Defaults to \`false\`.
-      - If azure-sdk-for-js is \`true\` but there's not a test folder under package-dir. Defaults to \`true\`.
-      `,
+      description: [
+        "Whether to generate test files, for basic testing of your generated sdks. Defaults to `undefined`.",
+        "other cases:",
+        "- If there's a test folder under package-dir. Defaults to `false`.",
+        "- If there's not a test folder under package-dir. Defaults to `true`.",
+      ].join("\n"),
     },
     "generate-sample": {
       type: "boolean",
@@ -207,70 +171,16 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "Whether to generate sample files, for basic samples of your generated sdks. Defaults to `undefined`. Management packages' default to `true`.",
     },
-    "azure-sdk-for-js": {
-      type: "boolean",
-      nullable: true,
-      description:
-        "This is used to indicate your project is generated in [azure-sdk-for-js](https://github.com/Azure/azure-sdk-for-js) repo or not. If your package is located in that repo we'll leverage `dev-tool` to accelerate our building and testing, however if not we'll remove the dependency for that tool. Defaults to `undefined`. Services with Flavor equal to 'Azure' default to 'true'. ",
-    },
-    "azure-output-directory": {
-      type: "string",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation",
-    },
     "is-typespec-test": {
       type: "boolean",
       nullable: true,
       description: "Internal option for test",
     },
-    title: {
-      type: "string",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
-    "dependency-info": {
-      type: "object",
-      additionalProperties: true,
-      properties: {
-        link: { type: "string", nullable: false },
-        description: { type: "string", nullable: false },
-      },
-      required: [],
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
-    "product-doc-link": {
-      type: "string",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
-    "service-info": {
-      type: "object",
-      additionalProperties: true,
-      properties: {
-        title: { type: "string", nullable: true },
-        description: { type: "string", nullable: true },
-      },
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
     "azure-arm": {
       type: "boolean",
       nullable: true,
       description: "Whether the package is an arm package.",
     },
-    "source-from": {
-      type: "string",
-      nullable: true,
-      description: "Internal option, the value is default for TypeSpec generation",
-    },
-    "is-modular-library": {
-      type: "boolean",
-      nullable: true,
-      default: false,
-      description:
-        "Whether to generate a Modular library. Defaults to `false`. Arm packages default to `true`.",
-    },
     "enable-operation-group": {
       type: "boolean",
       nullable: true,
@@ -289,23 +199,6 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "An option to organize the client in a hierarchical way as defined by `@clientInitialization`. This is true by default.",
     },
-    branded: {
-      type: "boolean",
-      nullable: true,
-      description: "A section of flavor",
-    },
-    flavor: {
-      type: "string",
-      nullable: true,
-      description: "The flavor of the SDK.",
-    },
-    "module-kind": {
-      type: "string",
-      nullable: true,
-      enum: ["esm"],
-      default: "esm",
-      description: "Internal option for test.",
-    },
     "compatibility-mode": {
       type: "boolean",
       nullable: true,
@@ -347,11 +240,6 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "Whether to generate the backward-compatible code for query parameter serialization for array types in RLC. Defaults to `false`",
     },
-    "default-value-object": {
-      type: "boolean",
-      nullable: true,
-      description: "Deprecated option for RLC legacy generation.",
-    },
     "typespec-title-map": {
       type: "object",
       additionalProperties: {
@@ -359,15 +247,16 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       },
       required: [],
       nullable: true,
-      description: `Only for Modular generation
-      By default, code generation uses the titles specified in the \`@client\` and \`@service\` decorators in TypeSpec to name modular clients. If you need to override these names, you can configure the \`typespec-title-map\`. The map's keys represent the original client names from TypeSpec, and the values are the desired client names. This configuration supports renaming multiple clients.
-
-      \`\`\`yaml
-      typespec-title-map: 
-        AnomalyDetectorClient: AnomalyDetectorRest
-        AnomalyDetectorClient2: AnomalyDetectorRest2
-      \`\`\`
-      `,
+      description: [
+        "Only for Modular generation",
+        "By default, code generation uses the titles specified in the `@client` and `@service` decorators in TypeSpec to name modular clients. If you need to override these names, you can configure the `typespec-title-map`. The map's keys represent the original client names from TypeSpec, and the values are the desired client names. This configuration supports renaming multiple clients.",
+        "",
+        "```yaml",
+        "typespec-title-map:",
+        "  AnomalyDetectorClient: AnomalyDetectorRest",
+        "  AnomalyDetectorClient2: AnomalyDetectorRest2",
+        "```",
+      ].join("\n"),
     },
     "should-use-pnpm-dep": {
       type: "boolean",
@@ -402,7 +291,7 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       type: "boolean",
       nullable: true,
       description:
-        "When set to true, generates React Native build targets (tsconfig, warp target, package.json exports). Only applicable when azure-sdk-for-js is true. Defaults to `false`.",
+        "When set to true, generates React Native build targets (tsconfig, warp target, package.json exports). Defaults to `false`.",
     },
   },
   required: [],

package/src/modular/build-classical-client.ts

@@ -290,8 +290,8 @@ function buildClientOperationGroups(
     } else {
       // The `rawGroupName` is used to any places where we need normalized name twice so we need to keep the raw as PascalCase.
       const rawGroupName = normalizeName(prefixes[0] ?? "", NameType.Interface);
-      const operationName = `_get${rawGroupName}Operations`;
-      const propertyType = `${rawGroupName}Operations`;
+      const operationName = `_get${normalizeName(rawGroupName, NameType.OperationGroup)}Operations`;
+      const propertyType = `${normalizeName(rawGroupName, NameType.OperationGroup)}Operations`;
       // The `groupName` is used to any places where we don't need normalized name again
       const groupName = normalizeName(rawGroupName, NameType.Property);
       const existProperty = clientClass.getProperties().filter((p) => {

package/src/modular/build-client-context.ts

@@ -1,4 +1,4 @@
-import { NameType, isAzurePackage, normalizeName } from "../rlc-common/index.js";
+import { NameType, normalizeName } from "../rlc-common/index.js";
 import {
   buildGetClientCredentialParam,
   buildGetClientEndpointParam,
@@ -164,13 +164,10 @@ export function buildClientContext(
   });
 
   // TODO use binder here
-  // (for now) now logger for unbranded pkgs
-  if (isAzurePackage(emitterOptions)) {
-    clientContextFile.addImportDeclaration({
-      moduleSpecifier: "../".repeat(hierarchy.length + 1) + "logger.js",
-      namedImports: ["logger"],
-    });
-  }
+  clientContextFile.addImportDeclaration({
+    moduleSpecifier: "../".repeat(hierarchy.length + 1) + "logger.js",
+    namedImports: ["logger"],
+  });
 
   const factoryFunction = clientContextFile.addFunction({
     docs: getDocsFromDescription(client.doc),
@@ -241,15 +238,10 @@ export function buildClientContext(
     if (!apiVersionInEndpoint && apiVersionParam.clientDefaultValue) {
       apiVersionStatement += `const ${apiVersionParamName} = options.${apiVersionParamName};`;
     }
-  } else if (isAzurePackage(emitterOptions)) {
-    apiVersionStatement += `
-        if (options.apiVersion) {
-          logger.warning("This client does not support client api-version, please change it at the operation level");
-        }`;
   } else {
     apiVersionStatement += `
         if (options.apiVersion) {
-          console.warn("This client does not support client api-version, please change it at the operation level");
+          logger.warning("This client does not support client api-version, please change it at the operation level");
         }`;
   }
   factoryFunction.addStatements(apiVersionStatement);

package/src/modular/build-project-files.ts

@@ -1,6 +1,6 @@
 import { NameType } from "../rlc-common/index.js";
 
-import path from "path/posix";
+import { getRelativePathFromDirectory, joinPaths } from "@typespec/compiler";
 import { useContext } from "../context-manager.js";
 import { getClientHierarchyMap, getModularClientOptions } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
@@ -19,7 +19,10 @@ function getSourceRootPrefix(emitterOptions: ModularEmitterOptions, context: Sdk
   const rootDir = (context.generationPathDetail?.rootDir ?? "").replace(/\\/g, "/");
 
   if (rootDir && sourceRoot.startsWith(rootDir)) {
-    const relativePath = path.relative(rootDir, sourceRoot).replace(/\\/g, "/");
+    const relativePath = getRelativePathFromDirectory(rootDir, sourceRoot, false).replace(
+      /\\/g,
+      "/",
+    );
     return `./${relativePath}`;
   }
 
@@ -95,7 +98,7 @@ export function getModuleExports(context: SdkContext, emitterOptions: ModularEmi
 function getModelSubpaths(emitterOptions: ModularEmitterOptions) {
   const outputProject = useContext("outputProject");
   const modelFiles = outputProject.getSourceFiles(
-    path.join(emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"), `models/**/*.ts`),
+    joinPaths(emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"), `models/**/*.ts`),
   );
   const subpath = new Set<string>();
   for (const modelFile of modelFiles) {
@@ -104,7 +107,11 @@ function getModelSubpaths(emitterOptions: ModularEmitterOptions) {
       continue;
     }
     subpath.add(
-      path.relative(emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"), filepath),
+      getRelativePathFromDirectory(
+        emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"),
+        filepath,
+        false,
+      ),
     );
   }
   return Array.from(subpath);

package/src/modular/build-restore-poller.ts

@@ -1,5 +1,5 @@
 import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
-import path from "path";
+import { joinPaths } from "@typespec/compiler";
 import { SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { useDependencies } from "../framework/hooks/use-dependencies.js";
@@ -32,7 +32,7 @@ export function buildRestorePoller(
     return;
   }
   const srcPath = emitterOptions.modularOptions.sourceRoot;
-  const filePath = path.join(
+  const filePath = joinPaths(
     `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}restorePollerHelpers.ts`,
   );
   const restorePollerFile = project.createSourceFile(filePath, undefined, {

package/src/modular/build-root-index.ts

@@ -1,11 +1,10 @@
 import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
-import { NoTarget } from "@typespec/compiler";
-import { join } from "path/posix";
+import { joinPaths, NoTarget } from "@typespec/compiler";
 import { Project, SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { resolveReference } from "../framework/reference.js";
 import { reportDiagnostic } from "../lib.js";
-import { isAzurePackage, NameType, normalizeName } from "../rlc-common/index.js";
+import { NameType, normalizeName } from "../rlc-common/index.js";
 import { getModularClientOptions } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
 import { getMethodHierarchiesMap } from "../utils/operation-util.js";
@@ -29,7 +28,7 @@ export function buildRootIndex(
   if (!clientMap) {
     // we still need to export the models if no client is provided
     exportModels(emitterOptions, rootIndexFile);
-    exportRestErrorTypes(context, rootIndexFile);
+    exportRestErrorTypes(rootIndexFile);
     return;
   }
   const project = useContext("outputProject");
@@ -72,7 +71,7 @@ export function buildRootIndex(
   exportPagingTypes(context, rootIndexFile);
   exportFileContentsType(context, rootIndexFile);
   exportAzureCloudTypes(context, rootIndexFile);
-  exportRestErrorTypes(context, rootIndexFile);
+  exportRestErrorTypes(rootIndexFile);
 }
 
 function exportModels(
@@ -106,10 +105,7 @@ function exportAzureCloudTypes(context: SdkContext, rootIndexFile: SourceFile) {
   }
 }
 
-function exportRestErrorTypes(context: SdkContext, rootIndexFile: SourceFile) {
-  if (!isAzurePackage({ options: context.rlcOptions })) {
-    return;
-  }
+function exportRestErrorTypes(rootIndexFile: SourceFile) {
   const existingExports = getExistingExports(rootIndexFile);
   const namedExports = ["RestError", "isRestError"].filter((name) => !existingExports.has(name));
   if (namedExports.length > 0) {
@@ -298,7 +294,7 @@ function exportModules(
       .getDirectories()
       .filter((dir) => {
         const formattedDir = dir.getPath().replace(/\\/g, "/");
-        const targetPath = join(srcPath, subfolder, moduleName).replace(/\\/g, "/");
+        const targetPath = joinPaths(srcPath, subfolder, moduleName).replace(/\\/g, "/");
         return formattedDir.startsWith(targetPath);
       })
       .map((dir) => {
@@ -309,17 +305,17 @@ function exportModules(
       .getDirectories()
       .filter((dir) => {
         const formattedDir = dir.getPath().replace(/\\/g, "/");
-        const targetPath = join(srcPath, subfolder, moduleName).replace(/\\/g, "/");
+        const targetPath = joinPaths(srcPath, subfolder, moduleName).replace(/\\/g, "/");
         return formattedDir.startsWith(targetPath);
       })
       .map((dir) => {
         return dir.getPath().replace(/\\/g, "/");
       });
   } else {
-    folders = [join(srcPath, subfolder, moduleName).replace(/\\/g, "/")];
+    folders = [joinPaths(srcPath, subfolder, moduleName).replace(/\\/g, "/")];
   }
   for (const folder of folders) {
-    const apiFilePattern = join(folder, "index.ts").replace(/\\/g, "/");
+    const apiFilePattern = joinPaths(folder, "index.ts").replace(/\\/g, "/");
     const modelsFile = project.getSourceFile(apiFilePattern);
     if (!modelsFile) {
       continue;

package/src/modular/build-subpath-index.ts

@@ -1,7 +1,7 @@
 import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
+import { joinPaths } from "@typespec/compiler";
 import { ModularEmitterOptions } from "./interfaces.js";
 
-import { join } from "path";
 import { Node, SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { getModularClientOptions } from "../utils/client-utils.js";
@@ -29,7 +29,7 @@ export function buildSubpathIndexFile(
       .getDirectories()
       .filter((dir) => {
         const formattedDir = dir.getPath().replace(/\\/g, "/");
-        const targetPath = join(srcPath, subfolder, subpath).replace(/\\/g, "/");
+        const targetPath = joinPaths(srcPath, subfolder, subpath).replace(/\\/g, "/");
         return (
           formattedDir.startsWith(targetPath) && !project.getSourceFile(`${formattedDir}/index.ts`)
         );
@@ -38,10 +38,10 @@ export function buildSubpathIndexFile(
         return dir.getPath().replace(/\\/g, "/");
       });
   } else {
-    folders = [join(srcPath, subfolder, subpath).replace(/\\/g, "/")];
+    folders = [joinPaths(srcPath, subfolder, subpath).replace(/\\/g, "/")];
   }
   for (const folder of folders) {
-    const apiFilePattern = subpath === "models" ? join(folder, "models.ts") : folder;
+    const apiFilePattern = subpath === "models" ? joinPaths(folder, "models.ts") : folder;
     const apiFiles = project.getSourceFiles().filter((file) => {
       if (subpath === "api" && options.recursive) {
         return file.getDirectoryPath().replace(/\\/g, "/") === apiFilePattern.replace(/\\/g, "/");

package/src/modular/emit-logger-file.ts

@@ -3,9 +3,6 @@ import { ModularEmitterOptions } from "./interfaces.js";
 
 export function emitLoggerFile(emitterOptions: ModularEmitterOptions, srcPath: string = "src") {
   const project = useContext("outputProject");
-  if (emitterOptions.options.flavor !== "azure") {
-    return;
-  }
 
   const sourceFile = project.createSourceFile(`${srcPath}/logger.ts`, "", {
     overwrite: true,

package/src/modular/emit-models-options.ts

@@ -1,4 +1,4 @@
-import * as path from "path";
+import { joinPaths } from "@typespec/compiler";
 
 import { ModularEmitterOptions } from "./interfaces.js";
 
@@ -25,7 +25,7 @@ export function buildApiOptions(
   for (const [prefixKey, operations] of methodMap) {
     const prefixes = prefixKey.split("/");
     const modelOptionsFile = project.createSourceFile(
-      path.join(
+      joinPaths(
         emitterOptions.modularOptions.sourceRoot,
         subfolder ?? "",
         `api`,

package/src/modular/emit-models.ts

@@ -36,16 +36,15 @@ import {
   getMultipartFileTypeExpression,
 } from "./type-expressions/get-model-expression.js";
 
-import { getNamespaceFullName, NoTarget } from "@typespec/compiler";
+import { getNamespaceFullName, joinPaths, NoTarget } from "@typespec/compiler";
 import { isMetadata, isOrExtendsHttpFile, Visibility } from "@typespec/http";
-import path from "path";
 import { useContext } from "../context-manager.js";
 import { addDeclaration } from "../framework/declaration.js";
 import {
   emitQueue,
   flattenPropertyModelMap,
   getAllOperationsFromClient,
-  pagedModelsKeptPublic,
+  pagedModelsUsedInNonPagingOps,
 } from "../framework/hooks/sdk-types.js";
 import { refkey } from "../framework/refkey.js";
 import { reportDiagnostic } from "../lib.js";
@@ -304,7 +303,7 @@ export function getApiVersionEnum(context: SdkContext) {
 }
 
 export function getModelsPath(sourceRoot: string, modelNamespace: string[] = []): string {
-  return path.join(
+  return joinPaths(
     ...[
       sourceRoot,
       "models",
@@ -842,7 +841,8 @@ export function normalizeModelName(
   }
   const namespacePrefix = context.rlcOptions?.enableModelNamespace ? segments.join("") : "";
   const internalModelPrefix =
-    (isPagedResultModel(context, type) && !pagedModelsKeptPublic.has(type)) || type.isGeneratedName
+    (isPagedResultModel(context, type) && !pagedModelsUsedInNonPagingOps.has(type)) ||
+    type.isGeneratedName
       ? "_"
       : "";
   return `${internalModelPrefix}${normalizeName(namespacePrefix + type.name, nameType, true)}${unionSuffix}`;
@@ -932,7 +932,7 @@ export function visitPackageTypes(context: SdkContext) {
   const { sdkPackage } = context;
   emitQueue.clear();
   flattenPropertyModelMap.clear();
-  pagedModelsKeptPublic.clear();
+  pagedModelsUsedInNonPagingOps.clear();
   // Add all models in the package to the emit queue
   for (const model of sdkPackage.models) {
     visitType(context, model);
@@ -1015,19 +1015,7 @@ function trackPagedModelInNonPagingMethod(
   if (method.kind !== "basic" && method.kind !== "lro") return;
   const respType = method.response.type;
   if (respType && isPagedResultModel(context, respType)) {
-    pagedModelsKeptPublic.add(respType);
-  }
-}
-
-/**
- * If a paged result model is used as a model property type, mark it so that
- * normalizeModelName keeps it public (no "_" prefix).
- */
-function trackPagedModelUsedAsProperty(context: SdkContext, type: SdkType): void {
-  // Unwrap array types to check the element type
-  const resolved = type.kind === "array" ? type.valueType : type;
-  if (resolved && isPagedResultModel(context, resolved)) {
-    pagedModelsKeptPublic.add(resolved);
+    pagedModelsUsedInNonPagingOps.add(respType);
   }
 }
 
@@ -1056,10 +1044,6 @@ function visitType(context: SdkContext, type: SdkType | undefined) {
       if (property.flatten && property.type.kind === "model") {
         flattenPropertyModelMap.set(property, type);
       }
-      // If a paged result model is used as a model property (not as a paging
-      // operation response), it must stay public (no "_" prefix) because users
-      // interact with it directly through the property.
-      trackPagedModelUsedAsProperty(context, property.type);
     }
     if (type.discriminatedSubtypes) {
       for (const subType of Object.values(type.discriminatedSubtypes)) {