From 46e30bc8f8a5df66835fa6a9a669022f0a75b413 Mon Sep 17 00:00:00 2001 From: sonytruelove <42536061+sonytruelove@users.noreply.github.com> Date: Mon, 26 Aug 2024 05:47:55 +0000 Subject: [PATCH] doc(rs-examples,go-examples): rename complex example to resources #272 --- .github/dependabot.yml | 2 +- Cargo.lock | 4 +- examples/go/complex-server/complex_server.go | 3 - examples/go/complex-server/wit/deps.toml | 1 - examples/go/complex-server/wit/world.wit | 5 - .../resources}/resources/bindings.wrpc.go | 100 +++++++++--------- .../bindings/server.wrpc.go | 6 +- .../cmd/resources-server-nats}/main.go | 4 +- .../go.mod | 2 +- .../go.sum | 0 .../go/resources-server/resources_server.go | 3 + .../resources-server}/wit/deps.lock | 4 +- examples/go/resources-server/wit/deps.toml | 1 + .../wit/deps/resources/resources.wit} | 2 +- examples/go/resources-server/wit/world.wit | 5 + .../complex-component-client/wit/deps.toml | 1 - .../complex-component-client/wit/world.wit | 5 - .../complex-component-server/wit/deps.toml | 1 - .../complex-component-server/wit/world.wit | 5 - .../Cargo.toml | 2 +- .../src/main.rs | 4 +- .../wit/deps.lock | 4 +- .../resources-component-client/wit/deps.toml | 1 + .../wit/deps/resources/resources.wit} | 2 +- .../resources-component-client/wit/world.wit | 5 + .../Cargo.toml | 2 +- .../src/lib.rs | 10 +- .../resources-component-server}/wit/deps.lock | 4 +- .../resources-component-server/wit/deps.toml | 1 + .../wit/deps/resources/resources.wit} | 2 +- .../resources-component-server/wit/world.wit | 5 + .../resources/resources.wit} | 2 +- go.work | 2 +- 33 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 examples/go/complex-server/complex_server.go delete mode 100644 examples/go/complex-server/wit/deps.toml delete mode 100644 examples/go/complex-server/wit/world.wit rename examples/go/{complex-server/bindings/exports/wrpc_examples/complex => resources-server/bindings/exports/wrpc_examples/resources}/resources/bindings.wrpc.go (75%) rename examples/go/{complex-server => resources-server}/bindings/server.wrpc.go (59%) rename examples/go/{complex-server/cmd/complex-server-nats => resources-server/cmd/resources-server-nats}/main.go (94%) rename examples/go/{complex-server => resources-server}/go.mod (89%) rename examples/go/{complex-server => resources-server}/go.sum (100%) create mode 100644 examples/go/resources-server/resources_server.go rename examples/{rust/complex-component-client => go/resources-server}/wit/deps.lock (83%) create mode 100644 examples/go/resources-server/wit/deps.toml rename examples/go/{complex-server/wit/deps/complex/complex.wit => resources-server/wit/deps/resources/resources.wit} (89%) create mode 100644 examples/go/resources-server/wit/world.wit delete mode 100644 examples/rust/complex-component-client/wit/deps.toml delete mode 100644 examples/rust/complex-component-client/wit/world.wit delete mode 100644 examples/rust/complex-component-server/wit/deps.toml delete mode 100644 examples/rust/complex-component-server/wit/world.wit rename examples/rust/{complex-component-client => resources-component-client}/Cargo.toml (88%) rename examples/rust/{complex-component-client => resources-component-client}/src/main.rs (72%) rename examples/rust/{complex-component-server => resources-component-client}/wit/deps.lock (83%) create mode 100644 examples/rust/resources-component-client/wit/deps.toml rename examples/rust/{complex-component-server/wit/deps/complex/complex.wit => resources-component-client/wit/deps/resources/resources.wit} (89%) create mode 100644 examples/rust/resources-component-client/wit/world.wit rename examples/rust/{complex-component-server => resources-component-server}/Cargo.toml (89%) rename examples/rust/{complex-component-server => resources-component-server}/src/lib.rs (54%) rename examples/{go/complex-server => rust/resources-component-server}/wit/deps.lock (83%) create mode 100644 examples/rust/resources-component-server/wit/deps.toml rename examples/{wit/complex/complex.wit => rust/resources-component-server/wit/deps/resources/resources.wit} (89%) create mode 100644 examples/rust/resources-component-server/wit/world.wit rename examples/{rust/complex-component-client/wit/deps/complex/complex.wit => wit/resources/resources.wit} (89%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7f3dd267..9114d200 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,7 +24,7 @@ updates: interval: "daily" - package-ecosystem: gomod - directory: /examples/go/complex-server + directory: /examples/go/resources-server schedule: interval: daily diff --git a/Cargo.lock b/Cargo.lock index ba44b245..543ffdef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -411,14 +411,14 @@ dependencies = [ ] [[package]] -name = "complex-component-client" +name = "resources-component-client" version = "0.1.0" dependencies = [ "wit-bindgen", ] [[package]] -name = "complex-component-server" +name = "resources-component-server" version = "0.1.0" dependencies = [ "wit-bindgen", diff --git a/examples/go/complex-server/complex_server.go b/examples/go/complex-server/complex_server.go deleted file mode 100644 index 4531c3b0..00000000 --- a/examples/go/complex-server/complex_server.go +++ /dev/null @@ -1,3 +0,0 @@ -//go:generate cargo run --bin wit-bindgen-wrpc go --out-dir bindings --package wrpc.io/examples/go/complex-server/bindings wit - -package complex_server diff --git a/examples/go/complex-server/wit/deps.toml b/examples/go/complex-server/wit/deps.toml deleted file mode 100644 index c23b5845..00000000 --- a/examples/go/complex-server/wit/deps.toml +++ /dev/null @@ -1 +0,0 @@ -complex = "../../../wit/complex" diff --git a/examples/go/complex-server/wit/world.wit b/examples/go/complex-server/wit/world.wit deleted file mode 100644 index 5948d64c..00000000 --- a/examples/go/complex-server/wit/world.wit +++ /dev/null @@ -1,5 +0,0 @@ -package wrpc-examples:complex-go-server; - -world server { - include wrpc-examples:complex/server; -} diff --git a/examples/go/complex-server/bindings/exports/wrpc_examples/complex/resources/bindings.wrpc.go b/examples/go/resources-server/bindings/exports/wrpc_examples/resources/resources/bindings.wrpc.go similarity index 75% rename from examples/go/complex-server/bindings/exports/wrpc_examples/complex/resources/bindings.wrpc.go rename to examples/go/resources-server/bindings/exports/wrpc_examples/resources/resources/bindings.wrpc.go index baa8c92c..430e278f 100644 --- a/examples/go/complex-server/bindings/exports/wrpc_examples/complex/resources/bindings.wrpc.go +++ b/examples/go/resources-server/bindings/exports/wrpc_examples/resources/resources/bindings.wrpc.go @@ -33,19 +33,19 @@ func ServeInterface(s wrpc.Server, h Handler) (stop func() error, err error) { return nil } - stop0, err := s.Serve("wrpc-examples:complex/resources", "foo", func(ctx context.Context, w wrpc.IndexWriteCloser, r wrpc.IndexReadCloser) { + stop0, err := s.Serve("wrpc-examples:resources/resources", "foo", func(ctx context.Context, w wrpc.IndexWriteCloser, r wrpc.IndexReadCloser) { defer func() { if err := w.Close(); err != nil { - slog.DebugContext(ctx, "failed to close writer", "instance", "wrpc-examples:complex/resources", "name", "foo", "err", err) + slog.DebugContext(ctx, "failed to close writer", "instance", "wrpc-examples:resources/resources", "name", "foo", "err", err) } }() - slog.DebugContext(ctx, "calling `wrpc-examples:complex/resources.foo` handler") + slog.DebugContext(ctx, "calling `wrpc-examples:resources/resources.foo` handler") r0, err := h.Foo(ctx) if cErr := r.Close(); cErr != nil { - slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:complex/resources", "name", "foo", "err", err) + slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:resources/resources", "name", "foo", "err", err) } if err != nil { - slog.WarnContext(ctx, "failed to handle invocation", "instance", "wrpc-examples:complex/resources", "name", "foo", "err", err) + slog.WarnContext(ctx, "failed to handle invocation", "instance", "wrpc-examples:resources/resources", "name", "foo", "err", err) return } @@ -74,44 +74,44 @@ func ServeInterface(s wrpc.Server, h Handler) (stop func() error, err error) { return nil }(string(r0), &buf) if err != nil { - slog.WarnContext(ctx, "failed to write result value", "i", 0, "wrpc-examples:complex/resources", "name", "foo", "err", err) + slog.WarnContext(ctx, "failed to write result value", "i", 0, "wrpc-examples:resources/resources", "name", "foo", "err", err) return } if write0 != nil { writes[0] = write0 } - slog.DebugContext(ctx, "transmitting `wrpc-examples:complex/resources.foo` result") + slog.DebugContext(ctx, "transmitting `wrpc-examples:resources/resources.foo` result") _, err = w.Write(buf.Bytes()) if err != nil { - slog.WarnContext(ctx, "failed to write result", "wrpc-examples:complex/resources", "name", "foo", "err", err) + slog.WarnContext(ctx, "failed to write result", "wrpc-examples:resources/resources", "name", "foo", "err", err) return } if len(writes) > 0 { for index, write := range writes { w, err := w.Index(index) if err != nil { - slog.ErrorContext(ctx, "failed to index writer", "index", index, "wrpc-examples:complex/resources", "name", "foo", "err", err) + slog.ErrorContext(ctx, "failed to index writer", "index", index, "wrpc-examples:resources/resources", "name", "foo", "err", err) return } index := index write := write go func() { if err := write(w); err != nil { - slog.WarnContext(ctx, "failed to write nested result value", "index", index, "wrpc-examples:complex/resources", "name", "foo", "err", err) + slog.WarnContext(ctx, "failed to write nested result value", "index", index, "wrpc-examples:resources/resources", "name", "foo", "err", err) } }() } } }) if err != nil { - return nil, fmt.Errorf("failed to serve `wrpc-examples:complex/resources.foo`: %w", err) + return nil, fmt.Errorf("failed to serve `wrpc-examples:resources/resources.foo`: %w", err) } stops = append(stops, stop0) - stop1, err := s.Serve("wrpc-examples:complex/resources", "foo.foo", func(ctx context.Context, w wrpc.IndexWriteCloser, r wrpc.IndexReadCloser) { + stop1, err := s.Serve("wrpc-examples:resources/resources", "foo.foo", func(ctx context.Context, w wrpc.IndexWriteCloser, r wrpc.IndexReadCloser) { defer func() { if err := w.Close(); err != nil { - slog.DebugContext(ctx, "failed to close writer", "instance", "wrpc-examples:complex/resources", "name", "foo.foo", "err", err) + slog.DebugContext(ctx, "failed to close writer", "instance", "wrpc-examples:resources/resources", "name", "foo.foo", "err", err) } }() slog.DebugContext(ctx, "reading parameter", "i", 0) @@ -153,19 +153,19 @@ func ServeInterface(s wrpc.Server, h Handler) (stop func() error, err error) { }(r) if err != nil { - slog.WarnContext(ctx, "failed to read parameter", "i", 0, "instance", "wrpc-examples:complex/resources", "name", "foo.foo", "err", err) + slog.WarnContext(ctx, "failed to read parameter", "i", 0, "instance", "wrpc-examples:resources/resources", "name", "foo.foo", "err", err) if err := r.Close(); err != nil { - slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:complex/resources", "name", "foo.foo", "err", err) + slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:resources/resources", "name", "foo.foo", "err", err) } return } - slog.DebugContext(ctx, "calling `wrpc-examples:complex/resources.foo.foo` handler") + slog.DebugContext(ctx, "calling `wrpc-examples:resources/resources.foo.foo` handler") r0, err := h.Foo_Foo(ctx, p0) if cErr := r.Close(); cErr != nil { - slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:complex/resources", "name", "foo.foo", "err", err) + slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:resources/resources", "name", "foo.foo", "err", err) } if err != nil { - slog.WarnContext(ctx, "failed to handle invocation", "instance", "wrpc-examples:complex/resources", "name", "foo.foo", "err", err) + slog.WarnContext(ctx, "failed to handle invocation", "instance", "wrpc-examples:resources/resources", "name", "foo.foo", "err", err) return } @@ -194,44 +194,44 @@ func ServeInterface(s wrpc.Server, h Handler) (stop func() error, err error) { return nil }(r0, &buf) if err != nil { - slog.WarnContext(ctx, "failed to write result value", "i", 0, "wrpc-examples:complex/resources", "name", "foo.foo", "err", err) + slog.WarnContext(ctx, "failed to write result value", "i", 0, "wrpc-examples:resources/resources", "name", "foo.foo", "err", err) return } if write0 != nil { writes[0] = write0 } - slog.DebugContext(ctx, "transmitting `wrpc-examples:complex/resources.foo.foo` result") + slog.DebugContext(ctx, "transmitting `wrpc-examples:resources/resources.foo.foo` result") _, err = w.Write(buf.Bytes()) if err != nil { - slog.WarnContext(ctx, "failed to write result", "wrpc-examples:complex/resources", "name", "foo.foo", "err", err) + slog.WarnContext(ctx, "failed to write result", "wrpc-examples:resources/resources", "name", "foo.foo", "err", err) return } if len(writes) > 0 { for index, write := range writes { w, err := w.Index(index) if err != nil { - slog.ErrorContext(ctx, "failed to index writer", "index", index, "wrpc-examples:complex/resources", "name", "foo.foo", "err", err) + slog.ErrorContext(ctx, "failed to index writer", "index", index, "wrpc-examples:resources/resources", "name", "foo.foo", "err", err) return } index := index write := write go func() { if err := write(w); err != nil { - slog.WarnContext(ctx, "failed to write nested result value", "index", index, "wrpc-examples:complex/resources", "name", "foo.foo", "err", err) + slog.WarnContext(ctx, "failed to write nested result value", "index", index, "wrpc-examples:resources/resources", "name", "foo.foo", "err", err) } }() } } }) if err != nil { - return nil, fmt.Errorf("failed to serve `wrpc-examples:complex/resources.foo.foo`: %w", err) + return nil, fmt.Errorf("failed to serve `wrpc-examples:resources/resources.foo.foo`: %w", err) } stops = append(stops, stop1) - stop2, err := s.Serve("wrpc-examples:complex/resources", "foo.bar", func(ctx context.Context, w wrpc.IndexWriteCloser, r wrpc.IndexReadCloser) { + stop2, err := s.Serve("wrpc-examples:resources/resources", "foo.bar", func(ctx context.Context, w wrpc.IndexWriteCloser, r wrpc.IndexReadCloser) { defer func() { if err := w.Close(); err != nil { - slog.DebugContext(ctx, "failed to close writer", "instance", "wrpc-examples:complex/resources", "name", "foo.bar", "err", err) + slog.DebugContext(ctx, "failed to close writer", "instance", "wrpc-examples:resources/resources", "name", "foo.bar", "err", err) } }() slog.DebugContext(ctx, "reading parameter", "i", 0) @@ -273,19 +273,19 @@ func ServeInterface(s wrpc.Server, h Handler) (stop func() error, err error) { }(r) if err != nil { - slog.WarnContext(ctx, "failed to read parameter", "i", 0, "instance", "wrpc-examples:complex/resources", "name", "foo.bar", "err", err) + slog.WarnContext(ctx, "failed to read parameter", "i", 0, "instance", "wrpc-examples:resources/resources", "name", "foo.bar", "err", err) if err := r.Close(); err != nil { - slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:complex/resources", "name", "foo.bar", "err", err) + slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:resources/resources", "name", "foo.bar", "err", err) } return } - slog.DebugContext(ctx, "calling `wrpc-examples:complex/resources.foo.bar` handler") + slog.DebugContext(ctx, "calling `wrpc-examples:resources/resources.foo.bar` handler") r0, err := h.Foo_Bar(ctx, p0) if cErr := r.Close(); cErr != nil { - slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:complex/resources", "name", "foo.bar", "err", err) + slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:resources/resources", "name", "foo.bar", "err", err) } if err != nil { - slog.WarnContext(ctx, "failed to handle invocation", "instance", "wrpc-examples:complex/resources", "name", "foo.bar", "err", err) + slog.WarnContext(ctx, "failed to handle invocation", "instance", "wrpc-examples:resources/resources", "name", "foo.bar", "err", err) return } @@ -314,44 +314,44 @@ func ServeInterface(s wrpc.Server, h Handler) (stop func() error, err error) { return nil }(r0, &buf) if err != nil { - slog.WarnContext(ctx, "failed to write result value", "i", 0, "wrpc-examples:complex/resources", "name", "foo.bar", "err", err) + slog.WarnContext(ctx, "failed to write result value", "i", 0, "wrpc-examples:resources/resources", "name", "foo.bar", "err", err) return } if write0 != nil { writes[0] = write0 } - slog.DebugContext(ctx, "transmitting `wrpc-examples:complex/resources.foo.bar` result") + slog.DebugContext(ctx, "transmitting `wrpc-examples:resources/resources.foo.bar` result") _, err = w.Write(buf.Bytes()) if err != nil { - slog.WarnContext(ctx, "failed to write result", "wrpc-examples:complex/resources", "name", "foo.bar", "err", err) + slog.WarnContext(ctx, "failed to write result", "wrpc-examples:resources/resources", "name", "foo.bar", "err", err) return } if len(writes) > 0 { for index, write := range writes { w, err := w.Index(index) if err != nil { - slog.ErrorContext(ctx, "failed to index writer", "index", index, "wrpc-examples:complex/resources", "name", "foo.bar", "err", err) + slog.ErrorContext(ctx, "failed to index writer", "index", index, "wrpc-examples:resources/resources", "name", "foo.bar", "err", err) return } index := index write := write go func() { if err := write(w); err != nil { - slog.WarnContext(ctx, "failed to write nested result value", "index", index, "wrpc-examples:complex/resources", "name", "foo.bar", "err", err) + slog.WarnContext(ctx, "failed to write nested result value", "index", index, "wrpc-examples:resources/resources", "name", "foo.bar", "err", err) } }() } } }) if err != nil { - return nil, fmt.Errorf("failed to serve `wrpc-examples:complex/resources.foo.bar`: %w", err) + return nil, fmt.Errorf("failed to serve `wrpc-examples:resources/resources.foo.bar`: %w", err) } stops = append(stops, stop2) - stop3, err := s.Serve("wrpc-examples:complex/resources", "bar", func(ctx context.Context, w wrpc.IndexWriteCloser, r wrpc.IndexReadCloser) { + stop3, err := s.Serve("wrpc-examples:resources/resources", "bar", func(ctx context.Context, w wrpc.IndexWriteCloser, r wrpc.IndexReadCloser) { defer func() { if err := w.Close(); err != nil { - slog.DebugContext(ctx, "failed to close writer", "instance", "wrpc-examples:complex/resources", "name", "bar", "err", err) + slog.DebugContext(ctx, "failed to close writer", "instance", "wrpc-examples:resources/resources", "name", "bar", "err", err) } }() slog.DebugContext(ctx, "reading parameter", "i", 0) @@ -393,19 +393,19 @@ func ServeInterface(s wrpc.Server, h Handler) (stop func() error, err error) { }(r) if err != nil { - slog.WarnContext(ctx, "failed to read parameter", "i", 0, "instance", "wrpc-examples:complex/resources", "name", "bar", "err", err) + slog.WarnContext(ctx, "failed to read parameter", "i", 0, "instance", "wrpc-examples:resources/resources", "name", "bar", "err", err) if err := r.Close(); err != nil { - slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:complex/resources", "name", "bar", "err", err) + slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:resources/resources", "name", "bar", "err", err) } return } - slog.DebugContext(ctx, "calling `wrpc-examples:complex/resources.bar` handler") + slog.DebugContext(ctx, "calling `wrpc-examples:resources/resources.bar` handler") r0, err := h.Bar(ctx, p0) if cErr := r.Close(); cErr != nil { - slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:complex/resources", "name", "bar", "err", err) + slog.ErrorContext(ctx, "failed to close reader", "instance", "wrpc-examples:resources/resources", "name", "bar", "err", err) } if err != nil { - slog.WarnContext(ctx, "failed to handle invocation", "instance", "wrpc-examples:complex/resources", "name", "bar", "err", err) + slog.WarnContext(ctx, "failed to handle invocation", "instance", "wrpc-examples:resources/resources", "name", "bar", "err", err) return } @@ -434,37 +434,37 @@ func ServeInterface(s wrpc.Server, h Handler) (stop func() error, err error) { return nil }(r0, &buf) if err != nil { - slog.WarnContext(ctx, "failed to write result value", "i", 0, "wrpc-examples:complex/resources", "name", "bar", "err", err) + slog.WarnContext(ctx, "failed to write result value", "i", 0, "wrpc-examples:resources/resources", "name", "bar", "err", err) return } if write0 != nil { writes[0] = write0 } - slog.DebugContext(ctx, "transmitting `wrpc-examples:complex/resources.bar` result") + slog.DebugContext(ctx, "transmitting `wrpc-examples:resources/resources.bar` result") _, err = w.Write(buf.Bytes()) if err != nil { - slog.WarnContext(ctx, "failed to write result", "wrpc-examples:complex/resources", "name", "bar", "err", err) + slog.WarnContext(ctx, "failed to write result", "wrpc-examples:resources/resources", "name", "bar", "err", err) return } if len(writes) > 0 { for index, write := range writes { w, err := w.Index(index) if err != nil { - slog.ErrorContext(ctx, "failed to index writer", "index", index, "wrpc-examples:complex/resources", "name", "bar", "err", err) + slog.ErrorContext(ctx, "failed to index writer", "index", index, "wrpc-examples:resources/resources", "name", "bar", "err", err) return } index := index write := write go func() { if err := write(w); err != nil { - slog.WarnContext(ctx, "failed to write nested result value", "index", index, "wrpc-examples:complex/resources", "name", "bar", "err", err) + slog.WarnContext(ctx, "failed to write nested result value", "index", index, "wrpc-examples:resources/resources", "name", "bar", "err", err) } }() } } }) if err != nil { - return nil, fmt.Errorf("failed to serve `wrpc-examples:complex/resources.bar`: %w", err) + return nil, fmt.Errorf("failed to serve `wrpc-examples:resources/resources.bar`: %w", err) } stops = append(stops, stop3) return stop, nil diff --git a/examples/go/complex-server/bindings/server.wrpc.go b/examples/go/resources-server/bindings/server.wrpc.go similarity index 59% rename from examples/go/complex-server/bindings/server.wrpc.go rename to examples/go/resources-server/bindings/server.wrpc.go index 1768f50b..6c43b2a1 100644 --- a/examples/go/complex-server/bindings/server.wrpc.go +++ b/examples/go/resources-server/bindings/server.wrpc.go @@ -3,11 +3,11 @@ package server import ( - exports__wrpc_examples__complex__resources "wrpc.io/examples/go/complex-server/bindings/exports/wrpc_examples/complex/resources" + exports__wrpc_examples__resources__resources "wrpc.io/examples/go/resources-server/bindings/exports/wrpc_examples/resources/resources" wrpc "wrpc.io/go" ) -func Serve(s wrpc.Server, h0 exports__wrpc_examples__complex__resources.Handler) (stop func() error, err error) { +func Serve(s wrpc.Server, h0 exports__wrpc_examples__resources__resources.Handler) (stop func() error, err error) { stops := make([]func() error, 0, 1) stop = func() error { for _, stop := range stops { @@ -17,7 +17,7 @@ func Serve(s wrpc.Server, h0 exports__wrpc_examples__complex__resources.Handler) } return nil } - stop0, err := exports__wrpc_examples__complex__resources.ServeInterface(s, h0) + stop0, err := exports__wrpc_examples__resources__resources.ServeInterface(s, h0) if err != nil { return } diff --git a/examples/go/complex-server/cmd/complex-server-nats/main.go b/examples/go/resources-server/cmd/resources-server-nats/main.go similarity index 94% rename from examples/go/complex-server/cmd/complex-server-nats/main.go rename to examples/go/resources-server/cmd/resources-server-nats/main.go index e68ec08f..910a9431 100644 --- a/examples/go/complex-server/cmd/complex-server-nats/main.go +++ b/examples/go/resources-server/cmd/resources-server-nats/main.go @@ -10,8 +10,8 @@ import ( "sync" "syscall" - server "wrpc.io/examples/go/complex-server/bindings" - "wrpc.io/examples/go/complex-server/bindings/exports/wrpc_examples/complex/resources" + server "wrpc.io/examples/go/resources-server/bindings" + "wrpc.io/examples/go/resources-server/bindings/exports/wrpc_examples/resources/resources" wrpc "wrpc.io/go" wrpcnats "wrpc.io/go/nats" "github.com/google/uuid" diff --git a/examples/go/complex-server/go.mod b/examples/go/resources-server/go.mod similarity index 89% rename from examples/go/complex-server/go.mod rename to examples/go/resources-server/go.mod index 92bf6ca7..e33ca7f9 100644 --- a/examples/go/complex-server/go.mod +++ b/examples/go/resources-server/go.mod @@ -1,4 +1,4 @@ -module wrpc.io/examples/go/complex-server +module wrpc.io/examples/go/resources-server go 1.22.2 diff --git a/examples/go/complex-server/go.sum b/examples/go/resources-server/go.sum similarity index 100% rename from examples/go/complex-server/go.sum rename to examples/go/resources-server/go.sum diff --git a/examples/go/resources-server/resources_server.go b/examples/go/resources-server/resources_server.go new file mode 100644 index 00000000..f731170c --- /dev/null +++ b/examples/go/resources-server/resources_server.go @@ -0,0 +1,3 @@ +//go:generate cargo run --bin wit-bindgen-wrpc go --out-dir bindings --package wrpc.io/examples/go/resources/bindings wit + +package resources_server diff --git a/examples/rust/complex-component-client/wit/deps.lock b/examples/go/resources-server/wit/deps.lock similarity index 83% rename from examples/rust/complex-component-client/wit/deps.lock rename to examples/go/resources-server/wit/deps.lock index 389d6c59..8967be6e 100644 --- a/examples/rust/complex-component-client/wit/deps.lock +++ b/examples/go/resources-server/wit/deps.lock @@ -1,4 +1,4 @@ -[complex] -path = "../../../wit/complex" +[resources] +path = "../../../wit/resources" sha256 = "d47aff89928fe5bb30ddc79a4bae79a5af6fa075e8694953567544fefa507048" sha512 = "2de2d6fccb3bde7f9c163890993b53191cc399fb16e28742dbd25f449fc1d8a2e0766a101d0cf4c252be07e2aa3c892daba876b009a0bd33e3c5dd5f74f790da" diff --git a/examples/go/resources-server/wit/deps.toml b/examples/go/resources-server/wit/deps.toml new file mode 100644 index 00000000..cb9afc70 --- /dev/null +++ b/examples/go/resources-server/wit/deps.toml @@ -0,0 +1 @@ +resources = "../../../wit/resources" diff --git a/examples/go/complex-server/wit/deps/complex/complex.wit b/examples/go/resources-server/wit/deps/resources/resources.wit similarity index 89% rename from examples/go/complex-server/wit/deps/complex/complex.wit rename to examples/go/resources-server/wit/deps/resources/resources.wit index 4464ddac..d051d9ab 100644 --- a/examples/go/complex-server/wit/deps/complex/complex.wit +++ b/examples/go/resources-server/wit/deps/resources/resources.wit @@ -1,4 +1,4 @@ -package wrpc-examples:complex; +package wrpc-examples:resources; interface resources { resource foo { diff --git a/examples/go/resources-server/wit/world.wit b/examples/go/resources-server/wit/world.wit new file mode 100644 index 00000000..0b3a3a6c --- /dev/null +++ b/examples/go/resources-server/wit/world.wit @@ -0,0 +1,5 @@ +package wrpc-examples:resources-go-server; + +world server { + include wrpc-examples:resources/server; +} diff --git a/examples/rust/complex-component-client/wit/deps.toml b/examples/rust/complex-component-client/wit/deps.toml deleted file mode 100644 index c23b5845..00000000 --- a/examples/rust/complex-component-client/wit/deps.toml +++ /dev/null @@ -1 +0,0 @@ -complex = "../../../wit/complex" diff --git a/examples/rust/complex-component-client/wit/world.wit b/examples/rust/complex-component-client/wit/world.wit deleted file mode 100644 index fdab25eb..00000000 --- a/examples/rust/complex-component-client/wit/world.wit +++ /dev/null @@ -1,5 +0,0 @@ -package wrpc-examples:complex-component-client; - -world client { - include wrpc-examples:complex/client; -} diff --git a/examples/rust/complex-component-server/wit/deps.toml b/examples/rust/complex-component-server/wit/deps.toml deleted file mode 100644 index c23b5845..00000000 --- a/examples/rust/complex-component-server/wit/deps.toml +++ /dev/null @@ -1 +0,0 @@ -complex = "../../../wit/complex" diff --git a/examples/rust/complex-component-server/wit/world.wit b/examples/rust/complex-component-server/wit/world.wit deleted file mode 100644 index 5a4e9a86..00000000 --- a/examples/rust/complex-component-server/wit/world.wit +++ /dev/null @@ -1,5 +0,0 @@ -package wrpc-examples:complex-component-server; - -world server { - include wrpc-examples:complex/server; -} diff --git a/examples/rust/complex-component-client/Cargo.toml b/examples/rust/resources-component-client/Cargo.toml similarity index 88% rename from examples/rust/complex-component-client/Cargo.toml rename to examples/rust/resources-component-client/Cargo.toml index 03e54ca4..4dac3d57 100644 --- a/examples/rust/complex-component-client/Cargo.toml +++ b/examples/rust/resources-component-client/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "complex-component-client" +name = "resources-component-client" version = "0.1.0" authors.workspace = true diff --git a/examples/rust/complex-component-client/src/main.rs b/examples/rust/resources-component-client/src/main.rs similarity index 72% rename from examples/rust/complex-component-client/src/main.rs rename to examples/rust/resources-component-client/src/main.rs index c246cf28..edf87197 100644 --- a/examples/rust/complex-component-client/src/main.rs +++ b/examples/rust/resources-component-client/src/main.rs @@ -1,9 +1,9 @@ -use crate::bindings::wrpc_examples::complex::resources; +use crate::bindings::wrpc_examples::resources::resources; mod bindings { wit_bindgen::generate!({ with: { - "wrpc-examples:complex/resources": generate + "wrpc-examples:resources/resources": generate } }); } diff --git a/examples/rust/complex-component-server/wit/deps.lock b/examples/rust/resources-component-client/wit/deps.lock similarity index 83% rename from examples/rust/complex-component-server/wit/deps.lock rename to examples/rust/resources-component-client/wit/deps.lock index 389d6c59..8967be6e 100644 --- a/examples/rust/complex-component-server/wit/deps.lock +++ b/examples/rust/resources-component-client/wit/deps.lock @@ -1,4 +1,4 @@ -[complex] -path = "../../../wit/complex" +[resources] +path = "../../../wit/resources" sha256 = "d47aff89928fe5bb30ddc79a4bae79a5af6fa075e8694953567544fefa507048" sha512 = "2de2d6fccb3bde7f9c163890993b53191cc399fb16e28742dbd25f449fc1d8a2e0766a101d0cf4c252be07e2aa3c892daba876b009a0bd33e3c5dd5f74f790da" diff --git a/examples/rust/resources-component-client/wit/deps.toml b/examples/rust/resources-component-client/wit/deps.toml new file mode 100644 index 00000000..cb9afc70 --- /dev/null +++ b/examples/rust/resources-component-client/wit/deps.toml @@ -0,0 +1 @@ +resources = "../../../wit/resources" diff --git a/examples/rust/complex-component-server/wit/deps/complex/complex.wit b/examples/rust/resources-component-client/wit/deps/resources/resources.wit similarity index 89% rename from examples/rust/complex-component-server/wit/deps/complex/complex.wit rename to examples/rust/resources-component-client/wit/deps/resources/resources.wit index 4464ddac..d051d9ab 100644 --- a/examples/rust/complex-component-server/wit/deps/complex/complex.wit +++ b/examples/rust/resources-component-client/wit/deps/resources/resources.wit @@ -1,4 +1,4 @@ -package wrpc-examples:complex; +package wrpc-examples:resources; interface resources { resource foo { diff --git a/examples/rust/resources-component-client/wit/world.wit b/examples/rust/resources-component-client/wit/world.wit new file mode 100644 index 00000000..f3e717cc --- /dev/null +++ b/examples/rust/resources-component-client/wit/world.wit @@ -0,0 +1,5 @@ +package wrpc-examples:resources-component-client; + +world client { + include wrpc-examples:resources/client; +} diff --git a/examples/rust/complex-component-server/Cargo.toml b/examples/rust/resources-component-server/Cargo.toml similarity index 89% rename from examples/rust/complex-component-server/Cargo.toml rename to examples/rust/resources-component-server/Cargo.toml index 1e81e407..6f71b94f 100644 --- a/examples/rust/complex-component-server/Cargo.toml +++ b/examples/rust/resources-component-server/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "complex-component-server" +name = "resources-component-server" version = "0.1.0" authors.workspace = true diff --git a/examples/rust/complex-component-server/src/lib.rs b/examples/rust/resources-component-server/src/lib.rs similarity index 54% rename from examples/rust/complex-component-server/src/lib.rs rename to examples/rust/resources-component-server/src/lib.rs index a8b7f184..0a06fe88 100644 --- a/examples/rust/complex-component-server/src/lib.rs +++ b/examples/rust/resources-component-server/src/lib.rs @@ -4,25 +4,25 @@ mod bindings { wit_bindgen::generate!({ with: { - "wrpc-examples:complex/resources": generate + "wrpc-examples:resources/resources": generate } }); export!(Handler); } -use bindings::exports::wrpc_examples::complex::resources::{FooBorrow, GuestFoo}; +use bindings::exports::wrpc_examples::resources::resources::{FooBorrow, GuestFoo}; pub struct Handler; pub struct Foo; -impl bindings::exports::wrpc_examples::complex::resources::GuestFoo for Foo { +impl bindings::exports::wrpc_examples::resources::resources::GuestFoo for Foo { fn new() -> Self { Self } - fn foo(_: bindings::exports::wrpc_examples::complex::resources::Foo) -> String { + fn foo(_: bindings::exports::wrpc_examples::resources::resources::Foo) -> String { "foo".to_string() } @@ -31,7 +31,7 @@ impl bindings::exports::wrpc_examples::complex::resources::GuestFoo for Foo { } } -impl bindings::exports::wrpc_examples::complex::resources::Guest for Handler { +impl bindings::exports::wrpc_examples::resources::resources::Guest for Handler { type Foo = Foo; fn bar(v: FooBorrow<'_>) -> String { diff --git a/examples/go/complex-server/wit/deps.lock b/examples/rust/resources-component-server/wit/deps.lock similarity index 83% rename from examples/go/complex-server/wit/deps.lock rename to examples/rust/resources-component-server/wit/deps.lock index 389d6c59..8967be6e 100644 --- a/examples/go/complex-server/wit/deps.lock +++ b/examples/rust/resources-component-server/wit/deps.lock @@ -1,4 +1,4 @@ -[complex] -path = "../../../wit/complex" +[resources] +path = "../../../wit/resources" sha256 = "d47aff89928fe5bb30ddc79a4bae79a5af6fa075e8694953567544fefa507048" sha512 = "2de2d6fccb3bde7f9c163890993b53191cc399fb16e28742dbd25f449fc1d8a2e0766a101d0cf4c252be07e2aa3c892daba876b009a0bd33e3c5dd5f74f790da" diff --git a/examples/rust/resources-component-server/wit/deps.toml b/examples/rust/resources-component-server/wit/deps.toml new file mode 100644 index 00000000..cb9afc70 --- /dev/null +++ b/examples/rust/resources-component-server/wit/deps.toml @@ -0,0 +1 @@ +resources = "../../../wit/resources" diff --git a/examples/wit/complex/complex.wit b/examples/rust/resources-component-server/wit/deps/resources/resources.wit similarity index 89% rename from examples/wit/complex/complex.wit rename to examples/rust/resources-component-server/wit/deps/resources/resources.wit index 4464ddac..d051d9ab 100644 --- a/examples/wit/complex/complex.wit +++ b/examples/rust/resources-component-server/wit/deps/resources/resources.wit @@ -1,4 +1,4 @@ -package wrpc-examples:complex; +package wrpc-examples:resources; interface resources { resource foo { diff --git a/examples/rust/resources-component-server/wit/world.wit b/examples/rust/resources-component-server/wit/world.wit new file mode 100644 index 00000000..5770c957 --- /dev/null +++ b/examples/rust/resources-component-server/wit/world.wit @@ -0,0 +1,5 @@ +package wrpc-examples:resources-component-server; + +world server { + include wrpc-examples:resources/server; +} diff --git a/examples/rust/complex-component-client/wit/deps/complex/complex.wit b/examples/wit/resources/resources.wit similarity index 89% rename from examples/rust/complex-component-client/wit/deps/complex/complex.wit rename to examples/wit/resources/resources.wit index 4464ddac..d051d9ab 100644 --- a/examples/rust/complex-component-client/wit/deps/complex/complex.wit +++ b/examples/wit/resources/resources.wit @@ -1,4 +1,4 @@ -package wrpc-examples:complex; +package wrpc-examples:resources; interface resources { resource foo { diff --git a/go.work b/go.work index bb834fa0..e8e275ce 100644 --- a/go.work +++ b/go.work @@ -1,7 +1,7 @@ go 1.22.2 use ( - ./examples/go/complex-server + ./examples/go/resources-server ./examples/go/hello-client ./examples/go/hello-server ./examples/go/streams-client