From f2aadffd957b34a47c0aecf82aa348f29bd64f64 Mon Sep 17 00:00:00 2001
From: Paul Loyd <pavelko95@gmail.com>
Date: Fri, 1 Dec 2017 20:44:35 +0300
Subject: [PATCH] Tests restructuring

---
 src/cli.js                                    |  2 +-
 src/collector.js                              |  4 +--
 tests/run.js                                  | 18 ++++------
 tests/samples/{any.js => any/source.js}       |  0
 tests/samples/{any.yaml => any/types.yaml}    |  1 -
 tests/samples/{arrays.js => arrays/source.js} |  0
 .../{arrays.yaml => arrays/types.yaml}        |  1 -
 .../{disorder.js => disorder/source.js}       |  0
 .../{disorder.yaml => disorder/types.yaml}    |  1 -
 .../{elementType.js => elementType/source.js} |  0
 .../types.yaml}                               |  1 -
 tests/samples/empty.yaml                      |  1 -
 tests/samples/{empty.js => empty/source.js}   |  0
 tests/samples/empty/types.yaml                |  1 +
 tests/samples/{enums.js => enums/source.js}   |  0
 .../samples/{enums.yaml => enums/types.yaml}  |  1 -
 tests/samples/{exact.js => exact/source.js}   |  0
 .../samples/{exact.yaml => exact/types.yaml}  |  1 -
 .../samples/externals/{ => modules}/first.js  |  0
 .../samples/externals/{ => modules}/second.js |  0
 .../{externals.js => externals/source.js}     |  8 ++---
 .../{externals.yaml => externals/types.yaml}  | 33 +++++++++----------
 .../{generics.js => generics/source.js}       |  0
 .../{generics.yaml => generics/types.yaml}    |  1 -
 .../{inheritance.js => inheritance/source.js} |  0
 .../types.yaml}                               |  1 -
 .../source.js}                                |  0
 .../types.yaml}                               |  1 -
 tests/samples/{keys.js => keys/source.js}     |  0
 tests/samples/{keys.yaml => keys/types.yaml}  |  1 -
 tests/samples/{maps.js => maps/source.js}     |  0
 tests/samples/{maps.yaml => maps/types.yaml}  |  1 -
 tests/samples/{maybe.js => maybe/source.js}   |  0
 .../samples/{maybe.yaml => maybe/types.yaml}  |  1 -
 tests/samples/{mixed.js => mixed/source.js}   |  0
 .../samples/{mixed.yaml => mixed/types.yaml}  |  1 -
 .../source.js}                                |  0
 .../types.yaml}                               |  1 -
 .../samples/{objects.js => objects/source.js} |  0
 .../{objects.yaml => objects/types.yaml}      |  1 -
 .../samples/{pragmas.js => pragmas/source.js} |  0
 .../{pragmas.yaml => pragmas/types.yaml}      |  1 -
 .../{primitives.js => primitives/source.js}   |  0
 .../types.yaml}                               |  1 -
 .../{readOnly.js => readOnly/source.js}       |  0
 .../{readOnly.yaml => readOnly/types.yaml}    |  1 -
 .../{references.js => references/source.js}   |  0
 .../types.yaml}                               |  1 -
 tests/samples/{scopes.js => scopes/source.js} |  0
 .../{scopes.yaml => scopes/types.yaml}        |  1 -
 .../{shadowing.js => shadowing/source.js}     |  0
 .../{shadowing.yaml => shadowing/types.yaml}  |  1 -
 tests/samples/{shape.js => shape/source.js}   |  0
 .../samples/{shape.yaml => shape/types.yaml}  |  1 -
 .../source.js}                                |  0
 .../types.yaml}                               |  1 -
 .../{skipStatics.js => skipStatics/source.js} |  0
 .../types.yaml}                               |  1 -
 tests/samples/{tuples.js => tuples/source.js} |  0
 .../{tuples.yaml => tuples/types.yaml}        |  1 -
 .../source.js}                                |  0
 .../types.yaml}                               |  1 -
 tests/samples/{unions.js => unions/source.js} |  0
 .../{unions.yaml => unions/types.yaml}        |  1 -
 .../source.js}                                |  0
 .../types.yaml}                               |  1 -
 tests/samples/unused.yaml                     |  1 -
 tests/samples/{unused.js => unused/source.js} |  0
 tests/samples/unused/types.yaml               |  1 +
 .../{valueAsType.js => valueAsType/source.js} |  0
 .../types.yaml}                               |  1 -
 tests/samples/{values.js => values/source.js} |  0
 .../{values.yaml => values/types.yaml}        |  1 -
 73 files changed, 32 insertions(+), 67 deletions(-)
 rename tests/samples/{any.js => any/source.js} (100%)
 rename tests/samples/{any.yaml => any/types.yaml} (95%)
 rename tests/samples/{arrays.js => arrays/source.js} (100%)
 rename tests/samples/{arrays.yaml => arrays/types.yaml} (99%)
 rename tests/samples/{disorder.js => disorder/source.js} (100%)
 rename tests/samples/{disorder.yaml => disorder/types.yaml} (98%)
 rename tests/samples/{elementType.js => elementType/source.js} (100%)
 rename tests/samples/{elementType.yaml => elementType/types.yaml} (98%)
 delete mode 100644 tests/samples/empty.yaml
 rename tests/samples/{empty.js => empty/source.js} (100%)
 create mode 100644 tests/samples/empty/types.yaml
 rename tests/samples/{enums.js => enums/source.js} (100%)
 rename tests/samples/{enums.yaml => enums/types.yaml} (99%)
 rename tests/samples/{exact.js => exact/source.js} (100%)
 rename tests/samples/{exact.yaml => exact/types.yaml} (98%)
 rename tests/samples/externals/{ => modules}/first.js (100%)
 rename tests/samples/externals/{ => modules}/second.js (100%)
 rename tests/samples/{externals.js => externals/source.js} (52%)
 rename tests/samples/{externals.yaml => externals/types.yaml} (69%)
 rename tests/samples/{generics.js => generics/source.js} (100%)
 rename tests/samples/{generics.yaml => generics/types.yaml} (99%)
 rename tests/samples/{inheritance.js => inheritance/source.js} (100%)
 rename tests/samples/{inheritance.yaml => inheritance/types.yaml} (99%)
 rename tests/samples/{intersections.js => intersections/source.js} (100%)
 rename tests/samples/{intersections.yaml => intersections/types.yaml} (99%)
 rename tests/samples/{keys.js => keys/source.js} (100%)
 rename tests/samples/{keys.yaml => keys/types.yaml} (97%)
 rename tests/samples/{maps.js => maps/source.js} (100%)
 rename tests/samples/{maps.yaml => maps/types.yaml} (98%)
 rename tests/samples/{maybe.js => maybe/source.js} (100%)
 rename tests/samples/{maybe.yaml => maybe/types.yaml} (99%)
 rename tests/samples/{mixed.js => mixed/source.js} (100%)
 rename tests/samples/{mixed.yaml => mixed/types.yaml} (95%)
 rename tests/samples/{nonMaybeType.js => nonMaybeType/source.js} (100%)
 rename tests/samples/{nonMaybeType.yaml => nonMaybeType/types.yaml} (94%)
 rename tests/samples/{objects.js => objects/source.js} (100%)
 rename tests/samples/{objects.yaml => objects/types.yaml} (98%)
 rename tests/samples/{pragmas.js => pragmas/source.js} (100%)
 rename tests/samples/{pragmas.yaml => pragmas/types.yaml} (99%)
 rename tests/samples/{primitives.js => primitives/source.js} (100%)
 rename tests/samples/{primitives.yaml => primitives/types.yaml} (99%)
 rename tests/samples/{readOnly.js => readOnly/source.js} (100%)
 rename tests/samples/{readOnly.yaml => readOnly/types.yaml} (98%)
 rename tests/samples/{references.js => references/source.js} (100%)
 rename tests/samples/{references.yaml => references/types.yaml} (99%)
 rename tests/samples/{scopes.js => scopes/source.js} (100%)
 rename tests/samples/{scopes.yaml => scopes/types.yaml} (99%)
 rename tests/samples/{shadowing.js => shadowing/source.js} (100%)
 rename tests/samples/{shadowing.yaml => shadowing/types.yaml} (98%)
 rename tests/samples/{shape.js => shape/source.js} (100%)
 rename tests/samples/{shape.yaml => shape/types.yaml} (98%)
 rename tests/samples/{skipFunctions.js => skipFunctions/source.js} (100%)
 rename tests/samples/{skipFunctions.yaml => skipFunctions/types.yaml} (99%)
 rename tests/samples/{skipStatics.js => skipStatics/source.js} (100%)
 rename tests/samples/{skipStatics.yaml => skipStatics/types.yaml} (94%)
 rename tests/samples/{tuples.js => tuples/source.js} (100%)
 rename tests/samples/{tuples.yaml => tuples/types.yaml} (99%)
 rename tests/samples/{typeInMethod.js => typeInMethod/source.js} (100%)
 rename tests/samples/{typeInMethod.yaml => typeInMethod/types.yaml} (97%)
 rename tests/samples/{unions.js => unions/source.js} (100%)
 rename tests/samples/{unions.yaml => unions/types.yaml} (98%)
 rename tests/samples/{unionsAndEnums.js => unionsAndEnums/source.js} (100%)
 rename tests/samples/{unionsAndEnums.yaml => unionsAndEnums/types.yaml} (99%)
 delete mode 100644 tests/samples/unused.yaml
 rename tests/samples/{unused.js => unused/source.js} (100%)
 create mode 100644 tests/samples/unused/types.yaml
 rename tests/samples/{valueAsType.js => valueAsType/source.js} (100%)
 rename tests/samples/{valueAsType.yaml => valueAsType/types.yaml} (98%)
 rename tests/samples/{values.js => values/source.js} (100%)
 rename tests/samples/{values.yaml => values/types.yaml} (97%)

