tsp - upgrade tsp to 1.5 (#1526)

Author: dolauli

common/config/rush/pnpm-lock.yaml

@@ -44,17 +44,17 @@
     "vitest": "1.6.1"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.59.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.59.0 <1.0.0",
-    "@typespec/compiler": ">=1.3.0 <2.0.0",
-    "@typespec/http": ">=1.3.0 <2.0.0",
-    "@typespec/streams": ">=0.72.1 <1.0.0",
-    "@typespec/xml": ">=0.72.1 <1.0.0",
-    "@typespec/rest": ">=0.72.1 <1.0.0",
-    "@typespec/versioning": ">=0.72.1 <1.0.0",
-    "@typespec/openapi": ">=1.3.0 <2.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.59.0 <1.0.0",
-    "@azure-tools/typespec-azure-rulesets": ">=0.59.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.61.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.61.0 <1.0.0",
+    "@typespec/compiler": ">=1.5.0 <2.0.0",
+    "@typespec/http": ">=1.5.0 <2.0.0",
+    "@typespec/streams": ">=0.75.0 <1.0.0",
+    "@typespec/xml": ">=0.75.0 <1.0.0",
+    "@typespec/rest": ">=0.75.0 <1.0.0",
+    "@typespec/versioning": ">=0.75.0 <1.0.0",
+    "@typespec/openapi": ">=1.5.0 <2.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.61.0 <1.0.0",
+    "@azure-tools/typespec-azure-rulesets": ">=0.61.0 <1.0.0"
   },
   "scripts": {
     "build": "tsc",

packages/typespec-powershell/package.json

@@ -60,8 +60,7 @@ import {
   createMetadataInfo,
   Visibility
 } from "@typespec/http";
-import { getPagedResult, getUnionAsEnum } from "@azure-tools/typespec-azure-core";
-import { extractPagedMetadataNested } from "./operationUtil.js";
+import { getUnionAsEnum } from "@azure-tools/typespec-azure-core";
 import { pascalCase, deconstruct } from "@azure-tools/codegen";
 import {
   getDefaultApiVersion,
@@ -780,31 +779,7 @@ function getSchemaForModel(
   // let name = dpgContext.rlcOptions?.enableModelNamespace
   // ? fullNamespaceName
   // : model.name;
-  let name = model.name;
-  if (
-    !overridedModelName &&
-    model.templateMapper &&
-    model.templateMapper.args &&
-    model.templateMapper.args.length > 0 &&
-    getPagedResult(program, model)
-  ) {
-    const templateTypes = model.templateMapper.args.filter((it) =>
-      isType(it)
-    ) as Type[];
-    name =
-      templateTypes
-        .map((it) => {
-          switch (it.kind) {
-            case "Model":
-              return it.name;
-            case "String":
-              return it.value;
-            default:
-              return "";
-          }
-        })
-        .join("") + "List";
-  }
+  const name = model.name;
 
   const modelSchema = new ObjectSchema(overridedModelName ?? name, getDoc(program, model) || "");
   // normalized the output name
@@ -844,37 +819,6 @@ function getSchemaForModel(
   //   modelSchema.fromCore = true;
   // }
 
-  if (getPagedResult(program, model)) {
-    const paged = extractPagedMetadataNested(program, model);
-    if (paged && paged.itemsProperty) {
-      const items = paged.itemsProperty as unknown as Model;
-      if (items && items.templateMapper && items.templateMapper.args) {
-        const templateTypes = items.templateMapper.args.filter((it) =>
-          isType(it)
-        ) as Type[];
-        const templateName = templateTypes
-          ?.map((it) => {
-            switch (it.kind) {
-              case "Model":
-                return it.name;
-              case "String":
-                return it.value;
-              default:
-                return "";
-            }
-          })
-          .join("");
-        // ToDo by xiaogang
-        // if (
-        //   paged.itemsProperty.name === "value" &&
-        //   paged.nextLinkProperty?.name === "nextLink"
-        // ) {
-        //   modelSchema.alias = `Paged<${templateName}>`;
-        //   modelSchema.outputAlias = `Paged<${templateName}Output>`;
-        // }
-      }
-    }
-  }
   modelSchema.properties = [];
 
   // getSchemaOrRef on all children to push them into components.schemas

packages/typespec-powershell/src/utils/modelUtils.ts

@@ -27,9 +27,7 @@ import {
   getHttpOperation
 } from "@typespec/http";
 import {
-  getLroMetadata,
-  getPagedResult,
-  PagedResultMetadata
+  getLroMetadata
 } from "@azure-tools/typespec-azure-core";
 import {
   getWireName,
@@ -408,36 +406,6 @@ export function hasPagingOperations(
   return false;
 }
 
-export function extractPagedMetadataNested(
-  program: Program,
-  type: Model
-): PagedResultMetadata | undefined {
-  // This only works for `is Page<T>` not `extends Page<T>`.
-  let paged = getPagedResult(program, type);
-  if (paged) {
-    return paged;
-  }
-  if (type.baseModel) {
-    paged = getPagedResult(program, type.baseModel);
-  }
-  if (paged) {
-    return paged;
-  }
-  const templateArguments = type.templateMapper?.args;
-  if (templateArguments) {
-    for (const argument of templateArguments) {
-      const modelArgument = argument as Model;
-      if (modelArgument) {
-        paged = extractPagedMetadataNested(program, modelArgument);
-        if (paged) {
-          return paged;
-        }
-      }
-    }
-  }
-  return paged;
-}
-
 export function getSpecialSerializeInfo(
   paramType: string,
   paramFormat: string
@@ -554,17 +522,6 @@ export function isIgnoredHeaderParam(param: HttpOperationParameter) {
   );
 }
 
-export function parseNextLinkName(
-  paged: PagedResultMetadata
-): string | undefined {
-  return paged.nextLinkProperty?.name;
-}
-
-export function parseItemName(paged: PagedResultMetadata): string | undefined {
-  // TODO: support the nested item names
-  return (paged.itemsSegments ?? [])[0];
-}
-
 export interface PageDetails {
   nextLinkNames: string[];
   itemNames: string[];
@@ -605,19 +562,6 @@ export function extractPageDetails(
       nextLinkNames: [nextLinkNames],
       itemNames: [itemNames]
     };
-  } else {
-    // TODO: remember to remove this once Azure Paging is removed.
-    for (const response of operation.responses) {
-      const paged = extractPagedMetadataNested(program, response.type as Model);
-      if (paged) {
-        const nextLinkName = parseNextLinkName(paged) ?? "nextLink";
-        const itemName = parseItemName(paged) ?? "value";
-        return {
-          nextLinkNames: [nextLinkName],
-          itemNames: [itemName]
-        };
-      }
-    }
   }
   return undefined;
 }

packages/typespec-powershell/src/utils/operationUtil.ts

@@ -7,10 +7,7 @@ import {
 import { ignoreDiagnostics, Model, Program, Type } from "@typespec/compiler";
 import { getHttpOperation, HttpOperation } from "@typespec/http";
 import {
-  hasPagingOperations,
-  extractPagedMetadataNested,
-  parseNextLinkName,
-  parseItemName
+  hasPagingOperations
 } from "../utils/operationUtil.js";
 import { listOperations } from "./clientUtils.js";
 
@@ -23,56 +20,4 @@ export function getPageable(
   return program.stateMap(pageableOperationsKey).get(entity);
 }
 
-export function extractPageDetailFromCore(
-  program: Program,
-  client: SdkClient,
-  dpgContext: SdkContext
-) {
-  if (!hasPagingOperations(program, client, dpgContext)) {
-    return;
-  }
-  const nextLinks = new Set<string>();
-  const itemNames = new Set<string>();
-  // Add default values
-  nextLinks.add("nextLink");
-  itemNames.add("value");
-  const clientOperations = listOperations(client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    // ignore overload base operation
-    if (route.overloads && route.overloads?.length > 0) {
-      continue;
-    }
-    extractPageDetailFromCoreForRoute(route);
-  }
-
-  function extractPageDetailFromCoreForRoute(route: HttpOperation) {
-    for (const response of route.responses) {
-      const paged = extractPagedMetadataNested(program, response.type as Model);
-      if (paged) {
-        const nextLinkName = parseNextLinkName(paged);
-        if (nextLinkName) {
-          nextLinks.add(nextLinkName);
-        }
-        const itemName = parseItemName(paged);
-        if (itemName) {
-          itemNames.add(itemName);
-        }
-        // Once we find paged metadata, we don't need to processs any further.
-        continue;
-      }
-    }
-  }
-  // If there are more than one options for nextLink and item names we need to generate a
-  // more complex pagination helper.
-  const isComplexPaging = nextLinks.size > 1 || itemNames.size > 1;
-  return {
-    hasPaging: true,
-    pageDetails: {
-      itemNames: [...itemNames],
-      nextLinkNames: [...nextLinks],
-      isComplexPaging
-    }
-  };
-}
 

packages/typespec-powershell/src/utils/pageUtils.ts

@@ -31,7 +31,5 @@ enum Versions {
   /**
    * The 2024-06-27 API version.
    */
-  @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
-  @useDependency(Azure.Core.Versions.v1_0_Preview_1)
   v2024_06_27: "2024-06-27",
 }

tests-upgrade/tests-emitter/AppComplianceAutomation.Management/main.tsp

@@ -37,7 +37,7 @@ model EvidenceResource extends Azure.ResourceManager.Foundations.ProxyResource {
    * Evidence property.
    */
   #suppress "deprecated" "Legacy flatten"
-  @Azure.ClientGenerator.Core.flattenProperty
+  @Azure.ClientGenerator.Core.Legacy.flattenProperty
   properties: EvidenceProperties;
 }
 

tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/EvidenceResource.tsp

@@ -37,7 +37,7 @@ model ReportResource extends Azure.ResourceManager.Foundations.ProxyResource {
    * Report property.
    */
   #suppress "deprecated" "Legacy flatten"
-  @Azure.ClientGenerator.Core.flattenProperty
+  @Azure.ClientGenerator.Core.Legacy.flattenProperty
   properties: ReportProperties;
 }
 

tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/ReportResource.tsp

@@ -42,7 +42,7 @@ model ScopingConfigurationResource
    * ScopingConfiguration property.
    */
   #suppress "deprecated" "Legacy flatten"
-  @Azure.ClientGenerator.Core.flattenProperty
+  @Azure.ClientGenerator.Core.Legacy.flattenProperty
   properties: ScopingConfigurationProperties;
 }
 

tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/ScopingConfigurationResource.tsp

@@ -35,7 +35,7 @@ model SnapshotResource extends Azure.ResourceManager.Foundations.ProxyResource {
    * Snapshot's property.
    */
   #suppress "deprecated" "Legacy flatten"
-  @Azure.ClientGenerator.Core.flattenProperty
+  @Azure.ClientGenerator.Core.Legacy.flattenProperty
   properties?: SnapshotProperties;
 }