Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions composition-go/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
test:
go test -v ./...
go test -v -tags=wg_composition_v8 ./...

.PHONY: test
2 changes: 2 additions & 0 deletions composition-go/composition_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ var subgraphs = []*Subgraph{
name: String
}`,
SubscriptionProtocol: "ws",
URL: "https://example.com/subgraph-a",
},
{
Name: "B",
Expand All @@ -58,6 +59,7 @@ var subgraphs = []*Subgraph{
age: Int @authenticated
}`,
SubscriptionProtocol: "ws",
URL: "https://example.com/subgraph-b",
},
}

Expand Down
4 changes: 4 additions & 0 deletions composition-go/index.global.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions composition-go/polyfill.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,8 @@ func urlParse(rawURL string, base string) (*urlShim, error) {
Username: u.User.Username(),
}, nil
}

func urlCanParse(rawURL string, base string) bool {
_, err := urlParse(rawURL, base)
return err == nil
}
4 changes: 4 additions & 0 deletions composition-go/shim/src/polyfill.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ class URL {
this[prop] = result[prop]
}
}

static canParse(url, base = undefined) {
return urlCanParse(url, base || '');
}
}
4 changes: 4 additions & 0 deletions composition-go/vm_goja.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ func newVM() (*gojaVm, error) {
if err := runtime.Set("urlParse", urlParse); err != nil {
return nil, err
}
if err := runtime.Set("urlCanParse", urlCanParse); err != nil {
return nil, err
}

return &gojaVm{
runtime: runtime,
federateSubgraphs: federateSubgraphs,
Expand Down
19 changes: 19 additions & 0 deletions composition-go/vm_v8.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,20 @@ func urlParseV8(info *v8.FunctionCallbackInfo) *v8.Value {
return value
}

func urlCanParseV8(info *v8.FunctionCallbackInfo) *v8.Value {
isolate := info.Context().Isolate()
args := info.Args()
url := args[0].String()
base := args[1].String()

result := urlCanParse(url, base)
value, err := v8.NewValue(isolate, result)
if err != nil {
panic(err)
}
return value
}

func newVM() (*v8Vm, error) {
isolate := v8.NewIsolate()

Expand All @@ -254,6 +268,11 @@ func newVM() (*v8Vm, error) {
return nil, err
}

urlCanParse := v8.NewFunctionTemplate(isolate, urlCanParseV8)
if err := global.Set("urlCanParse", urlCanParse, v8.ReadOnly); err != nil {
return nil, err
}

ctx := v8.NewContext(isolate, global)

if _, err := ctx.RunScript(jsPrelude, "prelude.js"); err != nil {
Expand Down
Loading