BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-10 07:06:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ts-no-import-ext flag (#7748)

Browse Source 
Co-authored-by: Derek Bailey <derekbailey@google.com>
This commit is contained in:
Chris
2023-01-07 13:42:28 -08:00
committed by GitHub
parent b5802b57f2
commit c2668fc0e2
13 changed files with 812 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/flatc.cpp
View File

@@ -613,6 +613,8 @@ int FlatCompiler::Compile(int argc, const char **argv) {
opts.json_nested_legacy_flatbuffers = true;
} else if (arg == "--ts-flat-files") {
opts.ts_flat_file = true;
} else if (arg == "--ts-no-import-ext") {
opts.ts_no_import_ext = true;
} else if (arg == "--no-leak-private-annotation") {
opts.no_leak_private_annotations = true;
} else if (arg == "--annotate") {

10
src/idl_gen_ts.cpp
View File

@@ -256,15 +256,16 @@ class TsGenerator : public BaseGenerator {
// specified here? Should we always be adding the "./" for a relative
// path or turn it off if --include-prefix is specified, or something
// else?
std::string import_extension = parser_.opts.ts_no_import_ext ? "" : ".js";
std::string include_name =
"./" + flatbuffers::StripExtension(include_file);
"./" + flatbuffers::StripExtension(include_file) + import_extension;
code += "import {";
for (const auto &pair : it.second) {
code += namer_.EscapeKeyword(pair.first) + " as " +
namer_.EscapeKeyword(pair.second) + ", ";
}
code.resize(code.size() - 2);
code += "} from '" + include_name + ".js';\n";
code += "} from '" + include_name + "';\n";
}
code += "\n";
}
@@ -883,10 +884,11 @@ class TsGenerator : public BaseGenerator {
import.object_name = object_name;
import.bare_file_path = bare_file_path;
import.rel_file_path = rel_file_path;
std::string import_extension = parser_.opts.ts_no_import_ext ? "" : ".js";
import.import_statement = "import { " + symbols_expression + " } from '" +
rel_file_path + ".js';";
rel_file_path + import_extension + "';";
import.export_statement = "export { " + symbols_expression + " } from '." +
bare_file_path + ".js';";
bare_file_path + import_extension + "';";
import.dependency = &dependency;
import.dependent = &dependent;