Fix issues with visibility change

eng/pipelines/templates/steps/npm-install.yml

@@ -11,8 +11,8 @@ steps:
   - script: npm --version --loglevel info
     displayName: npm --version
 
-  - script: npm ci
-    displayName: npm ci
+  - script: npm install --no-package-lock
+    displayName: npm install --no-package-lock
 
   - script: npm ls -a
     displayName: npm ls -a

eng/pipelines/typespec-validation-all.yml

@@ -53,6 +53,9 @@ jobs:
     vmImage: $(OSVmImage)
 
   steps:
+  - script: git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge -Xours origin/main
+    displayName: git merge origin/main
+
   - template: /eng/pipelines/templates/steps/npm-install.yml
 
   - pwsh: |

eng/pipelines/typespec-validation.yml

@@ -8,9 +8,12 @@ jobs:
     vmImage: ubuntu-22.04
 
   steps:
+  - script: git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge -Xours origin/main
+    displayName: git merge origin/main
+
   - template: /eng/pipelines/templates/steps/npm-install.yml
 
   - pwsh: |
-      $(Build.SourcesDirectory)/eng/scripts/TypeSpec-Validation.ps1 -GitClean -Verbose
+      $(Build.SourcesDirectory)/eng/scripts/TypeSpec-Validation.ps1 -GitClean -BaseCommitish HEAD~2 -Verbose
     displayName: Validate Impacted Specs
     ignoreLASTEXITCODE: true

package.json

@@ -1,18 +1,17 @@
 {
   "name": "azure-rest-api-specs",
   "devDependencies": {
-    "@azure-tools/typespec-apiview": "0.4.8",
-    "@azure-tools/typespec-autorest": "0.41.0",
-    "@azure-tools/typespec-azure-core": "0.41.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.41.0",
-    "@azure-tools/typespec-client-generator-core": "0.41.3",
+    "@azure-tools/typespec-autorest": "next",
+    "@azure-tools/typespec-azure-core": "next",
+    "@azure-tools/typespec-azure-resource-manager": "next",
+    "@azure-tools/typespec-client-generator-core": "next",
     "@azure/avocado": "^0.8.4",
-    "@typespec/compiler": "0.55.0",
-    "@typespec/http": "0.55.0",
-    "@typespec/openapi": "0.55.0",
-    "@typespec/openapi3": "0.55.0",
-    "@typespec/rest": "0.55.0",
-    "@typespec/versioning": "0.55.0",
+    "@typespec/compiler": "next",
+    "@typespec/http": "next",
+    "@typespec/openapi": "next",
+    "@typespec/openapi3": "next",
+    "@typespec/rest": "next",
+    "@typespec/versioning": "next",
     "azure-rest-api-specs-eng-tools": "file:eng/tools",
     "prettier": "~3.2.5",
     "typescript": "~5.3.3"

specification/ai/DocumentIntelligence/routes.tsp

@@ -115,7 +115,7 @@ model AnalyzeFromStreamRequestParams {
     | "application/vnd.openxmlformats-officedocument.presentationml.presentation";
 
   @doc("Input content.")
-  @body
+  @bodyRoot
   input: bytes;
 }
 
@@ -169,7 +169,7 @@ interface DocumentModels {
       contentType: "application/json";
 
       @doc("Analyze request parameters.")
-      @body
+      @bodyRoot
       analyzeRequest?: AnalyzeDocumentRequest;
     },
     AnalyzeResultOperation
@@ -186,7 +186,7 @@ interface DocumentModels {
   buildModel is DocumentIntelligenceLongRunningOperation<
     {
       @doc("Build request parameters.")
-      @body
+      @bodyRoot
       buildRequest: BuildDocumentModelRequest;
     },
     DocumentModelBuildOperationDetails
@@ -200,7 +200,7 @@ interface DocumentModels {
   composeModel is DocumentIntelligenceLongRunningOperation<
     {
       @doc("Compose request parameters.")
-      @body
+      @bodyRoot
       composeRequest: ComposeDocumentModelRequest;
     },
     DocumentModelComposeOperationDetails
@@ -216,7 +216,7 @@ interface DocumentModels {
   authorizeModelCopy is DocumentIntelligenceOperation<
     {
       @doc("Authorize copy request parameters.")
-      @body
+      @bodyRoot
       authorizeCopyRequest: AuthorizeCopyRequest;
     },
     CopyAuthorization
@@ -236,7 +236,7 @@ interface DocumentModels {
       modelId: string;
 
       @doc("Copy to request parameters.")
-      @body
+      @bodyRoot
       copyToRequest: CopyAuthorization;
     },
     DocumentModelCopyToOperationDetails
@@ -290,7 +290,7 @@ interface DocumentClassifiers {
   buildClassifier is DocumentIntelligenceLongRunningOperation<
     {
       @doc("Build request parameters.")
-      @body
+      @bodyRoot
       buildRequest: BuildDocumentClassifierRequest;
     },
     DocumentClassifierBuildOperationDetails
@@ -335,7 +335,7 @@ interface DocumentClassifiers {
       contentType: "application/json";
 
       @doc("Classify request parameters.")
-      @body
+      @bodyRoot
       classifyRequest: ClassifyDocumentRequest;
     },
     AnalyzeResultOperation

specification/ai/HealthInsights/HealthInsights.Common/primitives.tsp

@@ -33,7 +33,7 @@ alias ServiceTraits = NoRepeatableRequests &
   QueryParametersTrait<Azure.Core.ExpandQueryParameter>;
 
 model HealthInsightsErrorResponse is Azure.Core.Foundations.ErrorResponse {
-  ...RequestIdResponseHeaderTrait;
+  ...RequestIdResponseHeader;
 }
 
 alias HealthInsightsOperations = ResourceOperations<

specification/ai/ImageAnalysis/routes.tsp

@@ -82,7 +82,7 @@ op analyzeFromImageData is Azure.Core.RpcOperation<
     contentType: "application/octet-stream";
 
     @doc("The image to be analyzed")
-    @body
+    @bodyRoot
     imageData: bytes;
 
     ...SharedAnalyzeQuery;
@@ -101,7 +101,7 @@ op analyzeFromUrl is Azure.Core.RpcOperation<
     contentType: "application/json";
 
     @doc("The image to be analyzed")
-    @body
+    @bodyRoot
     imageUrl: ImageUrl;
 
     ...SharedAnalyzeQuery;