Use conditional compile (#24374)

markcowl · mikeharder · web-flow · commit 601e3d4bc0a9 · 2023-06-08T16:25:13.000-07:00
* Add conditional compile of client.tsp

* Always execute from main.tsp, always check client.tsp

* Fix script

* Remove yaml reference

* Update specification/cognitiveservices/HealthInsights/healthinsights.oncophenotype/tspconfig.yaml

---------

Co-authored-by: Mike Harder &lt;mharder@microsoft.com&gt;
diff --git a/eng/pipelines/templates/steps/typespec-ci.yml b/eng/pipelines/templates/steps/typespec-ci.yml
@@ -14,7 +14,14 @@ steps:
     pushd ${{parameters.Folder}}
 
     # Pass "--no" to ensure npx does not install anything (TypeSpec compiler should already be installed)
-    npx --no tsp compile . --warn-as-error || exit_code=1
+    
+    if test -f main.tsp; then
+      npx --no tsp compile . --warn-as-error || exit_code=1
+    fi
+    if test -f client.tsp; then
+      npx --no tsp compile client.tsp --no-emit --warn-as-error || exit_code=1
+    fi
+    
 
     # Format parent folder to include shared files (disabled until formatting diffs are fixed)
     # npx tsp format ../**/*.tsp
diff --git a/eng/pipelines/typespec-ci.yml b/eng/pipelines/typespec-ci.yml
@@ -49,6 +49,16 @@ jobs:
       Folder: specification/cognitiveservices/HealthInsights/healthinsights.openapi
       DisplayName: healthinsights.openapi
 
+  - template: templates/steps/typespec-ci.yml
+    parameters:
+      Folder: specification/cognitiveservices/HealthInsights/healthinsights.oncophenotype
+      DisplayName: healthinsights.oncophenotype
+
+  - template: templates/steps/typespec-ci.yml
+    parameters:
+      Folder: specification/cognitiveservices/HealthInsights/healthinsights.trialmatcher
+      DisplayName: healthinsights.trialmatcher
+
   - template: templates/steps/typespec-ci.yml
     parameters:
       Folder: specification/cognitiveservices/OpenAI.Inference
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "@azure-tools/typespec-azure-core": "0.31.0",
     "@azure-tools/typespec-azure-resource-manager": "0.31.0",
     "@azure-tools/typespec-providerhub": "0.31.0",
+    "@azure-tools/typespec-client-generator-core": "0.31.0",
     "@typespec/compiler": "0.45.0",
     "@azure/avocado": "^0.8.4",
     "@types/prettier": "^2.7.2",
diff --git a/specification/cognitiveservices/AnomalyDetector/client.tsp b/specification/cognitiveservices/AnomalyDetector/client.tsp
@@ -3,4 +3,4 @@ import "./main.tsp";
 
 using Azure.ClientGenerator.Core;
 
-@@convenientAPI(AnomalyDetector.Univariate.DetectUnivariateEntireSeries, false)
+@@convenientAPI(AnomalyDetector.Univariate.detectUnivariateEntireSeries, false)
diff --git a/specification/cognitiveservices/HealthInsights/healthinsights.oncophenotype/client.tsp b/specification/cognitiveservices/HealthInsights/healthinsights.oncophenotype/client.tsp
@@ -17,5 +17,6 @@ namespace ClientForAzureHealthInsights;
     service: AzureHealthInsights
 })
   interface CancerProfilingClient {
-  InferCancerProfile is AzureHealthInsights.OncoPhenotype.createJob;
+  #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "https://github.com/microsoft/typespec/issues/2037"
+  inferCancerProfile is AzureHealthInsights.OncoPhenotype.createJob;
 }
diff --git a/specification/cognitiveservices/HealthInsights/healthinsights.oncophenotype/tspconfig.yaml b/specification/cognitiveservices/HealthInsights/healthinsights.oncophenotype/tspconfig.yaml
@@ -1,25 +1,19 @@
-emit: [
-  "@azure-tools/typespec-csharp",
-  # "@azure-tools/cadl-python",
-  # "@azure-tools/typespec-java",
-  # "@azure-tools/cadl-typescript",
-]
-
+emit: []
 options:
   "@azure-tools/typespec-csharp":
     namespace : "Azure.Health.Insights.CancerProfiling"
     clear-output-folder : true
     new-project : false
     model-namespace : false
