Commit 808b44f8 authored by Kamil Rojewski's avatar Kamil Rojewski Committed by Wouter van Oortmerssen

TS tests fixes (#4265)

* Eclipse ignore

* TypeScript support

* Prefixing enums

* Test results

* Merged JS and TS generators

* Fixed AppVeyor build problems

* Fixed more AppVeyor build problems

* Fixed more AppVeyor build problems

* Changed TS flag to options struct

* Storing options by value

* Removed unneeded const

* Re-export support for unions

* Uint support

* Casting bools to numbers for mutation

* TS shell tests

* Reverted generates js test file to original version

* Backing up js tests and properly generating test data

* Not importing flatbuffers for TS test generation

* Not overwriting generated js for tests

* AppVeyor test fixes
parent 340d1a34
...@@ -48,6 +48,7 @@ tests/monsterdata_java_wire.mon ...@@ -48,6 +48,7 @@ tests/monsterdata_java_wire.mon
tests/monsterdata_go_wire.mon tests/monsterdata_go_wire.mon
tests/monsterdata_javascript_wire.mon tests/monsterdata_javascript_wire.mon
tests/unicode_test.mon tests/unicode_test.mon
tests/ts/
CMakeLists.txt.user CMakeLists.txt.user
CMakeScripts/** CMakeScripts/**
CTestTestfile.cmake CTestTestfile.cmake
......
...@@ -31,7 +31,7 @@ test_script: ...@@ -31,7 +31,7 @@ test_script:
- rem "---------------- JS -----------------" - rem "---------------- JS -----------------"
- "node --version" - "node --version"
- "..\\%CONFIGURATION%\\flatc -b monster_test.fbs unicode_test.json" - "..\\%CONFIGURATION%\\flatc -b monster_test.fbs unicode_test.json"
- "node JavaScriptTest" - "node JavaScriptTest ./monster_test_generated"
- rem "---------------- C# -----------------" - rem "---------------- C# -----------------"
# Have to compile this here rather than in "build" above because AppVeyor only # Have to compile this here rather than in "build" above because AppVeyor only
# supports building one project?? # supports building one project??
......
...@@ -3,7 +3,7 @@ var assert = require('assert'); ...@@ -3,7 +3,7 @@ var assert = require('assert');
var fs = require('fs'); var fs = require('fs');
var flatbuffers = require('../js/flatbuffers').flatbuffers; var flatbuffers = require('../js/flatbuffers').flatbuffers;
var MyGame = require('./monster_test_generated').MyGame; var MyGame = require(process.argv[2]).MyGame;
function main() { function main() {
......
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
pushd "$(dirname $0)" >/dev/null pushd "$(dirname $0)" >/dev/null
../flatc -b monster_test.fbs unicode_test.json ../flatc -b monster_test.fbs unicode_test.json
node JavaScriptTest node JavaScriptTest ./monster_test_generated
...@@ -15,11 +15,9 @@ ...@@ -15,11 +15,9 @@
# limitations under the License. # limitations under the License.
pushd "$(dirname $0)" >/dev/null pushd "$(dirname $0)" >/dev/null
../flatc --ts --no-fb-import --gen-mutable monster_test.fbs ../flatc --ts --no-fb-import --gen-mutable -o ts monster_test.fbs
../flatc -b monster_test.fbs unicode_test.json ../flatc -b monster_test.fbs unicode_test.json
npm install @types/flatbuffers npm install @types/flatbuffers
mv monster_test_generated.js monster_test_generated.js.bak tsc ts/monster_test_generated.ts
tsc monster_test_generated.ts
npm uninstall @types/flatbuffers npm uninstall @types/flatbuffers
node JavaScriptTest node JavaScriptTest ./ts/monster_test_generated
mv monster_test_generated.js.bak monster_test_generated.js
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
../flatc --cpp --java --csharp --go --binary --python --js --ts --php --grpc --gen-mutable --gen-object-api --no-includes monster_test.fbs monsterdata_test.json ../flatc --cpp --java --csharp --go --binary --python --js --ts --php --grpc --gen-mutable --gen-object-api --no-includes --no-fb-import monster_test.fbs monsterdata_test.json
../flatc --cpp --java --csharp --go --binary --python --js --ts --php --gen-mutable -o namespace_test namespace_test/namespace_test1.fbs namespace_test/namespace_test2.fbs ../flatc --cpp --java --csharp --go --binary --python --js --ts --php --gen-mutable --no-fb-import -o namespace_test namespace_test/namespace_test1.fbs namespace_test/namespace_test2.fbs
../flatc --cpp --gen-mutable --gen-object-api -o union_vector ./union_vector/union_vector.fbs ../flatc --cpp --gen-mutable --gen-object-api -o union_vector ./union_vector/union_vector.fbs
../flatc -b --schema --bfbs-comments monster_test.fbs ../flatc -b --schema --bfbs-comments monster_test.fbs
cd ../samples cd ../samples
......
// automatically generated by the FlatBuffers compiler, do not modify // automatically generated by the FlatBuffers compiler, do not modify
import { flatbuffers } from "./flatbuffers"
/** /**
* @enum * @enum
*/ */
......
// automatically generated by the FlatBuffers compiler, do not modify // automatically generated by the FlatBuffers compiler, do not modify
import { flatbuffers } from "./flatbuffers"
import * as NS9459827973991502386 from "./namespace_test1_generated"; import * as NS9459827973991502386 from "./namespace_test1_generated";
export * from "./namespace_test1_generated";
/** /**
* @constructor * @constructor
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment