[tsgen] Handle different get/set types for value_objects too. (#22439)

Mentioned in #22387

Author: brendandahl

src/embind/embind_gen.js

@@ -243,6 +243,18 @@ var LibraryEmbind = {
     }
 
   },
+  $printProperty: (prop, nameMap, out) => {
+    const setType = nameMap(prop.type, false);
+    const getType = nameMap(prop.type, true);
+    if (prop.readonly || setType === getType) {
+      out.push(`${prop.readonly ? 'readonly ' : ''}${prop.name}: ${getType}`);
+      return;
+    }
+    // The getter/setter types don't match, so generate each get/set definition.
+    out.push(`get ${prop.name}(): ${getType}`);
+    out.push(`set ${prop.name}(value: ${setType})`);
+  },
+  $ClassProperty__deps: ['$printProperty'],
   $ClassProperty: class {
     constructor(type, name, readonly) {
       this.type = type;
@@ -251,15 +263,7 @@ var LibraryEmbind = {
     }
 
     print(nameMap, out) {
-      const setType = nameMap(this.type, false);
-      const getType = nameMap(this.type, true);
-      if (this.readonly || setType === getType) {
-        out.push(`${this.readonly ? 'readonly ' : ''}${this.name}: ${getType}`);
-        return;
-      }
-      // The getter/setter types don't match, so generate each get/set definition.
-      out.push(`get ${this.name}(): ${getType}`);
-      out.push(`set ${this.name}(value: ${setType})`);
+      printProperty(this, nameMap, out);
     }
   },
   $ConstantDefinition: class {
@@ -325,6 +329,7 @@ var LibraryEmbind = {
       out.push(' ];\n\n');
     }
   },
+  $ValueObjectDefinition__deps: ['$printProperty'],
   $ValueObjectDefinition: class {
     constructor(typeId, name) {
       this.typeId = typeId;
@@ -336,12 +341,14 @@ var LibraryEmbind = {
     }
 
     print(nameMap, out) {
-      out.push(`export type ${this.name} = {\n`);
+      out.push(`export type ${this.name} = {\n  `);
       const outFields = [];
-      for (const {name, type} of this.fields) {
-        outFields.push(`  ${name}: ${nameMap(type)}`);
+      for (const field of this.fields) {
+        const property = [];
+        printProperty(field, nameMap, property);
+        outFields.push(...property);
       }
-      out.push(outFields.join(',\n'))
+      out.push(outFields.join(',\n  '))
       out.push('\n};\n\n');
     }
   },

test/other/embind_tsgen.cpp

@@ -60,6 +60,7 @@ EMSCRIPTEN_DECLARE_VAL_TYPE(CallbackType);
 struct ValObj {
   Foo foo;
   Bar bar;
+  std::string str;
   CallbackType callback;
   ValObj() : callback(val::undefined()) {}
 };
@@ -178,6 +179,7 @@ EMSCRIPTEN_BINDINGS(Test) {
   value_object<ValObj>("ValObj")
       .field("foo", &ValObj::foo)
       .field("bar", &ValObj::bar)
+      .field("str", &ValObj::str)
       .field("callback", &ValObj::callback);
 
   register_vector<int>("IntVec");

test/other/embind_tsgen.d.ts

@@ -85,12 +85,6 @@ export interface ClassWithSmartPtrConstructor {
   delete(): void;
 }
 
-export type ValObj = {
-  foo: Foo,
-  bar: Bar,
-  callback: (message: string) => void
-};
-
 export interface BaseClass {
   fn(_0: number): number;
   delete(): void;
@@ -103,6 +97,14 @@ export interface DerivedClass extends BaseClass {
 
 export type ValArr = [ number, number, number ];
 
+export type ValObj = {
+  foo: Foo,
+  bar: Bar,
+  get str(): string,
+  set str(value: EmbindString),
+  callback: (message: string) => void
+};
+
 interface EmbindModule {
   Test: {
     staticFunction(_0: number): number;

test/other/embind_tsgen_ignore_1.d.ts

@@ -94,12 +94,6 @@ export interface ClassWithSmartPtrConstructor {
   delete(): void;
 }
 
-export type ValObj = {
-  foo: Foo,
-  bar: Bar,
-  callback: (message: string) => void
-};
-
 export interface BaseClass {
   fn(_0: number): number;
   delete(): void;
@@ -112,6 +106,14 @@ export interface DerivedClass extends BaseClass {
 
 export type ValArr = [ number, number, number ];
 
+export type ValObj = {
+  foo: Foo,
+  bar: Bar,
+  get str(): string,
+  set str(value: EmbindString),
+  callback: (message: string) => void
+};
+
 interface EmbindModule {
   Test: {
     staticFunction(_0: number): number;

test/other/embind_tsgen_ignore_2.d.ts

@@ -71,12 +71,6 @@ export interface ClassWithSmartPtrConstructor {
   delete(): void;
 }
 
-export type ValObj = {
-  foo: Foo,
-  bar: Bar,
-  callback: (message: string) => void
-};
-
 export interface BaseClass {
   fn(_0: number): number;
   delete(): void;
@@ -89,6 +83,14 @@ export interface DerivedClass extends BaseClass {
 
 export type ValArr = [ number, number, number ];
 
+export type ValObj = {
+  foo: Foo,
+  bar: Bar,
+  get str(): string,
+  set str(value: EmbindString),
+  callback: (message: string) => void
+};
+
 interface EmbindModule {
   Test: {
     staticFunction(_0: number): number;

test/other/embind_tsgen_ignore_3.d.ts

@@ -85,12 +85,6 @@ export interface ClassWithSmartPtrConstructor {
   delete(): void;
 }
 
-export type ValObj = {
-  foo: Foo,
-  bar: Bar,
-  callback: (message: string) => void
-};
-
 export interface BaseClass {
   fn(_0: number): number;
   delete(): void;
@@ -103,6 +97,14 @@ export interface DerivedClass extends BaseClass {
 
 export type ValArr = [ number, number, number ];
 
+export type ValObj = {
+  foo: Foo,
+  bar: Bar,
+  get str(): string,
+  set str(value: EmbindString),
+  callback: (message: string) => void
+};
+
 interface EmbindModule {
   Test: {
     staticFunction(_0: number): number;