Skip to content

Commit 99ffc8a

Browse files
miparnisarimiparnisari
committed
chore: pass ctx to generator.GenerateSchema
1 parent 70fe885 commit 99ffc8a

File tree

10 files changed

+35
-34
lines changed

10 files changed

+35
-34
lines changed

‎internal/lsp/handlers.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ func (s *Server) textDocHover(_ context.Context, r *jsonrpc2.Request) (*Hover, e
282282
return hoverContents, nil
283283
}
284284

285-
func (s *Server) textDocFormat(_ context.Context, r *jsonrpc2.Request) ([]lsp.TextEdit, error) {
285+
func (s *Server) textDocFormat(ctx context.Context, r *jsonrpc2.Request) ([]lsp.TextEdit, error) {
286286
params, err := unmarshalParams[lsp.DocumentFormattingParams](r)
287287
if err != nil {
288288
return nil, err
@@ -295,7 +295,7 @@ func (s *Server) textDocFormat(_ context.Context, r *jsonrpc2.Request) ([]lsp.Te
295295
return err
296296
}
297297

298-
formattedSchema, _, err := generator.GenerateSchema(compiled.OrderedDefinitions)
298+
formattedSchema, _, err := generator.GenerateSchema(ctx, compiled.OrderedDefinitions)
299299
if err != nil {
300300
return err
301301
}

‎internal/services/v1/debug.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func getFullSchema(ctx context.Context, reader datalayer.SchemaReader) (string,
6060
defs = append(defs, ns.Definition)
6161
}
6262

63-
schema, _, err := generator.GenerateSchema(defs)
63+
schema, _, err := generator.GenerateSchema(ctx, defs)
6464
if err != nil {
6565
return "", err
6666
}

‎pkg/datastore/test/namespace.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ definition document {
371371
testutil.RequireProtoEqual(t, caveatDef, readCaveatDef, "found changed caveat definition")
372372

373373
// Ensure the read namespace's string form matches the input as an extra check.
374-
generated, _, err := generator.GenerateSchema([]compiler.SchemaDefinition{readCaveatDef, readNsDef})
374+
generated, _, err := generator.GenerateSchema(ctx, []compiler.SchemaDefinition{readCaveatDef, readNsDef})
375375
require.NoError(err)
376376
require.Equal(schemaString, generated)
377377
}

‎pkg/development/wasm/operations.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
func runOperation(devContext *development.DevContext, operation *devinterface.Operation) (*devinterface.OperationResult, error) {
1919
switch {
2020
case operation.FormatSchemaParameters != nil:
21-
formatted, _, err := generator.GenerateSchema(devContext.CompiledSchema.OrderedDefinitions)
21+
formatted, _, err := generator.GenerateSchema(devContext.Ctx, devContext.CompiledSchema.OrderedDefinitions)
2222
if err != nil {
2323
return nil, err
2424
}

‎pkg/schema/v2/builder_example_test.go‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package schema_test
22

33
import (
4+
"context"
45
"fmt"
56
"strings"
67

@@ -39,7 +40,7 @@ func ExampleSchemaBuilder() {
3940
Build()
4041

4142
defs, caveats, _ := s.ToDefinitions()
42-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
43+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
4344
fmt.Println(strings.TrimSpace(schemaText))
4445
}
4546

@@ -67,7 +68,7 @@ func ExampleSchemaBuilder_incrementalUnion() {
6768
Build()
6869

6970
defs, caveats, _ := s.ToDefinitions()
70-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
71+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
7172
fmt.Println(strings.TrimSpace(schemaText))
7273
}
7374

@@ -99,7 +100,7 @@ func ExampleSchemaBuilder_withArrow() {
99100
Build()
100101

101102
defs, caveats, _ := s.ToDefinitions()
102-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
103+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
103104
fmt.Println(strings.TrimSpace(schemaText))
104105
}
105106

@@ -119,7 +120,7 @@ func ExampleSchemaBuilder_withCaveat() {
119120
Build()
120121

121122
defs, caveats, _ := s.ToDefinitions()
122-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
123+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
123124
fmt.Println(strings.TrimSpace(schemaText))
124125
}
125126

@@ -148,7 +149,7 @@ func ExampleSchemaBuilder_withCaveatTypes() {
148149
Build()
149150

150151
defs, caveats, _ := s.ToDefinitions()
151-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
152+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
152153
fmt.Println(strings.TrimSpace(schemaText))
153154
}
154155

@@ -172,7 +173,7 @@ func ExampleSchemaBuilder_withExclusion() {
172173
Build()
173174

174175
defs, caveats, _ := s.ToDefinitions()
175-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
176+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
176177
fmt.Println(strings.TrimSpace(schemaText))
177178
}
178179

@@ -196,7 +197,7 @@ func ExampleSchemaBuilder_withIntersection() {
196197
Build()
197198

198199
defs, caveats, _ := s.ToDefinitions()
199-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
200+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
200201
fmt.Println(strings.TrimSpace(schemaText))
201202
}
202203

@@ -211,7 +212,7 @@ func ExampleSchemaBuilder_withWildcard() {
211212
Build()
212213

213214
defs, caveats, _ := s.ToDefinitions()
214-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
215+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
215216
fmt.Println(strings.TrimSpace(schemaText))
216217
}
217218

@@ -280,7 +281,7 @@ func ExampleSchemaBuilder_complex() {
280281
Build()
281282

282283
defs, caveats, _ := s.ToDefinitions()
283-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
284+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
284285
fmt.Println(strings.TrimSpace(schemaText))
285286
}
286287

@@ -306,7 +307,7 @@ func ExampleSchemaBuilder_constructorPattern() {
306307
Build()
307308

308309
defs, caveats, _ := s.ToDefinitions()
309-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
310+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
310311
fmt.Println(strings.TrimSpace(schemaText))
311312
}
312313

@@ -327,7 +328,7 @@ func ExampleSchemaBuilder_constructorWithIntersection() {
327328
Build()
328329

329330
defs, caveats, _ := s.ToDefinitions()
330-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
331+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
331332
fmt.Println(strings.TrimSpace(schemaText))
332333
}
333334

@@ -348,7 +349,7 @@ func ExampleSchemaBuilder_constructorWithExclusion() {
348349
Build()
349350

350351
defs, caveats, _ := s.ToDefinitions()
351-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
352+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
352353
fmt.Println(strings.TrimSpace(schemaText))
353354
}
354355

@@ -374,7 +375,7 @@ func ExampleSchemaBuilder_constructorWithArrow() {
374375
Build()
375376

376377
defs, caveats, _ := s.ToDefinitions()
377-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
378+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
378379
fmt.Println(strings.TrimSpace(schemaText))
379380
}
380381

@@ -395,7 +396,7 @@ func ExampleSchemaBuilder_constructorWithIntersectionArrow() {
395396
Build()
396397

397398
defs, caveats, _ := s.ToDefinitions()
398-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
399+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
399400
fmt.Println(strings.TrimSpace(schemaText))
400401
}
401402

@@ -418,7 +419,7 @@ func ExampleSchemaBuilder_constructorWithCaveat() {
418419
Build()
419420

420421
defs, caveats, _ := s.ToDefinitions()
421-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
422+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
422423
fmt.Println(strings.TrimSpace(schemaText))
423424
}
424425

@@ -475,7 +476,7 @@ func ExampleSchemaBuilder_constructorComplexNested() {
475476
Build()
476477

477478
defs, caveats, _ := s.ToDefinitions()
478-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
479+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
479480
fmt.Println(strings.TrimSpace(schemaText))
480481
}
481482

@@ -498,6 +499,6 @@ func ExampleSchemaBuilder_withIntersectionArrow() {
498499
Build()
499500

500501
defs, caveats, _ := s.ToDefinitions()
501-
schemaText, _, _ := generator.GenerateSchema(append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
502+
schemaText, _, _ := generator.GenerateSchema(context.Background(), append(toSchemaDefinitions(defs), toSchemaDefinitions(caveats)...))
502503
fmt.Println(strings.TrimSpace(schemaText))
503504
}

‎pkg/schema/v2/flatten_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ definition folder {
327327
schemaDefinitions = append(schemaDefinitions, caveat)
328328
}
329329

330-
generatedSchema, _, err := generator.GenerateSchema(schemaDefinitions)
330+
generatedSchema, _, err := generator.GenerateSchema(t.Context(), schemaDefinitions)
331331
require.NoError(t, err)
332332

333333
// Verify the generated schema compiles
@@ -365,7 +365,7 @@ definition folder {
365365
expectedSchemaDefinitions = append(expectedSchemaDefinitions, caveat)
366366
}
367367

368-
expectedGenerated, _, err := generator.GenerateSchema(expectedSchemaDefinitions)
368+
expectedGenerated, _, err := generator.GenerateSchema(t.Context(), expectedSchemaDefinitions)
369369
require.NoError(t, err)
370370

371371
// Compare the two generated schemas
@@ -674,7 +674,7 @@ definition user {}`,
674674
schemaDefinitions = append(schemaDefinitions, caveat)
675675
}
676676

677-
generatedSchema, _, err := generator.GenerateSchema(schemaDefinitions)
677+
generatedSchema, _, err := generator.GenerateSchema(t.Context(), schemaDefinitions)
678678
require.NoError(t, err)
679679

680680
// Verify the generated schema compiles
@@ -712,7 +712,7 @@ definition user {}`,
712712
expectedSchemaDefinitions = append(expectedSchemaDefinitions, caveat)
713713
}
714714

715-
expectedGenerated, _, err := generator.GenerateSchema(expectedSchemaDefinitions)
715+
expectedGenerated, _, err := generator.GenerateSchema(t.Context(), expectedSchemaDefinitions)
716716
require.NoError(t, err)
717717

718718
// Compare the two generated schemas
@@ -1116,7 +1116,7 @@ definition user {}
11161116
schemaDefinitions = append(schemaDefinitions, caveat)
11171117
}
11181118

1119-
generatedSchema, _, err := generator.GenerateSchema(schemaDefinitions)
1119+
generatedSchema, _, err := generator.GenerateSchema(t.Context(), schemaDefinitions)
11201120
require.NoError(t, err)
11211121

11221122
// Verify the generated schema compiles
@@ -1154,7 +1154,7 @@ definition user {}
11541154
expectedSchemaDefinitions = append(expectedSchemaDefinitions, caveat)
11551155
}
11561156

1157-
expectedGenerated, _, err := generator.GenerateSchema(expectedSchemaDefinitions)
1157+
expectedGenerated, _, err := generator.GenerateSchema(t.Context(), expectedSchemaDefinitions)
11581158
require.NoError(t, err)
11591159

11601160
// Compare the two generated schemas

‎pkg/schema/v2/testing/generator_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestExampleRunWithSchemaForTesting(t *testing.T) {
3030
definitions = append(definitions, cd)
3131
}
3232

33-
generated, _, err := generator.GenerateSchema(definitions)
33+
generated, _, err := generator.GenerateSchema(t.Context(), definitions)
3434
require.NoError(t, err)
3535
t.Logf("Generated schema:\n%s", generated)
3636

‎pkg/schemadsl/compiler/importer_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func TestImporter(t *testing.T) {
8282
compiler.SourceFolder(sourceFolder))
8383
require.NoError(t, err)
8484

85-
generated, _, err := generator.GenerateSchema(compiled.OrderedDefinitions)
85+
generated, _, err := generator.GenerateSchema(t.Context(), compiled.OrderedDefinitions)
8686
require.NoError(t, err)
8787

8888
if os.Getenv("REGEN") == "true" {
@@ -107,7 +107,7 @@ func TestImporter(t *testing.T) {
107107
compiler.SourceFS(fsys))
108108
require.NoError(t, err)
109109

110-
generated, _, err := generator.GenerateSchema(compiled.OrderedDefinitions)
110+
generated, _, err := generator.GenerateSchema(t.Context(), compiled.OrderedDefinitions)
111111
require.NoError(t, err)
112112

113113
if os.Getenv("REGEN") == "true" {

‎pkg/schemadsl/generator/generator.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ const Ellipsis = "..."
2929
// MaxSingleLineCommentLength sets the maximum length for a comment to made single line.
3030
const MaxSingleLineCommentLength = 70 // 80 - the comment parts and some padding
3131

32-
func GenerateSchema(definitions []compiler.SchemaDefinition) (string, bool, error) {
33-
return GenerateSchemaWithCaveatTypeSet(context.TODO(), definitions, caveattypes.Default.TypeSet)
32+
func GenerateSchema(ctx context.Context, definitions []compiler.SchemaDefinition) (string, bool, error) {
33+
return GenerateSchemaWithCaveatTypeSet(ctx, definitions, caveattypes.Default.TypeSet)
3434
}
3535

3636
// GenerateSchemaWithCaveatTypeSet generates a DSL view of the given schema.

‎pkg/schemadsl/generator/generator_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ definition user {
459459
}, compiler.AllowUnprefixedObjectType())
460460
require.NoError(err)
461461

462-
source, _, err := GenerateSchema(compiled.OrderedDefinitions)
462+
source, _, err := GenerateSchema(t.Context(), compiled.OrderedDefinitions)
463463
require.NoError(err)
464464
require.Equal(test.expected, source)
465465
})

0 commit comments

Comments
 (0)