Wrap types in namespace for --ts-flat-files and --gen-all (#7451)

* Wrap types in namespace for --ts-flat-files and --gen-all

* Fixes for escaping object types

* Added to generate_code

tests/flatc/bar/bar_with_ns.fbs

@@ -0,0 +1,14 @@
+include "baz/baz_with_ns.fbs";
+include "baz/baz.fbs";
+
+namespace bar;
+
+table Bar {
+  baz:baz.Baz;
+  baz2:Baz;
+  foo:Foo;
+}
+
+table Foo {
+  a:int;
+}

tests/flatc/bar/baz/baz_with_ns.fbs

@@ -0,0 +1,8 @@
+namespace baz;
+
+enum Baz : short {
+  None = 0,
+  Red,
+  Green,
+  Blue,
+}

tests/flatc/flatc_ts_tests.py

@@ -66,7 +66,7 @@ class TsTests():
         assert_file_and_contents(
             "foo_with_ns_generated.ts",
             [
-                "export { Bar } from './bar';",
+                "export { Bar } from './bar/bar';",
                 "export { Foo } from './something/foo';",
             ],
         )
@@ -77,7 +77,7 @@ class TsTests():
             "something/foo.ts",
             [
                 "export class Foo {",
-                "import { Bar } from '../bar';",
+                "import { Bar } from '../bar/bar';",
             ],
         )
 
@@ -142,6 +142,23 @@ class TsTests():
         # The root type Foo should not be generated in its own file.
         assert_file_doesnt_exists("foo.ts")
 
+    def FlatFilesWithNamespace(self):
+        # Generate just foo with the flat files option
+        flatc(["--ts", "--ts-flat-files", "foo_with_ns.fbs"])
+
+        # Should generate a single file that imports bar as a single file, and
+        # exports the Foo table.
+        assert_file_and_contents(
+            "foo_with_ns_generated.ts",
+            [
+                "import {Bar as Bar} from './bar_with_ns_generated';",
+                "export class Foo {",
+            ],
+        )
+
+        # The root type Foo should not be generated in its own file.
+        assert_file_doesnt_exists("foo.ts")
+
     def FlatFilesMultipleFiles(self):
         # Generate both foo and bar with the flat files option
         flatc(["--ts", "--ts-flat-files", "foo.fbs", "bar/bar.fbs"])
@@ -194,3 +211,32 @@ class TsTests():
         assert_file_doesnt_exists("foo.ts")
         assert_file_doesnt_exists("bar.ts")
         assert_file_doesnt_exists("baz.ts")
+
+
+    def ZFlatFilesGenAllWithNamespacing(self):
+        # Generate foo with all of its dependents with the flat files option
+        flatc(["--ts", "--ts-flat-files", "--gen-all", "foo_with_ns.fbs"])
+
+        # Should generate a single foo file
+        assert_file_and_contents(
+            "foo_with_ns_generated.ts",
+            # Should export each of the types within the single file
+            [
+                "export class bar_Bar {",
+                "export class bar_Foo {",
+                "export enum Baz {",
+                "export enum baz_Baz {",
+                "export class something_Foo {"
+            ],
+            # No includes for the dependent types should be present.
+            doesnt_contain=[
+                "import {Bar as Bar}",
+                "import {Baz as Baz}",
+            ],
+        )
+
+        # The types Foo, Bar and Baz should not be generated in their own files.
+        assert_file_doesnt_exists("foo.ts")
+        assert_file_doesnt_exists("bar.ts")
+        assert_file_doesnt_exists("baz.ts")
+

tests/flatc/foo.fbs

@@ -1,7 +1,9 @@
 include "bar/bar.fbs";
+include "bar/bar_with_ns.fbs";
 
 table Foo {
   bar:Bar;
+  bar2:bar.Bar;
 }
 
 root_type Foo;

tests/flatc/foo_with_ns.fbs

@@ -1,9 +1,9 @@
-include "bar/bar.fbs";
+include "bar/bar_with_ns.fbs";
 
 namespace something;
 
 table Foo {
-  bar:Bar;
+  bar:bar.Bar;
 }
 
 root_type Foo;

tests/flatc/main.py

@@ -27,3 +27,5 @@ print("{0} of {1} tests passed".format(passing, passing + failing))
 
 if failing > 0:
     sys.exit(1)
+
+# TsTests().Base()