diff --git a/src/cli.js b/src/cli.js
index 93c2aed..1a08195 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -17,7 +17,7 @@ function run(path: string) {
     try {
         const {types} = collect(path);
 
-        const output = yaml.dump({types}, null, null, {
+        const output = yaml.dump(types, null, null, {
             indent: 4,
             width: 100,
         });
diff --git a/src/collector.js b/src/collector.js
index 9207291..8d12808 100644
--- a/src/collector.js
+++ b/src/collector.js
@@ -48,8 +48,8 @@ export default class Collector {
         const ast = this.parser.parse(code);
 
         // TODO: customize it.
-        const id = pathToId(path);
-
+        // XXX: replace with normal resolver and path-to-id converter.
+        const id = pathToId(path.replace(/\/source\.js$/, ''));
         module = new Module(id, path);
 
         const scope = this._global.extend(module);
diff --git a/tests/run.js b/tests/run.js
index 0159885..4812e48 100644
--- a/tests/run.js
+++ b/tests/run.js
@@ -7,12 +7,12 @@ import wu from 'wu';
 import collect from '../src';
 
 function run(title) {
-    let actual, expected: $FlowFixMe;
+    let actual, expected;
 
     // Run the collector only if the suite will be checked.
     before(() => {
-        actual = collect(title + '.js');
-        expected = yaml.load(fs.readFileSync(title + '.yaml', 'utf8'));
+        actual = collect(title + '/source.js');
+        expected = yaml.load(fs.readFileSync(title + '/types.yaml', 'utf8'));
     });
 
     it('should not include cycles', () => {
@@ -20,7 +20,7 @@ function run(title) {
     });
 
     it('should provide expected types', () => {
-        assert.deepEqual(actual.types, expected.types);
+        assert.deepEqual(actual.types, expected);
     });
 }
 
@@ -47,13 +47,9 @@ function detectCycles(obj: mixed, cycles: Set<mixed> = new Set, objs: Set<mixed>
 function main() {
     process.chdir(path.join(__dirname, 'samples'));
 
-    fs.readdirSync('.')
-        .filter(name => path.extname(name) === '.js')
-        .forEach(name => {
-            const title = path.basename(name, '.js');
-
-            describe(title, () => run(title));
-        });
+    for (const title of fs.readdirSync('.')) {
+        describe(title, () => run(title));
+    }
 }
 
 main();
diff --git a/tests/samples/any.js b/tests/samples/any/source.js
similarity index 100%
rename from tests/samples/any.js
rename to tests/samples/any/source.js
diff --git a/tests/samples/any.yaml b/tests/samples/any/types.yaml
similarity index 95%
rename from tests/samples/any.yaml
rename to tests/samples/any/types.yaml
index 3656b05..7a14b94 100644
--- a/tests/samples/any.yaml
+++ b/tests/samples/any/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: any
     id: [any, X]
 -   kind: record
diff --git a/tests/samples/arrays.js b/tests/samples/arrays/source.js
similarity index 100%
rename from tests/samples/arrays.js
rename to tests/samples/arrays/source.js
diff --git a/tests/samples/arrays.yaml b/tests/samples/arrays/types.yaml
similarity index 99%
rename from tests/samples/arrays.yaml
rename to tests/samples/arrays/types.yaml
index fbb99c3..b1969ca 100644
--- a/tests/samples/arrays.yaml
+++ b/tests/samples/arrays/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/disorder.js b/tests/samples/disorder/source.js
similarity index 100%
rename from tests/samples/disorder.js
rename to tests/samples/disorder/source.js
diff --git a/tests/samples/disorder.yaml b/tests/samples/disorder/types.yaml
similarity index 98%
rename from tests/samples/disorder.yaml
rename to tests/samples/disorder/types.yaml
index a89bf7e..6a24299 100644
--- a/tests/samples/disorder.yaml
+++ b/tests/samples/disorder/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: string
     id: [disorder, Z]
 -   kind: record
diff --git a/tests/samples/elementType.js b/tests/samples/elementType/source.js
similarity index 100%
rename from tests/samples/elementType.js
rename to tests/samples/elementType/source.js
diff --git a/tests/samples/elementType.yaml b/tests/samples/elementType/types.yaml
similarity index 98%
rename from tests/samples/elementType.yaml
rename to tests/samples/elementType/types.yaml
index f6bb97f..cf9d90d 100644
--- a/tests/samples/elementType.yaml
+++ b/tests/samples/elementType/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: x
diff --git a/tests/samples/empty.yaml b/tests/samples/empty.yaml
deleted file mode 100644
index 77d540f..0000000
--- a/tests/samples/empty.yaml
+++ /dev/null
@@ -1 +0,0 @@
-types: []
diff --git a/tests/samples/empty.js b/tests/samples/empty/source.js
similarity index 100%
rename from tests/samples/empty.js
rename to tests/samples/empty/source.js
diff --git a/tests/samples/empty/types.yaml b/tests/samples/empty/types.yaml
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/tests/samples/empty/types.yaml
@@ -0,0 +1 @@
+[]
diff --git a/tests/samples/enums.js b/tests/samples/enums/source.js
similarity index 100%
rename from tests/samples/enums.js
rename to tests/samples/enums/source.js
diff --git a/tests/samples/enums.yaml b/tests/samples/enums/types.yaml
similarity index 99%
rename from tests/samples/enums.yaml
rename to tests/samples/enums/types.yaml
index 7c56b70..c280253 100644
--- a/tests/samples/enums.yaml
+++ b/tests/samples/enums/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/exact.js b/tests/samples/exact/source.js
similarity index 100%
rename from tests/samples/exact.js
rename to tests/samples/exact/source.js
diff --git a/tests/samples/exact.yaml b/tests/samples/exact/types.yaml
similarity index 98%
rename from tests/samples/exact.yaml
rename to tests/samples/exact/types.yaml
index 6226fbc..8c21e2b 100644
--- a/tests/samples/exact.yaml
+++ b/tests/samples/exact/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: x
diff --git a/tests/samples/externals/first.js b/tests/samples/externals/modules/first.js
similarity index 100%
rename from tests/samples/externals/first.js
rename to tests/samples/externals/modules/first.js
diff --git a/tests/samples/externals/second.js b/tests/samples/externals/modules/second.js
similarity index 100%
rename from tests/samples/externals/second.js
rename to tests/samples/externals/modules/second.js
diff --git a/tests/samples/externals.js b/tests/samples/externals/source.js
similarity index 52%
rename from tests/samples/externals.js
rename to tests/samples/externals/source.js
index ec338f1..7487d1b 100644
--- a/tests/samples/externals.js
+++ b/tests/samples/externals/source.js
@@ -1,10 +1,10 @@
-import D, {A, B as F} from './externals/first';
-import type {C} from './externals/first';
+import D, {A, B as F} from './modules/first';
+import type {C} from './modules/first';
 
 import UM from './unused/module';
 
-const {N, M, K: T} = require('./externals/second');
-const P = require('./externals/second');
+const {N, M, K: T} = require('./modules/second');
+const P = require('./modules/second');
 
 const UR = require('./unused/module');
 
diff --git a/tests/samples/externals.yaml b/tests/samples/externals/types.yaml
similarity index 69%
rename from tests/samples/externals.yaml
rename to tests/samples/externals/types.yaml
index a61f940..a2a34d4 100644
--- a/tests/samples/externals.yaml
+++ b/tests/samples/externals/types.yaml
@@ -1,49 +1,48 @@
-types:
 -   kind: record
     fields:
     -   name: a
         value: {kind: boolean}
         required: true
-    id: [externals, first, A]
+    id: [externals, modules, first, A]
 -   kind: record
     fields:
     -   name: b
         value: {kind: string}
         required: true
-    id: [externals, first, B]
+    id: [externals, modules, first, B]
 -   kind: record
     fields:
     -   name: c
         value: {kind: number, repr: f64}
         required: true
-    id: [externals, first, CC]
+    id: [externals, modules, first, CC]
 -   kind: record
     fields:
     -   name: d
         value: {kind: number, repr: f64}
         required: true
-    id: [externals, first, D]
+    id: [externals, modules, first, D]
 -   kind: record
     fields:
     -   name: a
         value:
             kind: reference
-            to: [externals, first, A]
+            to: [externals, modules, first, A]
         required: true
     -   name: b
         value:
             kind: reference
-            to: [externals, first, B]
+            to: [externals, modules, first, B]
         required: true
     -   name: c
         value:
             kind: reference
-            to: [externals, first, CC]
+            to: [externals, modules, first, CC]
         required: true
     -   name: d
         value:
             kind: reference
-            to: [externals, first, D]
+            to: [externals, modules, first, D]
         required: true
     id: [externals, X]
 -   kind: record
@@ -51,45 +50,45 @@ types:
     -   name: n
         value: {kind: boolean}
         required: true
-    id: [externals, second, N]
+    id: [externals, modules, second, N]
 -   kind: record
     fields:
     -   name: m
         value: {kind: string}
         required: true
-    id: [externals, second, M]
+    id: [externals, modules, second, M]
 -   kind: record
     fields:
     -   name: k
         value: {kind: number, repr: f64}
         required: true
-    id: [externals, second, KK]
+    id: [externals, modules, second, KK]
 -   kind: record
     fields:
     -   name: p
         value: {kind: number, repr: f64}
         required: true
-    id: [externals, second, P]
+    id: [externals, modules, second, P]
 -   kind: record
     fields:
     -   name: n
         value:
             kind: reference
-            to: [externals, second, N]
+            to: [externals, modules, second, N]
         required: true
     -   name: m
         value:
             kind: reference
-            to: [externals, second, M]
+            to: [externals, modules, second, M]
         required: true
     -   name: k
         value:
             kind: reference
-            to: [externals, second, KK]
+            to: [externals, modules, second, KK]
         required: true
     -   name: p
         value:
             kind: reference
-            to: [externals, second, P]
+            to: [externals, modules, second, P]
         required: true
     id: [externals, Y]
diff --git a/tests/samples/generics.js b/tests/samples/generics/source.js
similarity index 100%
rename from tests/samples/generics.js
rename to tests/samples/generics/source.js
diff --git a/tests/samples/generics.yaml b/tests/samples/generics/types.yaml
similarity index 99%
rename from tests/samples/generics.yaml
rename to tests/samples/generics/types.yaml
index 9637fa3..0685dcd 100644
--- a/tests/samples/generics.yaml
+++ b/tests/samples/generics/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: t
diff --git a/tests/samples/inheritance.js b/tests/samples/inheritance/source.js
similarity index 100%
rename from tests/samples/inheritance.js
rename to tests/samples/inheritance/source.js
diff --git a/tests/samples/inheritance.yaml b/tests/samples/inheritance/types.yaml
similarity index 99%
rename from tests/samples/inheritance.yaml
rename to tests/samples/inheritance/types.yaml
index dee941c..b7b0eb1 100644
--- a/tests/samples/inheritance.yaml
+++ b/tests/samples/inheritance/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/intersections.js b/tests/samples/intersections/source.js
similarity index 100%
rename from tests/samples/intersections.js
rename to tests/samples/intersections/source.js
diff --git a/tests/samples/intersections.yaml b/tests/samples/intersections/types.yaml
similarity index 99%
rename from tests/samples/intersections.yaml
rename to tests/samples/intersections/types.yaml
index 263b8f7..283b514 100644
--- a/tests/samples/intersections.yaml
+++ b/tests/samples/intersections/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/keys.js b/tests/samples/keys/source.js
similarity index 100%
rename from tests/samples/keys.js
rename to tests/samples/keys/source.js
diff --git a/tests/samples/keys.yaml b/tests/samples/keys/types.yaml
similarity index 97%
rename from tests/samples/keys.yaml
rename to tests/samples/keys/types.yaml
index d6dae00..bf451fc 100644
--- a/tests/samples/keys.yaml
+++ b/tests/samples/keys/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/maps.js b/tests/samples/maps/source.js
similarity index 100%
rename from tests/samples/maps.js
rename to tests/samples/maps/source.js
diff --git a/tests/samples/maps.yaml b/tests/samples/maps/types.yaml
similarity index 98%
rename from tests/samples/maps.yaml
rename to tests/samples/maps/types.yaml
index ea22f92..b0fa248 100644
--- a/tests/samples/maps.yaml
+++ b/tests/samples/maps/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: map
     keys: {kind: string}
     values: {kind: boolean}
diff --git a/tests/samples/maybe.js b/tests/samples/maybe/source.js
similarity index 100%
rename from tests/samples/maybe.js
rename to tests/samples/maybe/source.js
diff --git a/tests/samples/maybe.yaml b/tests/samples/maybe/types.yaml
similarity index 99%
rename from tests/samples/maybe.yaml
rename to tests/samples/maybe/types.yaml
index 05c76af..5b59418 100644
--- a/tests/samples/maybe.yaml
+++ b/tests/samples/maybe/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: x
diff --git a/tests/samples/mixed.js b/tests/samples/mixed/source.js
similarity index 100%
rename from tests/samples/mixed.js
rename to tests/samples/mixed/source.js
diff --git a/tests/samples/mixed.yaml b/tests/samples/mixed/types.yaml
similarity index 95%
rename from tests/samples/mixed.yaml
rename to tests/samples/mixed/types.yaml
index ff30c6e..7171c90 100644
--- a/tests/samples/mixed.yaml
+++ b/tests/samples/mixed/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: mixed
     id: [mixed, X]
 -   kind: record
diff --git a/tests/samples/nonMaybeType.js b/tests/samples/nonMaybeType/source.js
similarity index 100%
rename from tests/samples/nonMaybeType.js
rename to tests/samples/nonMaybeType/source.js
diff --git a/tests/samples/nonMaybeType.yaml b/tests/samples/nonMaybeType/types.yaml
similarity index 94%
rename from tests/samples/nonMaybeType.yaml
rename to tests/samples/nonMaybeType/types.yaml
index cd4bca0..abcc090 100644
--- a/tests/samples/nonMaybeType.yaml
+++ b/tests/samples/nonMaybeType/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: maybe
     value: {kind: string}
     id: [nonMaybeType, X]
diff --git a/tests/samples/objects.js b/tests/samples/objects/source.js
similarity index 100%
rename from tests/samples/objects.js
rename to tests/samples/objects/source.js
diff --git a/tests/samples/objects.yaml b/tests/samples/objects/types.yaml
similarity index 98%
rename from tests/samples/objects.yaml
rename to tests/samples/objects/types.yaml
index 4b1e7be..cb282b7 100644
--- a/tests/samples/objects.yaml
+++ b/tests/samples/objects/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: map
     keys: {kind: mixed}
     values: {kind: mixed}
diff --git a/tests/samples/pragmas.js b/tests/samples/pragmas/source.js
similarity index 100%
rename from tests/samples/pragmas.js
rename to tests/samples/pragmas/source.js
diff --git a/tests/samples/pragmas.yaml b/tests/samples/pragmas/types.yaml
similarity index 99%
rename from tests/samples/pragmas.yaml
rename to tests/samples/pragmas/types.yaml
index ebdddd9..c71f34d 100644
--- a/tests/samples/pragmas.yaml
+++ b/tests/samples/pragmas/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/primitives.js b/tests/samples/primitives/source.js
similarity index 100%
rename from tests/samples/primitives.js
rename to tests/samples/primitives/source.js
diff --git a/tests/samples/primitives.yaml b/tests/samples/primitives/types.yaml
similarity index 99%
rename from tests/samples/primitives.yaml
rename to tests/samples/primitives/types.yaml
index 66c9261..425cac8 100644
--- a/tests/samples/primitives.yaml
+++ b/tests/samples/primitives/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/readOnly.js b/tests/samples/readOnly/source.js
similarity index 100%
rename from tests/samples/readOnly.js
rename to tests/samples/readOnly/source.js
diff --git a/tests/samples/readOnly.yaml b/tests/samples/readOnly/types.yaml
similarity index 98%
rename from tests/samples/readOnly.yaml
rename to tests/samples/readOnly/types.yaml
index e17f26e..620fc68 100644
--- a/tests/samples/readOnly.yaml
+++ b/tests/samples/readOnly/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: x
diff --git a/tests/samples/references.js b/tests/samples/references/source.js
similarity index 100%
rename from tests/samples/references.js
rename to tests/samples/references/source.js
diff --git a/tests/samples/references.yaml b/tests/samples/references/types.yaml
similarity index 99%
rename from tests/samples/references.yaml
rename to tests/samples/references/types.yaml
index b5cb55f..12c6e70 100644
--- a/tests/samples/references.yaml
+++ b/tests/samples/references/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: string
     id: [references, A]
 -   kind: record
diff --git a/tests/samples/scopes.js b/tests/samples/scopes/source.js
similarity index 100%
rename from tests/samples/scopes.js
rename to tests/samples/scopes/source.js
diff --git a/tests/samples/scopes.yaml b/tests/samples/scopes/types.yaml
similarity index 99%
rename from tests/samples/scopes.yaml
rename to tests/samples/scopes/types.yaml
index d60a1c9..41b259e 100644
--- a/tests/samples/scopes.yaml
+++ b/tests/samples/scopes/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: boolean
     id: [scopes, '2', X]
 -   kind: string
diff --git a/tests/samples/shadowing.js b/tests/samples/shadowing/source.js
similarity index 100%
rename from tests/samples/shadowing.js
rename to tests/samples/shadowing/source.js
diff --git a/tests/samples/shadowing.yaml b/tests/samples/shadowing/types.yaml
similarity index 98%
rename from tests/samples/shadowing.yaml
rename to tests/samples/shadowing/types.yaml
index 22a6de5..ed07f6c 100644
--- a/tests/samples/shadowing.yaml
+++ b/tests/samples/shadowing/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields: []
     id: [shadowing, '1', Buffer]
diff --git a/tests/samples/shape.js b/tests/samples/shape/source.js
similarity index 100%
rename from tests/samples/shape.js
rename to tests/samples/shape/source.js
diff --git a/tests/samples/shape.yaml b/tests/samples/shape/types.yaml
similarity index 98%
rename from tests/samples/shape.yaml
rename to tests/samples/shape/types.yaml
index 7dd73fe..9a97a8e 100644
--- a/tests/samples/shape.yaml
+++ b/tests/samples/shape/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: x
diff --git a/tests/samples/skipFunctions.js b/tests/samples/skipFunctions/source.js
similarity index 100%
rename from tests/samples/skipFunctions.js
rename to tests/samples/skipFunctions/source.js
diff --git a/tests/samples/skipFunctions.yaml b/tests/samples/skipFunctions/types.yaml
similarity index 99%
rename from tests/samples/skipFunctions.yaml
rename to tests/samples/skipFunctions/types.yaml
index 0f1ef27..a55f535 100644
--- a/tests/samples/skipFunctions.yaml
+++ b/tests/samples/skipFunctions/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/skipStatics.js b/tests/samples/skipStatics/source.js
similarity index 100%
rename from tests/samples/skipStatics.js
rename to tests/samples/skipStatics/source.js
diff --git a/tests/samples/skipStatics.yaml b/tests/samples/skipStatics/types.yaml
similarity index 94%
rename from tests/samples/skipStatics.yaml
rename to tests/samples/skipStatics/types.yaml
index 3a6eab3..3d1fb41 100644
--- a/tests/samples/skipStatics.yaml
+++ b/tests/samples/skipStatics/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: xxx
diff --git a/tests/samples/tuples.js b/tests/samples/tuples/source.js
similarity index 100%
rename from tests/samples/tuples.js
rename to tests/samples/tuples/source.js
diff --git a/tests/samples/tuples.yaml b/tests/samples/tuples/types.yaml
similarity index 99%
rename from tests/samples/tuples.yaml
rename to tests/samples/tuples/types.yaml
index d49c1fa..f8a5423 100644
--- a/tests/samples/tuples.yaml
+++ b/tests/samples/tuples/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/typeInMethod.js b/tests/samples/typeInMethod/source.js
similarity index 100%
rename from tests/samples/typeInMethod.js
rename to tests/samples/typeInMethod/source.js
diff --git a/tests/samples/typeInMethod.yaml b/tests/samples/typeInMethod/types.yaml
similarity index 97%
rename from tests/samples/typeInMethod.yaml
rename to tests/samples/typeInMethod/types.yaml
index 900b8c7..ad06959 100644
--- a/tests/samples/typeInMethod.yaml
+++ b/tests/samples/typeInMethod/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields: []
     id: [typeInMethod, Test]
diff --git a/tests/samples/unions.js b/tests/samples/unions/source.js
similarity index 100%
rename from tests/samples/unions.js
rename to tests/samples/unions/source.js
diff --git a/tests/samples/unions.yaml b/tests/samples/unions/types.yaml
similarity index 98%
rename from tests/samples/unions.yaml
rename to tests/samples/unions/types.yaml
index 0d75428..af259cd 100644
--- a/tests/samples/unions.yaml
+++ b/tests/samples/unions/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/unionsAndEnums.js b/tests/samples/unionsAndEnums/source.js
similarity index 100%
rename from tests/samples/unionsAndEnums.js
rename to tests/samples/unionsAndEnums/source.js
diff --git a/tests/samples/unionsAndEnums.yaml b/tests/samples/unionsAndEnums/types.yaml
similarity index 99%
rename from tests/samples/unionsAndEnums.yaml
rename to tests/samples/unionsAndEnums/types.yaml
index 28c33f4..2ff42ea 100644
--- a/tests/samples/unionsAndEnums.yaml
+++ b/tests/samples/unionsAndEnums/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/unused.yaml b/tests/samples/unused.yaml
deleted file mode 100644
index 77d540f..0000000
--- a/tests/samples/unused.yaml
+++ /dev/null
@@ -1 +0,0 @@
-types: []
diff --git a/tests/samples/unused.js b/tests/samples/unused/source.js
similarity index 100%
rename from tests/samples/unused.js
rename to tests/samples/unused/source.js
diff --git a/tests/samples/unused/types.yaml b/tests/samples/unused/types.yaml
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/tests/samples/unused/types.yaml
@@ -0,0 +1 @@
+[]
diff --git a/tests/samples/valueAsType.js b/tests/samples/valueAsType/source.js
similarity index 100%
rename from tests/samples/valueAsType.js
rename to tests/samples/valueAsType/source.js
diff --git a/tests/samples/valueAsType.yaml b/tests/samples/valueAsType/types.yaml
similarity index 98%
rename from tests/samples/valueAsType.yaml
rename to tests/samples/valueAsType/types.yaml
index bbf1b3f..c6dc923 100644
--- a/tests/samples/valueAsType.yaml
+++ b/tests/samples/valueAsType/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a
diff --git a/tests/samples/values.js b/tests/samples/values/source.js
similarity index 100%
rename from tests/samples/values.js
rename to tests/samples/values/source.js
diff --git a/tests/samples/values.yaml b/tests/samples/values/types.yaml
similarity index 97%
rename from tests/samples/values.yaml
rename to tests/samples/values/types.yaml
index 23be34a..c4d30d8 100644
--- a/tests/samples/values.yaml
+++ b/tests/samples/values/types.yaml
@@ -1,4 +1,3 @@
-types:
 -   kind: record
     fields:
     -   name: a