[Health Insights] Project structure updates

specification/ai/HealthInsights/HealthInsights.Common/model.common.fhir.elements.tsp

@@ -1,4 +1,3 @@
-
 using TypeSpec.Rest;
 
 namespace Fhir.R4;
@@ -106,7 +105,6 @@ Concept - reference to a terminology or just text
 Based on [FHIR CodeableConcept](https://www.hl7.org/fhir/R4/datatypes.html#CodeableConcept)
 """)
 model CodeableConcept is Element {
-
   @doc("Code defined by a terminology system")
   coding?: Array<Coding>;
 
@@ -175,7 +173,7 @@ model Reference is Element {
 An identifier intended for computation
 Based on [FHIR Identifier](https://www.hl7.org/fhir/R4/identifier.html)
 """)
-model Identifier is  Element {
+model Identifier is Element {
   @doc("usual | official | temp | secondary | old (If known)")
   use?: string;
 

specification/ai/HealthInsights/HealthInsights.OncoPhenotype/client.tsp

@@ -3,12 +3,13 @@ import "./route.oncophenotype.tsp";
 
 import "@typespec/rest";
 import "@typespec/http";
-import "../HealthInsights.OpenAPI/service.tsp";
+import "../service.tsp";
 
 using Azure.ClientGenerator.Core;
 
-@TypeSpec.Versioning.useDependency(Azure.Core.Versions.v1_0_Preview_1)
-@TypeSpec.Versioning.useDependency(AzureHealthInsights.ApiVersion.v2023_09_01_Preview)
+@TypeSpec.Versioning.useDependency(
+  AzureHealthInsights.ApiVersion.v2023_09_01_Preview
+)
 namespace ClientForAzureHealthInsights;
 
 @client({

specification/ai/HealthInsights/HealthInsights.PatientTimeline/client.tsp

@@ -3,12 +3,13 @@ import "./route.patienttimeline.tsp";
 
 import "@typespec/rest";
 import "@typespec/http";
-import "../HealthInsights.OpenAPI/service.tsp";
+import "../service.tsp";
 
 using Azure.ClientGenerator.Core;
 
-@TypeSpec.Versioning.useDependency(Azure.Core.Versions.v1_0_Preview_1)
-@TypeSpec.Versioning.useDependency(AzureHealthInsights.ApiVersion.v2023_09_01_Preview)
+@TypeSpec.Versioning.useDependency(
+  AzureHealthInsights.ApiVersion.v2023_09_01_Preview
+)
 namespace ClientForAzureHealthInsights;
 
 @client({

specification/ai/HealthInsights/HealthInsights.RadiologyInsights/client.tsp

@@ -3,12 +3,13 @@ import "./route.radiologyinsights.tsp";
 
 import "@typespec/rest";
 import "@typespec/http";
-import "../HealthInsights.OpenAPI/service.tsp";
+import "../service.tsp";
 
 using Azure.ClientGenerator.Core;
 
-@TypeSpec.Versioning.useDependency(Azure.Core.Versions.v1_0_Preview_1)
-@TypeSpec.Versioning.useDependency(AzureHealthInsights.ApiVersion.v2023_09_01_Preview)
+@TypeSpec.Versioning.useDependency(
+  AzureHealthInsights.ApiVersion.v2023_09_01_Preview
+)
 namespace ClientForAzureHealthInsights;
 
 @client({

specification/ai/HealthInsights/HealthInsights.RadiologyInsights/model.radiologyinsights.tsp

@@ -94,7 +94,7 @@ An inference made by the Radiology Insights model regarding a patient.
   - FollowupCommunication
 """)
 @discriminator("kind")
-model RadiologyInsightsInference is Fhir.R4.Extendible {}
+model RadiologyInsightsInference is Fhir.R4.Extendible;
 
 @doc("A notification for age mismatch is displayed when the age mentioned in a document for a specific patient does not match the age specified in the patient information.")
 model AgeMismatchInference extends RadiologyInsightsInference {

specification/ai/HealthInsights/HealthInsights.TrialMatcher/client.tsp

@@ -3,12 +3,13 @@ import "./route.trialmatcher.tsp";
 
 import "@typespec/rest";
 import "@typespec/http";
-import "../HealthInsights.OpenAPI/service.tsp";
+import "../service.tsp";
 
 using Azure.ClientGenerator.Core;
 
-@TypeSpec.Versioning.useDependency(Azure.Core.Versions.v1_0_Preview_1)
-@TypeSpec.Versioning.useDependency(AzureHealthInsights.ApiVersion.v2023_09_01_Preview)
+@TypeSpec.Versioning.useDependency(
+  AzureHealthInsights.ApiVersion.v2023_09_01_Preview
+)
 namespace ClientForAzureHealthInsights;
 
 @client({

specification/ai/HealthInsights/main.tsp

@@ -0,0 +1,11 @@
+import "./HealthInsights.TrialMatcher/route.trialmatcher.tsp";
+import "./HealthInsights.OncoPhenotype/route.oncophenotype.tsp";
+import "./HealthInsights.RadiologyInsights/route.radiologyinsights.tsp";
+import "./HealthInsights.PatientTimeline/route.patienttimeline.tsp";
+import "@typespec/rest";
+import "@typespec/http";
+import "./service.tsp";
+
+// FIXME: This is a workaround. Tracking issue: https://github.com/microsoft/typespec/issues/2826
+alias _ForceOrderOfReslutionExtension_ = Fhir.R4.Extension;
+alias _ForceOrderOfReslutionCodeableConcept_ = Fhir.R4.CodeableConcept;

specification/ai/HealthInsights/HealthInsights.OpenAPI/tspconfig.yaml → specification/ai/HealthInsights/tspconfig.yaml

@@ -1,6 +1,6 @@
 parameters:
   "service-dir":
-    default: "HealthInsights"
+    default: "sdk/healthinsights"
   "service-name":
     default: "HealthInsights"
 emit:
@@ -11,7 +11,7 @@ linter:
 options:
   "@azure-tools/typespec-autorest":
     azure-resource-provider-folder: "data-plane"
-    emitter-output-dir: "{project-root}/../.."
+    emitter-output-dir: "{project-root}/.."
     examples-directory: examples
     omit-unreachable-types: true
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json"