[tsgen] Expand TS generation test to compile and run a TS file.

test/other/embind_tsgen.cpp

@@ -58,12 +58,19 @@ struct ValArr {
 EMSCRIPTEN_DECLARE_VAL_TYPE(CallbackType);
 
 struct ValObj {
-  Foo foo;
   Bar bar;
+  std::string string;
   CallbackType callback;
   ValObj() : callback(val::undefined()) {}
 };
 
+ValObj getValObj() {
+  ValObj o;
+  return o;
+}
+
+void setValObj(ValObj v) {}
+
 class ClassWithConstructor {
  public:
   ClassWithConstructor(int, const ValArr&) {}
@@ -190,9 +197,11 @@ EMSCRIPTEN_BINDINGS(Test) {
     .element(emscripten::index<3>());
 
   value_object<ValObj>("ValObj")
-      .field("foo", &ValObj::foo)
+      .field("string", &ValObj::string)
       .field("bar", &ValObj::bar)
       .field("callback", &ValObj::callback);
+  function("getValObj", &getValObj);
+  function("setValObj", &setValObj);
 
   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;
@@ -113,6 +107,12 @@ export interface InterfaceWrapper extends Interface {
 
 export type ValArr = [ number, number, number ];
 
+export type ValObj = {
+  string: EmbindString,
+  bar: Bar,
+  callback: (message: string) => void
+};
+
 interface EmbindModule {
   Test: {
     staticFunction(_0: number): number;
@@ -163,6 +163,8 @@ interface EmbindModule {
   smart_ptr_function(_0: ClassWithSmartPtrConstructor | null): number;
   smart_ptr_function_with_params(foo: ClassWithSmartPtrConstructor | null): number;
   function_with_callback_param(_0: (message: string) => void): number;
+  getValObj(): ValObj;
+  setValObj(_0: ValObj): void;
   string_test(_0: EmbindString): string;
   wstring_test(_0: string): string;
 }

test/other/embind_tsgen.ts

@@ -0,0 +1,28 @@
+
+import moduleLoader from './embind_tsgen.mjs';
+
+const module = await moduleLoader();
+
+// Test a few variations of passing value_objects with strings.
+module.setValObj({
+  bar: module.Bar.valueOne,
+  string: "ABCD",
+  callback: () => {}
+});
+
+module.setValObj({
+  bar: module.Bar.valueOne,
+  string: new Int8Array([65, 66, 67, 68]),
+  callback: () => {}
+});
+
+const valObj = module.getValObj();
+// TODO: remove the cast below when better definitions are generated for value
+// objects.
+const valString : string = valObj.string as string;
+
+// Ensure nonnull pointers do no need a cast or nullptr check to use.
+const obj = module.getNonnullPointer();
+obj.delete();
+
+console.log('ts ran');

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;
@@ -122,6 +116,12 @@ export interface InterfaceWrapper extends Interface {
 
 export type ValArr = [ number, number, number ];
 
+export type ValObj = {
+  string: EmbindString,
+  bar: Bar,
+  callback: (message: string) => void
+};
+
 interface EmbindModule {
   Test: {
     staticFunction(_0: number): number;
@@ -172,6 +172,8 @@ interface EmbindModule {
   smart_ptr_function(_0: ClassWithSmartPtrConstructor | null): number;
   smart_ptr_function_with_params(foo: ClassWithSmartPtrConstructor | null): number;
   function_with_callback_param(_0: (message: string) => void): number;
+  getValObj(): ValObj;
+  setValObj(_0: ValObj): void;
   string_test(_0: EmbindString): string;
   wstring_test(_0: string): string;
 }

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;
@@ -99,6 +93,12 @@ export interface InterfaceWrapper extends Interface {
 
 export type ValArr = [ number, number, number ];
 
+export type ValObj = {
+  string: EmbindString,
+  bar: Bar,
+  callback: (message: string) => void
+};
+
 interface EmbindModule {
   Test: {
     staticFunction(_0: number): number;
@@ -149,6 +149,8 @@ interface EmbindModule {
   smart_ptr_function(_0: ClassWithSmartPtrConstructor | null): number;
   smart_ptr_function_with_params(foo: ClassWithSmartPtrConstructor | null): number;
   function_with_callback_param(_0: (message: string) => void): number;
+  getValObj(): ValObj;
+  setValObj(_0: ValObj): void;
   string_test(_0: EmbindString): string;
   wstring_test(_0: string): string;
 }

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;
@@ -113,6 +107,12 @@ export interface InterfaceWrapper extends Interface {
 
 export type ValArr = [ number, number, number ];
 
+export type ValObj = {
+  string: EmbindString,
+  bar: Bar,
+  callback: (message: string) => void
+};
+
 interface EmbindModule {
   Test: {
     staticFunction(_0: number): number;
@@ -163,6 +163,8 @@ interface EmbindModule {
   smart_ptr_function(_0: ClassWithSmartPtrConstructor | null): number;
   smart_ptr_function_with_params(foo: ClassWithSmartPtrConstructor | null): number;
   function_with_callback_param(_0: (message: string) => void): number;
+  getValObj(): ValObj;
+  setValObj(_0: ValObj): void;
   string_test(_0: EmbindString): string;
   wstring_test(_0: string): string;
 }

test/other/embind_tsgen_package.json

@@ -0,0 +1,13 @@
+{
+  "name": "index",
+  "version": "1.0.0",
+  "description": "",
+  "main": "main.js",
+  "type": "module",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": ""
+}

test/test_other.py

@@ -3365,12 +3365,16 @@ def test_jspi_add_function(self):
   def test_embind_tsgen(self, opts):
     # Check that TypeScript generation works and that the program is runs as
     # expected.
-    self.do_runf('other/embind_tsgen.cpp', 'main ran',
-                 emcc_args=['-lembind', '--emit-tsd', 'embind_tsgen.d.ts'] + opts)
+    self.emcc(test_file('other/embind_tsgen.cpp'),
+              ['-o', 'embind_tsgen.mjs', '-lembind', '--emit-tsd', 'embind_tsgen.d.ts'] + opts)
 
     # Test that the output compiles with a TS file that uses the defintions.
-    cmd = shared.get_npm_cmd('tsc') + ['embind_tsgen.d.ts', '--noEmit']
+    shutil.copyfile(test_file('other/embind_tsgen.ts'), 'main.ts')
+    # A package file with type=module is needed to allow top level await in TS.
+    shutil.copyfile(test_file('other/embind_tsgen_package.json'), 'package.json')
+    cmd = shared.get_npm_cmd('tsc') + ['embind_tsgen.d.ts', 'main.ts', '--module', 'NodeNext', '--moduleResolution', 'nodenext']
     shared.check_call(cmd)
+    self.assertContained('main ran\nts ran', self.run_js('main.js'))
 
     actual = read_file('embind_tsgen.d.ts')
     self.assertFileContents(test_file('other/embind_tsgen.d.ts'), actual)