starpc 0.28.0 → 0.29.0

package/Makefile

@@ -1,36 +1,35 @@
 # https://github.com/aperturerobotics/protobuf-project
 
 SHELL:=bash
+ESBUILD=hack/bin/esbuild
 PROTOWRAP=hack/bin/protowrap
-PROTOC_GEN_GO=hack/bin/protoc-gen-go
+PROTOC_GEN_GO=hack/bin/protoc-gen-go-lite
 PROTOC_GEN_STARPC=hack/bin/protoc-gen-go-starpc
-PROTOC_GEN_VTPROTO=hack/bin/protoc-gen-go-vtproto
 GOIMPORTS=hack/bin/goimports
-GOFUMPT=hack/bin/gofumpt
 GOLANGCI_LINT=hack/bin/golangci-lint
 GO_MOD_OUTDATED=hack/bin/go-mod-outdated
 GOLIST=go list -f "{{ .Dir }}" -m
 
 export GO111MODULE=on
-undefine GOOS
 undefine GOARCH
+undefine GOOS
 
 all:
 
 vendor:
 	go mod vendor
 
-$(PROTOC_GEN_GO):
+$(ESBUILD):
 	cd ./hack; \
 	go build -v \
-		-o ./bin/protoc-gen-go \
-		google.golang.org/protobuf/cmd/protoc-gen-go
+		-o ./bin/esbuild \
+		github.com/evanw/esbuild/cmd/esbuild
 
-$(PROTOC_GEN_VTPROTO):
+$(PROTOC_GEN_GO):
 	cd ./hack; \
 	go build -v \
-		-o ./bin/protoc-gen-go-vtproto \
-		github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto
+		-o ./bin/protoc-gen-go-lite \
+		github.com/aperturerobotics/protobuf-go-lite/cmd/protoc-gen-go-lite
 
 $(PROTOC_GEN_STARPC):
 	cd ./hack; \
@@ -44,12 +43,6 @@ $(GOIMPORTS):
 		-o ./bin/goimports \
 		golang.org/x/tools/cmd/goimports
 
-$(GOFUMPT):
-	cd ./hack; \
-	go build -v \
-		-o ./bin/gofumpt \
-		mvdan.cc/gofumpt
-
 $(PROTOWRAP):
 	cd ./hack; \
 	go build -v \
@@ -68,37 +61,11 @@ $(GO_MOD_OUTDATED):
 		-o ./bin/go-mod-outdated \
 		github.com/psampaz/go-mod-outdated
 
-.PHONY: gengo
-gengo: $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTOC_GEN_VTPROTO) $(PROTOC_GEN_STARPC)
-	shopt -s globstar; \
-	set -eo pipefail; \
-	export PROJECT=$$(go list -m); \
-	export PATH=$$(pwd)/hack/bin:$${PATH}; \
-	mkdir -p $$(pwd)/vendor/$$(dirname $${PROJECT}); \
-	rm $$(pwd)/vendor/$${PROJECT} || true; \
-	ln -s $$(pwd) $$(pwd)/vendor/$${PROJECT} ; \
-	$(PROTOWRAP) \
-		-I $$(pwd)/vendor \
-		--go_out=$$(pwd)/vendor \
-		--go-vtproto_out=$$(pwd)/vendor \
-		--go-vtproto_opt=features=marshal+unmarshal+size+equal+clone \
-		--go-starpc_out=$$(pwd)/vendor \
-		--proto_path $$(pwd)/vendor \
-		--print_structure \
-		--only_specified_files \
-		$$(\
-			git \
-				ls-files "*.proto" |\
-				xargs printf -- \
-				"$$(pwd)/vendor/$${PROJECT}/%s "); \
-	rm $$(pwd)/vendor/$${PROJECT} || true
-	$(GOIMPORTS) -w ./
-
 node_modules:
 	yarn install
 
-.PHONY: gents
-gents: $(PROTOWRAP) node_modules
+.PHONY: genproto
+genproto: vendor node_modules $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTOC_GEN_STARPC)
 	shopt -s globstar; \
 	set -eo pipefail; \
 	export PROJECT=$$(go list -m); \
@@ -106,33 +73,37 @@ gents: $(PROTOWRAP) node_modules
 	mkdir -p $$(pwd)/vendor/$$(dirname $${PROJECT}); \
 	rm $$(pwd)/vendor/$${PROJECT} || true; \
 	ln -s $$(pwd) $$(pwd)/vendor/$${PROJECT} ; \
