Address PR comments

Azure · May 26, 2023 · 31faa3f · 31faa3f
1 parent 824fe06
commit 31faa3f
Show file tree

Hide file tree

Showing 38 changed files with 28 additions and 309 deletions.
diff --git a/packages/extensions/openapi-to-cadl/src/emiters/emit-cadl-config.ts b/packages/extensions/openapi-to-cadl/src/emiters/emit-cadl-config.ts
@@ -4,7 +4,7 @@ import { formatFile } from "../utils/format";
 export async function emitCadlConfig(filePath: string): Promise<void> {
   const content = `
   emit:
-    - "@azure-tools/typespec-autorest": true
+    - "@azure-tools/typespec-autorest":
     # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
     # "@azure-tools/typespec-python":
     #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/src/emiters/emit-package.ts b/packages/extensions/openapi-to-cadl/src/emiters/emit-package.ts
@@ -3,10 +3,17 @@ import { CadlProgram } from "../interfaces";
 import { formatFile } from "../utils/format";
 
 export async function emitPackage(filePath: string, program: CadlProgram): Promise<void> {
+  const session = getSession();
+  // Default to false;
+  const includePackage = session.configuration["include-package"] === true;
+
+  if (!includePackage) {
+    return;
+  }
+
   const name = program.serviceInformation.name.toLowerCase().replace(/ /g, "-");
   const description = program.serviceInformation.doc;
   const content = JSON.stringify(getPackage(name, description as string));
-  const session = getSession();
   session.writeFile({ filename: filePath, content: formatFile(content, filePath) });
 }
 

diff --git a/packages/extensions/openapi-to-cadl/test/analyzeText/readme.md b/packages/extensions/openapi-to-cadl/test/analyzeText/readme.md
@@ -6,6 +6,7 @@ clear-output-folder: false
 guessResourceKey: true
 isAzureSpec: true
 namespace: "Azure.Language.Authoring"
+include-package: true
 modelerfour:
   lenient-model-deduplication: true
   prenamer: true

diff --git a/packages/extensions/openapi-to-cadl/test/analyzeText/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/analyzeText/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/anomalyDetector/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/anomalyDetector/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/anomalyDetector/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/anomalyDetector/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/arm-compute/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/arm-compute/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/arm-compute/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/arm-compute/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/batch/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/batch/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/batch/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/batch/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/bodyComplex/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/bodyComplex/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/bodyComplex/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/bodyComplex/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/complexObject/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/complexObject/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/complexObject/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/complexObject/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/confidentialLedger/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/confidentialLedger/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/confidentialLedger/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/confidentialLedger/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/keyvault/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/keyvault/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/keyvault/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/keyvault/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/loadTest/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/loadTest/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/loadTest/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/loadTest/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/nh/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/nh/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/nh/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/nh/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/openAI/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/openAI/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/openAI/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/openAI/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/pagination/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/pagination/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/pagination/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/pagination/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/qna/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/qna/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/qna/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/qna/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/qnaAuthoring/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/qnaAuthoring/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/qnaAuthoring/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/qnaAuthoring/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true

diff --git a/packages/extensions/openapi-to-cadl/test/qnaRuntime/tsp-output/package.json b/packages/extensions/openapi-to-cadl/test/qnaRuntime/tsp-output/package.json
diff --git a/packages/extensions/openapi-to-cadl/test/qnaRuntime/tsp-output/tspconfig.yaml b/packages/extensions/openapi-to-cadl/test/qnaRuntime/tsp-output/tspconfig.yaml
@@ -1,5 +1,5 @@
 emit:
-  - "@azure-tools/typespec-autorest": true
+  - "@azure-tools/typespec-autorest":
   # Uncomment this line and add "@azure-tools/typespec-python" to your package.json to generate Python code
   # "@azure-tools/typespec-python":
   #   "basic-setup-py": true