fix: Handle comments better

Emyrk · Emyrk · commit fd7587262a05 · 2022-10-19T23:26:28.000-05:00
diff --git a/scripts/apitypings/main.go b/scripts/apitypings/main.go
@@ -475,9 +475,6 @@ func (g *Generator) buildStruct(obj types.Object, st *types.Struct) (string, err
 			}
 		}
 
-		if tsType.AboveTypeLine != "" {
-			state.AboveLine = tsType.AboveTypeLine
-		}
 		optional := ""
 		if jsonOptional || tsType.Optional {
 			optional = "?"
@@ -498,6 +495,11 @@ func (g *Generator) buildStruct(obj types.Object, st *types.Struct) (string, err
 				genericsUsed[name] = constraint
 			}
 		}
+
+		if tsType.AboveTypeLine != "" {
+			// Just append these as fields. We should fix this later.
+			state.Fields = append(state.Fields, tsType.AboveTypeLine)
+		}
 		state.Fields = append(state.Fields, fmt.Sprintf("%sreadonly %s%s: %s", indent, jsonName, optional, valueType))
 	}
 
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -907,10 +907,7 @@ export type LogSource = "provisioner" | "provisioner_daemon"
 export type LoginType = "github" | "oidc" | "password" | "token"
 
 // From codersdk/parameters.go
-export type ParameterDestinationScheme =
-  | "environment_variable"
-  | "none"
-  | "provisioner_variable"
+export type ParameterDestinationScheme = "environment_variable" | "none" | "provisioner_variable"
 
 // From codersdk/parameters.go
 export type ParameterScope = "import_job" | "template" | "workspace"
@@ -922,13 +919,7 @@ export type ParameterSourceScheme = "data" | "none"
 export type ParameterTypeSystem = "hcl" | "none"
 
 // From codersdk/provisionerdaemons.go
-export type ProvisionerJobStatus =
-  | "canceled"
-  | "canceling"
-  | "failed"
-  | "pending"
-  | "running"
-  | "succeeded"
+export type ProvisionerJobStatus = "canceled" | "canceling" | "failed" | "pending" | "running" | "succeeded"
 
 // From codersdk/organizations.go
 export type ProvisionerStorageMethod = "file"
@@ -937,15 +928,7 @@ export type ProvisionerStorageMethod = "file"
 export type ProvisionerType = "echo" | "terraform"
 
 // From codersdk/audit.go
-export type ResourceType =
-  | "api_key"
-  | "git_ssh_key"
-  | "group"
-  | "organization"
-  | "template"
-  | "template_version"
-  | "user"
-  | "workspace"
+export type ResourceType = "api_key" | "git_ssh_key" | "group" | "organization" | "template" | "template_version" | "user" | "workspace"
 
 // From codersdk/sse.go
 export type ServerSentEventType = "data" | "error" | "ping"
@@ -960,27 +943,13 @@ export type UserStatus = "active" | "suspended"
 export type WorkspaceAgentStatus = "connected" | "connecting" | "disconnected"
 
 // From codersdk/workspaceapps.go
-export type WorkspaceAppHealth =
-  | "disabled"
-  | "healthy"
-  | "initializing"
-  | "unhealthy"
+export type WorkspaceAppHealth = "disabled" | "healthy" | "initializing" | "unhealthy"
 
 // From codersdk/workspaceapps.go
 export type WorkspaceAppSharingLevel = "authenticated" | "owner" | "public"
 
 // From codersdk/workspacebuilds.go
-export type WorkspaceStatus =
-  | "canceled"
-  | "canceling"
-  | "deleted"
-  | "deleting"
-  | "failed"
-  | "pending"
-  | "running"
-  | "starting"
-  | "stopped"
-  | "stopping"
+export type WorkspaceStatus = "canceled" | "canceling" | "deleted" | "deleting" | "failed" | "pending" | "running" | "starting" | "stopped" | "stopping"
 
 // From codersdk/workspacebuilds.go
 export type WorkspaceTransition = "delete" | "start" | "stop"

Original file line number	Diff line number	Diff line change
`@@ -475,9 +475,6 @@ func (g Generator) buildStruct(obj types.Object, st types.Struct) (string, err`
`475`	`475`	`}`
`476`	`476`	`}`
`477`	`477`
`478`		`- if tsType.AboveTypeLine != "" {`
`479`		`- state.AboveLine = tsType.AboveTypeLine`
`480`		`- }`
`481`	`478`	`optional := ""`
`482`	`479`	`if jsonOptional \|\| tsType.Optional {`
`483`	`480`	`optional = "?"`
`@@ -498,6 +495,11 @@ func (g Generator) buildStruct(obj types.Object, st types.Struct) (string, err`
`498`	`495`	`genericsUsed[name] = constraint`
`499`	`496`	`}`
`500`	`497`	`}`
	`498`	`+`
	`499`	`+ if tsType.AboveTypeLine != "" {`
	`500`	`+ // Just append these as fields. We should fix this later.`
	`501`	`+ state.Fields = append(state.Fields, tsType.AboveTypeLine)`
	`502`	`+ }`
`501`	`503`	`state.Fields = append(state.Fields, fmt.Sprintf("%sreadonly %s%s: %s", indent, jsonName, optional, valueType))`
`502`	`504`	`}`
`503`	`505`