fix up impl

MaxKless · MaxKless · commit d7debab4419d · 2025-06-17T10:45:41.000+02:00
diff --git a/apps/intellij/src/main/kotlin/dev/nx/console/generate/NxGenerateService.kt b/apps/intellij/src/main/kotlin/dev/nx/console/generate/NxGenerateService.kt
@@ -131,7 +131,7 @@ class NxGenerateService(val project: Project, private val cs: CoroutineScope) {
                         )
                     val transformedSchema =
                         project.service<NxlsService>().transformedGeneratorSchema(inputSchema)
-                    transformedSchema?.options ?: rawOptions
+                    transformedSchema.options
                 }
 
         val generatorWithOptions = NxGenerator(generator, generatorOptions)
diff --git a/apps/intellij/src/main/kotlin/dev/nx/console/nxls/NxlsService.kt b/apps/intellij/src/main/kotlin/dev/nx/console/nxls/NxlsService.kt
@@ -100,7 +100,8 @@ class NxlsService(private val project: Project, private val cs: CoroutineScope)
     suspend fun generators(): List<NxGenerator> {
         return withMessageIssueCatch("nx/generators") {
             server()?.getNxService()?.generators()?.await()
-        }() ?: emptyList()
+        }()
+            ?: emptyList()
     }
 
     suspend fun generatorOptions(
@@ -109,14 +110,15 @@ class NxlsService(private val project: Project, private val cs: CoroutineScope)
         return withMessageIssueCatch("nx/generatorOptions") {
             val request = NxGeneratorOptionsRequest(requestOptions)
             server()?.getNxService()?.generatorOptions(request)?.await()
-        }() ?: emptyList()
+        }()
+            ?: emptyList()
     }
 
     suspend fun transformedGeneratorSchema(generatorSchema: GeneratorSchema): GeneratorSchema {
         return withMessageIssueCatch("nx/transformedGeneratorSchema") {
-            val request = NxTransformedGeneratorSchemaRequest(generatorSchema)
-            server()?.getNxService()?.transformedGeneratorSchema(request)?.await()
-        }() ?: generatorSchema
+            server()?.getNxService()?.transformedGeneratorSchema(generatorSchema)?.await()
+        }()
+            ?: generatorSchema
     }
 
     suspend fun generatorContextFromPath(
@@ -140,7 +142,8 @@ class NxlsService(private val project: Project, private val cs: CoroutineScope)
         val request = NxProjectsByPathsRequest(paths)
         return withMessageIssueCatch("nx/projectsByPaths") {
             server()?.getNxService()?.projectsByPaths(request)?.await()
-        }() ?: emptyMap()
+        }()
+            ?: emptyMap()
     }
 
     suspend fun projectGraphOutput(): ProjectGraphOutput? {
@@ -184,7 +187,8 @@ class NxlsService(private val project: Project, private val cs: CoroutineScope)
     suspend fun sourceMapFilesToProjectsMap(): Map<String, Array<String>> {
         return withMessageIssueCatch("nx/sourceMapFilesToProjectMap") {
             server()?.getNxService()?.sourceMapFilesToProjectsMap()?.await()
-        }() ?: emptyMap()
+        }()
+            ?: emptyMap()
     }
 
     suspend fun targetsForConfigFile(
@@ -194,7 +198,8 @@ class NxlsService(private val project: Project, private val cs: CoroutineScope)
         return withMessageIssueCatch("nx/targetsForConfigFile") {
             val request = NxTargetsForConfigFileRequest(projectName, configFilePath)
             server()?.getNxService()?.targetsForConfigFile(request)?.await()
-        }() ?: emptyMap()
+        }()
+            ?: emptyMap()
     }
 
     suspend fun cloudStatus(): NxCloudStatus? {
diff --git a/apps/intellij/src/main/kotlin/dev/nx/console/nxls/server/NxService.kt b/apps/intellij/src/main/kotlin/dev/nx/console/nxls/server/NxService.kt
@@ -41,9 +41,7 @@ interface NxService {
     }
 
     @JsonRequest
-    fun transformedGeneratorSchema(
-        transformedGeneratorSchemaRequest: NxTransformedGeneratorSchemaRequest
-    ): CompletableFuture<GeneratorSchema> {
+    fun transformedGeneratorSchema(schema: GeneratorSchema): CompletableFuture<GeneratorSchema> {
         throw UnsupportedOperationException()
     }
 
@@ -83,11 +81,6 @@ interface NxService {
         throw UnsupportedOperationException()
     }
 
-    @JsonRequest
-    fun transformedGeneratorSchema(schema: GeneratorSchema): CompletableFuture<GeneratorSchema> {
-        throw UnsupportedOperationException()
-    }
-
     @JsonRequest
     fun startupMessage(
         schema: GeneratorSchema
diff --git a/libs/intellij/models/src/main/kotlin/dev/nx/console/models/NxGeneratorOption.kt b/libs/intellij/models/src/main/kotlin/dev/nx/console/models/NxGeneratorOption.kt
@@ -12,7 +12,7 @@ import kotlinx.serialization.Serializable
 sealed interface NxGeneratorOption {
     val name: String
     val isRequired: Boolean?
-    val deprecated: Boolean?
+    val deprecated: String?
     val description: String?
     val type: String?
     val enum: List<String>?
@@ -26,81 +26,81 @@ sealed interface NxGeneratorOption {
 data class NxOptionWithNoDefault(
     override val name: String,
     override val isRequired: Boolean?,
-    override val deprecated: Boolean?,
     override val description: String?,
     override val type: String?,
     override val enum: List<String>?,
     override var items: List<String>?,
+    @SerializedName("x-deprecated") @SerialName("x-deprecated") override val deprecated: String?,
     @SerializedName("x-priority") @SerialName("x-priority") override val priority: String?,
     @SerializedName("x-dropdown") @SerialName("x-dropdown") override val dropdown: String?,
-    @SerializedName("x-hint") @SerialName("x-hint") override val hint: String?
+    @SerializedName("x-hint") @SerialName("x-hint") override val hint: String?,
 ) : NxGeneratorOption
 
 @Serializable
 data class NxOptionWithStringDefault(
     val default: String,
     override val name: String,
     override val isRequired: Boolean?,
-    override val deprecated: Boolean?,
     override val description: String?,
     override val type: String?,
     override val enum: List<String>?,
     override var items: List<String>?,
+    @SerializedName("x-deprecated") @SerialName("x-deprecated") override val deprecated: String?,
     @SerializedName("x-priority") @SerialName("x-priority") override val priority: String?,
     @SerializedName("x-dropdown") @SerialName("x-dropdown") override val dropdown: String?,
-    @SerializedName("x-hint") @SerialName("x-hint") override val hint: String?
+    @SerializedName("x-hint") @SerialName("x-hint") override val hint: String?,
 ) : NxGeneratorOption
 
 @Serializable
 data class NxOptionWithBooleanDefault(
     val default: Boolean,
     override val name: String,
     override val isRequired: Boolean?,
-    override val deprecated: Boolean?,
     override val description: String?,
     override val type: String?,
     override val enum: List<String>?,
     override var items: List<String>?,
+    @SerializedName("x-deprecated") @SerialName("x-deprecated") override val deprecated: String?,
     @SerializedName("x-priority") @SerialName("x-priority") override val priority: String?,
     @SerializedName("x-dropdown") @SerialName("x-dropdown") override val dropdown: String?,
-    @SerializedName("x-hint") @SerialName("x-hint") override val hint: String?
+    @SerializedName("x-hint") @SerialName("x-hint") override val hint: String?,
 ) : NxGeneratorOption
 
 @Serializable
 data class NxOptionWithArrayDefault(
     val default: List<String>,
     override val name: String,
     override val isRequired: Boolean?,
-    override val deprecated: Boolean?,
     override val description: String?,
     override val type: String?,
     override val enum: List<String>?,
     override var items: List<String>?,
+    @SerializedName("x-deprecated") @SerialName("x-deprecated") override val deprecated: String?,
     @SerializedName("x-priority") @SerialName("x-priority") override val priority: String?,
     @SerializedName("x-dropdown") @SerialName("x-dropdown") override val dropdown: String?,
-    @SerializedName("x-hint") @SerialName("x-hint") override val hint: String?
+    @SerializedName("x-hint") @SerialName("x-hint") override val hint: String?,
 ) : NxGeneratorOption
 
 @Serializable
 data class NxOptionWithNumberDefault(
     val default: Int,
     override val name: String,
     override val isRequired: Boolean?,
-    override val deprecated: Boolean?,
     override val description: String?,
     override val type: String?,
     override val enum: List<String>?,
     override var items: List<String>?,
+    @SerializedName("x-deprecated") @SerialName("x-deprecated") override val deprecated: String?,
     @SerializedName("x-priority") @SerialName("x-priority") override val priority: String?,
     @SerializedName("x-dropdown") @SerialName("x-dropdown") override val dropdown: String?,
-    @SerializedName("x-hint") @SerialName("x-hint") override val hint: String?
+    @SerializedName("x-hint") @SerialName("x-hint") override val hint: String?,
 ) : NxGeneratorOption
 
 class NxGeneratorOptionDeserializer : JsonDeserializer<NxGeneratorOption> {
     override fun deserialize(
         element: JsonElement?,
         type: Type?,
-        context: JsonDeserializationContext?
+        context: JsonDeserializationContext?,
     ): NxGeneratorOption? {
         val defaultElement =
             element?.asJsonObject?.get("default")
@@ -109,24 +109,24 @@ class NxGeneratorOptionDeserializer : JsonDeserializer<NxGeneratorOption> {
         return if (defaultElement.isJsonArray) {
             context?.deserialize<NxOptionWithArrayDefault>(
                 element,
-                NxOptionWithArrayDefault::class.java
+                NxOptionWithArrayDefault::class.java,
             )
         } else if (defaultElement.isJsonPrimitive) {
             val defaultValueType = defaultElement.asJsonPrimitive!!
             if (defaultValueType.isBoolean) {
                 context?.deserialize<NxOptionWithBooleanDefault>(
                     element,
-                    NxOptionWithBooleanDefault::class.java
+                    NxOptionWithBooleanDefault::class.java,
                 )
             } else if (defaultValueType.isString) {
                 context?.deserialize<NxOptionWithStringDefault>(
                     element,
-                    NxOptionWithStringDefault::class.java
+                    NxOptionWithStringDefault::class.java,
                 )
             } else if (defaultValueType.isNumber) {
                 context?.deserialize<NxOptionWithNumberDefault>(
                     element,
-                    NxOptionWithNumberDefault::class.java
+                    NxOptionWithNumberDefault::class.java,
                 )
             } else {
                 null

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ class NxGenerateService(val project: Project, private val cs: CoroutineScope) {`
`131`	`131`	`)`
`132`	`132`	`val transformedSchema =`
`133`	`133`	`project.service<NxlsService>().transformedGeneratorSchema(inputSchema)`
`134`		`- transformedSchema?.options ?: rawOptions`
	`134`	`+ transformedSchema.options`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`val generatorWithOptions = NxGenerator(generator, generatorOptions)`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,7 @@ interface NxService {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@JsonRequest`
`44`		`- fun transformedGeneratorSchema(`
`45`		`- transformedGeneratorSchemaRequest: NxTransformedGeneratorSchemaRequest`
`46`		`- ): CompletableFuture<GeneratorSchema> {`
	`44`	`+ fun transformedGeneratorSchema(schema: GeneratorSchema): CompletableFuture<GeneratorSchema> {`
`47`	`45`	`throw UnsupportedOperationException()`
`48`	`46`	`}`
`49`	`47`
`@@ -83,11 +81,6 @@ interface NxService {`
`83`	`81`	`throw UnsupportedOperationException()`
`84`	`82`	`}`
`85`	`83`
`86`		`- @JsonRequest`
`87`		`- fun transformedGeneratorSchema(schema: GeneratorSchema): CompletableFuture<GeneratorSchema> {`
`88`		`- throw UnsupportedOperationException()`
`89`		`- }`
`90`		`-`
`91`	`84`	`@JsonRequest`
`92`	`85`	`fun startupMessage(`
`93`	`86`	`schema: GeneratorSchema`