From 98181f627c1a1841e27ae828d8611484e8d686d1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 19 Jan 2024 08:10:32 +0000
Subject: [PATCH 1/2] fix(deps): update dependency json-schema-to-ts to v2.12.0

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 25f67aaed4..818865fba7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31616,13 +31616,13 @@ __metadata:
   linkType: hard
 
 "json-schema-to-ts@npm:^2.6.2":
-  version: 2.9.2
-  resolution: "json-schema-to-ts@npm:2.9.2"
+  version: 2.12.0
+  resolution: "json-schema-to-ts@npm:2.12.0"
   dependencies:
     "@babel/runtime": ^7.18.3
     "@types/json-schema": ^7.0.9
-    ts-algebra: ^1.2.0
-  checksum: 64bf7226511a3719075d28e715fbd203576088b6ebcf494d6c5ee2bcf5b24d6081fa0cfce22ce254ad8798b7044603db4e4d19779c6f5765285fb9ddaa0756ef
+    ts-algebra: ^1.2.2
+  checksum: 6dc4bc836591d888beb20e8bf45dfa3b75df4a331f18675bd2e39a2262e105e0dc86012031fff0be408499a07ae8bc30f5a879c24696189b2c30a34edd5fa72f
   languageName: node
   linkType: hard
 
@@ -42475,10 +42475,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-algebra@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "ts-algebra@npm:1.2.0"
-  checksum: 471d3a049dbceadf2355f980e4d0a4cba413b50e66f0c8fb5eece876c238f7d2a270e1c85aa9ebd04349ae70335715f8e6d87338fd8cf755d12e285e884b3d91
+"ts-algebra@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "ts-algebra@npm:1.2.2"
+  checksum: eea0c08fba10c4a758086079c575a32c4c050f50087e06fcc1ccd53b045bdf7bdb0ab9597a52a241a714f058ff047cedbddcb1539de5e66bb424aa5b33c677a1
   languageName: node
   linkType: hard
 

From 2067689453dee0a61ebcbda60e9eba78cb95cf01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 19 Jan 2024 16:11:36 +0100
Subject: [PATCH 2/2] fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/hot-tips-doubt.md                       | 5 +++++
 packages/backend-openapi-utils/api-report.md       | 6 +++---
 packages/backend-openapi-utils/src/types/common.ts | 4 ++--
 packages/backend-openapi-utils/src/types/params.ts | 4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/hot-tips-doubt.md

diff --git a/.changeset/hot-tips-doubt.md b/.changeset/hot-tips-doubt.md
new file mode 100644
index 0000000000..464ddec302
--- /dev/null
+++ b/.changeset/hot-tips-doubt.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-openapi-utils': patch
+---
+
+Internal updates due to `json-schema-to-ts`
diff --git a/packages/backend-openapi-utils/api-report.md b/packages/backend-openapi-utils/api-report.md
index 0d78ec9671..8e702b8c23 100644
--- a/packages/backend-openapi-utils/api-report.md
+++ b/packages/backend-openapi-utils/api-report.md
@@ -7,7 +7,7 @@ import type { ContentObject } from 'openapi3-ts';
 import type core from 'express-serve-static-core';
 import { Express as Express_2 } from 'express';
 import { FromSchema } from 'json-schema-to-ts';
-import { JSONSchema7 } from 'json-schema-to-ts';
+import { JSONSchema } from 'json-schema-to-ts';
 import { middleware } from 'express-openapi-validator';
 import type { OpenAPIObject } from 'openapi3-ts';
 import type { ParameterObject } from 'openapi3-ts';
@@ -62,7 +62,7 @@ type ComponentTypes<Doc extends RequiredDoc> = Extract<
 
 // @public (undocumented)
 type ConvertAll<T extends ReadonlyArray<unknown>> = {
-  [Index in keyof T]: T[Index] extends JSONSchema7
+  [Index in keyof T]: T[Index] extends JSONSchema
     ? FromSchema<T[Index]>
     : T[Index];
 } & {
@@ -463,7 +463,7 @@ type ParameterSchema<
   Schema extends ImmutableParameterObject['schema'],
 > = SchemaRef<Doc, Schema> extends infer R
   ? R extends ImmutableSchemaObject
-    ? R extends JSONSchema7
+    ? R extends JSONSchema
       ? FromSchema<R>
       : never
     : never
diff --git a/packages/backend-openapi-utils/src/types/common.ts b/packages/backend-openapi-utils/src/types/common.ts
index f9dedf2f84..a43ad4449f 100644
--- a/packages/backend-openapi-utils/src/types/common.ts
+++ b/packages/backend-openapi-utils/src/types/common.ts
@@ -18,7 +18,7 @@
  * Pulled from https://github.com/varanauskas/oatx.
  */
 
-import { FromSchema, JSONSchema7 } from 'json-schema-to-ts';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import {
   ImmutableContentObject,
   ImmutableOpenAPIObject,
@@ -221,7 +221,7 @@ export type TuplifyUnion<
  * @public
  */
 export type ConvertAll<T extends ReadonlyArray<unknown>> = {
-  [Index in keyof T]: T[Index] extends JSONSchema7
+  [Index in keyof T]: T[Index] extends JSONSchema
     ? FromSchema<T[Index]>
     : T[Index];
 } & { length: T['length'] };
diff --git a/packages/backend-openapi-utils/src/types/params.ts b/packages/backend-openapi-utils/src/types/params.ts
index 208cbd4e9a..969657bac7 100644
--- a/packages/backend-openapi-utils/src/types/params.ts
+++ b/packages/backend-openapi-utils/src/types/params.ts
@@ -36,7 +36,7 @@ import {
   SchemaRef,
   ValueOf,
 } from './common';
-import { FromSchema, JSONSchema7 } from 'json-schema-to-ts';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
 /**
  * @public
@@ -96,7 +96,7 @@ export type ParameterSchema<
   Schema extends ImmutableParameterObject['schema'],
 > = SchemaRef<Doc, Schema> extends infer R
   ? R extends ImmutableSchemaObject
-    ? R extends JSONSchema7
+    ? R extends JSONSchema
       ? FromSchema<R>
       : never
     : never