diff --git a/.chronus/changes/dependabot-submodules-core-afd3772-2024-1-9-8-55-23.md b/.chronus/changes/dependabot-submodules-core-afd3772-2024-1-9-8-55-23.md new file mode 100644 index 0000000000..40b3c23d94 --- /dev/null +++ b/.chronus/changes/dependabot-submodules-core-afd3772-2024-1-9-8-55-23.md @@ -0,0 +1,6 @@ +--- +changeKind: internal +packages: + - "@azure-tools/typespec-client-generator-core" +--- + diff --git a/.prettierignore b/.prettierignore index 3170a2f697..2b5bc6c625 100644 --- a/.prettierignore +++ b/.prettierignore @@ -70,3 +70,6 @@ core/packages/compiler/templates/__snapshots__/ # Skip formatting tsp files *.noformat.tsp + +# Tm Grammars generated files +core/grammars/ diff --git a/core b/core index 7452fe9a57..afd377242e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7452fe9a5793554e5fd7b3337a356024cc89fd50 +Subproject commit afd377242ea73eaace3460cd327ee74c52d5933f diff --git a/cspell.yaml b/cspell.yaml index b219e454f3..96f61d7333 100644 --- a/cspell.yaml +++ b/cspell.yaml @@ -13,12 +13,18 @@ ignorePaths: - "**/CHANGELOG.md" - common/scripts/* - packages/website/build/* + - pnpm-lock.yaml + - eng/feeds/**/examples/** + - packages/samples/test/output/** +useGitignore: true enableFiletypes: - - cadl + - tsp + - typespec words: - allof - apim - apos + - armId - azsdk - Bazs - byos @@ -29,20 +35,27 @@ words: - foos - horiz - Howtos + - infile + - kvset - liftr - logz - LRO + - lropaging + - Lucene - msazure - msdata + - mylocation + - nupkg - odata - Onco - oncophenotype + - PAYG - prismjs + - qnas - regionality + - Reranker - rpaasoneboxacr - rpass - SERVICERP - - userrp - - lropaging - - armId - tcgc + - userrp diff --git a/eng/scripts/new_service_adoption.py b/eng/scripts/new_service_adoption.py index 3cdcd57a51..515f19bef1 100755 --- a/eng/scripts/new_service_adoption.py +++ b/eng/scripts/new_service_adoption.py @@ -74,9 +74,9 @@ def pr_for_new_service(pr, files: list[dict]): # Make sure there are at least 4 path segments pattern = r'specification/[a-z-]+/(data-plane|resource-manager)/.*/.*' filenames = [x['filename'] for x in files] - xfiles = [x for x in filenames if re.match(pattern, x) and 'common' not in x] + x_files = [x for x in filenames if re.match(pattern, x) and 'common' not in x] # The namespace is the combined 3 path segments after "specification" - namespaces = list({'/'.join(x.split('/')[1:4]) for x in xfiles}) + namespaces = list({'/'.join(x.split('/')[1:4]) for x in x_files}) for namespace in namespaces: if non_public(namespace): continue diff --git a/package.json b/package.json index e2e2e27691..91086fef9d 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "check-version-mismatch": "syncpack list-mismatches", "change": "chronus", "clean": "pnpm run-all run clean", - "cspell": "cspell --no-progress \"**/*.{md,ts,tsx}\" ", + "cspell": "cspell --no-progress .", "dogfood": "pnpm install && pnpm build && pnpm run-all dogfood", "fix-version-mismatch": "syncpack fix-mismatches", "format": "pnpm run prettier --write", diff --git a/packages/samples/specs/data-plane/formrecognizer/main.tsp b/packages/samples/specs/data-plane/formrecognizer/main.tsp index ee2e39457a..c8de646fff 100644 --- a/packages/samples/specs/data-plane/formrecognizer/main.tsp +++ b/packages/samples/specs/data-plane/formrecognizer/main.tsp @@ -250,7 +250,7 @@ enum AnalyzeResultOperationStatus { notStarted, @doc("Operation is running.") - runnning, + running, @doc("Operation has failed.") failed, diff --git a/packages/samples/specs/data-plane/language/authoring/authoring.tsp b/packages/samples/specs/data-plane/language/authoring/authoring.tsp index 6213c4a2bf..5d27844949 100644 --- a/packages/samples/specs/data-plane/language/authoring/authoring.tsp +++ b/packages/samples/specs/data-plane/language/authoring/authoring.tsp @@ -272,9 +272,8 @@ interface Projects { >; #suppress "@azure-tools/typespec-azure-core/long-running-polling-operation-required" "This operation does not follow the standard long-running operation pattern." - // NOTE: `import` is a reserved keyword @doc("Triggers a job to export a project's data.") - importx is Operations.ResourceAction< + `import` is Operations.ResourceAction< Project, ExportedProject, TypeSpec.Http.AcceptedResponse & Foundations.LongRunningStatusLocation diff --git a/packages/samples/specs/data-plane/languageqna/Interface/common.tsp b/packages/samples/specs/data-plane/languageqna/Interface/common.tsp index 330b1ac882..7b0de36233 100644 --- a/packages/samples/specs/data-plane/languageqna/Interface/common.tsp +++ b/packages/samples/specs/data-plane/languageqna/Interface/common.tsp @@ -2,6 +2,8 @@ import "@typespec/http"; import "@typespec/rest"; import "@typespec/openapi"; +// cspell:ignore qnas + using TypeSpec.Http; using TypeSpec.OpenAPI; @@ -93,7 +95,7 @@ model MaxPageSizeParameter { @extension("x-ms-parameter-location", "method") @doc("The maximum number of resources to include in a single response") @query - mazpagesize?: int32; + maxpagesize?: int32; } alias ListParameters = TopParameter & SkipParameter & MaxPageSizeParameter; diff --git a/packages/samples/specs/data-plane/languageqna/Interface/main.tsp b/packages/samples/specs/data-plane/languageqna/Interface/main.tsp index 866f32674a..35bed8a897 100644 --- a/packages/samples/specs/data-plane/languageqna/Interface/main.tsp +++ b/packages/samples/specs/data-plane/languageqna/Interface/main.tsp @@ -67,7 +67,7 @@ interface Synonyms interface Sources extends ResourceUpdate, ResourceList { - // TODO: Singlton Resource not represented correctly + // TODO: Singleton Resource not represented correctly @get @route("{projectName}/sources/jobs/{jobId}") GetJob(...ResourceParameters, ...JobIdParameter): JobState | ODataError; diff --git a/packages/samples/specs/data-plane/languageqna/Raw/main.tsp b/packages/samples/specs/data-plane/languageqna/Raw/main.tsp index 0cc3dc443d..62ef920196 100644 --- a/packages/samples/specs/data-plane/languageqna/Raw/main.tsp +++ b/packages/samples/specs/data-plane/languageqna/Raw/main.tsp @@ -222,7 +222,6 @@ namespace QuestionAnsweringProjects { JobMetadata >; - // TODO: ok resonse code is incorrect @post @doc("Update Active Learning feedback.") @action("feedback") diff --git a/packages/samples/specs/data-plane/searchindex/main.tsp b/packages/samples/specs/data-plane/searchindex/main.tsp index 4ad86240c1..aa3530fcea 100644 --- a/packages/samples/specs/data-plane/searchindex/main.tsp +++ b/packages/samples/specs/data-plane/searchindex/main.tsp @@ -6,6 +6,8 @@ // ISSUE: Can't set service description: https://github.com/Azure/typespec-azure/issues/1032 // ISSUE: @extension on parameter doesn't work: https://github.com/Azure/typespec-azure/issues/1121 +// cspell:ignore Viet + import "@typespec/http"; import "@typespec/rest"; import "@typespec/openapi"; @@ -37,7 +39,7 @@ enum AutocompleteMode { @doc("Only one term is suggested. If the query has two terms, only the last term is completed. For example, if the input is 'washington medic', the suggested terms could include 'medicaid', 'medicare', and 'medicine'.") OneTerm: "oneTerm", - @doc("Matching two-term phrases in the index will be suggested. For example, if the inpu.t is 'medic', the suggested terms could include 'medicare coverage' and 'medical assistant'.") + @doc("Matching two-term phrases in the index will be suggested. For example, if the input is 'medic', the suggested terms could include 'medicare coverage' and 'medical assistant'.") TwoTerms: "twoTerms", @doc("Completes the last term in a query with two or more terms, where the last two terms are a phrase that exists in the index. For example, if the input is 'washington medic', the suggested terms could include 'washington medicaid' and 'washington medical'.") @@ -1041,7 +1043,7 @@ interface Documents { } // ISSUE: Can't respond with empty object: https://github.com/Azure/typespec-azure/issues/1122. -// They probably meant to have additonalProperties here? Surely this doesn't literally return `{}` always? +// They probably meant to have additionalProperties here? Surely this doesn't literally return `{}` always? @tag("Documents") @route("/docs('{key}')") interface DocumentsByKey { diff --git a/packages/samples/specs/data-plane/searchservice/languages.tsp b/packages/samples/specs/data-plane/searchservice/languages.tsp index 0d46f81530..e2dd26626b 100644 --- a/packages/samples/specs/data-plane/searchservice/languages.tsp +++ b/packages/samples/specs/data-plane/searchservice/languages.tsp @@ -1,5 +1,7 @@ namespace Azure.SearchService; +// cspell:ignore Bangla Bokmaal Bokmål Piqd Kiswahili Yucatec Otomi + @doc("The language codes supported for input text by KeyPhraseExtractionSkill.") enum KeyPhraseExtractionSkillLanguage { @doc("Danish") da, diff --git a/packages/samples/specs/data-plane/searchservice/search-datasource.ops.tsp b/packages/samples/specs/data-plane/searchservice/search-datasource.ops.tsp index 97e8b66622..30f91badfb 100644 --- a/packages/samples/specs/data-plane/searchservice/search-datasource.ops.tsp +++ b/packages/samples/specs/data-plane/searchservice/search-datasource.ops.tsp @@ -12,7 +12,7 @@ using TypeSpec.Rest.Resource; @tag("DataSources") interface DatasourcesApis { @route("/datasources") - @doc("Lists all indexe data sources available for a search service.") + @doc("Lists all indexes data sources available for a search service.") @get list(...SelectParameter, ...ClientRequestIdParameter, ...ApiVersionParameter): CollectionResult< SearchIndexerDataSource, diff --git a/packages/samples/specs/data-plane/searchservice/search-index.models.tsp b/packages/samples/specs/data-plane/searchservice/search-index.models.tsp index 275deb431e..b708a14060 100644 --- a/packages/samples/specs/data-plane/searchservice/search-index.models.tsp +++ b/packages/samples/specs/data-plane/searchservice/search-index.models.tsp @@ -1,5 +1,7 @@ import "./searchservice.models.tsp"; +// cspell:ignore Bangla Bokmaal Bokmål kstem Sorani Decompounder TFIDF + using TypeSpec.OpenAPI; using TypeSpec.Rest; @@ -628,7 +630,7 @@ enum LexicalTokenizerName { @doc("Grammar-based tokenizer that is suitable for processing most European-language documents. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/standard/ClassicTokenizer.html") Classic: "classic", - @doc("Tokenizes the input from an edge into n-grams of the given size(s). See https://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.html") + @doc("Tokenize the input from an edge into n-grams of the given size(s). See https://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.html") EdgeNGram: "edgeNGram", @doc("Emits the entire input as a single token. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/core/KeywordTokenizer.html") @@ -646,7 +648,7 @@ enum LexicalTokenizerName { @doc("Divides text using language-specific rules and reduces words to their base forms.") MicrosoftLanguageStemmingTokenizer: "microsoft_language_stemming_tokenizer", - @doc("Tokenizes the input into n-grams of the given size(s). See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/ngram/NGramTokenizer.html") + @doc("Tokenize the input into n-grams of the given size(s). See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/ngram/NGramTokenizer.html") NGram: "nGram", @doc("Tokenizer for path-like hierarchies. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/path/PathHierarchyTokenizer.html") @@ -658,7 +660,7 @@ enum LexicalTokenizerName { @doc("Standard Lucene analyzer; Composed of the standard tokenizer, lowercase filter and stop filter. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/standard/StandardTokenizer.html") Standard: "standard_v2", - @doc("Tokenizes urls and emails as one token. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.html") + @doc("Tokenize urls and emails as one token. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.html") UaxUrlEmail: "uax_url_email", @doc("Divides text at whitespace. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/core/WhitespaceTokenizer.html") @@ -819,7 +821,7 @@ model ClassicTokenizer extends LexicalTokenizer { maxTokenLength?: int32 = 255; } -@doc("Tokenizes the input from an edge into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene.") +@doc("Tokenize the input from an edge into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene.") model EdgeNGramTokenizer extends LexicalTokenizer { `@odata.type`: "#Microsoft.Azure.Search.EdgeNGramTokenizer"; @@ -1164,7 +1166,7 @@ enum MicrosoftStemmingTokenizerLanguage { Vietnamese: "vietnamese", } -@doc("Tokenizes the input into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene.") +@doc("Tokenize the input into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene.") model NGramTokenizer extends LexicalTokenizer { `@odata.type`: "#Microsoft.Azure.Search.NGramTokenizer"; @@ -1236,7 +1238,7 @@ model LuceneStandardTokenizerV2 extends LexicalTokenizer { maxTokenLength?: int32 = 255; } -@doc("Tokenizes urls and emails as one token. This tokenizer is implemented using Apache Lucene.") +@doc("Tokenize urls and emails as one token. This tokenizer is implemented using Apache Lucene.") model UaxUrlEmailTokenizer extends LexicalTokenizer { `@odata.type`: "#Microsoft.Azure.Search.UaxUrlEmailTokenizer"; diff --git a/packages/samples/specs/data-plane/searchservice/searchservice.models.tsp b/packages/samples/specs/data-plane/searchservice/searchservice.models.tsp index 8d96b687ab..74237c4b9a 100644 --- a/packages/samples/specs/data-plane/searchservice/searchservice.models.tsp +++ b/packages/samples/specs/data-plane/searchservice/searchservice.models.tsp @@ -1,6 +1,8 @@ import "@typespec/http"; import "@typespec/rest"; +// cspell:ignore adls adlsgen + import "./dataIdentity.model.tsp"; import "./dataPolicy.model.tsp"; diff --git a/packages/samples/specs/resource-manager/arm-library/ref-library/int-templates.tsp b/packages/samples/specs/resource-manager/arm-library/ref-library/int-templates.tsp index d96e8551a6..6c8245bbcd 100644 --- a/packages/samples/specs/resource-manager/arm-library/ref-library/int-templates.tsp +++ b/packages/samples/specs/resource-manager/arm-library/ref-library/int-templates.tsp @@ -83,7 +83,7 @@ interface TenantOperations extends ProxyResourceOperations, ResourceUpdate {} -@doc("rp-specific proeprties for the resource") +@doc("rp-specific properties for the resource") model TestTenantProperties { @doc("The status of the last operation performed on this resource.") provisioningState: ResourceProvisioningState; @@ -107,7 +107,7 @@ interface ExtensionOperations extends ProxyResourceOperations, ResourceUpdate {} -@doc("rp-specific proeprties for the resource") +@doc("rp-specific properties for the resource") model TestExtensionProperties { @doc("The status of the last operation performed on this resource.") provisioningState: ResourceProvisioningState; diff --git a/packages/samples/specs/resource-manager/arm-library/ref-library/op-templates.tsp b/packages/samples/specs/resource-manager/arm-library/ref-library/op-templates.tsp index dbc928243f..31253e5aac 100644 --- a/packages/samples/specs/resource-manager/arm-library/ref-library/op-templates.tsp +++ b/packages/samples/specs/resource-manager/arm-library/ref-library/op-templates.tsp @@ -33,7 +33,7 @@ interface Tracked2Operations { listBySubscription is ArmListBySubscription; } -@doc("rp-specific proeprties for the resource with all envelope properties") +@doc("rp-specific properties for the resource with all envelope properties") model TestTrackedProperties2 { @doc("The status of the last operation performed on this resource.") provisioningState: ResourceProvisioningState; diff --git a/packages/samples/specs/resource-manager/arm-scenarios/proxy/main.tsp b/packages/samples/specs/resource-manager/arm-scenarios/proxy/main.tsp index 79c32016d3..3d81fa2ed3 100644 --- a/packages/samples/specs/resource-manager/arm-scenarios/proxy/main.tsp +++ b/packages/samples/specs/resource-manager/arm-scenarios/proxy/main.tsp @@ -122,11 +122,11 @@ model Dependent is ProxyResource { name: string; } -/** Depedent properties */ +/** Dependent properties */ model DependentProperties { - /** Age of depedent */ + /** Age of dependent */ age: int32; - /** Gender of depedent */ + /** Gender of dependent */ gender: string; } diff --git a/packages/samples/specs/resource-manager/customer-managed-keys/main.tsp b/packages/samples/specs/resource-manager/customer-managed-keys/main.tsp index fcef00260a..2247f91373 100644 --- a/packages/samples/specs/resource-manager/customer-managed-keys/main.tsp +++ b/packages/samples/specs/resource-manager/customer-managed-keys/main.tsp @@ -22,7 +22,7 @@ namespace Microsoft.UpdateTests; interface Operations extends Azure.ResourceManager.Operations {} -@doc("Widget Resoruce") +@doc("Widget Resource") model WidgetResource is TrackedResource { @doc("The name of the widget.") @key("widgetName") diff --git a/packages/samples/specs/resource-manager/envelopetest/main.tsp b/packages/samples/specs/resource-manager/envelopetest/main.tsp index b6f2f3d072..f28466698b 100644 --- a/packages/samples/specs/resource-manager/envelopetest/main.tsp +++ b/packages/samples/specs/resource-manager/envelopetest/main.tsp @@ -38,7 +38,7 @@ model AllPropertiesResource is TrackedResource { interface AllProperties extends TrackedResourceOperations {} -@doc("rp-specific proeprties for the resource with all envelope properties") +@doc("rp-specific properties for the resource with all envelope properties") model AllPropertiesProperties { @doc("The status of the last operation performed on this resource.") provisioningState: EnvelopeProvisioningState; diff --git a/packages/samples/specs/resource-manager/liftr.confluent/confluent.rest.typespec-example b/packages/samples/specs/resource-manager/liftr.confluent/confluent.rest.typespec-example index aec8c3fc86..9f7233073f 100644 --- a/packages/samples/specs/resource-manager/liftr.confluent/confluent.rest.typespec-example +++ b/packages/samples/specs/resource-manager/liftr.confluent/confluent.rest.typespec-example @@ -4,11 +4,11 @@ namespace Organization { @get op get(@path subscription: string, @path resourceGroup: string, @path name: string) : ArmResponse; - @slro("/operations", OperationStatus) + @lro("/operations", OperationStatus) @put op createOrUpdate(@path subscription: string, @path resourceGroup: string, @path name: string, Organization) : ArmResponse; @patch op update(@path subscription: string, @path resourceGroup: string, @path name: string, OrganizationUpdate) : ArmResponse; - @slro("/operations", OperationStatus) + @lro("/operations", OperationStatus) @delete op delete(@path subscription: string, @path resourceGroup: string, @path name: string) : ArmResponse; @post op getKeys(@path subscription: string, @path resourceGroup: string, @path name: string) : ArmResponse; diff --git a/packages/samples/specs/resource-manager/logz/models.tsp b/packages/samples/specs/resource-manager/logz/models.tsp index 118efa51d5..5b6303a18f 100644 --- a/packages/samples/specs/resource-manager/logz/models.tsp +++ b/packages/samples/specs/resource-manager/logz/models.tsp @@ -190,7 +190,7 @@ model FilteringTag { @doc("The value of the tag.") value: string; - @doc("The action associated with thsi tag.") + @doc("The action associated with this tag.") action: TagAction; } diff --git a/packages/samples/specs/resource-manager/operationsTest/main.tsp b/packages/samples/specs/resource-manager/operationsTest/main.tsp index 5849c2023c..a8716076bf 100644 --- a/packages/samples/specs/resource-manager/operationsTest/main.tsp +++ b/packages/samples/specs/resource-manager/operationsTest/main.tsp @@ -93,7 +93,7 @@ interface TenantOperations extends ProxyResourceOperations, ResourceUpdate {} -@doc("rp-specific proeprties for the resource") +@doc("rp-specific properties for the resource") model TestTenantProperties { @doc("The status of the last operation performed on this resource.") provisioningState: EnvelopeProvisioningState; @@ -137,7 +137,7 @@ interface ExtensionOperations extends ProxyResourceOperations, ResourceUpdate {} -@doc("rp-specific proeprties for the resource") +@doc("rp-specific properties for the resource") model TestExtensionProperties { @doc("The status of the last operation performed on this resource.") provisioningState: EnvelopeProvisioningState; diff --git a/packages/samples/specs/resource-manager/operationsTest/opTemplates.tsp b/packages/samples/specs/resource-manager/operationsTest/opTemplates.tsp index 73f46becac..0bdc69db7b 100644 --- a/packages/samples/specs/resource-manager/operationsTest/opTemplates.tsp +++ b/packages/samples/specs/resource-manager/operationsTest/opTemplates.tsp @@ -30,7 +30,7 @@ interface Tracked2Operations { listBySubscription is ArmListBySubscription; } -@doc("rp-specific proeprties for the resource with all envelope properties") +@doc("rp-specific properties for the resource with all envelope properties") model TestTrackedProperties2 { @doc("The status of the last operation performed on this resource.") provisioningState: EnvelopeProvisioningState; @@ -86,7 +86,7 @@ interface TenantOperations2 { listByParent is ArmResourceListByParent; } -@doc("rp-specific proeprties for the resource") +@doc("rp-specific properties for the resource") model TestTenantProperties2 { @visibility("read") @doc("The status of the last operation performed on this resource.") diff --git a/packages/samples/specs/resource-manager/servicelinker/servicelinker.tsp b/packages/samples/specs/resource-manager/servicelinker/servicelinker.tsp index 1cb6735fe1..daea95c8bd 100644 --- a/packages/samples/specs/resource-manager/servicelinker/servicelinker.tsp +++ b/packages/samples/specs/resource-manager/servicelinker/servicelinker.tsp @@ -57,7 +57,7 @@ model LinkerProperties { ...DefaultProvisioningStateProperty; } -@doc("The kmind of authentication used for this linker.") +@doc("The kind of authentication used for this linker.") enum AuthType { @doc("System assigned identity") systemAssignedIdentity, diff --git a/packages/samples/test/output/azure/core/data-plane/formrecognizer/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/azure/core/data-plane/formrecognizer/@azure-tools/typespec-autorest/openapi.json index 4a7c607eb4..6bae9fd02a 100644 --- a/packages/samples/test/output/azure/core/data-plane/formrecognizer/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/azure/core/data-plane/formrecognizer/@azure-tools/typespec-autorest/openapi.json @@ -778,7 +778,7 @@ "description": "Operation status.", "enum": [ "notStarted", - "runnning", + "running", "failed", "succeeded" ], @@ -792,8 +792,8 @@ "description": "Operation has not started." }, { - "name": "runnning", - "value": "runnning", + "name": "running", + "value": "running", "description": "Operation is running." }, { diff --git a/packages/samples/test/output/azure/core/data-plane/formrecognizer/@typespec/openapi3/openapi.yaml b/packages/samples/test/output/azure/core/data-plane/formrecognizer/@typespec/openapi3/openapi.yaml index 1cbca5f339..44b7f29492 100644 --- a/packages/samples/test/output/azure/core/data-plane/formrecognizer/@typespec/openapi3/openapi.yaml +++ b/packages/samples/test/output/azure/core/data-plane/formrecognizer/@typespec/openapi3/openapi.yaml @@ -577,7 +577,7 @@ components: type: string enum: - notStarted - - runnning + - running - failed - succeeded description: Operation status. diff --git a/packages/samples/test/output/azure/core/data-plane/language/authoring/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/azure/core/data-plane/language/authoring/@azure-tools/typespec-autorest/openapi.json index d9c9d055ee..2ccfe74612 100644 --- a/packages/samples/test/output/azure/core/data-plane/language/authoring/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/azure/core/data-plane/language/authoring/@azure-tools/typespec-autorest/openapi.json @@ -305,9 +305,9 @@ "x-ms-long-running-operation": true } }, - "/authoring/analyze-text/projects/{projectName}:importx": { + "/authoring/analyze-text/projects/{projectName}:import": { "post": { - "operationId": "Projects_Importx", + "operationId": "Projects_Import", "description": "Triggers a job to export a project's data.", "parameters": [ { diff --git a/packages/samples/test/output/azure/core/data-plane/language/authoring/@typespec/openapi3/openapi.yaml b/packages/samples/test/output/azure/core/data-plane/language/authoring/@typespec/openapi3/openapi.yaml index 9b16eb1c34..e6c81e819f 100644 --- a/packages/samples/test/output/azure/core/data-plane/language/authoring/@typespec/openapi3/openapi.yaml +++ b/packages/samples/test/output/azure/core/data-plane/language/authoring/@typespec/openapi3/openapi.yaml @@ -581,9 +581,9 @@ paths: application/json: schema: $ref: '#/components/schemas/Azure.Core.Foundations.ErrorResponse' - /authoring/analyze-text/projects/{projectName}:importx: + /authoring/analyze-text/projects/{projectName}:import: post: - operationId: Projects_importx + operationId: Projects_import description: Triggers a job to export a project's data. parameters: - $ref: '#/components/parameters/Azure.Core.Foundations.ApiVersionParameter' diff --git a/packages/samples/test/output/azure/core/data-plane/searchindex/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/azure/core/data-plane/searchindex/@azure-tools/typespec-autorest/openapi.json index cb94a682ae..d9e4e65fa7 100644 --- a/packages/samples/test/output/azure/core/data-plane/searchindex/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/azure/core/data-plane/searchindex/@azure-tools/typespec-autorest/openapi.json @@ -935,7 +935,7 @@ { "name": "TwoTerms", "value": "twoTerms", - "description": "Matching two-term phrases in the index will be suggested. For example, if the inpu.t is 'medic', the suggested terms could include 'medicare coverage' and 'medical assistant'." + "description": "Matching two-term phrases in the index will be suggested. For example, if the input is 'medic', the suggested terms could include 'medicare coverage' and 'medical assistant'." }, { "name": "OneTermWithContext", @@ -1430,7 +1430,7 @@ { "name": "TwoTerms", "value": "twoTerms", - "description": "Matching two-term phrases in the index will be suggested. For example, if the inpu.t is 'medic', the suggested terms could include 'medicare coverage' and 'medical assistant'." + "description": "Matching two-term phrases in the index will be suggested. For example, if the input is 'medic', the suggested terms could include 'medicare coverage' and 'medical assistant'." }, { "name": "OneTermWithContext", diff --git a/packages/samples/test/output/azure/core/data-plane/searchservice/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/azure/core/data-plane/searchservice/@azure-tools/typespec-autorest/openapi.json index 802c7028f9..b69af5efe3 100644 --- a/packages/samples/test/output/azure/core/data-plane/searchservice/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/azure/core/data-plane/searchservice/@azure-tools/typespec-autorest/openapi.json @@ -68,7 +68,7 @@ "tags": [ "DataSources" ], - "description": "Lists all indexe data sources available for a search service.", + "description": "Lists all indexes data sources available for a search service.", "parameters": [ { "$ref": "#/parameters/SelectParameter" @@ -2322,7 +2322,7 @@ }, "EdgeNGramTokenizer": { "type": "object", - "description": "Tokenizes the input from an edge into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene.", + "description": "Tokenize the input from an edge into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene.", "properties": { "minGram": { "type": "integer", @@ -4230,7 +4230,7 @@ { "name": "EdgeNGram", "value": "edgeNGram", - "description": "Tokenizes the input from an edge into n-grams of the given size(s). See https://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.html" + "description": "Tokenize the input from an edge into n-grams of the given size(s). See https://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.html" }, { "name": "Keyword", @@ -4260,7 +4260,7 @@ { "name": "NGram", "value": "nGram", - "description": "Tokenizes the input into n-grams of the given size(s). See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/ngram/NGramTokenizer.html" + "description": "Tokenize the input into n-grams of the given size(s). See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/ngram/NGramTokenizer.html" }, { "name": "PathHierarchy", @@ -4280,7 +4280,7 @@ { "name": "UaxUrlEmail", "value": "uax_url_email", - "description": "Tokenizes urls and emails as one token. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.html" + "description": "Tokenize urls and emails as one token. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.html" }, { "name": "Whitespace", @@ -5146,7 +5146,7 @@ }, "NGramTokenizer": { "type": "object", - "description": "Tokenizes the input into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene.", + "description": "Tokenize the input into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene.", "properties": { "minGram": { "type": "integer", @@ -8019,7 +8019,7 @@ }, "UaxUrlEmailTokenizer": { "type": "object", - "description": "Tokenizes urls and emails as one token. This tokenizer is implemented using Apache Lucene.", + "description": "Tokenize urls and emails as one token. This tokenizer is implemented using Apache Lucene.", "properties": { "maxTokenLength": { "type": "integer", diff --git a/packages/samples/test/output/azure/core/data-plane/searchservice/@typespec/openapi3/openapi.yaml b/packages/samples/test/output/azure/core/data-plane/searchservice/@typespec/openapi3/openapi.yaml index c15a2ea109..5debab905b 100644 --- a/packages/samples/test/output/azure/core/data-plane/searchservice/@typespec/openapi3/openapi.yaml +++ b/packages/samples/test/output/azure/core/data-plane/searchservice/@typespec/openapi3/openapi.yaml @@ -15,7 +15,7 @@ paths: tags: - DataSources operationId: DatasourcesApis_list - description: Lists all indexe data sources available for a search service. + description: Lists all indexes data sources available for a search service. parameters: - $ref: '#/components/parameters/SelectParameter' - $ref: '#/components/parameters/ClientRequestIdParameter' @@ -1642,7 +1642,7 @@ components: description: Character classes to keep in the tokens. allOf: - $ref: '#/components/schemas/LexicalTokenizer' - description: Tokenizes the input from an edge into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene. + description: Tokenize the input from an edge into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene. ElisionTokenFilter: type: object required: @@ -2851,7 +2851,7 @@ components: description: Character classes to keep in the tokens. allOf: - $ref: '#/components/schemas/LexicalTokenizer' - description: Tokenizes the input into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene. + description: Tokenize the input into n-grams of the given size(s). This tokenizer is implemented using Apache Lucene. OcrSkill: type: object required: @@ -4335,7 +4335,7 @@ components: default: 255 allOf: - $ref: '#/components/schemas/LexicalTokenizer' - description: Tokenizes urls and emails as one token. This tokenizer is implemented using Apache Lucene. + description: Tokenize urls and emails as one token. This tokenizer is implemented using Apache Lucene. VisualFeature: type: string enum: diff --git a/packages/samples/test/output/azure/resource-manager/arm-library/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/azure/resource-manager/arm-library/@azure-tools/typespec-autorest/openapi.json index 9c3f085214..4f1825de5a 100644 --- a/packages/samples/test/output/azure/resource-manager/arm-library/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/azure/resource-manager/arm-library/@azure-tools/typespec-autorest/openapi.json @@ -1760,7 +1760,7 @@ }, "Microsoft.InterfacesTest.TestExtensionProperties": { "type": "object", - "description": "rp-specific proeprties for the resource", + "description": "rp-specific properties for the resource", "properties": { "provisioningState": { "$ref": "#/definitions/Azure.ResourceManager.ResourceProvisioningState", @@ -1798,7 +1798,7 @@ }, "Microsoft.InterfacesTest.TestTenantProperties": { "type": "object", - "description": "rp-specific proeprties for the resource", + "description": "rp-specific properties for the resource", "properties": { "provisioningState": { "$ref": "#/definitions/Azure.ResourceManager.ResourceProvisioningState", @@ -1914,7 +1914,7 @@ }, "Microsoft.OperationsTest.TestTrackedProperties2": { "type": "object", - "description": "rp-specific proeprties for the resource with all envelope properties", + "description": "rp-specific properties for the resource with all envelope properties", "properties": { "provisioningState": { "$ref": "#/definitions/Azure.ResourceManager.ResourceProvisioningState", diff --git a/packages/samples/test/output/azure/resource-manager/arm-scenarios/proxy/@azure-tools/typespec-autorest/2021-10-01-preview/openapi.json b/packages/samples/test/output/azure/resource-manager/arm-scenarios/proxy/@azure-tools/typespec-autorest/2021-10-01-preview/openapi.json index 304e971d45..324ccbdddd 100644 --- a/packages/samples/test/output/azure/resource-manager/arm-scenarios/proxy/@azure-tools/typespec-autorest/2021-10-01-preview/openapi.json +++ b/packages/samples/test/output/azure/resource-manager/arm-scenarios/proxy/@azure-tools/typespec-autorest/2021-10-01-preview/openapi.json @@ -719,16 +719,16 @@ }, "DependentProperties": { "type": "object", - "description": "Depedent properties", + "description": "Dependent properties", "properties": { "age": { "type": "integer", "format": "int32", - "description": "Age of depedent" + "description": "Age of dependent" }, "gender": { "type": "string", - "description": "Gender of depedent" + "description": "Gender of dependent" } }, "required": [ @@ -753,11 +753,11 @@ "age": { "type": "integer", "format": "int32", - "description": "Age of depedent" + "description": "Age of dependent" }, "gender": { "type": "string", - "description": "Gender of depedent" + "description": "Gender of dependent" } } }, diff --git a/packages/samples/test/output/azure/resource-manager/customer-managed-keys/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/azure/resource-manager/customer-managed-keys/@azure-tools/typespec-autorest/openapi.json index d04180f50b..cf7328388c 100644 --- a/packages/samples/test/output/azure/resource-manager/customer-managed-keys/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/azure/resource-manager/customer-managed-keys/@azure-tools/typespec-autorest/openapi.json @@ -364,7 +364,7 @@ "definitions": { "WidgetResource": { "type": "object", - "description": "Widget Resoruce", + "description": "Widget Resource", "properties": { "properties": { "$ref": "#/definitions/WidgetResourceProperties", diff --git a/packages/samples/test/output/azure/resource-manager/envelopetest/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/azure/resource-manager/envelopetest/@azure-tools/typespec-autorest/openapi.json index a81a834c00..40d361007b 100644 --- a/packages/samples/test/output/azure/resource-manager/envelopetest/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/azure/resource-manager/envelopetest/@azure-tools/typespec-autorest/openapi.json @@ -648,7 +648,7 @@ "definitions": { "AllPropertiesProperties": { "type": "object", - "description": "rp-specific proeprties for the resource with all envelope properties", + "description": "rp-specific properties for the resource with all envelope properties", "properties": { "provisioningState": { "$ref": "#/definitions/EnvelopeProvisioningState", diff --git a/packages/samples/test/output/azure/resource-manager/logz/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/azure/resource-manager/logz/@azure-tools/typespec-autorest/openapi.json index 44327330c8..0f93123ed3 100644 --- a/packages/samples/test/output/azure/resource-manager/logz/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/azure/resource-manager/logz/@azure-tools/typespec-autorest/openapi.json @@ -1456,7 +1456,7 @@ }, "action": { "$ref": "#/definitions/TagAction", - "description": "The action associated with thsi tag." + "description": "The action associated with this tag." } }, "required": [ diff --git a/packages/samples/test/output/azure/resource-manager/operationsTest/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/azure/resource-manager/operationsTest/@azure-tools/typespec-autorest/openapi.json index 5da72ac63f..3469ad7e90 100644 --- a/packages/samples/test/output/azure/resource-manager/operationsTest/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/azure/resource-manager/operationsTest/@azure-tools/typespec-autorest/openapi.json @@ -4257,7 +4257,7 @@ }, "TestExtensionProperties": { "type": "object", - "description": "rp-specific proeprties for the resource", + "description": "rp-specific properties for the resource", "properties": { "provisioningState": { "$ref": "#/definitions/EnvelopeProvisioningState", @@ -4528,7 +4528,7 @@ }, "TestTenantProperties": { "type": "object", - "description": "rp-specific proeprties for the resource", + "description": "rp-specific properties for the resource", "properties": { "provisioningState": { "$ref": "#/definitions/EnvelopeProvisioningState", @@ -4546,7 +4546,7 @@ }, "TestTenantProperties2": { "type": "object", - "description": "rp-specific proeprties for the resource", + "description": "rp-specific properties for the resource", "properties": { "provisioningState": { "$ref": "#/definitions/EnvelopeProvisioningState", @@ -4816,7 +4816,7 @@ }, "TestTrackedProperties2": { "type": "object", - "description": "rp-specific proeprties for the resource with all envelope properties", + "description": "rp-specific properties for the resource with all envelope properties", "properties": { "provisioningState": { "$ref": "#/definitions/EnvelopeProvisioningState", diff --git a/packages/samples/test/output/azure/resource-manager/servicelinker/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/azure/resource-manager/servicelinker/@azure-tools/typespec-autorest/openapi.json index 371767b2ce..2505886309 100644 --- a/packages/samples/test/output/azure/resource-manager/servicelinker/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/azure/resource-manager/servicelinker/@azure-tools/typespec-autorest/openapi.json @@ -413,7 +413,7 @@ }, "AuthType": { "type": "string", - "description": "The kmind of authentication used for this linker.", + "description": "The kind of authentication used for this linker.", "enum": [ "systemAssignedIdentity", "userAssignedIdentity", diff --git a/packages/samples/test/output/core/binary/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/core/binary/@azure-tools/typespec-autorest/openapi.json index 9240304e67..4be568257a 100644 --- a/packages/samples/test/output/core/binary/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/core/binary/@azure-tools/typespec-autorest/openapi.json @@ -47,10 +47,10 @@ "post": { "operationId": "BytesMethod_GenericBinaryFile", "produces": [ - "application/octect-stream" + "application/octet-stream" ], "consumes": [ - "application/octect-stream" + "application/octet-stream" ], "parameters": [ { diff --git a/packages/samples/test/output/core/documentation/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/core/documentation/@azure-tools/typespec-autorest/openapi.json index 63750f967e..9d9b9a404a 100644 --- a/packages/samples/test/output/core/documentation/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/core/documentation/@azure-tools/typespec-autorest/openapi.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "title": "Documentaion sample", + "title": "Documentation sample", "version": "0000-00-00", "x-typespec-generated": [ { diff --git a/packages/samples/test/output/core/encoded-names/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/core/encoded-names/@azure-tools/typespec-autorest/openapi.json index 2d133962d8..31ac580b8a 100644 --- a/packages/samples/test/output/core/encoded-names/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/core/encoded-names/@azure-tools/typespec-autorest/openapi.json @@ -3,7 +3,7 @@ "info": { "title": "Sample showcasing encoded names", "version": "0000-00-00", - "description": "This example showcase propviding a different name over the wire.\nIn this example the `WithEncodedNames` model has a `notBefore` property that should get serialized as `nbf` when serialized as json.", + "description": "This example showcase providing a different name over the wire.\nIn this example the `WithEncodedNames` model has a `notBefore` property that should get serialized as `nbf` when serialized as json.", "x-typespec-generated": [ { "emitter": "@azure-tools/typespec-autorest" diff --git a/packages/samples/test/output/core/testserver/body-complex/@azure-tools/typespec-autorest/openapi.json b/packages/samples/test/output/core/testserver/body-complex/@azure-tools/typespec-autorest/openapi.json index ffb4eafb42..5ce7535a7b 100644 --- a/packages/samples/test/output/core/testserver/body-complex/@azure-tools/typespec-autorest/openapi.json +++ b/packages/samples/test/output/core/testserver/body-complex/@azure-tools/typespec-autorest/openapi.json @@ -648,7 +648,7 @@ "description": "Name property with a very long description that does not fit on a single line and a line break." }, "color": { - "$ref": "#/definitions/CMYKColors" + "$ref": "#/definitions/Colors" } }, "required": [ @@ -684,7 +684,7 @@ "field" ] }, - "CMYKColors": { + "Colors": { "type": "string", "enum": [ "cyan", @@ -693,7 +693,7 @@ "blacK" ], "x-ms-enum": { - "name": "CMYKColors", + "name": "Colors", "modelAsString": true } }, diff --git a/packages/typespec-client-generator-core/doc/types.tsp b/packages/typespec-client-generator-core/doc/types.tsp index 7e170b1adc..ace1145dc4 100644 --- a/packages/typespec-client-generator-core/doc/types.tsp +++ b/packages/typespec-client-generator-core/doc/types.tsp @@ -234,7 +234,7 @@ model SdkModelType extends SdkType { access: AccessFlags; usage: UsageFlags; additionalProperties?: SdkType; - dicriminatorValue?: string; + discriminatorValue?: string; discriminatedSubtypes?: Record; baseModel?: SdkModelType; } @@ -266,7 +266,7 @@ model SdkModelPropertyType { /** * Represents a property for a body model type * - * @property visibility: Visiblity of the model + * @property visibility: Visibility of the model * @property discriminator: Whether the property is a discriminator * @property serializedName: The name of the property we send over the wire to the services */