Normalize case handling for objects and callbacks

bindgen/templates/CallbackInterfaceTemplate.go

@@ -15,7 +15,7 @@ type {{ type_name }} interface {
 // {{ foreign_callback }} cannot be callable be a compiled function at a same time
 type {{ foreign_callback }} struct {}
 
-{% let cgo_callback_fn = self.cgo_callback_fn(type_name, module_path) -%}
+{% let cgo_callback_fn = self.cgo_callback_fn(cbi.name(), module_path) -%}
 //export {{ cgo_callback_fn }}
 func {{ cgo_callback_fn }}(handle C.uint64_t, method C.int32_t, argsPtr *C.uint8_t, argsLen C.int32_t, outBuf *C.RustBuffer) C.int32_t {
 	cb := {{ type_|lift_fn }}(uint64(handle));

bindgen/templates/ObjectTemplate.go

@@ -5,23 +5,23 @@
 {{- self.add_import("runtime") }}
 
 {%- let obj = ci.get_object_definition(name).expect("missing obj") %}
-{%- let canonical_name = type_|canonical_name %}
+{%- let obj_name = obj.name()|class_name %}
 {%- if self.include_once_check("ObjectRuntime.go") %}{% include "ObjectRuntime.go" %}{% endif %}
 
-type {{ canonical_name }} struct {
+type {{ obj_name }} struct {
 	ffiObject FfiObject
 }
 
 {%- match obj.primary_constructor() %}
 {%- when Some with (cons) %}
-func New{{ canonical_name }}({% call go::arg_list_decl(cons) -%}) {% call go::return_type_decl(cons) %} {
+func New{{ obj_name }}({% call go::arg_list_decl(cons) -%}) {% call go::return_type_decl(cons) %} {
 	{% call go::ffi_call_binding(func, "") %}
 }
 {%- when None %}
 {%- endmatch %}
 
 {% for cons in obj.alternate_constructors() -%}
-func {{ canonical_name }}{{ cons.name()|fn_name }}({% call go::arg_list_decl(cons) %}) {% call go::return_type_decl(cons) %} {
+func {{ obj_name }}{{ cons.name()|fn_name }}({% call go::arg_list_decl(cons) %}) {% call go::return_type_decl(cons) %} {
 	{% call go::ffi_call_binding(func, "") %}
 }
 {% endfor %}
@@ -61,7 +61,7 @@ type {{ obj|ffi_converter_name }} struct {}
 var {{ obj|ffi_converter_name }}INSTANCE = {{ obj|ffi_converter_name }}{}
 
 func (c {{ obj|ffi_converter_name }}) Lift(pointer unsafe.Pointer) {{ type_name }} {
-	result := &{{ canonical_name }} {
+	result := &{{ obj_name }} {
 		newFfiObject(
 			pointer,
 			func(pointer unsafe.Pointer, status *C.RustCallStatus) {

binding_tests/custom_types_test.go

@@ -5,8 +5,8 @@
 package binding_tests
 
 import (
-    "testing"
-    "net/url"
+	"net/url"
+	"testing"
 
     "github.com/NordSecurity/uniffi-bindgen-go/binding_tests/generated/custom_types"
 
@@ -31,6 +31,6 @@ func TestCustomTypes(t *testing.T) {
 
 	// Change some data and ensure that the round-trip works
 	demo.Url = *unwrap(url.Parse("http://new.example.com/"))
-	demo.Handle = 456;
+	demo.Handle = 456
 	assert.Equal(t, demo, custom_types.GetCustomTypesDemo(&demo))
 }

binding_tests/name_case_test.go

@@ -0,0 +1,30 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package binding_tests
+
+import (
+	"errors"
+	. "github.com/NordSecurity/uniffi-bindgen-go/binding_tests/generated/name_case"
+	"testing"
+)
+
+type MyNameCaseCallback struct{}
+
+func (*MyNameCaseCallback) Test() {}
+
+func TestNameCaseCompiles(t *testing.T) {
+	_ = EnumTestVariantOne
+	_ = AssociatedEnumTestVariantTest{0}
+
+	var expectedError *ErrorTestVariantOne
+	errors.As(NewErrorTestVariantOne(), &expectedError)
+
+	var expectedAssociatedError *AssociatedErrorTestVariantTest
+	errors.As(NewAssociatedErrorTestVariantTest(0), &expectedAssociatedError)
+
+	var _ *ObjectTest = NewObjectTest()
+	_ = RecordTest{0}
+	var _ CallbackTest = &MyNameCaseCallback{}
+}

docker_build.sh

@@ -6,4 +6,4 @@ docker run \
     --volume $HOME/.cargo/registry:/usr/local/cargo/registry \
     --volume $PWD:/mounted_workdir \
     --workdir /mounted_workdir \
-    rust:1.64 ./build.sh
+    rust:1.70 ./build.sh

fixtures/Cargo.toml

@@ -38,7 +38,7 @@ uniffi-fixture-type-limits = { path = "../3rd-party/uniffi-rs/fixtures/type-limi
 uniffi-fixture-time = { path = "../3rd-party/uniffi-rs/fixtures/uniffi-fixture-time" }
 
 # Go specific
-uniffi-go-fixture-errors = { path = "errors" }
 uniffi-go-fixture-destroy = { path = "destroy" }
+uniffi-go-fixture-errors = { path = "errors" }
+uniffi-go-fixture-name-case = { path = "name-case" }
 uniffi-go-fixture-objects = { path = "objects" }
-

fixtures/destroy/src/lib.rs

@@ -54,7 +54,7 @@ pub struct SmallJournal {
 
 #[derive(Debug, Clone)]
 pub enum EnumJournal {
-    Journal { journal: SmallJournal }
+    Journal { journal: SmallJournal },
 }
 
 fn create_journal() -> ResourceJournal {

fixtures/name-case/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "uniffi-go-fixture-name-case"
+version = "0.22.0"
+authors = ["Firefox Sync Team <[email protected]>"]
+edition = "2021"
+license = "MPL-2.0"
+publish = false
+
+[lib]
+name = "uniffi_go_name_case"
+crate-type = ["lib", "cdylib"]
+
+[dependencies]
+thiserror = "1.0"
+uniffi = { path = "../../3rd-party/uniffi-rs/uniffi" }
+
+[build-dependencies]
+uniffi = {path = "../../3rd-party/uniffi-rs/uniffi", features = ["build"] }
+
+[dev-dependencies]
+glob = "0.3"
+uniffi = {path = "../../3rd-party/uniffi-rs/uniffi", features = ["bindgen-tests"] }
+uniffi_bindgen = { path = "../../3rd-party/uniffi-rs/uniffi_bindgen" }
+uniffi_testing = { path = "../../3rd-party/uniffi-rs/uniffi_testing" }

fixtures/name-case/README.md

@@ -0,0 +1,3 @@
+# A basic test for uniffi components
+
+This test covers case senstitivity for generate code.

fixtures/name-case/build.rs

@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+fn main() {
+    uniffi::generate_scaffolding("./src/name-case.udl").unwrap();
+}

fixtures/name-case/src/lib.rs

@@ -0,0 +1,51 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+include!(concat!(env!("OUT_DIR"), "/name-case.uniffi.rs"));
+
+pub enum ENUMTest {
+    VARIANTOne,
+}
+
+pub enum AssociatedENUMTest {
+    VARIANTTest { code: i16 },
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum ERRORTest {
+    #[error("Test")]
+    VARIANTOne,
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum AssociatedERRORTest {
+    #[error("Test")]
+    VARIANTTest { code: i16 },
+}
+
+pub struct OBJECTTest {}
+
+impl OBJECTTest {
+    pub fn new() -> Self {
+        OBJECTTest {}
+    }
+
+    pub fn new_alternate() -> Self {
+        OBJECTTest {}
+    }
+
+    pub fn test(&self) {}
+}
+
+pub struct RECORDTest {
+    test: i32,
+}
+
+pub fn test() {
+    let _ = ERRORTest::VARIANTOne;
+}
+
+pub trait CALLBACKTest {
+    fn test(&self);
+}

fixtures/name-case/src/name-case.udl

@@ -0,0 +1,35 @@
+namespace name_case {
+    void test();
+};
+
+enum ENUMTest { "VARIANTOne" };
+
+[Enum]
+interface AssociatedENUMTest {
+    VARIANTTest(i16 code);
+};
+
+[Error]
+enum ERRORTest { "VARIANTOne" };
+
+[Error]
+interface AssociatedERRORTest {
+    VARIANTTest(i16 code);
+};
+
+interface OBJECTTest {
+    constructor();
+
+    [Name="new_alternate"]
+    constructor();
+
+    void test();
+};
+
+dictionary RECORDTest {
+    i32 test;
+};
+
+callback interface CALLBACKTest {
+    void test();
+};

fixtures/src/lib.rs

@@ -34,7 +34,8 @@ mod uniffi_fixtures {
     uniffi_type_limits::uniffi_reexport_scaffolding!();
 
     // Go specific
-    uniffi_go_errors::uniffi_reexport_scaffolding!();
     uniffi_go_destroy::uniffi_reexport_scaffolding!();
+    uniffi_go_errors::uniffi_reexport_scaffolding!();
+    uniffi_go_name_case::uniffi_reexport_scaffolding!();
     uniffi_go_objects::uniffi_reexport_scaffolding!();
 }