adding fb import when no other imports are present (#6030)

Co-authored-by: Kamil Rojewski <kamil.rojewski@gmail.com> Co-authored-by: Wouter van Oortmerssen <aardappel@gmail.com>
google · Jul 30, 2020 · f1f23d0 · f1f23d0
1 parent f1025b2
commit f1f23d0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -127,4 +127,6 @@ grpc/google/
 **/Package.resolved
 .clangd/**
 package-lock.json
-.clwb
+/*.ilk
+/*.pdb
+.clwb
diff --git a/src/idl_gen_js_ts.cpp b/src/idl_gen_js_ts.cpp
@@ -214,11 +214,15 @@ class JsTsGenerator : public BaseGenerator {
     // Emit namespaces in a form that Closure Compiler can optimize
     std::string &code = *code_ptr;
     std::string &exports = *exports_ptr;
+
+    if (lang_.language == IDLOptions::kTs) {
+      code += "import * as flatbuffers from 'flatbuffers';\n";
+    }
+
     for (auto it = sorted_namespaces.begin(); it != sorted_namespaces.end();
          ++it) {
       if (lang_.language == IDLOptions::kTs) {
         if (it->find('.') == std::string::npos) {
-          code += "import * as flatbuffers from 'flatbuffers';\n";
           break;
         }
       } else {

diff --git a/tests/union_vector/union_vector_generated.ts b/tests/union_vector/union_vector_generated.ts
@@ -1,5 +1,6 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
+import * as flatbuffers from 'flatbuffers';
 /**
  * @enum {number}
  */