From d9cb3ff931e5471e5b188cfc24c3963895ad6ea8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 08:22:08 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump prettier from 2.8.8 to 3.0.3 Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.0.3. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.0.3) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5ab96582..5ba27f61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "multi-semantic-release": "3.0.2", "patch-package": "8.0.0", "pre-commit": "1.2.2", - "prettier": "2.8.8", + "prettier": "3.0.3", "turbo": "1.10.13", "typescript": "4.6.4" }, @@ -12144,15 +12144,15 @@ "dev": true }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" diff --git a/package.json b/package.json index bdefdbb9..1f21f06a 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "multi-semantic-release": "3.0.2", "patch-package": "8.0.0", "pre-commit": "1.2.2", - "prettier": "2.8.8", + "prettier": "3.0.3", "turbo": "1.10.13", "typescript": "4.6.4" }, From 64fb4c9b68106fa8da42e774745f9d01b2fbb961 Mon Sep 17 00:00:00 2001 From: Patrick McLaughlin Date: Wed, 30 Aug 2023 15:47:31 -0400 Subject: [PATCH 2/2] chore: fix formatting with prettier 3.0.3 --- packages/express-wrapper/test/server.test.ts | 2 +- packages/openapi-generator/src/openapi.ts | 51 ++++++++++++-------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/packages/express-wrapper/test/server.test.ts b/packages/express-wrapper/test/server.test.ts index 0bbd5417..d1823969 100644 --- a/packages/express-wrapper/test/server.test.ts +++ b/packages/express-wrapper/test/server.test.ts @@ -100,7 +100,7 @@ const GetHelloWorld = async (params: { id: string }) => ({ type: 'ok', payload: params, - } as const); + }) as const; test('should offer a delightful developer experience', async () => { const app = createServer(ApiSpec, (app: express.Application) => { diff --git a/packages/openapi-generator/src/openapi.ts b/packages/openapi-generator/src/openapi.ts index 3f15e360..2373a768 100644 --- a/packages/openapi-generator/src/openapi.ts +++ b/packages/openapi-generator/src/openapi.ts @@ -24,14 +24,17 @@ function schemaToOpenAPI( case 'object': return { type: 'object', - properties: Object.entries(schema.properties).reduce((acc, [name, prop]) => { - const innerSchema = schemaToOpenAPI(prop); - if (innerSchema === undefined) { - return acc; - } + properties: Object.entries(schema.properties).reduce( + (acc, [name, prop]) => { + const innerSchema = schemaToOpenAPI(prop); + if (innerSchema === undefined) { + return acc; + } - return { ...acc, [name]: innerSchema }; - }, {} as Record), + return { ...acc, [name]: innerSchema }; + }, + {} as Record, + ), required: schema.required, }; case 'intersection': @@ -127,21 +130,27 @@ export function convertRoutesToOpenAPI( routes: Route[], schemas: Components, ): OpenAPIV3_1.Document { - const paths = routes.reduce((acc, route) => { - const [path, method, pathItem] = routeToOpenAPI(route); - let pathObject = acc[path] ?? {}; - pathObject[method] = pathItem; - return { ...acc, [path]: pathObject }; - }, {} as Record>); + const paths = routes.reduce( + (acc, route) => { + const [path, method, pathItem] = routeToOpenAPI(route); + let pathObject = acc[path] ?? {}; + pathObject[method] = pathItem; + return { ...acc, [path]: pathObject }; + }, + {} as Record>, + ); - const openapiSchemas = Object.entries(schemas).reduce((acc, [name, schema]) => { - const openapiSchema = schemaToOpenAPI(schema); - if (openapiSchema === undefined) { - return acc; - } else { - return { ...acc, [name]: openapiSchema }; - } - }, {} as Record); + const openapiSchemas = Object.entries(schemas).reduce( + (acc, [name, schema]) => { + const openapiSchema = schemaToOpenAPI(schema); + if (openapiSchema === undefined) { + return acc; + } else { + return { ...acc, [name]: openapiSchema }; + } + }, + {} as Record, + ); return { openapi: '3.1.0',