fix(nx-dev): resolve type interface conflicts (#14611)

bcabanes · web-flow · commit 9d1969e91f1f · 2023-01-25T09:38:33.000-06:00
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
@@ -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
@@ -76,14 +76,14 @@ export interface SchemaMetadata {
   path: string;
   schema: NxSchema | null;
   type: 'executor' | 'generator';
-
   'x-deprecated'?: string;
 }
 
 export interface NxSchema extends JsonSchema1 {
   description: string;
   examplesFile: string;
   hidden: boolean;
+  presets: { name: string; keys: string[] }[];
 }
 
 export type IntrinsicPackageMetadata = Omit<

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export function getSchemaViewModel(`
`64`	`64`	`);`
`65`	`65`	`},`
`66`	`66`	`hidden: schema.hidden,`
`67`		`- deprecated: schema['x-deprecated'],`
	`67`	`+ deprecated: schema['x-deprecated'] \|\| '',`
`68`	`68`	`type: schema.type,`
`69`	`69`	`};`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,14 +76,14 @@ export interface SchemaMetadata {`
`76`	`76`	`path: string;`
`77`	`77`	`schema: NxSchema \| null;`
`78`	`78`	`type: 'executor' \| 'generator';`
`79`		`-`
`80`	`79`	`'x-deprecated'?: string;`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`export interface NxSchema extends JsonSchema1 {`
`84`	`83`	`description: string;`
`85`	`84`	`examplesFile: string;`
`86`	`85`	`hidden: boolean;`
	`86`	`+ presets: { name: string; keys: string[] }[];`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`export type IntrinsicPackageMetadata = Omit<`