From 9d1969e91f1f7787127c20bb80cc851fd1309ec0 Mon Sep 17 00:00:00 2001
From: Benjamin Cabanes <3447705+bcabanes@users.noreply.github.com>
Date: Wed, 25 Jan 2023 10:38:33 -0500
Subject: [PATCH] fix(nx-dev): resolve type interface conflicts (#14611)

---
 .../src/lib/get-schema-view-model.ts                            | 2 +-
 nx-dev/models-package/src/lib/package.models.ts                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nx-dev/feature-package-schema-viewer/src/lib/get-schema-view-model.ts b/nx-dev/feature-package-schema-viewer/src/lib/get-schema-view-model.ts
index 9414a3cff9..843b3e64a7 100644
--- a/nx-dev/feature-package-schema-viewer/src/lib/get-schema-view-model.ts
+++ b/nx-dev/feature-package-schema-viewer/src/lib/get-schema-view-model.ts
@@ -64,7 +64,7 @@ export function getSchemaViewModel(
       );
     },
     hidden: schema.hidden,
-    deprecated: schema['x-deprecated'],
+    deprecated: schema['x-deprecated'] || '',
     type: schema.type,
   };
 }
diff --git a/nx-dev/models-package/src/lib/package.models.ts b/nx-dev/models-package/src/lib/package.models.ts
index c9d47096e3..a854008050 100644
--- a/nx-dev/models-package/src/lib/package.models.ts
+++ b/nx-dev/models-package/src/lib/package.models.ts
@@ -76,7 +76,6 @@ export interface SchemaMetadata {
   path: string;
   schema: NxSchema | null;
   type: 'executor' | 'generator';
-
   'x-deprecated'?: string;
 }
 
@@ -84,6 +83,7 @@ export interface NxSchema extends JsonSchema1 {
   description: string;
   examplesFile: string;
   hidden: boolean;
+  presets: { name: string; keys: string[] }[];
 }
 
 export type IntrinsicPackageMetadata = Omit<