From 1892b25a46c98597ca9aa2f777503c450672195e Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Wed, 2 Jun 2021 10:10:21 -0700 Subject: [PATCH 1/5] Allow x-ms-paths not to start with / --- .../libs/autorest-schemas/swagger-extensions.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/libs/autorest-schemas/swagger-extensions.json b/packages/libs/autorest-schemas/swagger-extensions.json index 90058885ae..23e06ba18c 100644 --- a/packages/libs/autorest-schemas/swagger-extensions.json +++ b/packages/libs/autorest-schemas/swagger-extensions.json @@ -1685,7 +1685,16 @@ ] }, "xmsPaths": { - "$ref": "#/definitions/paths" + "type": "object", + "description": "Relative paths to the individual endpoints. They must be relative to the 'basePath'.", + "patternProperties": { + "^x-.*$": { + "$ref": "#/definitions/vendorExtension" + } + }, + "additionalProperties": { + "$ref": "#/definitions/pathItem" + } }, "xmsExternal": { "type": "boolean" From fa1e3c40cf535f6598d610a98639feced095d0ee Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Wed, 2 Jun 2021 10:10:53 -0700 Subject: [PATCH 2/5] . --- .../feat-x-ms-paths-allow-slash_2021-06-02-17-10.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@autorest/schemas/feat-x-ms-paths-allow-slash_2021-06-02-17-10.json diff --git a/common/changes/@autorest/schemas/feat-x-ms-paths-allow-slash_2021-06-02-17-10.json b/common/changes/@autorest/schemas/feat-x-ms-paths-allow-slash_2021-06-02-17-10.json new file mode 100644 index 0000000000..86b026ca3f --- /dev/null +++ b/common/changes/@autorest/schemas/feat-x-ms-paths-allow-slash_2021-06-02-17-10.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@autorest/schemas", + "comment": "Allow x-ms-paths not to start with /", + "type": "patch" + } + ], + "packageName": "@autorest/schemas", + "email": "tiguerin@microsoft.com" +} \ No newline at end of file From e3a443d183d8f48d57bc7d74a30aff4dd04f73fc Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Wed, 2 Jun 2021 15:02:23 -0700 Subject: [PATCH 3/5] emptyh path --- packages/extensions/modelerfour/src/modeler/interpretations.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/extensions/modelerfour/src/modeler/interpretations.ts b/packages/extensions/modelerfour/src/modeler/interpretations.ts index 571fd03640..7f644b0be4 100644 --- a/packages/extensions/modelerfour/src/modeler/interpretations.ts +++ b/packages/extensions/modelerfour/src/modeler/interpretations.ts @@ -355,7 +355,7 @@ export class Interpretations { /** gets the operation path from metadata, falls back to the OAI3 path key */ getPath(pathItem: OpenAPI.PathItem, operation: OpenAPI.HttpOperation, path: string) { - return this.xmsMeta(pathItem, "path") || this.xmsMeta(operation, "path") || path; + return this.xmsMeta(pathItem, "path") ?? this.xmsMeta(operation, "path") ?? path; } /* From a6838a0b98c8a1a267581e3896f2b12b6f1201c2 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Wed, 2 Jun 2021 15:02:57 -0700 Subject: [PATCH 4/5] / --- .../feat-x-ms-paths-allow-slash_2021-06-02-22-02.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@autorest/modelerfour/feat-x-ms-paths-allow-slash_2021-06-02-22-02.json diff --git a/common/changes/@autorest/modelerfour/feat-x-ms-paths-allow-slash_2021-06-02-22-02.json b/common/changes/@autorest/modelerfour/feat-x-ms-paths-allow-slash_2021-06-02-22-02.json new file mode 100644 index 0000000000..38596e99e1 --- /dev/null +++ b/common/changes/@autorest/modelerfour/feat-x-ms-paths-allow-slash_2021-06-02-22-02.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@autorest/modelerfour", + "comment": "**Fix** Allow empty paths in operation", + "type": "patch" + } + ], + "packageName": "@autorest/modelerfour", + "email": "tiguerin@microsoft.com" +} \ No newline at end of file From e4d0985357c6d1cb9a82621bee4b83538527f987 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Thu, 3 Jun 2021 15:38:57 -0700 Subject: [PATCH 5/5] bump --- .../feature-adl-plugin_2021-04-29-16-41.json | 11 ---------- .../feature-adl-plugin_2021-04-29-16-41.json | 11 ---------- .../feature-adl-plugin_2021-04-29-16-41.json | 11 ---------- ...ms-paths-allow-slash_2021-06-02-22-02.json | 11 ---------- ...ms-paths-allow-slash_2021-06-02-17-10.json | 11 ---------- packages/apps/autorest/CHANGELOG.json | 15 ++++++++++++++ packages/apps/autorest/CHANGELOG.md | 7 ++++++- packages/apps/autorest/package.json | 6 +++--- packages/extensions/adl/CHANGELOG.json | 11 ++++++++++ packages/extensions/adl/CHANGELOG.md | 9 +++++++++ packages/extensions/core/CHANGELOG.json | 20 +++++++++++++++++++ packages/extensions/core/CHANGELOG.md | 9 ++++++++- packages/extensions/core/package.json | 6 +++--- .../extensions/modelerfour/CHANGELOG.json | 12 +++++++++++ packages/extensions/modelerfour/CHANGELOG.md | 9 ++++++++- packages/extensions/modelerfour/package.json | 2 +- packages/libs/autorest-schemas/CHANGELOG.json | 12 +++++++++++ packages/libs/autorest-schemas/CHANGELOG.md | 9 ++++++++- packages/libs/autorest-schemas/package.json | 2 +- packages/libs/configuration/CHANGELOG.json | 12 +++++++++++ packages/libs/configuration/CHANGELOG.md | 9 ++++++++- packages/libs/configuration/package.json | 2 +- .../testing/test-public-packages/package.json | 4 ++-- packages/tools/compare/package.json | 2 +- 24 files changed, 141 insertions(+), 72 deletions(-) delete mode 100644 common/changes/@autorest/adl/feature-adl-plugin_2021-04-29-16-41.json delete mode 100644 common/changes/@autorest/configuration/feature-adl-plugin_2021-04-29-16-41.json delete mode 100644 common/changes/@autorest/core/feature-adl-plugin_2021-04-29-16-41.json delete mode 100644 common/changes/@autorest/modelerfour/feat-x-ms-paths-allow-slash_2021-06-02-22-02.json delete mode 100644 common/changes/@autorest/schemas/feat-x-ms-paths-allow-slash_2021-06-02-17-10.json create mode 100644 packages/extensions/adl/CHANGELOG.json create mode 100644 packages/extensions/adl/CHANGELOG.md diff --git a/common/changes/@autorest/adl/feature-adl-plugin_2021-04-29-16-41.json b/common/changes/@autorest/adl/feature-adl-plugin_2021-04-29-16-41.json deleted file mode 100644 index 6edf0a1a3b..0000000000 --- a/common/changes/@autorest/adl/feature-adl-plugin_2021-04-29-16-41.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "packageName": "@autorest/adl", - "comment": "", - "type": "none" - } - ], - "packageName": "@autorest/adl", - "email": "tiguerin@microsoft.com" -} \ No newline at end of file diff --git a/common/changes/@autorest/configuration/feature-adl-plugin_2021-04-29-16-41.json b/common/changes/@autorest/configuration/feature-adl-plugin_2021-04-29-16-41.json deleted file mode 100644 index 1aecddb8fa..0000000000 --- a/common/changes/@autorest/configuration/feature-adl-plugin_2021-04-29-16-41.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "packageName": "@autorest/configuration", - "comment": "Add support for adl", - "type": "minor" - } - ], - "packageName": "@autorest/configuration", - "email": "tiguerin@microsoft.com" -} \ No newline at end of file diff --git a/common/changes/@autorest/core/feature-adl-plugin_2021-04-29-16-41.json b/common/changes/@autorest/core/feature-adl-plugin_2021-04-29-16-41.json deleted file mode 100644 index 8535334482..0000000000 --- a/common/changes/@autorest/core/feature-adl-plugin_2021-04-29-16-41.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "packageName": "@autorest/core", - "comment": "Blaming files not loaded by autorest", - "type": "patch" - } - ], - "packageName": "@autorest/core", - "email": "tiguerin@microsoft.com" -} \ No newline at end of file diff --git a/common/changes/@autorest/modelerfour/feat-x-ms-paths-allow-slash_2021-06-02-22-02.json b/common/changes/@autorest/modelerfour/feat-x-ms-paths-allow-slash_2021-06-02-22-02.json deleted file mode 100644 index 38596e99e1..0000000000 --- a/common/changes/@autorest/modelerfour/feat-x-ms-paths-allow-slash_2021-06-02-22-02.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "packageName": "@autorest/modelerfour", - "comment": "**Fix** Allow empty paths in operation", - "type": "patch" - } - ], - "packageName": "@autorest/modelerfour", - "email": "tiguerin@microsoft.com" -} \ No newline at end of file diff --git a/common/changes/@autorest/schemas/feat-x-ms-paths-allow-slash_2021-06-02-17-10.json b/common/changes/@autorest/schemas/feat-x-ms-paths-allow-slash_2021-06-02-17-10.json deleted file mode 100644 index 86b026ca3f..0000000000 --- a/common/changes/@autorest/schemas/feat-x-ms-paths-allow-slash_2021-06-02-17-10.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "packageName": "@autorest/schemas", - "comment": "Allow x-ms-paths not to start with /", - "type": "patch" - } - ], - "packageName": "@autorest/schemas", - "email": "tiguerin@microsoft.com" -} \ No newline at end of file diff --git a/packages/apps/autorest/CHANGELOG.json b/packages/apps/autorest/CHANGELOG.json index c45ac5413f..e510ee876f 100644 --- a/packages/apps/autorest/CHANGELOG.json +++ b/packages/apps/autorest/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "autorest", "entries": [ + { + "version": "3.2.3", + "tag": "autorest_v3.2.3", + "date": "Thu, 03 Jun 2021 22:37:55 GMT", + "comments": { + "dependency": [ + { + "comment": "Updating dependency \"@autorest/configuration\" from `~1.4.1` to `~1.5.0`" + }, + { + "comment": "Updating dependency \"@autorest/core\" from `~3.4.4` to `~3.4.5`" + } + ] + } + }, { "version": "3.2.2", "tag": "autorest_v3.2.2", diff --git a/packages/apps/autorest/CHANGELOG.md b/packages/apps/autorest/CHANGELOG.md index 6cfb3ee123..120a3ce2a4 100644 --- a/packages/apps/autorest/CHANGELOG.md +++ b/packages/apps/autorest/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - autorest -This log was last generated on Wed, 26 May 2021 18:31:17 GMT and should not be manually modified. +This log was last generated on Thu, 03 Jun 2021 22:37:55 GMT and should not be manually modified. + +## 3.2.3 +Thu, 03 Jun 2021 22:37:55 GMT + +_Version update only_ ## 3.2.2 Wed, 26 May 2021 18:31:17 GMT diff --git a/packages/apps/autorest/package.json b/packages/apps/autorest/package.json index 272e5826aa..107f544208 100644 --- a/packages/apps/autorest/package.json +++ b/packages/apps/autorest/package.json @@ -1,6 +1,6 @@ { "name": "autorest", - "version": "3.2.2", + "version": "3.2.3", "description": "The AutoRest tool generates client libraries for accessing RESTful web services. Input to AutoRest is an OpenAPI spec that describes the REST API.", "engines": { "node": ">=10.13.0" @@ -40,8 +40,8 @@ }, "typings": "./dist/exports.d.ts", "devDependencies": { - "@autorest/configuration": "~1.4.1", - "@autorest/core": "~3.4.4", + "@autorest/configuration": "~1.5.0", + "@autorest/core": "~3.4.5", "@azure-tools/async-io": "~3.0.0", "@azure-tools/extension": "~3.2.7", "@azure-tools/tasks": "~3.0.0", diff --git a/packages/extensions/adl/CHANGELOG.json b/packages/extensions/adl/CHANGELOG.json new file mode 100644 index 0000000000..4c8872fe0c --- /dev/null +++ b/packages/extensions/adl/CHANGELOG.json @@ -0,0 +1,11 @@ +{ + "name": "@autorest/adl", + "entries": [ + { + "version": "0.0.1", + "tag": "@autorest/adl_v0.0.1", + "date": "Thu, 03 Jun 2021 22:37:55 GMT", + "comments": {} + } + ] +} diff --git a/packages/extensions/adl/CHANGELOG.md b/packages/extensions/adl/CHANGELOG.md new file mode 100644 index 0000000000..1f3b83d7a5 --- /dev/null +++ b/packages/extensions/adl/CHANGELOG.md @@ -0,0 +1,9 @@ +# Change Log - @autorest/adl + +This log was last generated on Thu, 03 Jun 2021 22:37:55 GMT and should not be manually modified. + +## 0.0.1 +Thu, 03 Jun 2021 22:37:55 GMT + +_Initial release_ + diff --git a/packages/extensions/core/CHANGELOG.json b/packages/extensions/core/CHANGELOG.json index f80af114ce..cd5aafd615 100644 --- a/packages/extensions/core/CHANGELOG.json +++ b/packages/extensions/core/CHANGELOG.json @@ -1,6 +1,26 @@ { "name": "@autorest/core", "entries": [ + { + "version": "3.4.5", + "tag": "@autorest/core_v3.4.5", + "date": "Thu, 03 Jun 2021 22:37:55 GMT", + "comments": { + "patch": [ + { + "comment": "Blaming files not loaded by autorest" + } + ], + "dependency": [ + { + "comment": "Updating dependency \"@autorest/configuration\" from `~1.4.1` to `~1.5.0`" + }, + { + "comment": "Updating dependency \"@autorest/schemas\" from `~1.1.3` to `~1.1.4`" + } + ] + } + }, { "version": "3.4.4", "tag": "@autorest/core_v3.4.4", diff --git a/packages/extensions/core/CHANGELOG.md b/packages/extensions/core/CHANGELOG.md index 77017825f2..91c28ee612 100644 --- a/packages/extensions/core/CHANGELOG.md +++ b/packages/extensions/core/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log - @autorest/core -This log was last generated on Wed, 26 May 2021 18:31:17 GMT and should not be manually modified. +This log was last generated on Thu, 03 Jun 2021 22:37:55 GMT and should not be manually modified. + +## 3.4.5 +Thu, 03 Jun 2021 22:37:55 GMT + +### Patches + +- Blaming files not loaded by autorest ## 3.4.4 Wed, 26 May 2021 18:31:17 GMT diff --git a/packages/extensions/core/package.json b/packages/extensions/core/package.json index 49fb9a20b0..af84236fa1 100644 --- a/packages/extensions/core/package.json +++ b/packages/extensions/core/package.json @@ -1,6 +1,6 @@ { "name": "@autorest/core", - "version": "3.4.4", + "version": "3.4.5", "description": "AutoRest core module", "engines": { "node": ">=10.13.0" @@ -40,8 +40,8 @@ "typings": "./dist/exports.d.ts", "devDependencies": { "@autorest/common": "~1.1.4", - "@autorest/configuration": "~1.4.1", - "@autorest/schemas": "~1.1.3", + "@autorest/configuration": "~1.5.0", + "@autorest/schemas": "~1.1.4", "@autorest/test-utils": "~0.2.2", "@azure-tools/async-io": "~3.0.0", "@azure-tools/codegen": "~2.5.294", diff --git a/packages/extensions/modelerfour/CHANGELOG.json b/packages/extensions/modelerfour/CHANGELOG.json index 47ada9b85f..c8e03c3cec 100644 --- a/packages/extensions/modelerfour/CHANGELOG.json +++ b/packages/extensions/modelerfour/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@autorest/modelerfour", "entries": [ + { + "version": "4.19.3", + "tag": "@autorest/modelerfour_v4.19.3", + "date": "Thu, 03 Jun 2021 22:37:55 GMT", + "comments": { + "patch": [ + { + "comment": "**Fix** Allow empty paths in operation" + } + ] + } + }, { "version": "4.19.2", "tag": "@autorest/modelerfour_v4.19.2", diff --git a/packages/extensions/modelerfour/CHANGELOG.md b/packages/extensions/modelerfour/CHANGELOG.md index 3c8510e56c..f47b301518 100644 --- a/packages/extensions/modelerfour/CHANGELOG.md +++ b/packages/extensions/modelerfour/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log - @autorest/modelerfour -This log was last generated on Thu, 20 May 2021 16:41:13 GMT and should not be manually modified. +This log was last generated on Thu, 03 Jun 2021 22:37:55 GMT and should not be manually modified. + +## 4.19.3 +Thu, 03 Jun 2021 22:37:55 GMT + +### Patches + +- **Fix** Allow empty paths in operation ## 4.19.2 Thu, 20 May 2021 16:41:13 GMT diff --git a/packages/extensions/modelerfour/package.json b/packages/extensions/modelerfour/package.json index 273ea6b085..c35470fa92 100644 --- a/packages/extensions/modelerfour/package.json +++ b/packages/extensions/modelerfour/package.json @@ -1,6 +1,6 @@ { "name": "@autorest/modelerfour", - "version": "4.19.2", + "version": "4.19.3", "description": "AutoRest Modeler Version Four (component)", "directories": { "doc": "docs" diff --git a/packages/libs/autorest-schemas/CHANGELOG.json b/packages/libs/autorest-schemas/CHANGELOG.json index 00d6fb14f0..68d12efce1 100644 --- a/packages/libs/autorest-schemas/CHANGELOG.json +++ b/packages/libs/autorest-schemas/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@autorest/schemas", "entries": [ + { + "version": "1.1.4", + "tag": "@autorest/schemas_v1.1.4", + "date": "Thu, 03 Jun 2021 22:37:55 GMT", + "comments": { + "patch": [ + { + "comment": "Allow x-ms-paths not to start with /" + } + ] + } + }, { "version": "1.1.3", "tag": "@autorest/schemas_v1.1.3", diff --git a/packages/libs/autorest-schemas/CHANGELOG.md b/packages/libs/autorest-schemas/CHANGELOG.md index fd7da7f52c..e72878cdc3 100644 --- a/packages/libs/autorest-schemas/CHANGELOG.md +++ b/packages/libs/autorest-schemas/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log - @autorest/schemas -This log was last generated on Thu, 20 May 2021 16:41:13 GMT and should not be manually modified. +This log was last generated on Thu, 03 Jun 2021 22:37:55 GMT and should not be manually modified. + +## 1.1.4 +Thu, 03 Jun 2021 22:37:55 GMT + +### Patches + +- Allow x-ms-paths not to start with / ## 1.1.3 Thu, 20 May 2021 16:41:13 GMT diff --git a/packages/libs/autorest-schemas/package.json b/packages/libs/autorest-schemas/package.json index eec14b029b..dbf4275e72 100644 --- a/packages/libs/autorest-schemas/package.json +++ b/packages/libs/autorest-schemas/package.json @@ -1,6 +1,6 @@ { "name": "@autorest/schemas", - "version": "1.1.3", + "version": "1.1.4", "description": "Internal package storing schemas", "scripts": { "test": "echo 'No Test'", diff --git a/packages/libs/configuration/CHANGELOG.json b/packages/libs/configuration/CHANGELOG.json index 9a319f35ee..4e6cab25b1 100644 --- a/packages/libs/configuration/CHANGELOG.json +++ b/packages/libs/configuration/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@autorest/configuration", "entries": [ + { + "version": "1.5.0", + "tag": "@autorest/configuration_v1.5.0", + "date": "Thu, 03 Jun 2021 22:37:55 GMT", + "comments": { + "minor": [ + { + "comment": "Add support for adl" + } + ] + } + }, { "version": "1.4.1", "tag": "@autorest/configuration_v1.4.1", diff --git a/packages/libs/configuration/CHANGELOG.md b/packages/libs/configuration/CHANGELOG.md index b9119431bb..84e2d543b2 100644 --- a/packages/libs/configuration/CHANGELOG.md +++ b/packages/libs/configuration/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log - @autorest/configuration -This log was last generated on Wed, 26 May 2021 18:31:17 GMT and should not be manually modified. +This log was last generated on Thu, 03 Jun 2021 22:37:55 GMT and should not be manually modified. + +## 1.5.0 +Thu, 03 Jun 2021 22:37:55 GMT + +### Minor changes + +- Add support for adl ## 1.4.1 Wed, 26 May 2021 18:31:17 GMT diff --git a/packages/libs/configuration/package.json b/packages/libs/configuration/package.json index 2344dfaeea..666907e53a 100644 --- a/packages/libs/configuration/package.json +++ b/packages/libs/configuration/package.json @@ -1,6 +1,6 @@ { "name": "@autorest/configuration", - "version": "1.4.1", + "version": "1.5.0", "description": "Autorest configuration", "main": "dist/index.js", "typings": "dist/index.d.ts", diff --git a/packages/testing/test-public-packages/package.json b/packages/testing/test-public-packages/package.json index 91ec0d0278..08386ee785 100644 --- a/packages/testing/test-public-packages/package.json +++ b/packages/testing/test-public-packages/package.json @@ -30,8 +30,8 @@ }, "homepage": "https://github.com/Azure/autorest#readme", "dependencies": { - "@autorest/core": "~3.4.4", - "autorest": "~3.2.2", + "@autorest/core": "~3.4.5", + "autorest": "~3.2.3", "source-map-support": "^0.5.19" }, "devDependencies": { diff --git a/packages/tools/compare/package.json b/packages/tools/compare/package.json index 441a1f8796..01182d8278 100644 --- a/packages/tools/compare/package.json +++ b/packages/tools/compare/package.json @@ -32,7 +32,7 @@ }, "homepage": "https://github.com/Azure/autorest.compare#readme", "dependencies": { - "autorest": "~3.2.2", + "autorest": "~3.2.3", "chalk": "^4.1.0", "diff": "^4.0.1", "js-yaml": "~4.0.0",