-	$(PROTOWRAP) \
-		-I $$(pwd)/vendor \
-		--plugin=./node_modules/.bin/protoc-gen-ts_proto \
-		--ts_proto_out=$$(pwd)/vendor \
-		--ts_proto_opt=esModuleInterop=true \
-		--ts_proto_opt=fileSuffix=.pb \
-		--ts_proto_opt=importSuffix=.js \
-		--ts_proto_opt=forceLong=long \
-		--ts_proto_opt=oneof=unions \
-		--ts_proto_opt=outputServices=default,outputServices=generic-definitions \
-		--ts_proto_opt=useAbortSignal=true \
-		--ts_proto_opt=useAsyncIterable=true \
-		--ts_proto_opt=useDate=true \
-		--proto_path $$(pwd)/vendor \
-		--print_structure \
-		--only_specified_files \
-		$$(\
-			git \
-				ls-files "*.proto" |\
-				xargs printf -- \
-				"$$(pwd)/vendor/$${PROJECT}/%s "); \
+	protogen() { \
+		$(PROTOWRAP) \
+			-I $$(pwd)/vendor \
+			--plugin=./node_modules/.bin/protoc-gen-ts_proto \
+			--go-lite_out=$$(pwd)/vendor \
+			--go-lite_opt=features=marshal+unmarshal+size+equal+clone \
+			--go-starpc_out=$$(pwd)/vendor \
+			--ts_proto_out=$$(pwd)/vendor \
+			--ts_proto_opt=esModuleInterop=true \
+			--ts_proto_opt=fileSuffix=.pb \
+			--ts_proto_opt=importSuffix=.js \
+			--ts_proto_opt=forceLong=long \
+			--ts_proto_opt=oneof=unions \
+			--ts_proto_opt=outputServices=default,outputServices=generic-definitions \
+			--ts_proto_opt=useAbortSignal=true \
+			--ts_proto_opt=useAsyncIterable=true \
+			--ts_proto_opt=useDate=true \
+			--proto_path $$(pwd)/vendor \
+			--print_structure \
+			--only_specified_files \
+			$$(\
+				git \
+					ls-files "$$1" |\
+					xargs printf -- \
+					"$$(pwd)/vendor/$${PROJECT}/%s "); \
+	}; \
+	protogen "./*.proto"; \
 	rm $$(pwd)/vendor/$${PROJECT} || true
+	$(GOIMPORTS) -w ./
 	npm run format:js
 
-.PHONY: genproto
-genproto: gengo gents
-
 .PHONY: gen
 gen: genproto
 
@@ -146,21 +117,21 @@ list: $(GO_MOD_OUTDATED)
 
 .PHONY: lint
 lint: $(GOLANGCI_LINT)
-	$(GOLANGCI_LINT) run --timeout=10m
+	$(GOLANGCI_LINT) run
 
 .PHONY: fix
 fix: $(GOLANGCI_LINT)
-	$(GOLANGCI_LINT) run --fix --timeout=10m
+	$(GOLANGCI_LINT) run --fix
+
+.PHONY: test
+test:
+	go test -v ./...
 
 .PHONY: format
 format: $(GOFUMPT) $(GOIMPORTS)
 	$(GOIMPORTS) -w ./
 	$(GOFUMPT) -w ./
 
-.PHONY: test
-test:
-	go test -timeout=30s -v ./...
-
 .PHONY: integration
 integration: node_modules vendor
 	cd ./integration && bash ./integration.bash

package/e2e/mock/mock.pb.go

@@ -1,67 +1,28 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.33.0-devel
-// 	protoc        v4.25.3
+// Code generated by protoc-gen-go-lite. DO NOT EDIT.
+// protoc-gen-go-lite version: v0.2.3
 // source: github.com/aperturerobotics/starpc/e2e/mock/mock.proto
 
 package e2e_mock
 
 import (
-	reflect "reflect"
-	sync "sync"
+	fmt "fmt"
+	io "io"
 
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+	protohelpers "github.com/aperturerobotics/protobuf-go-lite/protohelpers"
 )
 
 // MockMsg is the mock message body.
 type MockMsg struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Body string `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"`
