embind: Generate TS definitions from static class methods. (#19895)

Author: brendandahl

src/embind/embind_ts.js

@@ -42,19 +42,20 @@ var LibraryEmbind = {
     printFunction(nameMap, out) {
       out.push(`${this.name}`);
       this.printSignature(nameMap, out);
-      out.push(';\n');
     }
 
     printModuleEntry(nameMap, out) {
       out.push('  ');
       this.printFunction(nameMap, out);
+      out.push(';\n');
     }
   },
   $ClassDefinition: class ClassDefinition {
     constructor(typeId, name, base = null) {
       this.typeId = typeId;
       this.name = name;
       this.methods = [];
+      this.staticMethods = [];
       this.constructors = [
         new FunctionDefinition('default', this, [])
       ];
@@ -75,6 +76,7 @@ var LibraryEmbind = {
       for (const method of this.methods) {
         out.push('  ');
         method.printFunction(nameMap, out);
+        out.push(';\n');
       }
       out.push('  delete(): void;\n');
       out.push('}\n\n');
@@ -85,6 +87,10 @@ var LibraryEmbind = {
       // TODO Handle constructor overloading
       const constructor = this.constructors[this.constructors.length > 1 ? 1 : 0];
       constructor.printSignature(nameMap, out);
+      for (const method of this.staticMethods) {
+        out.push('; ');
+        method.printFunction(nameMap, out);
+      }
       out.push('};\n');
     }
   },
@@ -376,6 +382,23 @@ var LibraryEmbind = {
       return [];
     });
   },
+  _embind_register_class_class_function__deps: ['$createFunctionDefinition'],
+  _embind_register_class_class_function: function(rawClassType,
+                                                  methodName,
+                                                  argCount,
+                                                  rawArgTypesAddr,
+                                                  invokerSignature,
+                                                  rawInvoker,
+                                                  fn,
+                                                  isAsync) {
+    whenDependentTypesAreResolved([], [rawClassType], function(classType) {
+      classType = classType[0];
+      createFunctionDefinition(methodName, argCount, rawArgTypesAddr, false, (funcDef) => {
+        classType.staticMethods.push(funcDef);
+      });
+      return [];
+    });
+  },
   _embind_register_enum__deps: ['$readLatin1String', '$EnumDefinition', '$moduleDefinitions'],
   _embind_register_enum: function(rawType, name, size, isSigned) {
     name = readLatin1String(name);

test/other/embind_tsgen.cpp

@@ -16,6 +16,8 @@ class Test {
   int getX() const { return x; }
   void setX(int x_) { x = x_; }
 
+  static int static_function(int x) { return 1; }
+
 private:
   int x;
 };
@@ -84,6 +86,7 @@ EMSCRIPTEN_BINDINGS(Test) {
       .function("functionFour", &Test::function_four)
       .function("constFn", &Test::const_fn)
       .property("x", &Test::getX, &Test::setX)
+      .class_function("staticFunction", &Test::static_function)
 	;
 
   function("class_returning_fn", &class_returning_fn);

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};
+  Test: {new(): Test; staticFunction(_0: number): number};
   class_returning_fn(): Test;
   class_unique_ptr_returning_fn(): Test;
   a_class_instance: Test;