chore: define types explictly

Author: Emyrk

preview/apitypes/apitypes.go

@@ -3,19 +3,25 @@ package apitypes
 import (
 	"time"
 
-	"github.com/coder/preview"
+	"github.com/hashicorp/hcl/v2"
+
 	"github.com/coder/preview/types"
 )
 
 type PreviewOutput struct {
-	Output *preview.Output   `json:"output"`
+	Output *Output           `json:"output"`
 	Diags  types.Diagnostics `json:"diags"`
 	// ParserLogs are trivy logs that occur during parsing the
 	// Terraform files. This is useful for debugging issues with the
 	// invalid terraform syntax.
 	ParserLogs []ParserLog `json:"parser_logs,omitempty"`
 }
 
+type Output struct {
+	Parameters []ParameterWithSource `json:"parameters"`
+	Files      map[string]*hcl.File  `json:"files"`
+}
+
 type ParserLog struct {
 	Time    time.Time `json:"time"`
 	Level   string    `json:"level"`
@@ -28,3 +34,24 @@ type ParserLog struct {
 type NullHCLString = types.NullHCLString
 
 type FriendlyDiagnostic = types.FriendlyDiagnostic
+
+type ParameterWithSource struct {
+	types.Parameter
+	TypeRange hcl.Range `json:"type_range"`
+}
+
+func WithSource(p []types.Parameter) []ParameterWithSource {
+	result := make([]ParameterWithSource, 0, len(p))
+	for _, param := range p {
+		src := ParameterWithSource{
+			Parameter: param,
+		}
+
+		if param.Source != nil {
+			src.TypeRange = param.Source.HCLBlock().TypeRange
+		}
+
+		result = append(result, src)
+	}
+	return result
+}

preview/main.go

@@ -72,7 +72,10 @@ func tfpreview(this js.Value, p []js.Value) (output any) {
 	}, tf)
 
 	data, _ := json.Marshal(apitypes.PreviewOutput{
-		Output:     pOutput,
+		Output: &apitypes.Output{
+			Parameters: apitypes.WithSource(pOutput.Parameters),
+			Files:      pOutput.Files,
+		},
 		Diags:      types.Diagnostics(diags),
 		ParserLogs: l.entries,
 	})

public/build/preview.wasm

@@ -1,9 +1,5 @@
 // Code generated by 'guts'. DO NOT EDIT.
 
-// From terraform/block.go
-export interface Block {
-}
-
 // From types/diagnostics.go
 export interface DiagnosticExtra {
     code: string;
@@ -39,12 +35,10 @@ export interface NullHCLString {
     valid: boolean;
 }
 
-// From preview/preview.go
+// From apitypes/apitypes.go
 export interface Output {
-    ModuleOutput: Value;
-    Parameters: Parameter[];
-    WorkspaceTags: TagBlocks;
-    Files: Record<string, File | null> | null;
+    parameters: ParameterWithSource[];
+    files: Record<string, File | null> | null;
 }
 
 // From types/parameter.go
@@ -101,6 +95,11 @@ export interface ParameterValidation {
     validation_monotonic: string | null;
 }
 
+// From apitypes/apitypes.go
+export interface ParameterWithSource extends Parameter {
+    type_range: Range;
+}
+
 // From apitypes/apitypes.go
 export interface ParserLog {
     time: string;
@@ -111,33 +110,25 @@ export interface ParserLog {
     err: string;
 }
 
+// From hcl/pos.go
+export interface Pos {
+    Line: number;
+    Column: number;
+    Byte: number;
+}
+
 // From apitypes/apitypes.go
 export interface PreviewOutput {
     output: Output | null;
     diags: Diagnostics;
     parser_logs?: ParserLog[];
 }
 
-// From types/tags.go
-export interface Tag {
-    Key: NullHCLString;
-    Value: NullHCLString;
-}
-
-// From types/tags.go
-export interface TagBlock {
-    Tags: Tags;
-    Block: Block | null;
-}
-
-// From types/tags.go
-export type TagBlocks = TagBlock[];
-
-// From types/tags.go
-export type Tags = Tag[];
-
-// From cty/value.go
-export interface Value {
+// From hcl/pos.go
+export interface Range {
+    Filename: string;
+    Start: Pos;
+    End: Pos;
 }