Remove Callback type as a global.

src/render/glyph_manager.js

@@ -8,6 +8,7 @@ const {AlphaImage} = require('../util/image');
 
 import type {StyleGlyph} from '../style/style_glyph';
 import type {RequestTransformFunction} from '../ui/map';
+import type {Callback} from '../types/callback';
 
 type Entry = {
     // null means we've requested the range, but the glyph wasn't included in the result.

src/render/image_manager.js

@@ -9,6 +9,7 @@ const assert = require('assert');
 import type {StyleImage} from '../style/style_image';
 import type {ImagePosition} from './image_atlas';
 import type {Bin} from '@mapbox/shelf-pack';
+import type {Callback} from '../types/callback';
 
 type Pattern = {
     bin: Bin,

src/source/geojson_source.js

@@ -11,6 +11,7 @@ import type {Source} from './source';
 import type Map from '../ui/map';
 import type Dispatcher from '../util/dispatcher';
 import type Tile from './tile';
+import type {Callback} from '../types/callback';
 
 /**
  * A source containing GeoJSON.

src/source/geojson_worker_source.js

@@ -19,6 +19,7 @@ import type StyleLayerIndex from '../style/style_layer_index';
 
 import type {LoadVectorDataCallback} from './vector_tile_worker_source';
 import type {RequestParameters} from '../util/ajax';
+import type { Callback } from '../types/callback';
 
 export type GeoJSON = Object;
 

src/source/image_source.js

@@ -19,6 +19,7 @@ import type Map from '../ui/map';
 import type Dispatcher from '../util/dispatcher';
 import type Tile from './tile';
 import type Coordinate from '../geo/coordinate';
+import type {Callback} from '../types/callback';
 
 export type ImageTextureSource =
   ImageData |

src/source/load_tilejson.js

@@ -6,6 +6,7 @@ const browser = require('../util/browser');
 const normalizeURL = require('../util/mapbox').normalizeSourceURL;
 
 import type {RequestTransformFunction} from '../ui/map';
+import type {Callback} from '../types/callback';
 
 module.exports = function(options: any, requestTransformFn: RequestTransformFunction, callback: Callback<TileJSON>) {
     const loaded = function(err, tileJSON: any) {

src/source/raster_tile_source.js

@@ -13,6 +13,7 @@ import type TileCoord from './tile_coord';
 import type Map from '../ui/map';
 import type Dispatcher from '../util/dispatcher';
 import type Tile from './tile';
+import type {Callback} from '../types/callback';
 
 class RasterTileSource extends Evented implements Source {
     type: 'raster';

src/source/source.js

@@ -7,6 +7,7 @@ import type Evented from '../util/evented';
 import type Map from '../ui/map';
 import type Tile from './tile';
 import type TileCoord from './tile_coord';
+import type {Callback} from '../types/callback';
 
 /**
  * The `Source` interface must be implemented by each source type, including "core" types (`vector`, `raster`,

src/source/source_cache.js

@@ -17,6 +17,7 @@ import type Dispatcher from '../util/dispatcher';
 import type Transform from '../geo/transform';
 import type {TileState} from './tile';
 import type CollisionIndex from '../symbol/collision_index';
+import type {Callback} from '../types/callback';
 
 /**
  * `SourceCache` is responsible for

src/source/vector_tile_source.js

@@ -13,6 +13,7 @@ import type TileCoord from './tile_coord';
 import type Map from '../ui/map';
 import type Dispatcher from '../util/dispatcher';
 import type Tile from './tile';
+import type {Callback} from '../types/callback';
 
 class VectorTileSource extends Evented implements Source {
     type: 'vector';

src/source/vector_tile_worker_source.js

@@ -15,6 +15,7 @@ import type {
 
 import type Actor from '../util/actor';
 import type StyleLayerIndex from '../style/style_layer_index';
+import type {Callback} from '../types/callback';
 
 export type LoadVectorTileResult = {
     vectorTile: VectorTile;

src/source/worker.js

@@ -17,6 +17,7 @@ import type {
 } from '../source/worker_source';
 
 import type {WorkerGlobalScopeInterface} from '../util/web_worker';
+import type {Callback} from '../types/callback';
 
 /**
  * @private

src/style/load_glyph_range.js

@@ -6,6 +6,7 @@ const parseGlyphPBF = require('./parse_glyph_pbf');
 
 import type {StyleGlyph} from './style_glyph';
 import type {RequestTransformFunction} from '../ui/map';
+import type {Callback} from '../types/callback';
 
 module.exports = function (fontstack: string,
                            range: number,

src/style/load_sprite.js

@@ -7,6 +7,7 @@ const {RGBAImage} = require('../util/image');
 
 import type {StyleImage} from './style_image';
 import type {RequestTransformFunction} from '../ui/map';
+import type {Callback} from '../types/callback';
 
 module.exports = function(baseURL: string,
                           transformRequestCallback: RequestTransformFunction,

src/style/style.js

@@ -33,6 +33,7 @@ import type {Source} from '../source/source';
 import type {StyleImage} from './style_image';
 import type {StyleGlyph} from './style_glyph';
 import type CollisionIndex from '../symbol/collision_index';
+import type {Callback} from '../types/callback';
 
 const supportedDiffOperations = util.pick(diff.operations, [
     'addLayer',

flow-typed/callback.js → src/types/callback.js

@@ -1,3 +1,4 @@
+// @flow
 
 // Flow can't perfectly type Node-style callbacks yet; it does not have a way to
 // express that if the first parameter is null, the second is not, so for the time
@@ -13,5 +14,4 @@
 //    });
 //
 // See https://github.com/facebook/flow/issues/2123 for more.
-
-declare type Callback<T> = (error: ?Error, result: ?T) => void;
+export type Callback<T> = (error: ?Error, result: ?T) => void;

src/util/ajax.js

@@ -2,6 +2,8 @@
 
 const window = require('./window');
 
+import type { Callback } from '../types/callback';
+
 /**
  * The type of a resource.
  * @private

src/util/util.js

@@ -4,6 +4,8 @@ const UnitBezier = require('@mapbox/unitbezier');
 const Coordinate = require('../geo/coordinate');
 const Point = require('@mapbox/point-geometry');
 
+import type {Callback} from '../types/callback';
+
 /**
  * @module util
  * @private