-  # "@azure-tools/typespec-java":
-  #     namespace: "Com.Azure.Health.Insights.CancerProfiling"
-  #     clear-output-folder: true
-  #     new-project: false
-  #     model-namespace: false
-  # "@azure-tools/cadl-python":
-  #     package-mode: "dataplane"
-  #     package-name: "azure-healthinsights-cancerprofiling"
-  # "@azure-tools/cadl-typescript": 
-  #     packageDetails:
-  #        name: "@azure-rest/health-insights-cancerprofiling"
-  #        description: "Azure Health Insights CancerProfiling"
+  "@azure-tools/typespec-java":
+    namespace: "Com.Azure.Health.Insights.CancerProfiling"
+    clear-output-folder: true
+    new-project: false
+    model-namespace: false
+  "@azure-tools/cadl-python":
+    package-mode: "dataplane"
+    package-name: "azure-healthinsights-cancerprofiling"
+  "@azure-tools/cadl-typescript": 
+    packageDetails:
+      name: "@azure-rest/health-insights-cancerprofiling"
+      description: "Azure Health Insights CancerProfiling"
diff --git a/specification/cognitiveservices/HealthInsights/healthinsights.openapi/tspconfig.yaml b/specification/cognitiveservices/HealthInsights/healthinsights.openapi/tspconfig.yaml
@@ -1,9 +1,6 @@
 emit: [
     "@azure-tools/typespec-autorest",
-  # "@azure-tools/cadl-apiview"
 ]
-
-
 options:
   "@azure-tools/typespec-autorest":
      azure-resource-provider-folder: "data-plane"
diff --git a/specification/cognitiveservices/HealthInsights/healthinsights.trialmatcher/client.tsp b/specification/cognitiveservices/HealthInsights/healthinsights.trialmatcher/client.tsp
@@ -17,5 +17,6 @@ namespace ClientForAzureHealthInsights;
     service: AzureHealthInsights
 })
   interface ClinicalMatchingClient {
-  MatchTrials is AzureHealthInsights.TrialMatcher.createJob;
+    #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "https://github.com/microsoft/typespec/issues/2037"
+    matchTrials is AzureHealthInsights.TrialMatcher.createJob;
 }
diff --git a/specification/cognitiveservices/HealthInsights/healthinsights.trialmatcher/tspconfig.yaml b/specification/cognitiveservices/HealthInsights/healthinsights.trialmatcher/tspconfig.yaml
@@ -1,25 +1,19 @@
-emit: [
-  "@azure-tools/typespec-csharp",
-  # "@azure-tools/cadl-python",
-  # "@azure-tools/typespec-java",
-  # "@azure-tools/cadl-typescript",
-]
-
+emit: []
 options:
   "@azure-tools/typespec-csharp":
     namespace : "Azure.Health.Insights.ClinicalMatching"
     clear-output-folder : true
     new-project : false
     model-namespace : false
-  # "@azure-tools/typespec-java":
-  #     namespace: "Com.Azure.Health.Insights.ClinicalMatching"
-  #     clear-output-folder: true
-  #     new-project: false
-  #     model-namespace: false
-  # "@azure-tools/cadl-python":
-  #     package-mode: "dataplane"
-  #     package-name: "azure-healthinsights-clinicalmatching"
-  # "@azure-tools/cadl-typescript": 
-  #     packageDetails:
-  #        name: "@azure-rest/health-insights-clinicalmatching"
-  #        description: "Azure Health Insights ClinicalMatching"
+  "@azure-tools/typespec-java":
+    namespace: "Com.Azure.Health.Insights.ClinicalMatching"
+    clear-output-folder: true
+    new-project: false
+    model-namespace: false
+  "@azure-tools/cadl-python":
+    package-mode: "dataplane"
+    package-name: "azure-healthinsights-clinicalmatching"
+  "@azure-tools/cadl-typescript": 
+    packageDetails:
+      name: "@azure-rest/health-insights-clinicalmatching"
+      description: "Azure Health Insights ClinicalMatching"

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@ import "./main.tsp";`
`3`	`3`
`4`	`4`	`using Azure.ClientGenerator.Core;`
`5`	`5`
`6`		`-@@convenientAPI(AnomalyDetector.Univariate.DetectUnivariateEntireSeries, false)`
	`6`	`+@@convenientAPI(AnomalyDetector.Univariate.detectUnivariateEntireSeries, false)`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@ namespace ClientForAzureHealthInsights;`
`17`	`17`	`service: AzureHealthInsights`
`18`	`18`	`})`
`19`	`19`	`interface CancerProfilingClient {`
`20`		`- InferCancerProfile is AzureHealthInsights.OncoPhenotype.createJob;`
	`20`	`+ #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "https://github.com/microsoft/typespec/issues/2037"`
	`21`	`+ inferCancerProfile is AzureHealthInsights.OncoPhenotype.createJob;`
`21`	`22`	`}`