embind: Support TS generation for static class properties. (#20075)

Author: brendandahl

src/embind/embind_ts.js

@@ -56,6 +56,7 @@ var LibraryEmbind = {
       this.name = name;
       this.methods = [];
       this.staticMethods = [];
+      this.staticProperties = [];
       this.constructors = [
         new FunctionDefinition('default', this, [])
       ];
@@ -72,6 +73,7 @@ var LibraryEmbind = {
       for (const property of this.properties) {
         out.push('  ');
         property.print(nameMap, out);
+        out.push(';\n');
       }
       for (const method of this.methods) {
         out.push('  ');
@@ -91,6 +93,10 @@ var LibraryEmbind = {
         out.push('; ');
         method.printFunction(nameMap, out);
       }
+      for (const prop of this.staticProperties) {
+        out.push('; ');
+        prop.print(nameMap, out);
+      }
       out.push('};\n');
     }
   },
@@ -101,7 +107,7 @@ var LibraryEmbind = {
     }
 
     print(nameMap, out) {
-      out.push(`${this.name}: ${nameMap(this.type)};\n`);
+      out.push(`${this.name}: ${nameMap(this.type)}`);
     }
   },
   $ConstantDefinition: class ConstantDefinition {
@@ -399,6 +405,27 @@ var LibraryEmbind = {
       return [];
     });
   },
+  _embind_register_class_class_property__deps: [
+    '$readLatin1String', '$whenDependentTypesAreResolved', '$ClassProperty'],
+  _embind_register_class_class_property: (rawClassType,
+                                          fieldName,
+                                          rawFieldType,
+                                          rawFieldPtr,
+                                          getterSignature,
+                                          getter,
+                                          setterSignature,
+                                          setter) => {
+    fieldName = readLatin1String(fieldName);
+    whenDependentTypesAreResolved([], [rawClassType], function(classType) {
+      classType = classType[0];
+      whenDependentTypesAreResolved([], [rawFieldType], function(types) {
+        const prop = new ClassProperty(types[0], fieldName);
+        classType.staticProperties.push(prop);
+        return [];
+      });
+      return [];
+    });
+  },
   _embind_register_enum__deps: ['$readLatin1String', '$EnumDefinition', '$moduleDefinitions'],
   _embind_register_enum: function(rawType, name, size, isSigned) {
     name = readLatin1String(name);

test/other/embind_tsgen.cpp

@@ -18,6 +18,8 @@ class Test {
 
   static int static_function(int x) { return 1; }
 
+  static int static_property;
+
 private:
   int x;
 };
@@ -87,6 +89,7 @@ EMSCRIPTEN_BINDINGS(Test) {
       .function("constFn", &Test::const_fn)
       .property("x", &Test::getX, &Test::setX)
       .class_function("staticFunction", &Test::static_function)
+      .class_property("staticProperty", &Test::static_property)
 	;
 
   function("class_returning_fn", &class_returning_fn);
@@ -144,6 +147,8 @@ EMSCRIPTEN_BINDINGS(Test) {
       .function("fn2", &DerivedClass::fn2);
 }
 
+int Test::static_property = 42;
+
 int main() {
   // Main should not be run during TypeScript generation.
   abort();

test/other/embind_tsgen.d.ts

@@ -57,7 +57,7 @@ export interface DerivedClass extends BaseClass {
 export type ValArr = [ number, number, number ];
 
 export interface MainModule {
-  Test: {new(): Test; staticFunction(_0: number): number};
+  Test: {new(): Test; staticFunction(_0: number): number; staticProperty: number};
   class_returning_fn(): Test;
   class_unique_ptr_returning_fn(): Test;
   a_class_instance: Test;