Merge pull request #466 from mocks-server/release

javierbrea · web-flow · commit bf9dd81d142e · 2023-04-09T17:49:00.000+02:00
Release v4.0.1
diff --git a/mocks/admin-api-client-data-provider-e2e-react-app/package.json b/mocks/admin-api-client-data-provider-e2e-react-app/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "dependencies": {
-    "@data-provider/axios": "5.0.0",
+    "@data-provider/axios": "5.0.1",
     "@data-provider/core": "4.0.0",
     "@data-provider/react": "1.6.0",
     "@mocks-server/admin-api-client-data-provider": "workspace:*",
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "@rollup/plugin-babel": "5.3.1",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",
-    "@rollup/plugin-typescript": "8.3.4",
+    "@rollup/plugin-typescript": "8.5.0",
     "@testing-library/cypress": "8.0.3",
     "@typescript-eslint/eslint-plugin": "5.32.0",
     "@typescript-eslint/parser": "5.32.0",
@@ -52,7 +52,7 @@
     "cypress": "9.7.0",
     "cypress-fail-fast": "3.4.1",
     "deepmerge": "4.2.2",
-    "eslint": "8.22.0",
+    "eslint": "8.24.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-jest": "26.7.0",
     "eslint-plugin-no-only-tests": "2.6.0",
@@ -71,7 +71,7 @@
     "react-scripts": "4.0.3",
     "request": "2.88.2",
     "request-promise": "4.2.6",
-    "rollup": "2.77.2",
+    "rollup": "2.79.0",
     "rollup-plugin-terser": "7.0.2",
     "serve": "13.0.4",
     "sinon": "13.0.2",
diff --git a/packages/admin-api-client-data-provider/CHANGELOG.md b/packages/admin-api-client-data-provider/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Removed
 ### BREAKING CHANGES
 
+## [6.1.2] - 2023-04-09
+
+### Changed
+- chore(deps): Update dependencies
+
 ## [6.1.1] - 2022-09-14
 
 ### Changed
diff --git a/packages/admin-api-client-data-provider/package.json b/packages/admin-api-client-data-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mocks-server/admin-api-client-data-provider",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "Client of @mocks-server/plugin-admin-api built with @data-provider",
   "keywords": [
     "administration",
@@ -36,7 +36,7 @@
     "@mocks-server/admin-api-paths": "workspace:*"
   },
   "devDependencies": {
-    "@data-provider/axios": "5.0.0",
+    "@data-provider/axios": "5.0.1",
     "@data-provider/core": "4.0.0",
     "redux": "4.2.0"
   },
diff --git a/packages/admin-api-client-data-provider/sonar-project.properties b/packages/admin-api-client-data-provider/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.organization=mocks-server
 sonar.projectKey=mocks-server_main_admin-api-client-data-provider
 sonar.projectName=admin-api-client-data-provider
-sonar.projectVersion=6.1.1
+sonar.projectVersion=6.1.2
 
 sonar.javascript.file.suffixes=.js
 sonar.sourceEncoding=UTF-8
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 ### Removed
 
+## [4.0.1] - 2023-04-09
+
+### Changed
+- chore(deps): Update dependencies
+
 ## [4.0.0] - 2022-09-14
 
 ### Removed
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mocks-server/core",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Pluggable mock server supporting multiple route variants and mocks",
   "keywords": [
     "mocks",
@@ -58,7 +58,7 @@
     "lodash": "4.17.21",
     "node-watch": "0.7.3",
     "update-notifier": "5.1.0",
-    "winston": "3.8.1",
+    "winston": "3.8.2",
     "winston-array-transport": "1.1.10",
     "yaml": "2.1.1"
   },
diff --git a/packages/core/sonar-project.properties b/packages/core/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.organization=mocks-server
 sonar.projectKey=mocks-server_main_core
 sonar.projectName=core
-sonar.projectVersion=4.0.0
+sonar.projectVersion=4.0.1
 
 sonar.javascript.file.suffixes=.js
 sonar.sourceEncoding=UTF-8
diff --git a/packages/logger/CHANGELOG.md b/packages/logger/CHANGELOG.md
@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Removed
 
+## [1.1.1] - 2023-04-09
+
+### Changed
+- chore(deps): Update dependencies
+
 ## [1.1.0] - 2022-07-05
 
 ### Changed
diff --git a/packages/logger/package.json b/packages/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mocks-server/logger",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Namespaced logger",
   "keywords": [
     "log",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "chalk": "4.1.1",
-    "winston": "3.8.1",
+    "winston": "3.8.2",
     "winston-array-transport": "1.1.10"
   },
   "engines": {
diff --git a/packages/logger/sonar-project.properties b/packages/logger/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.organization=mocks-server
 sonar.projectKey=mocks-server_main_logger
 sonar.projectName=logger
-sonar.projectVersion=1.1.0
+sonar.projectVersion=1.1.1
 
 sonar.javascript.file.suffixes=.js
 sonar.sourceEncoding=UTF-8
diff --git a/packages/main/CHANGELOG.md b/packages/main/CHANGELOG.md
@@ -14,6 +14,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Removed
 ### Breaking change
 
+## [4.0.1] - 2023-04-09
+
+### Fixed
+- chore(deps): Update OpenAPI plugin to 2.0.1. Fix conversion of paths with multiple parameters in OpenAPI plugin. (#464)
+
 ## [4.0.0] - 2022-09-14
 
 ### Changed
diff --git a/packages/main/package.json b/packages/main/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mocks-server/main",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Mock Server supporting multiple route variants and mocks",
   "keywords": [
     "mock",
diff --git a/packages/main/sonar-project.properties b/packages/main/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.organization=mocks-server
 sonar.projectKey=mocks-server_main
 sonar.projectName=main
-sonar.projectVersion=4.0.0
+sonar.projectVersion=4.0.1
 
 sonar.javascript.file.suffixes=.js
 sonar.sourceEncoding=UTF-8
diff --git a/packages/plugin-openapi/CHANGELOG.md b/packages/plugin-openapi/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Removed
 ### BREAKING CHANGE
 
+## [2.0.1] - 2023-04-09
+
+### Fixed
+- fix(#464): Fix conversion of paths with multiple parameters
+
 ## [2.0.0] - 2022-09-14
 
 ### Changed
diff --git a/packages/plugin-openapi/jest.config.js b/packages/plugin-openapi/jest.config.js
@@ -26,7 +26,7 @@ module.exports = {
 
   // The glob patterns Jest uses to detect test files
   testMatch: ["<rootDir>/test/**/*.spec.js"],
-  // testMatch: ["<rootDir>/test/**/collections.spec.js"],
+  // testMatch: ["<rootDir>/test/**/*.spec.js"],
 
   // The test environment that will be used for testing
   testEnvironment: "node",
diff --git a/packages/plugin-openapi/package.json b/packages/plugin-openapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mocks-server/plugin-openapi",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Mocks server plugin allowing to create routes and collections from OpenApi definitions",
   "keywords": [
     "mocks-server-plugin",
@@ -35,7 +35,7 @@
     "@mocks-server/core": ">=4.0.0 <5.x"
   },
   "dependencies": {
-    "openapi-types": "12.0.0",
+    "openapi-types": "12.0.2",
     "json-refs": "3.0.15"
   },
   "devDependencies": {
diff --git a/packages/plugin-openapi/sonar-project.properties b/packages/plugin-openapi/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.organization=mocks-server
 sonar.projectKey=mocks-server_main_plugin-openapi
 sonar.projectName=plugin-openapi
-sonar.projectVersion=2.0.0
+sonar.projectVersion=2.0.1
 
 sonar.javascript.file.suffixes=.js
 sonar.sourceEncoding=UTF-8
diff --git a/packages/plugin-openapi/src/openapi.ts b/packages/plugin-openapi/src/openapi.ts
@@ -15,7 +15,7 @@ function notEmpty<TValue>(value: TValue | null | undefined): value is TValue {
 
 function replaceTemplateInPath(path: string): string {
   // /api/users/{userId} -> api/users/:userId
-  return path.replace(/{(\S*)}/gim, ":$1")
+  return path.replace(/{(\S*?)}/gim, ":$1")
 }
 
 function pathToId(path: string): string {
diff --git a/packages/plugin-openapi/test/fixtures/api-multiple-params/collections.js b/packages/plugin-openapi/test/fixtures/api-multiple-params/collections.js
@@ -0,0 +1,12 @@
+module.exports = [
+  {
+    id: "base",
+    routes: [
+      "get-users:200-json-one-user",
+      "post-users:201-status",
+      "get-users-id:200-json-success",
+      "get-users-id-books-bookId:200-json-success",
+      "get-users-id-books-bookId-pages-pageNumber:200-text-success",
+    ],
+  },
+];
diff --git a/packages/plugin-openapi/test/fixtures/api-multiple-params/openapi/api.js b/packages/plugin-openapi/test/fixtures/api-multiple-params/openapi/api.js
@@ -0,0 +1,105 @@
+const openApiDocument = require("../../../openapi/users");
+
+module.exports = [
+  {
+    basePath: "/api",
+    document: {
+      ...openApiDocument,
+      paths: {
+        ...openApiDocument.paths,
+        "/users/{id}/books/{bookId}": {
+          get: {
+            parameters: [
+              {
+                name: "id",
+                in: "path",
+                description: "ID of the user",
+                required: true,
+                schema: {
+                  type: "string",
+                },
+              },
+              {
+                name: "bookId",
+                in: "path",
+                description: "ID the user book",
+                required: true,
+                schema: {
+                  type: "string",
+                },
+              },
+            ],
+            summary: "Return books of one user",
+            responses: {
+              "200": {
+                description: "successful operation",
+                content: {
+                  "application/json": {
+                    examples: {
+                      success: {
+                        summary: "One book",
+                        value: {
+                          id: 1,
+                          title: "1984",
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+        "/users/{id}/books/{bookId}/pages/{pageNumber}": {
+          get: {
+            parameters: [
+              {
+                name: "id",
+                in: "path",
+                description: "ID of the user",
+                required: true,
+                schema: {
+                  type: "string",
+                },
+              },
+              {
+                name: "bookId",
+                in: "path",
+                description: "ID the user book",
+                required: true,
+                schema: {
+                  type: "string",
+                },
+              },
+              {
+                name: "pageNumber",
+                in: "path",
+                description: "Book page number",
+                required: true,
+                schema: {
+                  type: "number",
+                },
+              },
+            ],
+            summary: "Return a page of a book of one user",
+            responses: {
+              "200": {
+                description: "successful operation",
+                content: {
+                  "text/plain": {
+                    examples: {
+                      success: {
+                        summary: "Example page",
+                        value: "Page of the book 1984 by George Orwell.",
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+];
diff --git a/packages/plugin-openapi/test/multiple-params.spec.js b/packages/plugin-openapi/test/multiple-params.spec.js
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"private": true,`
`3`	`3`	`"dependencies": {`
`4`		`- "@data-provider/axios": "5.0.0",`
	`4`	`+ "@data-provider/axios": "5.0.1",`
`5`	`5`	`"@data-provider/core": "4.0.0",`
`6`	`6`	`"@data-provider/react": "1.6.0",`
`7`	`7`	`"@mocks-server/admin-api-client-data-provider": "workspace:*",`