+	unknownFields []byte
+	Body          string `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"`
 }
 
 func (x *MockMsg) Reset() {
 	*x = MockMsg{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MockMsg) String() string {
-	return protoimpl.X.MessageStringOf(x)
 }
 
 func (*MockMsg) ProtoMessage() {}
 
-func (x *MockMsg) ProtoReflect() protoreflect.Message {
-	mi := &file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MockMsg.ProtoReflect.Descriptor instead.
-func (*MockMsg) Descriptor() ([]byte, []int) {
-	return file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDescGZIP(), []int{0}
-}
-
 func (x *MockMsg) GetBody() string {
 	if x != nil {
 		return x.Body
@@ -69,83 +30,176 @@ func (x *MockMsg) GetBody() string {
 	return ""
 }
 
-var File_github_com_aperturerobotics_starpc_e2e_mock_mock_proto protoreflect.FileDescriptor
-
-var file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDesc = []byte{
-	0x0a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x70, 0x65,
-	0x72, 0x74, 0x75, 0x72, 0x65, 0x72, 0x6f, 0x62, 0x6f, 0x74, 0x69, 0x63, 0x73, 0x2f, 0x73, 0x74,
-	0x61, 0x72, 0x70, 0x63, 0x2f, 0x65, 0x32, 0x65, 0x2f, 0x6d, 0x6f, 0x63, 0x6b, 0x2f, 0x6d, 0x6f,
-	0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x65, 0x32, 0x65, 0x2e, 0x6d, 0x6f,
-	0x63, 0x6b, 0x22, 0x1d, 0x0a, 0x07, 0x4d, 0x6f, 0x63, 0x6b, 0x4d, 0x73, 0x67, 0x12, 0x12, 0x0a,
-	0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x6f, 0x64,
-	0x79, 0x32, 0x3b, 0x0a, 0x04, 0x4d, 0x6f, 0x63, 0x6b, 0x12, 0x33, 0x0a, 0x0b, 0x4d, 0x6f, 0x63,
-	0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x11, 0x2e, 0x65, 0x32, 0x65, 0x2e, 0x6d,
-	0x6f, 0x63, 0x6b, 0x2e, 0x4d, 0x6f, 0x63, 0x6b, 0x4d, 0x73, 0x67, 0x1a, 0x11, 0x2e, 0x65, 0x32,
-	0x65, 0x2e, 0x6d, 0x6f, 0x63, 0x6b, 0x2e, 0x4d, 0x6f, 0x63, 0x6b, 0x4d, 0x73, 0x67, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+func (m *MockMsg) CloneVT() *MockMsg {
+	if m == nil {
+		return (*MockMsg)(nil)
+	}
+	r := new(MockMsg)
+	r.Body = m.Body
+	if len(m.unknownFields) > 0 {
+		r.unknownFields = make([]byte, len(m.unknownFields))
+		copy(r.unknownFields, m.unknownFields)
+	}
+	return r
 }
 
-var (
-	file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDescOnce sync.Once
-	file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDescData = file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDesc
-)
+func (m *MockMsg) CloneMessageVT() any {
+	return m.CloneVT()
+}
 
-func file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDescGZIP() []byte {
-	file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDescOnce.Do(func() {
-		file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDescData)
-	})
-	return file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDescData
+func (this *MockMsg) EqualVT(that *MockMsg) bool {
+	if this == that {
+		return true
+	} else if this == nil || that == nil {
+		return false
+	}
+	if this.Body != that.Body {
+		return false
+	}
+	return string(this.unknownFields) == string(that.unknownFields)
+}
+
+func (this *MockMsg) EqualMessageVT(thatMsg any) bool {
+	that, ok := thatMsg.(*MockMsg)
+	if !ok {
+		return false
+	}
+	return this.EqualVT(that)
+}
+func (m *MockMsg) MarshalVT() (dAtA []byte, err error) {
+	if m == nil {
+		return nil, nil
+	}
+	size := m.SizeVT()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBufferVT(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
 }
 
-var file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_goTypes = []interface{}{
-	(*MockMsg)(nil), // 0: e2e.mock.MockMsg
+func (m *MockMsg) MarshalToVT(dAtA []byte) (int, error) {
+	size := m.SizeVT()
+	return m.MarshalToSizedBufferVT(dAtA[:size])
 }
-var file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_depIdxs = []int32{
-	0, // 0: e2e.mock.Mock.MockRequest:input_type -> e2e.mock.MockMsg
-	0, // 1: e2e.mock.Mock.MockRequest:output_type -> e2e.mock.MockMsg
-	1, // [1:2] is the sub-list for method output_type
-	0, // [0:1] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
+
+func (m *MockMsg) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
+	if m == nil {
+		return 0, nil
+	}
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.unknownFields != nil {
+		i -= len(m.unknownFields)
+		copy(dAtA[i:], m.unknownFields)
+	}
+	if len(m.Body) > 0 {
+		i -= len(m.Body)
+		copy(dAtA[i:], m.Body)
+		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Body)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
 }
 
-func init() { file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_init() }
-func file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_init() {
-	if File_github_com_aperturerobotics_starpc_e2e_mock_mock_proto != nil {
-		return
+func (m *MockMsg) SizeVT() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Body)
+	if l > 0 {
+		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
 	}
-	if !protoimpl.UnsafeEnabled {
-		file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MockMsg); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
+	n += len(m.unknownFields)
+	return n
+}
+
+func (m *MockMsg) UnmarshalVT(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return protohelpers.ErrIntOverflow
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
 			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MockMsg: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MockMsg: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Body", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return protohelpers.ErrIntOverflow
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Body = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := protohelpers.Skip(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return protohelpers.ErrInvalidLength
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.unknownFields = append(m.unknownFields, dAtA[iNdEx:iNdEx+skippy]...)
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
 	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_goTypes,
-		DependencyIndexes: file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_depIdxs,
-		MessageInfos:      file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_msgTypes,
-	}.Build()
-	File_github_com_aperturerobotics_starpc_e2e_mock_mock_proto = out.File
-	file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_rawDesc = nil
-	file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_goTypes = nil
-	file_github_com_aperturerobotics_starpc_e2e_mock_mock_proto_depIdxs = nil
+	return nil
 }

package/e2e/mock/mock_srpc.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-srpc. DO NOT EDIT.
-// protoc-gen-srpc version: v0.22.7
+// protoc-gen-srpc version: v0.28.1
 // source: github.com/aperturerobotics/starpc/e2e/mock/mock.proto
 
 package e2e_mock