diff --git a/types/angular-route/angular-route-tests.ts b/types/angular-route/angular-route-tests.ts
index 4d596cdfdf..677c1589ed 100644
--- a/types/angular-route/angular-route-tests.ts
+++ b/types/angular-route/angular-route-tests.ts
@@ -40,7 +40,8 @@ $routeProvider
         }
     })
     .otherwise({ redirectTo: '/' })
-    .otherwise({ redirectTo: ($routeParams?: ng.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any) => "" });
+    .otherwise({ redirectTo: ($routeParams?: ng.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any) => "" })
+    .otherwise("/");
 
 
 var current: ng.route.ICurrentRoute;
diff --git a/types/angular-route/index.d.ts b/types/angular-route/index.d.ts
index 29c59f955c..56bd3f2263 100644
--- a/types/angular-route/index.d.ts
+++ b/types/angular-route/index.d.ts
@@ -138,7 +138,7 @@ declare module 'angular' {
              *
              * @params Mapping information to be assigned to $route.current.
              */
-            otherwise(params: IRoute): IRouteProvider;
+            otherwise(params: IRoute | string): IRouteProvider;
             /**
              * Adds a new route definition to the $route service.
              *
diff --git a/types/array-unique/array-unique-tests.ts b/types/array-unique/array-unique-tests.ts
new file mode 100644
index 0000000000..a854cab3bf
--- /dev/null
+++ b/types/array-unique/array-unique-tests.ts
@@ -0,0 +1,9 @@
+import arrayUnique = require("array-unique");
+
+arrayUnique([1, 1, 2, 3, 3]);
+
+arrayUnique(["foo", "foo", "bar", "foo"]);
+
+arrayUnique.immutable([1, 1, 2, 3, 3]);
+
+arrayUnique.immutable(["foo", "foo", "bar", "foo"]);
diff --git a/types/array-unique/index.d.ts b/types/array-unique/index.d.ts
new file mode 100644
index 0000000000..40d73a53de
--- /dev/null
+++ b/types/array-unique/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for array-unique 0.3
+// Project: https://github.com/jonschlinkert/array-unique
+// Definitions by: Michaël St-Georges <https://github.com/CSLTech>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function arrayUnique<T>(arr: T[]): T[];
+
+declare namespace arrayUnique {
+    function immutable<T>(arr: ReadonlyArray<T>): T[];
+}
+
+export = arrayUnique;
diff --git a/types/array-unique/tsconfig.json b/types/array-unique/tsconfig.json
new file mode 100644
index 0000000000..9829c01906
--- /dev/null
+++ b/types/array-unique/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "array-unique-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/array-unique/tslint.json b/types/array-unique/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/array-unique/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/async/index.d.ts b/types/async/index.d.ts
index 17fecb467b..e2ecb522bc 100644
--- a/types/async/index.d.ts
+++ b/types/async/index.d.ts
@@ -7,6 +7,7 @@
 export as namespace async;
 
 export interface Dictionary<T> { [key: string]: T; }
+export type IterableCollection<T> = T[] | IterableIterator<T> | Dictionary<T>
 
 export interface ErrorCallback<T> { (err?: T): void; }
 export interface AsyncBooleanResultCallback<E> { (err?: E, truthValue?: boolean): void; }
@@ -36,11 +37,9 @@ export interface AsyncQueue<T> {
     running(): number;
     idle(): boolean;
     concurrency: number;
-    push<E>(task: T, callback?: ErrorCallback<E>): void;
+    push<E>(task: T | T[], callback?: ErrorCallback<E>): void;
     push<R,E>(task: T, callback?: AsyncResultCallback<R, E>): void;
-    push<E>(task: T[], callback?: ErrorCallback<E>): void;
-    unshift<E>(task: T, callback?: ErrorCallback<E>): void;
-    unshift<E>(task: T[], callback?: ErrorCallback<E>): void;
+    unshift<E>(task: T | T[], callback?: ErrorCallback<E>): void;
     saturated: () => any;
     empty: () => any;
     drain: () => any;
@@ -62,8 +61,7 @@ export interface AsyncPriorityQueue<T> {
     concurrency: number;
     started: boolean;
     paused: boolean;
-    push<R,E>(task: T, priority: number, callback?: AsyncResultArrayCallback<R, E>): void;
-    push<R,E>(task: T[], priority: number, callback?: AsyncResultArrayCallback<R, E>): void;
+    push<R,E>(task: T | T[], priority: number, callback?: AsyncResultArrayCallback<R, E>): void;
     saturated: () => any;
     empty: () => any;
     drain: () => any;
@@ -86,7 +84,6 @@ export interface AsyncCargo {
     length(): number;
     payload?: number;
     push(task: any, callback? : Function): void;
-    push(task: any[], callback? : Function): void;
     saturated(): void;
     empty(): void;
     drain(): void;
@@ -97,39 +94,28 @@ export interface AsyncCargo {
 }
 
 // Collections
-export function each<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function each<T, E>(arr: Dictionary<T>, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function each<T, E>(arr: IterableCollection<T>, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const eachSeries: typeof each;
-export function eachLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function eachLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function eachLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const forEach: typeof each;
 export const forEachSeries: typeof each;
 export const forEachLimit: typeof eachLimit;
-export function forEachOf<T, E>(obj: T[] | IterableIterator<T>, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function forEachOf<T, E>(obj: Dictionary<T>, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function forEachOf<T, E>(obj: IterableCollection<T>, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const forEachOfSeries: typeof forEachOf;
-export function forEachOfLimit<T, E>(obj: T[] | IterableIterator<T>, limit: number, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function forEachOfLimit<T, E>(obj: Dictionary<T>, limit: number, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function forEachOfLimit<T, E>(obj: IterableCollection<T>, limit: number, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const eachOf: typeof forEachOf;
 export const eachOfSeries: typeof forEachOf;
 export const eachOfLimit: typeof forEachOfLimit;
 export function map<T, R, E>(arr: T[] | IterableIterator<T>, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export function map<T, R, E>(arr: Dictionary<T>, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export const mapSeries: typeof map;
-export function mapLimit<T, R, E>(
-    arr: T[] | Dictionary<T> | IterableIterator<T>,
-    limit: number,
-    iterator: AsyncResultIterator<T, R, E>,
-    callback?: AsyncResultArrayCallback<R, E>
-): void;
+export function mapLimit<T, R, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export function mapValuesLimit<T, R, E>(obj: Dictionary<T>, limit: number, iteratee: (value: T, key: string, callback: AsyncResultCallback<R, E>) => void, callback: AsyncResultObjectCallback<R, E>): void;
 export function mapValues<T, R, E>(obj: Dictionary<T>, iteratee: (value: T, key: string, callback: AsyncResultCallback<R, E>) => void, callback: AsyncResultObjectCallback<R, E>): void;
 export const mapValuesSeries: typeof mapValues;
-export function filter<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
-export function filter<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
+export function filter<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
 export const filterSeries: typeof filter;
-export function filterLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
-export function filterLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
+export function filterLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
 export const select: typeof filter;
 export const selectSeries: typeof filter;
 export const selectLimit: typeof filterLimit;
@@ -141,36 +127,28 @@ export const inject: typeof reduce;
 export const foldl: typeof reduce;
 export const reduceRight: typeof reduce;
 export const foldr: typeof reduce;
-export function detect<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
-export function detect<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
+export function detect<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
 export const detectSeries: typeof detect;
-export function detectLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
-export function detectLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
+export function detectLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
 export const find: typeof detect;
 export const findSeries: typeof detect;
 export const findLimit: typeof detectLimit;
 export function sortBy<T, V, E>(arr: T[] | IterableIterator<T>, iterator: AsyncResultIterator<T, V, E>, callback?: AsyncResultArrayCallback<T, E>): void;
-export function some<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function some<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function some<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const someSeries: typeof some;
-export function someLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function someLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function someLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const any: typeof some;
 export const anySeries: typeof someSeries;
 export const anyLimit: typeof someLimit;
-export function every<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function every<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function every<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const everySeries: typeof every;
-export function everyLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function everyLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function everyLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const all: typeof every;
 export const allSeries: typeof every;
 export const allLimit: typeof everyLimit;
 
-export function concat<T, R, E>(arr: T[] | IterableIterator<T>, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
-export function concat<T, R, E>(arr: Dictionary<T>, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
-export function concatLimit<T, R, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
-export function concatLimit<T, R, E>(arr: Dictionary<T>, limit: number,iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
+export function concat<T, R, E>(arr: IterableCollection<T>, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
+export function concatLimit<T, R, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export const concatSeries: typeof concat;
 
 // Control Flow
diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index cefa92ef5c..f21fab1114 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -43,7 +43,7 @@ declare let marker: Atom.Marker;
 declare let markers: Atom.Marker[];
 declare let markerLayer: Atom.MarkerLayer;
 declare let notification: Atom.Notification;
-declare let notifications: Atom.Notification[];
+declare let notifications: ReadonlyArray<Atom.Notification>;
 declare let pack: Atom.Package;
 declare let packs: Atom.Package[];
 declare let pane: Atom.Pane;
@@ -56,10 +56,12 @@ declare let posArr: Atom.Point[];
 declare let project: Atom.Project;
 declare let range: Atom.Range;
 declare let ranges: Atom.Range[];
+declare let readonlyStrs: ReadonlyArray<string>;
 declare let registry: Atom.GrammarRegistry;
 declare let repository: Atom.GitRepository;
 declare let repositories: Atom.GitRepository[];
 declare let scopeDescriptor: Atom.ScopeDescriptor;
+declare let scopes: ReadonlyArray<string>;
 declare let selection: Atom.Selection;
 declare let selections: Atom.Selection[];
 declare let styleManager: Atom.StyleManager;
@@ -188,6 +190,10 @@ function testAtomEnvironment() {
     // Messaging the User
     atom.beep();
 
+    atom.confirm({ defaultId: 42 }, (response, checked) => {
+        num = response;
+        bool = checked;
+    });
     atom.confirm({ message: "Test" });
     atom.confirm({ message: "Test", buttons: [ "a", "b" ], detailedMessage: "Test" });
     num = atom.confirm({ message: "Test", detailedMessage: "Test", buttons: {
@@ -270,13 +276,19 @@ function testCommandRegistry() {
         "test-function2": (event) => {},
     });
     atom.commands.add("test", "test:function", {
-        didDispatch: (event) => event.stopImmediatePropagation(),
+        didDispatch: (event) => {
+            event.stopImmediatePropagation();
+        },
         description: "A Command Test",
         displayName: "Command: Test",
     });
     atom.commands.add("atom-text-editor", {
-        "test-function": (event) => event.currentTarget.getModel(),
-        "test-function2": (event) => event.currentTarget.getComponent(),
+        "test-function": (event) => {
+            event.currentTarget.getModel();
+        },
+        "test-function2": (event) => {
+            event.currentTarget.getComponent();
+        }
     });
     atom.commands.add("atom-workspace", {
         "test-command": {
@@ -345,7 +357,7 @@ function testConfig() {
 
     const allConfigValues = atom.config.getAll("test");
     for (const { scopeDescriptor, value } of allConfigValues) {
-        scopeDescriptor.scopes;
+        scopes = scopeDescriptor.getScopesArray();
     }
     atom.config.getAll("test", { scope: scopeDescriptor });
     atom.config.getAll("test", { excludeSources: ["test"] });
@@ -853,6 +865,7 @@ function testDock() {
     subscription = dock.onDidDestroyPaneItem(event => {
         event.index && event.item && event.pane;
     });
+    subscription = dock.onDidChangeHovered(hovered => bool = hovered);
 
     // Pane Items
     objs = dock.getPaneItems();
@@ -1375,6 +1388,7 @@ function testNotification() {
 function testNotificationManager() {
     // Events
     atom.notifications.onDidAddNotification(notification => notification.dismiss());
+    atom.notifications.onDidClearNotifications(() => undefined);
 
     // Adding Notifications
     atom.notifications.addSuccess("Test");
@@ -1409,6 +1423,9 @@ function testNotificationManager() {
 
     // Getting Notifications
     notifications = atom.notifications.getNotifications();
+
+    // Managing Notifications
+    atom.notifications.clear();
 }
 
 // Package ====================================================================
@@ -1833,7 +1850,7 @@ function testRange() {
 }
 
 // ScopeDescriptor ============================================================
-strs = scopeDescriptor.getScopesArray();
+readonlyStrs = scopeDescriptor.getScopesArray();
 
 // Selection ==================================================================
 function testSelection() {
@@ -2219,6 +2236,7 @@ function testTextBuffer() {
     num = buffer.createCheckpoint();
     bool = buffer.revertToCheckpoint(42);
     bool = buffer.groupChangesSinceCheckpoint(42);
+    bool = buffer.groupLastChanges();
     buffer.getChangesSinceCheckpoint(42);
 
     // Search And Replace
@@ -2306,6 +2324,7 @@ function testTextBuffer() {
     num = buffer.getLastRow();
     pos = buffer.getFirstPosition();
     pos = buffer.getEndPosition();
+    num = buffer.getLength();
     num = buffer.getMaxCharacterIndex();
     range = buffer.rangeForRow(42, true);
     num = buffer.characterIndexForPosition(pos);
@@ -2700,6 +2719,8 @@ function testTextEditor() {
     editor.moveToNextSubwordBoundary();
     editor.moveToBeginningOfNextParagraph();
     editor.moveToBeginningOfPreviousParagraph();
+    editor.selectLargerSyntaxNode();
+    editor.selectSmallerSyntaxNode();
     cursor = editor.getLastCursor();
 
     str = editor.getWordUnderCursor();
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index df446d50c3..e673ada530 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Atom 1.24
+// Type definitions for Atom 1.25
 // Project: https://github.com/atom/atom
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 //                 smhxx <https://github.com/smhxx>
@@ -7,7 +7,7 @@
 // TypeScript Version: 2.3
 
 // NOTE: only those classes exported within this file should be retain that status below.
-// https://github.com/atom/atom/blob/v1.24.0/exports/atom.js
+// https://github.com/atom/atom/blob/v1.25.0/exports/atom.js
 
 /// <reference types="node" />
 
@@ -39,58 +39,58 @@ export function watchPath(rootPath: string, options: {}, eventCallback: (events:
 export interface AtomEnvironment {
     // Properties
     /** A CommandRegistry instance. */
-    commands: CommandRegistry;
+    readonly commands: CommandRegistry;
 
     /** A Config instance. */
-    config: Config;
+    readonly config: Config;
 
     /** A Clipboard instance. */
-    clipboard: Clipboard;
+    readonly clipboard: Clipboard;
 
     /** A ContextMenuManager instance. */
-    contextMenu: ContextMenuManager;
+    readonly contextMenu: ContextMenuManager;
 
     /** A MenuManager instance. */
-    menu: MenuManager;
+    readonly menu: MenuManager;
 
     /** A KeymapManager instance. */
-    keymaps: KeymapManager;
+    readonly keymaps: KeymapManager;
 
     /** A TooltipManager instance. */
-    tooltips: TooltipManager;
+    readonly tooltips: TooltipManager;
 
     /** A NotificationManager instance. */
-    notifications: NotificationManager;
+    readonly notifications: NotificationManager;
 
     /** A Project instance. */
-    project: Project;
+    readonly project: Project;
 
     /** A GrammarRegistry instance. */
-    grammars: GrammarRegistry;
+    readonly grammars: GrammarRegistry;
 
     /** A HistoryManager instance. */
-    history: HistoryManager;
+    readonly history: HistoryManager;
 
     /** A PackageManager instance. */
-    packages: PackageManager;
+    readonly packages: PackageManager;
 
     /** A ThemeManager instance. */
-    themes: ThemeManager;
+    readonly themes: ThemeManager;
 
     /** A StyleManager instance. */
-    styles: StyleManager;
+    readonly styles: StyleManager;
 
     /** A DeserializerManager instance. */
-    deserializers: DeserializerManager;
+    readonly deserializers: DeserializerManager;
 
     /** A ViewRegistry instance. */
-    views: ViewRegistry;
+    readonly views: ViewRegistry;
 
     /** A Workspace instance. */
-    workspace: Workspace;
+    readonly workspace: Workspace;
 
     /** A TextEditorRegistry instance. */
-    textEditors: TextEditorRegistry;
+    readonly textEditors: TextEditorRegistry;
 
     // Event Subscription
     /** Invoke the given callback whenever ::beep is called. */
@@ -204,7 +204,27 @@ export interface AtomEnvironment {
     beep(): void;
 
     /**
-     *  A flexible way to open a dialog akin to an alert dialog.
+     *  A flexible way to open a dialog akin to an alert dialog. If a callback
+     *  is provided, then the confirmation will work asynchronously, which is
+     *  recommended.
+     *
+     *  If the dialog is closed (via `Esc` key or `X` in the top corner) without
+     *  selecting a button the first button will be clicked unless a "Cancel" or "No"
+     *  button is provided.
+     *
+     *  Returns the chosen button index number if the buttons option was an array.
+     *  @param response The index of the button that was clicked.
+     *  @param checkboxChecked The checked state of the checkbox if `checkboxLabel` was set.
+     *  Otherwise false.
+     */
+    confirm(options: ConfirmationOptions, callback: (response: number,
+        checkboxChecked: boolean) => void): void;
+
+    /**
+     *  A flexible way to open a dialog akin to an alert dialog. If a callback
+     *  is provided, then the confirmation will work asynchronously, which is
+     *  recommended.
+     *
      *  If the dialog is closed (via `Esc` key or `X` in the top corner) without
      *  selecting a button the first button will be clicked unless a "Cancel" or "No"
      *  button is provided.
@@ -218,7 +238,10 @@ export interface AtomEnvironment {
     }): void;
 
     /**
-     *  A flexible way to open a dialog akin to an alert dialog.
+     *  A flexible way to open a dialog akin to an alert dialog. If a callback
+     *  is provided, then the confirmation will work asynchronously, which is
+     *  recommended.
+     *
      *  If the dialog is closed (via `Esc` key or `X` in the top corner) without
      *  selecting a button the first button will be clicked unless a "Cancel" or "No"
      *  button is provided.
@@ -264,11 +287,11 @@ export interface CommandRegistryTargetMap extends HTMLElementTagNameMap {
 }
 
 export type CommandRegistryListener<TargetType extends EventTarget> = {
-  didDispatch(event: CommandEvent<TargetType>): void,
-  displayName?: string,
-  description?: string,
-  hiddenInCommandPalette?: boolean,
-} | ((event: CommandEvent<TargetType>) => void);
+    didDispatch(event: CommandEvent<TargetType>): void | Promise<void>,
+    displayName?: string,
+    description?: string,
+    hiddenInCommandPalette?: boolean,
+} | ((event: CommandEvent<TargetType>) => void | Promise<void>);
 
 /**
  *  Associates listener functions with commands in a context-sensitive way
@@ -305,9 +328,10 @@ export interface CommandRegistry {
 
     /**
      *  Simulate the dispatch of a command on a DOM node.
-     *  @return Whether or not there was a matching command for the target.
+     *  @return Either a Promise that resolves after all handlers complete or null if
+     *  no handlers were matched.
      */
-    dispatch(target: Node, commandName: string): boolean;
+    dispatch(target: Node, commandName: string): Promise<void> | null;
 
     /** Invoke the given callback before dispatching a command event. */
     onWillDispatch(callback: (event: CommandEvent) => void): Disposable;
@@ -446,7 +470,7 @@ export interface Config {
  */
 export interface Decoration {
     /** The identifier for this Decoration. */
-    id: number;
+    readonly id: number;
 
     // Construction and Destruction
     /**
@@ -654,7 +678,7 @@ export interface DisplayMarker {
  */
 export interface DisplayMarkerLayer {
     /** The identifier for the underlying MarkerLayer. */
-    id: string;
+    readonly id: string;
 
     // Lifecycle
     /** Destroy this layer. */
@@ -839,7 +863,7 @@ export interface LayerDecoration {
  */
 export interface Marker {
     /** The identifier for this Marker. */
-    id: number;
+    readonly id: number;
 
     // Lifecycle
     /**
@@ -952,7 +976,7 @@ export interface Marker {
 /** Experimental: A container for a related set of markers. */
 export interface MarkerLayer {
     /** The identifier for this MarkerLayer. */
-    id: string;
+    readonly id: string;
 
     // Lifecycle
     /** Create a copy of this layer with markers in the same state and locations. */
@@ -1035,13 +1059,13 @@ export class Notification {
 
 /** A notification manager used to create Notifications to be shown to the user. */
 export interface NotificationManager {
-    // Properties
-    notifications: Notification[];
-
     // Events
     /** Invoke the given callback after a notification has been added. */
     onDidAddNotification(callback: (notification: Notification) => void): Disposable;
 
+    /** Invoke the given callback after the notifications have been cleared. */
+    onDidClearNotifications(callback: () => void): Disposable;
+
     // Adding Notifications
     /** Add a success notification. */
     addSuccess(message: string, options?: NotificationOptions): Notification;
@@ -1060,7 +1084,11 @@ export interface NotificationManager {
 
     // Getting Notifications
     /** Get all the notifications. */
-    getNotifications(): Notification[];
+    getNotifications(): ReadonlyArray<Notification>;
+
+    // Managing Notifications
+    /** Clear all the notifications. */
+    clear(): void;
 }
 
 /** Represents a point in a buffer in row/column coordinates. */
@@ -1272,8 +1300,7 @@ export class Range {
  *  including cursor and selection positions, folds, and soft wraps.
  */
 export class TextEditor {
-    id: number;
-    buffer: TextBuffer;
+    readonly id: number;
 
     // NOTE: undocumented within the public API. Don't go down the rabbit hole.
     constructor(options?: object);
@@ -2137,6 +2164,12 @@ export class TextEditor {
      */
     selectToBeginningOfPreviousParagraph(): void;
 
+    /** For each selection, select the syntax node that contains that selection. */
+    selectLargerSyntaxNode(): void;
+
+    /** Undo the effect a preceding call to `::selectLargerSyntaxNode`. */
+    selectSmallerSyntaxNode(): void;
+
     /** Select the range of the given marker if it is valid. */
     selectMarker(marker: DisplayMarker): Range|undefined;
 
@@ -2347,7 +2380,10 @@ export class TextEditor {
     /** Unfold all existing folds. */
     unfoldAll(): void;
 
-    /** Fold all foldable lines at the given indent level. */
+    /**
+     * Fold all foldable lines at the given indent level.
+     * @param level A zero-indexed number.
+     */
     foldAllAtIndentLevel(level: number): void;
 
     /**
@@ -2524,10 +2560,6 @@ export interface TextEditorRegistry {
     observe(callback: (editor: TextEditor) => void): Disposable;
 }
 
-export interface JQueryCompatible<Element extends Node = HTMLElement> extends Iterable<Element> {
-    jquery: string;
-}
-
 export type TooltipPlacement =
     |"top"|"bottom"|"left"|"right"
     |"auto"|"auto top"|"auto bottom"|"auto left"|"auto right";
@@ -2984,7 +3016,7 @@ export interface WorkspaceCenter {
  *  Node's ChildProcess.
  */
 export class BufferedProcess {
-    process?: ChildProcess;
+    readonly process?: ChildProcess;
 
     constructor(options: ProcessOptions);
 
@@ -3452,6 +3484,12 @@ export interface Dock {
     /** Invoke the given callback when a pane item is destroyed. */
     onDidDestroyPaneItem(callback: (event: PaneItemObservedEvent) => void): Disposable;
 
+    /**
+     *  Invoke the given callback when the hovered state of the dock changes.
+     *  @param hovered Is the dock now hovered?
+     */
+    onDidChangeHovered(callback: (hovered: boolean) => void): Disposable;
+
     // Pane Items
     /** Get all pane items in the dock. */
     getPaneItems(): object[];
@@ -4052,10 +4090,10 @@ export interface MenuManager {
  */
 export interface Package {
     /** The name of the Package. */
-    name: string;
+    readonly name: string;
 
     /** The path to the Package on disk. */
-    path: string;
+    readonly path: string;
 
     // Event Subscription
     /** Invoke the given callback when all packages have been activated. */
@@ -4377,7 +4415,7 @@ export interface Pane {
  */
 export interface Panel<T = object> {
     /** Whether or not the Panel is visible. */
-    visible: boolean;
+    readonly visible: boolean;
 
     // Construction and Destruction
     /** Destroy and remove this panel from the UI. */
@@ -4498,10 +4536,8 @@ export interface Project {
  *  syntax tree to a token including all scope names for the entire path.
  */
 export interface ScopeDescriptor {
-    scopes: string[];
-
     /** Returns all scopes for this descriptor. */
-    getScopesArray(): string[];
+    getScopesArray(): ReadonlyArray<string>;
 }
 
 /** Represents a selection in the TextEditor. */
@@ -4894,13 +4930,13 @@ export class Task {
  */
 export class TextBuffer {
     /** The unique identifier for this buffer. */
-    id: string;
+    readonly id: string;
 
     /** The number of retainers for the buffer. */
-    refcount: number;
+    readonly refcount: number;
 
     /** Whether or not the bufffer has been destroyed. */
-    destroyed: boolean;
+    readonly destroyed: boolean;
 
     /** Create a new buffer backed by the given file path. */
     static load(filePath: string, params?: BufferLoadOptions): Promise<TextBuffer>;
@@ -5068,7 +5104,10 @@ export class TextBuffer {
     /** Get the text of the last line of the buffer, without its line ending. */
     getLastLine(): string;
 
-    /** Get the text of the line at the given row, without its line ending. */
+    /**
+     *  Get the text of the line at the given 0-indexed row, without its line ending.
+     *  @param row A number representing the row.
+     */
     lineForRow(row: number): string|undefined;
 
     /** Get the line ending for the given 0-indexed row. */
@@ -5120,10 +5159,18 @@ export class TextBuffer {
     /** Delete the text in the given range. */
     delete(range: RangeCompatible): Range;
 
-    /** Delete the line associated with a specified row. */
+    /**
+     *  Delete the line associated with a specified 0-indexed row.
+     *  @param row A number representing the row to delete.
+     */
     deleteRow(row: number): Range;
 
-    /** Delete the lines associated with the specified row range. */
+    /**
+     *  Delete the lines associated with the specified 0-indexed row range.
+     *
+     *  If the row range is out of bounds, it will be clipped. If the `startRow`
+     *  is greater than the `endRow`, they will be reordered.
+     */
     deleteRows(startRow: number, endRow: number): Range;
 
     // Markers
@@ -5162,10 +5209,16 @@ export class TextBuffer {
     getMarkerCount(): number;
 
     // History
-    /** Undo the last operation. If a transaction is in progress, aborts it. */
+    /**
+     *  Undo the last operation. If a transaction is in progress, aborts it.
+     *  @return A boolean of whether or not a change was made.
+     */
     undo(): boolean;
 
-    /** Redo the last operation. */
+    /**
+     *  Redo the last operation.
+     *  @return A boolean of whether or not a change was made.
+     */
     redo(): boolean;
 
     /** Batch multiple operations as a single undo/redo step. */
@@ -5173,37 +5226,44 @@ export class TextBuffer {
     transact<T>(fn: () => T): T;
 
     /**
-     *  Call within a transaction to terminate the function's execution and
-     *  revert any changes performed up to the abortion.
+     *  Abort the currently running transaction.
+     *
+     *  Only intended to be called within the `fn` option to `::transact`.
      */
     abortTransaction(): void;
 
-    /**
-     *  Clear the undo stack. When calling this method within a transaction,
-     *  the ::onDidChangeText event will not be triggered because the information
-     *  describing the changes is lost.
-     */
+    /** Clear the undo stack. */
     clearUndoStack(): void;
 
     /**
      *  Create a pointer to the current state of the buffer for use with
-     *  ::revertToCheckpoint and ::groupChangesSinceCheckpoint.
+     *  `::revertToCheckpoint` and `::groupChangesSinceCheckpoint`.
+     *  @return A checkpoint ID value.
      */
     createCheckpoint(): number;
 
     /**
      *  Revert the buffer to the state it was in when the given checkpoint was created.
-     *  Returns a boolean indicating whether the operation succeeded.
+     *  @return A boolean indicating whether the operation succeeded.
      */
     revertToCheckpoint(checkpoint: number): boolean;
 
     /**
      *  Group all changes since the given checkpoint into a single transaction for
      *  purposes of undo/redo.
-     *  Returns a boolean indicating whether the operation succeeded.
+     *  @return A boolean indicating whether the operation succeeded.
      */
     groupChangesSinceCheckpoint(checkpoint: number): boolean;
 
+    /**
+     *  Group the last two text changes for purposes of undo/redo.
+     *
+     *  This operation will only succeed if there are two changes on the undo stack.
+     *  It will not group past the beginning of an open transaction.
+     *  @return A boolean indicating whether the operation succeeded.
+     */
+    groupLastChanges(): boolean;
+
     /**
      *  Returns a list of changes since the given checkpoint.
      *  If the given checkpoint is no longer present in the undo history, this method
@@ -5293,17 +5353,26 @@ export class TextBuffer {
     /** Get the maximal position in the buffer, where new text would be appended. */
     getEndPosition(): Point;
 
+    /** Get the length of the buffer's text. */
+    getLength(): number;
+
     /** Get the length of the buffer in characters. */
     getMaxCharacterIndex(): number;
 
-    /** Get the range for the given row. */
-    rangeForRow(row: number, includeNewline: boolean): Range;
+    /**
+     *  Get the range for the given row.
+     *  @param row A number representing a 0-indexed row.
+     *  @param includeNewline A boolean indicating whether or not to include the
+     *  newline, which results in a range that extends to the start of the next line.
+     *  (default: false)
+     */
+    rangeForRow(row: number, includeNewline?: boolean): Range;
 
     /**
      *  Convert a position in the buffer in row/column coordinates to an absolute
      *  character offset, inclusive of line ending characters.
      */
-    characterIndexForPosition(position: Point|[number, number]): number;
+    characterIndexForPosition(position: PointCompatible): number;
 
     /**
      *  Convert an absolute character offset, inclusive of newlines, to a position
@@ -5753,7 +5822,7 @@ export interface TextEditorObservedEvent {
 // information under certain contexts.
 
 // NOTE: the config schema with these defaults can be found here:
-//   https://github.com/atom/atom/blob/v1.24.0/src/config-schema.js
+//   https://github.com/atom/atom/blob/v1.25.0/src/config-schema.js
 /**
  *  Allows you to strongly type Atom configuration variables. Additional key:value
  *  pairings merged into this interface will result in configuration values under
@@ -6039,6 +6108,59 @@ export interface BuildEnvironmentOptions {
     enablePersistence?: boolean;
 }
 
+export interface ConfirmationOptions {
+    /** The type of the confirmation prompt. */
+    type?: "none"|"info"|"error"|"question"|"warning";
+
+    /** The text for the buttons. */
+    buttons?: ReadonlyArray<string>;
+
+    /** The index for the button to be selected by default in the prompt. */
+    defaultId?: number;
+
+    /** The title for the prompt. */
+    title?: string;
+
+    /** The content of the message box. */
+    message?: string;
+
+    /** Additional information regarding the message. */
+    detail?: string;
+
+    /** If provided, the message box will include a checkbox with the given label. */
+    checkboxLabel?: string;
+
+    /** Initial checked state of the checkbox. false by default. */
+    checkboxChecked?: boolean;
+
+    /** An Electron NativeImage to use as the prompt's icon. */
+    icon?: object;
+
+    /**
+     *  The index of the button to be used to cancel the dialog, via the `Esc` key.
+     *  By default this is assigned to the first button with "cancel" or "no" as the
+     *  label. If no such labeled buttons exist and this option is not set, 0 will be
+     *  used as the return value or callback response.
+     *
+     *  This option is ignored on Windows.
+     */
+    cancelId?: number;
+
+    /**
+     *  On Windows, Electron will try to figure out which one of the buttons are
+     *  common buttons (like `Cancel` or `Yes`), and show the others as command links
+     *  in the dialog. This can make the dialog appear in the style of modern Windows
+     *  apps. If you don't like this behavior, you can set noLink to true.
+     */
+    noLink?: boolean;
+
+    /**
+     * Normalize the keyboard access keys across platforms.
+     * Atom defaults this to true.
+     */
+    normalizeAccessKeys?: boolean;
+}
+
 export interface ContextMenuOptions {
     /** The menu item's label. */
     label?: string;
@@ -6506,6 +6628,10 @@ export interface DisposableLike {
     dispose(): void;
 }
 
+export interface JQueryCompatible<Element extends Node = HTMLElement> extends Iterable<Element> {
+    jquery: string;
+}
+
 /** The types usable when constructing a point via the Point::fromObject method. */
 export type PointCompatible = PointLike|[number, number];
 
@@ -6753,11 +6879,11 @@ export interface TokenizeLineResult {
  *  jQuery, which is an expensive dependency we want to eliminate.
  */
 export interface Tooltip {
-    options: TooltipOptions;
-    enabled: boolean;
-    timeout: number;
-    hoverState: "in"|"out"|null;
-    element: HTMLElement;
+    readonly options: TooltipOptions;
+    readonly enabled: boolean;
+    readonly timeout: number;
+    readonly hoverState: "in"|"out"|null;
+    readonly element: HTMLElement;
 
     getTitle(): string;
     getTooltipElement(): HTMLElement;
@@ -6774,11 +6900,11 @@ export interface ViewModel {
 }
 
 export interface WindowLoadSettings {
-    appVersion: string;
-    atomHome: string;
-    devMode: boolean;
-    resourcePath: string;
-    safeMode: boolean;
-    env?: { [key: string]: string|undefined };
-    profileStartup?: boolean;
+    readonly appVersion: string;
+    readonly atomHome: string;
+    readonly devMode: boolean;
+    readonly resourcePath: string;
+    readonly safeMode: boolean;
+    readonly env?: { [key: string]: string|undefined };
+    readonly profileStartup?: boolean;
 }
diff --git a/types/auth0-lock/auth0-lock-tests.ts b/types/auth0-lock/auth0-lock-tests.ts
index 119bbb3c37..3ef12e327b 100644
--- a/types/auth0-lock/auth0-lock-tests.ts
+++ b/types/auth0-lock/auth0-lock-tests.ts
@@ -117,6 +117,18 @@ const authOptions : Auth0LockConstructorOptions = {
 
 new Auth0Lock(CLIENT_ID, DOMAIN, authOptions);
 
+// test "other" properties
+
+const otherOptions : Auth0LockConstructorOptions = {
+  clientBaseUrl: "http://www.example.com",
+  configurationBaseUrl: "https://cdn.auth0.com",
+  languageBaseUrl: "http://www.example.com",
+  hashCleanup: false,
+  leeway: 30
+};
+
+new Auth0Lock(CLIENT_ID, DOMAIN, otherOptions);
+
 // test multi-variant example
 
 const multiVariantOptions : Auth0LockConstructorOptions = {
diff --git a/types/auth0-lock/index.d.ts b/types/auth0-lock/index.d.ts
index 352d9c71a9..7dd99af9e6 100644
--- a/types/auth0-lock/index.d.ts
+++ b/types/auth0-lock/index.d.ts
@@ -119,17 +119,23 @@ interface Auth0LockConstructorOptions {
     autoclose?: boolean;
     autofocus?: boolean;
     avatar?: Auth0LockAvatarOptions;
+    clientBaseUrl?: string;
     closable?: boolean;
+    configurationBaseUrl?: string;
     container?: string;
     defaultADUsernameFromEmailPrefix?: string;
     defaultDatabaseConnection?: string;
     defaultEnterpriseConnection?: string;
     forgotPasswordLink?: string;
+    hashCleanup?: boolean;
     initialScreen?: "login" | "signUp" | "forgotPassword";
     language?: string;
+    languageBaseUrl?: string;
     languageDictionary?: any;
+    leeway?: number;
     loginAfterSignUp?: boolean;
     mustAcceptTerms?: boolean;
+    oidcConformant?: boolean;
     popupOptions?: Auth0LockPopupOptions;
     prefill?: { email?: string, username?: string};
     rememberLastLogin?: boolean;
@@ -137,7 +143,6 @@ interface Auth0LockConstructorOptions {
     socialButtonStyle?: "big" | "small";
     theme?: Auth0LockThemeOptions;
     usernameStyle?: string;
-    oidcConformant?: boolean;
 }
 
 interface Auth0LockFlashMessageOptions {
diff --git a/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts b/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
index 8ac6457975..3ac593a651 100644
--- a/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
+++ b/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
@@ -20,5 +20,8 @@ namespace BMapTests {
             map.addOverlay(marker);
             marker.setAnimation(BMAP_ANIMATION_BOUNCE);
         }
+        public create_map(map: BMap.Map, city: string) {
+            map.centerAndZoom(city);
+        }
     }
 }
diff --git a/types/baidumap-web-sdk/baidumap.core.d.ts b/types/baidumap-web-sdk/baidumap.core.d.ts
index 24d1aed9f0..a12b78788a 100644
--- a/types/baidumap-web-sdk/baidumap.core.d.ts
+++ b/types/baidumap-web-sdk/baidumap.core.d.ts
@@ -56,6 +56,7 @@ declare namespace BMap {
         getZoom(): number
         getPanorama(): Panorama
         centerAndZoom(center: Point, zoom: number): void
+        centerAndZoom(city: string): void
         panTo(center: Point, opts?: PanOptions): void
         panBy(x: number, y: number, opts?: PanOptions): void
         reset(): void
diff --git a/types/bitcoinjs-lib/index.d.ts b/types/bitcoinjs-lib/index.d.ts
index c7d1acc899..11d311a276 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -85,7 +85,7 @@ export class ECPair {
 
     static fromPublicKeyBuffer(buffer: Buffer, network: Network): ECPair;
 
-    static fromWIF(string: string, network: Network): ECPair;
+    static fromWIF(string: string, network?: Network): ECPair;
 
     static makeRandom(options?: { compressed?: boolean, network?: Network, rng?: Rng }): ECPair;
 }
diff --git a/types/bootstrap/bootstrap-tests.ts b/types/bootstrap/bootstrap-tests.ts
index 17d6e088cf..21286ad5f4 100755
--- a/types/bootstrap/bootstrap-tests.ts
+++ b/types/bootstrap/bootstrap-tests.ts
@@ -2,8 +2,10 @@
 // Alert
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $("#alert").alert();
 
+// $ExpectType JQuery<HTMLElement>
 $("#alert").alert("close");
 
 $("#alert").on("close.bs.alert", () => {});
@@ -12,20 +14,32 @@ $("#alert").on("close.bs.alert", () => {});
 // Button
 // --------------------------------------------------------------------------------------
 
-// $("#button").button(); // must fail
+// $ExpectError
+$("#button").button();
 
+// $ExpectType JQuery<HTMLElement>
 $("#button").button("toggle");
 
 // --------------------------------------------------------------------------------------
 // Carousel
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $("#carousel").carousel();
 
+// $ExpectType JQuery<HTMLElement>
 $("#carousel").carousel("pause");
 
 $("#carousel").carousel(100);
 
+$("#carousel").on("slide.bs.carousel", function(ev) {
+    const that: HTMLElement = this;
+    const from: number = ev.from;
+    const to: number = ev.to;
+    const direction: string = ev.direction;
+    const data: undefined = ev.data;
+});
+
 $("#carousel").carousel({
     interval: 5000,
     keyboard: true,
@@ -37,20 +51,43 @@ $("#carousel").carousel({
     pause: false,
 });
 
-$("#carousel").on("slide.bs.carousel", function(ev) {
-    const that: HTMLElement = this;
-    const from: number = ev.from;
-    const to: number = ev.to;
-    const direction: string = ev.direction;
-    const data: undefined = ev.data;
+// --------------------------------------------------------------------------------------
+// Collapse
+// --------------------------------------------------------------------------------------
+
+// $ExpectType JQuery<HTMLElement>
+$("#collapse").collapse();
+
+// $ExpectType JQuery<HTMLElement>
+$("#collapse").collapse("toggle");
+
+$("#collapse").on("show.bs.collapse", () => {});
+
+$("#collapse").collapse({
+    parent: "#parent",
+    toggle: true,
+});
+
+$("#collapse").collapse({
+    parent: document.body,
+});
+
+$("#collapse").collapse({
+    parent: $("#parent"),
+});
+
+$("#collapse").collapse({
+    toggle: false,
 });
 
 // --------------------------------------------------------------------------------------
 // Dropdown
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $("#dropdown").dropdown();
 
+// $ExpectType JQuery<HTMLElement>
 $("#dropdown").dropdown("update");
 
 $("#dropdown").on("hide.bs.dropdown", () => {});
@@ -66,7 +103,7 @@ $("#dropdown").dropdown({
 });
 
 $("#dropdown").dropdown({
-    offset(offsets: BootstrapOffsetsExtend) {
+    offset(offsets: Bootstrap.OffsetsExtend) {
         if (!this.flip)
             return { popper: { left: 100 } };
         return {};
@@ -81,8 +118,10 @@ $("#dropdown").dropdown({
 // Modal
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $("#modal").modal();
 
+// $ExpectType JQuery<HTMLElement>
 $("#modal").modal("show");
 
 $("#modal").on("hide.bs.modal", () => {});
@@ -98,12 +137,90 @@ $("#modal").modal({
     backdrop: "static",
 });
 
+// --------------------------------------------------------------------------------------
+// Popover
+// --------------------------------------------------------------------------------------
+
+// $ExpectType JQuery<HTMLElement>
+$("#popover").popover();
+
+// $ExpectType JQuery<HTMLElement>
+$("#popover").popover("toggle");
+
+$("#popover").on("show.bs.popover", () => {});
+
+$("#popover").popover({});
+
+$("#popover").popover({
+    animation: false,
+    container: "#container",
+    delay: {show: 500, hide: 100},
+    html: true,
+    placement: "auto",
+    selector: "[rel=\"popover\"]",
+    template: '<div class="popover empty" role="popover"></div>',
+    title: "Hello world",
+    trigger: "hover focus",
+    offset: 10,
+    fallbackPlacement: ["flip", "clockwise"],
+    boundary: "scrollParent",
+});
+
+$("#popover").popover({
+    placement(this, popover, trigger) {
+        console.log(this.tip === popover);
+        console.log(this.element === trigger);
+        console.log(this.config.content);
+        return "left";
+    },
+});
+
+// --------------------------------------------------------------------------------------
+// Scrollspy
+// --------------------------------------------------------------------------------------
+
+// $ExpectType JQuery<HTMLElement>
+$("#scrollspy").scrollspy();
+
+// $ExpectType JQuery<HTMLElement>
+$("#scrollspy").scrollspy("refresh");
+
+$("#scrollspy").on("activate.bs.scrollspy", () => {});
+
+$("#scrollspy").scrollspy({
+    offset: 100,
+    target: "#navbar-example2",
+    method: "offset",
+});
+
+$("#scrollspy").scrollspy({
+    target: document.getElementById("navbar-example2") as HTMLElement
+});
+
+$("#scrollspy").scrollspy({
+    method: "position"
+});
+
+// --------------------------------------------------------------------------------------
+// Tab
+// --------------------------------------------------------------------------------------
+
+// $ExpectType JQuery<HTMLElement>
+$("#someListItem").tab("show");
+
+$("a[data-toggle=\"list\"]").on("shown.bs.tab", (e) => {
+    e.target; // newly activated tab
+    e.relatedTarget; // previous active tab
+});
+
 // --------------------------------------------------------------------------------------
 // Tooltip
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $("#tooltip").tooltip();
 
+// $ExpectType JQuery<HTMLElement>
 $("#tooltip").tooltip("show");
 
 $("#tooltip").on("hide.bs.tooltip", () => {});
@@ -149,6 +266,14 @@ $("#tooltip").tooltip({
     },
 });
 
+$("#tooltip").tooltip({
+    placement(this, tooltip, trigger) {
+        // $ExpectError
+        console.log(this.config.content); // only for PopoverOption, not TooltipOption
+        return "left";
+    },
+});
+
 $("#tooltip").tooltip({
     selector: "[rel=\"tooltip\"]",
 });
@@ -176,7 +301,7 @@ $("#tooltip").tooltip({
 });
 
 $("#tooltip").tooltip({
-    trigger: "focus hover",
+    trigger: "hover focus",
 });
 
 $("#tooltip").tooltip({
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index c158bbd807..88bcc66af8 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -4,45 +4,43 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// TODO: collapse, tab (list-group, navs), popovers, scrollspy
+/// <reference types="jquery"/>
 
-/// <reference types="jquery" />
+import * as Popper from "popper.js";
+
+export as namespace Bootstrap;
 
 // --------------------------------------------------------------------------
 // Some Types and Interfaces
 // --------------------------------------------------------------------------
 
-type BootstrapPlacement = "auto" | "top" | "bottom" | "left" | "right";
-type PopperBehavior = "flip" | "clockwise" | "counterclockwise";
+export type Placement = "auto" | "top" | "bottom" | "left" | "right";
 
-interface BootstrapDelay {
+export type Trigger = "click" | "hover" | "focus" | "manual" |
+    "click hover" | "click focus" | "hover focus" |
+    "click hover focus";
+
+export interface Delay {
     show: number;
     hide: number;
 }
 
-interface BootstrapTooltipInstance {
-    config: BootstrapTooltipOption;
+export interface TooltipInstance<T extends TooltipOption> {
+    config: T;
     element: Element;
     tip: HTMLElement;
 }
 
-interface BootstrapOffsetExtend {
-    top?: number;
-    left?: number;
-    width?: number;
-    height?: number;
-}
-
-interface BootstrapOffsetsExtend {
-    popper?: BootstrapOffsetExtend;
-    reference?: BootstrapOffsetExtend;
+export interface OffsetsExtend {
+    popper?: Partial<Popper.Offset>;
+    reference?: Partial<Popper.Offset>;
 }
 
 // --------------------------------------------------------------------------------------
 // Options Interfaces
 // --------------------------------------------------------------------------------------
 
-interface BootstrapCarouselOption {
+export interface CarouselOption {
     /**
      * The amount of time to delay between automatically cycling an item. If false, carousel will not automatically cycle.
      *
@@ -75,14 +73,32 @@ interface BootstrapCarouselOption {
     wrap?: boolean;
 }
 
-interface BootstrapDropdownOption {
+export interface CollapseOption {
+    /**
+     * If parent is provided, then all collapsible elements under the specified parent will be closed when
+     * this collapsible item is shown. (similar to traditional accordion behavior - this is dependent on the card class).
+     * The attribute has to be set on the target collapsible area.
+     *
+     * @default ""
+     */
+    parent?: string | JQuery | Element;
+
+    /**
+     * Toggles the collapsible element on invocation.
+     *
+     * @default true
+     */
+    toggle?: boolean;
+}
+
+export interface DropdownOption {
     /**
      * Offset of the dropdown relative to its target.
      * For more information refer to Popper.js's offset docs.
      *
      * @default 0
      */
-    offset?: number | string | ((this: BootstrapDropdownOption, offset: BootstrapOffsetsExtend) => BootstrapOffsetsExtend);
+    offset?: number | string | ((this: DropdownOption, offset: OffsetsExtend) => OffsetsExtend);
 
     /**
      * Allow Dropdown to flip in case of an overlapping on the reference element.
@@ -99,10 +115,10 @@ interface BootstrapDropdownOption {
      *
      * @default "scrollParent"
      */
-    boundary?: "viewport" | "window" | "scrollParent" | HTMLElement;
+    boundary?: Popper.Boundary | HTMLElement;
 }
 
-interface BootstrapModalOption {
+export interface ModalOption {
     /**
      * Includes a modal-backdrop element.
      * Alternatively, specify static for a backdrop which doesn't close the modal on click.
@@ -133,36 +149,69 @@ interface BootstrapModalOption {
     show?: boolean;
 }
 
-interface BootstrapTooltipOption {
+export interface PopoverOption extends TooltipOption {
     /**
-     * Apply a CSS fade transition to the tooltip.
+     * Default content value if data-content attribute isn't present.
+     * If a function is given, it will be called with its this reference
+     * set to the element that the popover is attached to.
+     */
+    content?: string | Element | ((this: Element) => string | Element);
+}
+
+export interface ScrollspyOption {
+    /**
+     * TODO: https://github.com/twbs/bootstrap/issues/25799
+     *
+     * @default "auto"
+     */
+    method?: "auto" | "offset" | "position";
+
+    /**
+     * Pixels to offset from top when calculating position of scroll.
+     *
+     * @default 10
+     */
+    offset?: number;
+
+    /**
+     * A selector of the parent element or the parent element itself
+     * of any Bootstrap `.nav` or `.list-group` component.
+     *
+     * @default ""
+     */
+    target?: string | Element;
+}
+
+export interface TooltipOption {
+    /**
+     * Apply a CSS fade transition to the tooltip or popover.
      *
      * @default true
      */
     animation?: boolean;
 
     /**
-     * Appends the tooltip to a specific element. Example: `container: 'body'`.
-     * This option is particularly useful in that it allows you to position the tooltip
+     * Appends the tooltip or popover to a specific element. Example: `container: 'body'`.
+     * This option is particularly useful in that it allows you to position the tooltip or popover
      * in the flow of the document near the triggering element - which will prevent
-     * the tooltip from floating away from the triggering element during a window resize.
+     * it from floating away from the triggering element during a window resize.
      *
      * @default false
      */
     container?: string | Element | false;
 
     /**
-     * Delay showing and hiding the tooltip (ms) - does not apply to manual trigger type.
+     * Delay showing and hiding the tooltip or popover (ms) - does not apply to manual trigger type.
      * If a number is supplied, delay is applied to both hide/show.
      * Object structure is: `delay: { "show": 500, "hide": 100 }`.
      *
      * @default 0
      */
-    delay?: number | BootstrapDelay;
+    delay?: number | Delay;
 
     /**
-     * Allow HTML in the tooltip.
-     * If true, HTML tags in the tooltip's title will be rendered in the tooltip.
+     * Allow HTML in the tooltip or popover.
+     * If true, HTML tags will be rendered in the tooltip or popover.
      * If false, jQuery's text method will be used to insert content into the DOM.
      * Use text if you're worried about XSS attacks.
      *
@@ -171,18 +220,18 @@ interface BootstrapTooltipOption {
     html?: boolean;
 
     /**
-     * How to position the tooltip - auto | top | bottom | left | right.
-     * When auto is specified, it will dynamically reorient the tooltip.
+     * How to position the tooltip or popover - auto | top | bottom | left | right.
+     * When auto is specified, it will dynamically reorient the tooltip or popover.
      * When a function is used to determine the placement, it is called with
-     * the tooltip DOM node as its first argument and the triggering element DOM node as its second.
-     * The this context is set to the tooltip instance.
+     * the tooltip or popover DOM node as its first argument and the triggering element DOM node as its second.
+     * The this context is set to the tooltip or popover instance.
      *
      * @default "top"
      */
-    placement?: BootstrapPlacement | ((this: BootstrapTooltipInstance, tooltip: HTMLElement, trigger: Element) => BootstrapPlacement);
+    placement?: Placement | ((this: TooltipInstance<this>, node: HTMLElement, trigger: Element) => Placement);
 
     /**
-     * If a selector is provided, tooltip objects will be delegated to the specified targets.
+     * If a selector is provided, tooltip or popover objects will be delegated to the specified targets.
      * In practice, this is used to enable dynamic HTML content to have popovers added.
      *
      * @default false
@@ -190,41 +239,40 @@ interface BootstrapTooltipOption {
     selector?: string | false;
 
     /**
-     * Base HTML to use when creating the tooltip. The tooltip's title will be injected into
-     * the `.tooltip-inner`. The `.arrow` will become the tooltip's arrow.
-     * The outermost wrapper element should have the `.tooltip` class and `role="tooltip"`.
+     * Base HTML to use when creating the tooltip or popover. The tooltip's (resp., popover's) title will be injected into
+     * the `.tooltip-inner` (resp., `.popover-header`). The `.arrow` will become the tooltip's (resp., popover's) arrow.
+     * The outermost wrapper element should have the `.tooltip` (resp., .popover) class and `role="tooltip"`.
      *
      * @default '<div class="tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>'
+     * @default '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'
      */
     template?: string;
 
     /**
      * Default title value if title attribute isn't present.
      * If a function is given, it will be called with its this reference set to the element
-     * that the tooltip is attached to.
+     * that the tooltip or popover is attached to.
      *
      * @default ""
      */
-    title?: string | Element | ((this: Element) => string);
+    title?: string | Element | ((this: Element) => string | Element);
 
     /**
-     * How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.
-     * 'manual' indicates that the tooltip will be triggered programmatically via the .tooltip('show'), .tooltip('hide') and
-     * .tooltip('toggle') methods; this value cannot be combined with any other trigger.
-     * 'hover' on its own will result in tooltips that cannot be triggered via the keyboard, and should only be used if
-     * alternative methods for conveying the same information for keyboard users is present.
+     * How tooltip or popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.
+     * 'manual' indicates that the tooltip will be triggered programmatically; this value cannot be combined with any other trigger.
+     * 'hover' should only be used if alternative methods for conveying the same information for keyboard users is present.
      *
-     * @default "hover focus"
+     * @default tooltip: "hover focus", popover: "click"
      */
-    trigger?: string;
+    trigger?: Trigger;
 
     /**
-     * Offset of the tooltip relative to its target.
+     * Offset of the tooltip or popover relative to its target.
      * For more information refer to Popper.js's offset docs.
      *
      * @default 0
      */
-     offset?: number | string;
+    offset?: number | string;
 
     /**
      * Allow to specify which position Popper will use on fallback.
@@ -232,24 +280,24 @@ interface BootstrapTooltipOption {
      *
      * @default "flip"
      */
-    fallbackPlacement?: PopperBehavior | PopperBehavior[];
+    fallbackPlacement?: Popper.Behavior | ReadonlyArray<Popper.Behavior>;
 
     /**
-     * Overflow constraint boundary of the tooltip.
+     * Overflow constraint boundary of the tooltip or popover.
      * Accepts the values of 'viewport', 'window', 'scrollParent',
      * or an HTMLElement reference (JavaScript only).
      * For more information refer to Popper.js's preventOverflow docs.
      *
      * @default "scrollParent"
      */
-    boundary?: "viewport" | "window" | "scrollParent" | HTMLElement;
+    boundary?: Popper.Boundary | HTMLElement;
 }
 
 // --------------------------------------------------------------------------------------
 // Events
 // --------------------------------------------------------------------------------------
 
-interface BootstrapCarouselEventHandler<TElement> extends JQuery.Event<TElement, undefined> {
+export interface CarouselEventHandler<TElement> extends JQuery.Event<TElement, undefined> {
     /**
      * The direction in which the carousel is sliding.
      */
@@ -266,34 +314,53 @@ interface BootstrapCarouselEventHandler<TElement> extends JQuery.Event<TElement,
     to: number;
 }
 
-type BootstrapAlertEvent = "close.bs.alert" | "closed.bs.alert";
-type BootstrapCarouselEvent = "slide.bs.carousel" | "slid.bs.carousel";
-type BootstrapDropdownEvent = "show.bs.dropdown" | "shown.bs.dropdown" | "hide.bs.dropdown" | "hidden.bs.dropdown";
-type BootstrapModalEvent = "show.bs.modal" | "shown.bs.modal" | "hide.bs.modal" |  "hidden.bs.modal";
-type BootstrapTooltipEvent = "show.bs.tooltip" | "shown.bs.tooltip" | "hide.bs.tooltip" |  "hidden.bs.tooltip" | "inserted.bs.tooltip";
+export type AlertEvent = "close.bs.alert" | "closed.bs.alert";
+export type CarouselEvent = "slide.bs.carousel" | "slid.bs.carousel";
+export type CollapseEvent = "show.bs.collapse" | "shown.bs.collapse" | "hide.bs.collapse" | "hidden.bs.collapse";
+export type DropdownEvent = "show.bs.dropdown" | "shown.bs.dropdown" | "hide.bs.dropdown" | "hidden.bs.dropdown";
+export type ModalEvent = "show.bs.modal" | "shown.bs.modal" | "hide.bs.modal" | "hidden.bs.modal";
+export type PopoverEvent = "show.bs.popover" | "shown.bs.popover" | "hide.bs.popover" | "hidden.bs.popover" | "inserted.bs.popover";
+export type ScrollspyEvent = "activate.bs.scrollspy";
+export type TapEvent = "show.bs.tab" | "shown.bs.tab" | "hide.bs.tab" | "hidden.bs.tab";
+export type TooltipEvent = "show.bs.tooltip" | "shown.bs.tooltip" | "hide.bs.tooltip" | "hidden.bs.tooltip" | "inserted.bs.tooltip";
 
 // --------------------------------------------------------------------------------------
 // jQuery
 // --------------------------------------------------------------------------------------
 
-interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement> {
-    alert(action?: "close" | "dispose"): this;
+declare global {
+    interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement> {
+        alert(action?: "close" | "dispose"): this;
 
-    button(action: "toggle" | "dispose"): this;
+        button(action: "toggle" | "dispose"): this;
 
-    carousel(action: "cycle" | "pause" | number | "prev" | "next" | "dispose"): this;
-    carousel(options?: BootstrapCarouselOption): this;
+        carousel(action: "cycle" | "pause" | number | "prev" | "next" | "dispose"): this;
+        carousel(options?: CarouselOption): this;
 
-    dropdown(action: "toggle" | "update" | "dispose"): this;
-    dropdown(options?: BootstrapDropdownOption): this;
+        collapse(action: "toggle" | "show" | "hide" | "dispose"): this;
+        collapse(options?: CollapseOption): this;
 
-    modal(action: "toggle" | "show" | "hide" | "handleUpdate" | "dispose"): this;
-    modal(options?: BootstrapModalOption): this;
+        dropdown(action: "toggle" | "update" | "dispose"): this;
+        dropdown(options?: DropdownOption): this;
 
-    tooltip(action: "show" | "hide" | "toggle" | "dispose" | "enable" | "disable" | "toggleEnabled" | "update"): this;
-    tooltip(options?: BootstrapTooltipOption): this;
+        modal(action: "toggle" | "show" | "hide" | "handleUpdate" | "dispose"): this;
+        modal(options?: ModalOption): this;
 
-    on(events: BootstrapCarouselEvent, handler: JQuery.EventHandlerBase<TElement, BootstrapCarouselEventHandler<TElement>>): this;
-    on(events: BootstrapAlertEvent | BootstrapDropdownEvent | BootstrapModalEvent | BootstrapTooltipEvent,
-        handler: JQuery.EventHandler<TElement>): this;
+        popover(action: "show" | "hide" | "toggle" | "dispose" | "enable" | "disable" | "toggleEnabled" | "update"): this;
+        popover(options?: PopoverOption): this;
+
+        scrollspy(action: "refresh" | "dispose"): this;
+        scrollspy(options?: ScrollspyOption): this;
+
+        tab(action: "show" | "dispose"): this;
+
+        tooltip(action: "show" | "hide" | "toggle" | "dispose" | "enable" | "disable" | "toggleEnabled" | "update"): this;
+        tooltip(options?: TooltipOption): this;
+
+        on(events: CarouselEvent, handler: JQuery.EventHandlerBase<TElement, CarouselEventHandler<TElement>>): this;
+        on(events:
+            AlertEvent | CollapseEvent | DropdownEvent | ModalEvent |
+            PopoverEvent | ScrollspyEvent | TapEvent | TooltipEvent,
+            handler: JQuery.EventHandler<TElement>): this;
+    }
 }
diff --git a/types/bootstrap/package.json b/types/bootstrap/package.json
new file mode 100644
index 0000000000..af84860ef1
--- /dev/null
+++ b/types/bootstrap/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "popper.js": "^1.14.1"
+    }
+}
\ No newline at end of file
diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 97844cfbbb..c07c938630 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -167,6 +167,11 @@ declare namespace Bull {
      * End date when the repeat job should stop repeating
      */
     endDate?: Date | string | number;
+
+    /**
+     * Number of times the job should repeat at max.
+     */
+    limit?: number;
   }
 
   interface JobOptions {
@@ -273,18 +278,30 @@ declare namespace Bull {
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
+     * The callback can also be defined as the string path to a module
+     * exporting the callback function. Using a path has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
      *
      * A promise must be returned to signal job completion.
      * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
      * If it is resolved, its value will be the "completed" event's second argument.
      */
-    process(callback: (job: Job) => void): Promise<any>;
+    process(callback: ((job: Job) => void) | string): Promise<any>;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
+     * The callback can also be defined as the string path to a module
+     * exporting the callback function. Using a path has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
      *
      * A promise must be returned to signal job completion.
      * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
@@ -292,7 +309,7 @@ declare namespace Bull {
      *
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(concurrency: number, callback: (job: Job) => void): Promise<any>;
+    process(concurrency: number, callback: ((job: Job) => void) | string): Promise<any>;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -314,6 +331,12 @@ declare namespace Bull {
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
+     * The callback can also be defined as the string path to a module
+     * exporting the callback function. Using a path has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
      *
      * A promise must be returned to signal job completion.
      * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
@@ -322,7 +345,7 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      */
     // tslint:disable-next-line:unified-signatures
-    process(name: string, callback: (job: Job) => void): Promise<any>;
+    process(name: string, callback: ((job: Job) => void) | string): Promise<any>;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -345,6 +368,12 @@ declare namespace Bull {
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
+     * The callback can also be defined as the string path to a module
+     * exporting the callback function. Using a path has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
      *
      * A promise must be returned to signal job completion.
      * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
@@ -353,7 +382,7 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(name: string, concurrency: number, callback: (job: Job) => void): Promise<any>;
+    process(name: string, concurrency: number, callback: ((job: Job) => void) | string): Promise<any>;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
diff --git a/types/chrome/index.d.ts b/types/chrome/index.d.ts
index cde1de9092..d12bf94302 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -5041,7 +5041,7 @@ declare namespace chrome.runtime {
 
     export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> {}
 
-    export interface PortMessageEvent extends chrome.events.Event<(message: Object, port: Port) => void> {}
+    export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> {}
 
     export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> {}
 
diff --git a/types/compression/compression-tests.ts b/types/compression/compression-tests.ts
index dc284ce2df..192ec309e8 100644
--- a/types/compression/compression-tests.ts
+++ b/types/compression/compression-tests.ts
@@ -1,4 +1,3 @@
-
 import express = require('express');
 import compress = require('compression');
 
@@ -7,3 +6,15 @@ app.use(compress());
 app.use(compress({
     threshold: 512
 }));
+app.use(compress({
+    threshold: 512,
+    filter: (req, res) => {
+        if (req.headers['x-no-compression']) {
+            // don't compress responses with this request header
+            return false;
+        }
+
+        // fallback to standard filter function
+        return compress.filter(req, res);
+    }
+}));
\ No newline at end of file
diff --git a/types/compression/index.d.ts b/types/compression/index.d.ts
index 68d687a9c4..813a823a96 100644
--- a/types/compression/index.d.ts
+++ b/types/compression/index.d.ts
@@ -1,13 +1,26 @@
 // Type definitions for compression
 // Project: https://github.com/expressjs/compression
 // Definitions by: Santi Albo <https://github.com/santialbo>
+//                 Rob van der Burgt <https://github.com/rburgt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
 import * as express from 'express';
 
+declare function e(options?: e.CompressionOptions): express.RequestHandler;
+
 declare namespace e {
-    interface CompressionOptions  {
+    /**
+     * Default filter, used for extending filter given in CompressionOptions
+     * See https://github.com/expressjs/compression#filter-1 regarding the usage
+     */
+    export function filter(req: express.Request, res: express.Response): boolean;
+
+    interface CompressionFilter {
+        (req: express.Request, res: express.Response): boolean;
+    }
+
+    interface CompressionOptions {
         /**
          * See https://github.com/expressjs/compression#chunksize regarding the usage.
          */
@@ -31,7 +44,7 @@ declare namespace e {
         /**
          * See https://github.com/expressjs/compression#threshold regarding the usage.
          */
-        threshold?: number|string;
+        threshold?: number | string;
 
         /**
          * See https://github.com/expressjs/compression#windowbits regarding the usage.
@@ -41,8 +54,8 @@ declare namespace e {
         /**
          * See https://github.com/expressjs/compression#filter regarding the usage.
          */
-        filter?: Function;
-        
+        filter?: CompressionFilter;
+
         /**
          * See https://nodejs.org/api/zlib.html#zlib_class_options regarding the usage.
          */
@@ -55,5 +68,4 @@ declare namespace e {
     }
 }
 
-declare function e(options?: e.CompressionOptions): express.RequestHandler;
 export = e;
diff --git a/types/d3-contour/d3-contour-tests.ts b/types/d3-contour/d3-contour-tests.ts
index ce9d50717f..4563521751 100644
--- a/types/d3-contour/d3-contour-tests.ts
+++ b/types/d3-contour/d3-contour-tests.ts
@@ -113,7 +113,11 @@ interface CustomDatum {
 
 // Get contour generator -------------------------------------------------------
 
-const contDensDefault: d3Contour.ContourDensity<[number, number]> = d3Contour.contourDensity();
+// test generic parameter defaults for ContourDensity and contourDensity
+const contDensDefault: d3Contour.ContourDensity = d3Contour.contourDensity();
+// tslint:disable-next-line: use-default-type-parameter
+const contDensDefaultCopy: d3Contour.ContourDensity<[number, number]> = contDensDefault;
+// test with explicit generic parameter
 let contDensCustom: d3Contour.ContourDensity<CustomDatum> = d3Contour.contourDensity<CustomDatum>();
 
 // Configure contour generator =================================================
diff --git a/types/d3-contour/index.d.ts b/types/d3-contour/index.d.ts
index ba9c8e075d..c0b3d70b5e 100644
--- a/types/d3-contour/index.d.ts
+++ b/types/d3-contour/index.d.ts
@@ -120,8 +120,13 @@ export function contours(): Contours;
 
 /**
  * A contour generator for density estimates.
+ *
+ * The generic refers to the data type of an element in the data array
+ * used with the density contour generator. If omitted, the default setting assumes that,
+ * the elements of the data array used with the density contour generator are two-element arrays.
+ * The first element corresponds to the x-dimension, the second to the y-dimension.
  */
-export interface ContourDensity<Datum> {
+export interface ContourDensity<Datum = [number, number]> {
     /**
      * Estimates the density contours for the given array of data, returning an array of GeoJSON MultiPolygon geometry objects.
      * Each geometry object represents the area where the estimated number of points per square pixel is greater than or equal to
@@ -238,21 +243,15 @@ export interface ContourDensity<Datum> {
     bandwidth(bandwidth: number): this;
 }
 
-/**
- * Construct a new contour generator for density estimates with the default settings.
- *
- * The default settings assume that, the elements of the data array used
- * with the density contour generator are two-element arrays. The first element
- * corresponds to the x-dimension, the second to the y-dimension.
- */
-export function contourDensity(): ContourDensity<[number, number]>;
 /**
  * Construct a new contour generator for density estimates.
  *
  * The generic refers to the data type of an element in the data array
- * used with the density contour generator.
+ * used with the density contour generator. If omitted, the default setting assumes that,
+ * the elements of the data array used with the density contour generator are two-element arrays.
+ * The first element corresponds to the x-dimension, the second to the y-dimension.
  *
  * Important: ensure that the x- and y-accessor functions are configured to
  * match the data type used for the generic Datum.
  */
-export function contourDensity<Datum>(): ContourDensity<Datum>;
+export function contourDensity<Datum = [number, number]>(): ContourDensity<Datum>;
diff --git a/types/deepmerge/index.d.ts b/types/deepmerge/index.d.ts
index 05f5c96d2e..39158354de 100644
--- a/types/deepmerge/index.d.ts
+++ b/types/deepmerge/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for deepmerge 1.3
+// Type definitions for deepmerge 2.1
 // Project: https://github.com/KyleAMathews/deepmerge
 // Definitions by: marvinscharle <https://github.com/marvinscharle>
 //                 syy1125 <https://github.com/syy1125>
+//                 AppLover69 <https://github.com/AppLover69>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.2
 
 export = deepmerge;
 
@@ -14,6 +15,7 @@ declare namespace deepmerge {
     interface Options {
         clone?: boolean;
         arrayMerge?(destination: any[], source: any[], options?: Options): any[];
+        isMergeableObject?(value: object): boolean;
     }
 
     function all<T>(objects: Array<Partial<T>>, options?: Options): T;
diff --git a/types/dwt/addon.pdf.d.ts b/types/dwt/addon.pdf.d.ts
new file mode 100644
index 0000000000..ef0980abfd
--- /dev/null
+++ b/types/dwt/addon.pdf.d.ts
@@ -0,0 +1,73 @@
+/*!
+* Dynamsoft WebTwain PDF Addon
+* Product: Dynamsoft Web Twain
+* Web Site: http://www.dynamsoft.com
+*
+* Copyright 2018, Dynamsoft Corporation
+* Author: Dynamsoft Support Team
+* Version: 13.4
+*/
+
+declare enum EnumDWT_ConverMode {
+    CM_DEFAULT = 0,
+    TWPT_CM_RENDERALLGRAY = 1
+}
+
+/**
+ * @class
+ */
+interface PDF {
+    /**
+     * Download and install pdf rasterizer add-on on the local system.
+     * @method Dynamsoft.WebTwain#Download
+     * @param {string} remoteFile specifies the value of which frame to get.
+     * @param {function} optionalAsyncSuccessFunc optional.
+     * The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} optionalAsyncFailureFunc optional.
+     * The function to call when the download fails. Please refer to the function prototype OnFailure.
+     * @return {bool}
+     */
+    Download(remoteFile: string,
+        optionalAsyncSuccessFunc?: () => void,
+        optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
+    /**
+     *  Input the password to decrypt PDF files using PDF Rasterizer add-on.
+     * @method Dynamsoft.WebTwain#SetPassword
+     * @param {string} password Specifies the PDF password.
+     * @return {bool}
+     */
+    SetPassword(password: string): boolean;
+
+    /**
+     *  Set the image convert mode for PDF Rasterizer in Dynamic Web TWAIN.
+     * @method Dynamsoft.WebTwain#SetConvertMode
+     * @param {EnumDWT_ConverMode} convertMode Specifies the image convert mode.
+     * @return {bool}
+     */
+    SetConvertMode(convertMode: EnumDWT_ConverMode): boolean;
+
+    /**
+     *  Set the output resolution for the PDF Rasterizer in Dynamic Web TWAIN.
+     * @method Dynamsoft.WebTwain#ReadRect
+     * @param {float} fResolution Specifies the resolution for convert image from PDF file.
+     * @return {bool}
+     */
+    SetResolution(fResolution: number): boolean;
+
+    /**
+     * Judges whether the local PDF is text-based or not.
+     * @method Dynamsoft.WebTwain#ReadRect
+     * @param {string} localFile specifies the local path of the target PDF.
+     * @return {bool}
+     */
+    IsTextBasedPDF(localFile: string): boolean;
+}
+
+interface WebTwainAddon {
+    PDF: PDF;
+}
+
+interface WebTwain {
+	Addon: WebTwainAddon;
+}
diff --git a/types/dwt/dwt-tests.ts b/types/dwt/dwt-tests.ts
index 16a56f1cd2..1be94acca1 100644
--- a/types/dwt/dwt-tests.ts
+++ b/types/dwt/dwt-tests.ts
@@ -103,8 +103,8 @@ function downloadImage() {
 function loadPDF() {
     const DWObject = Dynamsoft.WebTwainEnv.GetWebTwain('dwtcontrolContainer');
     if (DWObject) {
-        DWObject.Addon.PDF.SetResolution(200);
-        DWObject.Addon.PDF.SetConvertMode(1);
+		DWObject.Addon.PDF.SetResolution(200);
+		DWObject.Addon.PDF.SetConvertMode(1);
         DWObject.IfShowFileDialog = true;
         DWObject.LoadImageEx(" ", 5);
     }
diff --git a/types/dwt/index.d.ts b/types/dwt/index.d.ts
index b19980603e..b940c6ae4e 100644
--- a/types/dwt/index.d.ts
+++ b/types/dwt/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for dwt 13.3
+// Type definitions for dwt 13.4
 // Project: http://www.dynamsoft.com/Products/WebTWAIN_Overview.aspx
 // Definitions by: Xiao Ling <https://github.com/yushulx>
 //                 Josh Hall <https://github.com/jbh>
+//                 Lincoln Hu <https://github.com/lincoln2018>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -10,68 +11,11 @@
 * Product: Dynamsoft Web Twain
 * Web Site: http://www.dynamsoft.com
 *
-* Copyright 2017, Dynamsoft Corporation
+* Copyright 2018, Dynamsoft Corporation
 * Author: Dynamsoft Support Team
-* Version: 13.3
+* Version: 13.4
 */
 
-/**
- * Dynamsoft WebTwain Addon PDF
- */
-declare enum EnumDWT_ConverMode {
-    CM_DEFAULT = 0,
-    TWPT_CM_RENDERALLGRAY = 1
-}
-
-/**
- * @class
- */
-interface PDF {
-    /**
-     * Download and install pdf rasterizer add-on on the local system. 
-     * @method Dynamsoft.WebTwain#Download 
-     * @param {string} remoteFile specifies the value of which frame to get.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
-     */
-    Download(remoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
-    /**
-     *  Input the password to decrypt PDF files using PDF Rasterizer add-on. 
-     * @method Dynamsoft.WebTwain#SetPassword 
-     * @param {string} password Specifies the PDF password.
-     * @return {bool}
-     */
-    SetPassword(password: string): boolean;
-
-    /**
-     *  Set the image convert mode for PDF Rasterizer in Dynamic Web TWAIN. 
-     * @method Dynamsoft.WebTwain#SetConvertMode 
-     * @param {EnumDWT_ConverMode} convertMode Specifies the image convert mode.
-     * @return {bool}
-     */
-    SetConvertMode(convertMode: EnumDWT_ConverMode): boolean;
-
-    /**
-     *  Set the output resolution for the PDF Rasterizer in Dynamic Web TWAIN.
-     * @method Dynamsoft.WebTwain#ReadRect 
-     * @param {float} fResolution Specifies the resolution for convert image from PDF file.
-     * @return {bool}
-     */
-    SetResolution(fResolution: number): boolean;
-
-    /**
-     * Judges whether the local PDF is text-based or not.
-     * @method Dynamsoft.WebTwain#ReadRect 
-     * @param {string} localFile specifies the local path of the target PDF.
-     * @return {bool}
-     */
-    IsTextBasedPDF(localFile: string): boolean;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
 /**
  * @namespace Dynamsoft
  */
@@ -1318,21 +1262,11 @@ interface Container {
     Height: string | number;
 }
 
-interface WebTwainAddon {
-    PDF: PDF;
-}
-
 /**
  * @class
  */
 // properties (get/set) / sync functions
 interface WebTwain {
-    /**
-     * Returns addon.
-     * @type {WebTwainAddon}
-     */
-    Addon: WebTwainAddon;
-
     /**
      * Returns or sets whether multi-page selection is supported.
      * @type {bool}
diff --git a/types/dwt/tsconfig.json b/types/dwt/tsconfig.json
index db2ac6bbf4..13f35fcfbf 100644
--- a/types/dwt/tsconfig.json
+++ b/types/dwt/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "addon.pdf.d.ts",
         "dwt-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/dynogels/index.d.ts b/types/dynogels/index.d.ts
index 2e4c5acbf4..4742af5a04 100644
--- a/types/dynogels/index.d.ts
+++ b/types/dynogels/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for dynogels 8.0
 // Project: https://github.com/clarkie/dynogels#readme
 // Definitions by: Spartan Labs <https://github.com/SpartanLabs>
+//                 Ramon de Klein <https://github.com/ramondeklein>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -76,7 +77,7 @@ export interface Model {
     getItems(items: string[] | Array<{ [key: string]: string }>, options: GetItemOptions, callback: (err: Error, items: any[]) => void): void;
     batchGetItems(items: string[] | Array<{ [key: string]: string }>, callback: (err: Error, items: any[]) => void): void;
     batchGetItems(items: string[] | Array<{ [key: string]: string }>, options: GetItemOptions, callback: (err: Error, items: any[]) => void): void;
-    createTable(options: { [key: string]: CreateTablesOptions } | DynogelsGlobalOptions, callback: (err: Error, data: AWS.DynamoDB.CreateTableOutput) => void): void;
+    createTable(options: CreateTablesOptions, callback: (err: Error, data: AWS.DynamoDB.CreateTableOutput) => void): void;
     createTable(callback: (err: Error, data: AWS.DynamoDB.CreateTableOutput) => void): void;
     updateTable(throughput: Throughput, callback: (err: Error, data: AWS.DynamoDB.UpdateTableOutput) => void): void;
     updateTable(callback: (err: Error, data: AWS.DynamoDB.UpdateTableOutput) => void): void;
diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index 7b78770489..9eec5ed467 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -23,6 +23,9 @@ declare module 'ember-data' {
     type AttributesFor<Model> = keyof Model; // TODO: filter to attr properties only (TS 2.8)
     type RelationshipsFor<Model> = keyof Model; // TODO: filter to hasMany/belongsTo properties only (TS 2.8)
 
+    export interface ChangedAttributes {
+        [key: string]: [any, any] | undefined;
+    }
     interface AttributeMeta<Model extends DS.Model> {
         type: keyof TransformRegistry;
         options: object;
@@ -500,7 +503,7 @@ declare module 'ember-data' {
              * Returns an object, whose keys are changed properties, and value is
              * an [oldProp, newProp] array.
              */
-            changedAttributes(): {};
+            changedAttributes(): ChangedAttributes;
             /**
              * If the model `hasDirtyAttributes` this function will discard any unsaved
              * changes. If the model `isNew` it will be removed from the store.
diff --git a/types/ember-data/test/model.ts b/types/ember-data/test/model.ts
index a18167dbee..63bda2588e 100644
--- a/types/ember-data/test/model.ts
+++ b/types/ember-data/test/model.ts
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import DS from 'ember-data';
+import DS, { ChangedAttributes } from 'ember-data';
 import { assertType } from "./lib/assert";
 
 const Person = DS.Model.extend({
@@ -30,3 +30,7 @@ assertType<Date>(user.get('createdAt'));
 
 user.serialize();
 user.serialize({ includeId: true });
+user.serialize({ includeId: true });
+
+const attributes = user.changedAttributes();
+assertType<ChangedAttributes>(attributes);
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index a89d6bcc6f..dd3ed1ec64 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -2078,6 +2078,7 @@ declare module 'ember' {
              * Transition the application into another route. The route may
              * be either a single route or route path:
              */
+            transitionTo(name: string, options?: {}): Transition;
             transitionTo(name: string, ...models: any[]): Transition;
             transitionTo(name: string, options: {}): Transition;
         }
@@ -3305,6 +3306,7 @@ declare module 'ember' {
          * @param options   optional hash with a queryParams property containing a
          *                  mapping of query parameters
          */
+        isActive(routeName: string, options?: { queryParams: object }): boolean;
         isActive(routeName: string, models: RouteModel, options?: { queryParams: object }): boolean;
         isActive(routeName: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): boolean;
         isActive(routeName: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): boolean;
@@ -3322,6 +3324,7 @@ declare module 'ember' {
          *                       containing a mapping of query parameters
          * @returns              the Transition object associated with this attempted transition
          */
+        replaceWith(routeNameOrUrl: string, options?: { queryParams: object }): Ember.Transition;
         replaceWith(routeNameOrUrl: string, models: RouteModel, options?: { queryParams: object }): Ember.Transition;
         replaceWith(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): Ember.Transition;
         replaceWith(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): Ember.Transition;
@@ -3339,6 +3342,7 @@ declare module 'ember' {
          *                       containing a mapping of query parameters
          * @returns              the Transition object associated with this attempted transition
          */
+        transitionTo(routeNameOrUrl: string, options?: { queryParam: object }): Ember.Transition;
         transitionTo(routeNameOrUrl: string, models: RouteModel, options?: { queryParams: object }): Ember.Transition;
         transitionTo(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): Ember.Transition;
         transitionTo(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): Ember.Transition;
@@ -3355,6 +3359,7 @@ declare module 'ember' {
          *                  a mapping of query parameters
          * @returns         the string representing the generated URL
          */
+        urlFor(routeName: string, options?: { queryParams: object }): string;
         urlFor(routeName: string, models: RouteModel, options?: { queryParams: object }): string;
         urlFor(routeName: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): string;
         urlFor(routeName: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): string;
diff --git a/types/ember/test/router.ts b/types/ember/test/router.ts
index 9ec79ce281..c663083679 100755
--- a/types/ember/test/router.ts
+++ b/types/ember/test/router.ts
@@ -22,3 +22,21 @@ AppRouter.map(function() {
     this.mount('my-engine');
     this.mount('my-engine', { as: 'some-other-engine', path: '/some-other-engine'});
 });
+
+const RouterServiceConsumer = Ember.Service.extend({
+    router: Ember.inject.service('router'),
+    transitionWithoutModel() {
+        Ember.get(this, 'router')
+        .transitionTo('some-route');
+    },
+    transitionWithModel() {
+        const model = Ember.Object.create();
+        Ember.get(this, 'router')
+        .transitionTo('some.other.route', model);
+    },
+    transitionWithModelAndOptions() {
+        const model = Ember.Object.create();
+        Ember.get(this, 'router')
+        .transitionTo('index', model, { queryParams: { search: 'ember' }});
+    }
+});
diff --git a/types/event-kit/index.d.ts b/types/event-kit/index.d.ts
index 2208ffaae3..aa0275d8a8 100644
--- a/types/event-kit/index.d.ts
+++ b/types/event-kit/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for event-kit 2.x
+// Type definitions for event-kit 2.4
 // Project: https://github.com/atom/event-kit
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -69,7 +69,8 @@ export class CompositeDisposable implements DisposableLike {
  *  for handlers registered via ::on to be invoked with calls to ::emit.
  */
 // tslint:disable-next-line:no-any
-export class Emitter<Emissions = { [key: string]: any }> implements DisposableLike {
+export class Emitter<OptionalEmissions = { [key: string]: any }, RequiredEmissions = {}>
+        implements DisposableLike {
     disposed: boolean;
 
     /** Construct an emitter. */
@@ -83,31 +84,58 @@ export class Emitter<Emissions = { [key: string]: any }> implements DisposableLi
 
     // Event Subscription
     /** Registers a handler to be invoked whenever the given event is emitted. */
-    on<T extends keyof Emissions>(eventName: T, handler: (value?: Emissions[T]) => void):
-        Disposable;
+    on<T extends keyof OptionalEmissions>(eventName: T, handler: (value?:
+        OptionalEmissions[T]) => void): Disposable;
+    /** Registers a handler to be invoked whenever the given event is emitted. */
+    on<T extends keyof RequiredEmissions>(eventName: T, handler: (value:
+        RequiredEmissions[T]) => void): Disposable;
 
     /**
      *  Register the given handler function to be invoked the next time an event
      *  with the given name is emitted via ::emit.
      */
-    once<T extends keyof Emissions>(eventName: T, handler: (value?: Emissions[T]) => void):
-        Disposable;
+    once<T extends keyof OptionalEmissions>(eventName: T, handler: (value?:
+        OptionalEmissions[T]) => void): Disposable;
+    /**
+     *  Register the given handler function to be invoked the next time an event
+     *  with the given name is emitted via ::emit.
+     */
+    once<T extends keyof RequiredEmissions>(eventName: T, handler: (value:
+        RequiredEmissions[T]) => void): Disposable;
 
     /**
      *  Register the given handler function to be invoked before all other
      *  handlers existing at the time of subscription whenever events by the
      *  given name are emitted via ::emit.
      */
-    preempt<T extends keyof Emissions>(eventName: T, handler: (value?: Emissions[T]) => void):
-        Disposable;
+    preempt<T extends keyof OptionalEmissions>(eventName: T, handler: (value?:
+        OptionalEmissions[T]) => void): Disposable;
+    /**
+     *  Register the given handler function to be invoked before all other
+     *  handlers existing at the time of subscription whenever events by the
+     *  given name are emitted via ::emit.
+     */
+    preempt<T extends keyof RequiredEmissions>(eventName: T, handler: (value:
+        RequiredEmissions[T]) => void): Disposable;
 
     // Event Emission
     /** Invoke the handlers registered via ::on for the given event name. */
-    emit<T extends keyof Emissions>(eventName: T, value?: Emissions[T]): void;
+    emit<T extends keyof OptionalEmissions>(eventName: T, value?:
+        OptionalEmissions[T]): void;
+    /** Invoke the handlers registered via ::on for the given event name. */
+    emit<T extends keyof RequiredEmissions>(eventName: T, value:
+        RequiredEmissions[T]): void;
 
     /**
      *  Asynchronously invoke the handlers registered via ::on for the given event name.
      *  @return A promise that will be fulfilled once all handlers have been invoked.
      */
-    emitAsync<T extends keyof Emissions>(eventName: T, value?: Emissions[T]): Promise<void>;
+    emitAsync<T extends keyof OptionalEmissions>(eventName: T, value?:
+        OptionalEmissions[T]): Promise<void>;
+    /**
+     *  Asynchronously invoke the handlers registered via ::on for the given event name.
+     *  @return A promise that will be fulfilled once all handlers have been invoked.
+     */
+    emitAsync<T extends keyof RequiredEmissions>(eventName: T, value:
+        RequiredEmissions[T]): Promise<void>;
 }
diff --git a/types/excel-style-dataformatter/excel-style-dataformatter-tests.ts b/types/excel-style-dataformatter/excel-style-dataformatter-tests.ts
new file mode 100644
index 0000000000..828771242e
--- /dev/null
+++ b/types/excel-style-dataformatter/excel-style-dataformatter-tests.ts
@@ -0,0 +1,33 @@
+import * as DataFormatter from "excel-style-dataformatter";
+import * as enLocales from "excel-style-dataformatter/lib/locales/en-US";
+import * as ruLocales from "excel-style-dataformatter/lib/locales/ru";
+
+const localesOptions: DataFormatter.LocalesOptions = {
+	name: "test",
+	months: ['january', 'february', 'march', 'april', 'may', 'june', 'july', 'august', 'september', 'october', 'november', 'december'],
+	monthsShort: ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'],
+	days: ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'],
+	daysShort: ['su', 'mo', 'tu', 'we', 'th', 'fr', 'sa'],
+	thousandSeparator: ',',
+	decimalSeparator: '.',
+	formats: {
+		'Test format 1': '#.#',
+		'Test format 2': '$ #,##0.00;[Red]$ -#,##0.00',
+	}
+};
+const formatterOptions: DataFormatter.FormatterOptions = {
+	debug: true,
+	UTCOffset: 100,
+	locale: "test",
+	transformCode: (code: string): string => {
+		return code + "string";
+	},
+	locales: [localesOptions, ruLocales]
+};
+const dataFormatter1 = new DataFormatter(formatterOptions);
+const dataFormatter2 = new DataFormatter();
+dataFormatter2.defineLocales([enLocales, ruLocales]);
+dataFormatter2.setLocale("ru");
+dataFormatter2.setUTCOffset(null);
+dataFormatter2.setUTCOffset(100);
+const result: DataFormatter.FormatResult = dataFormatter2.format("testValue", "testType", "testFormat");
diff --git a/types/excel-style-dataformatter/index.d.ts b/types/excel-style-dataformatter/index.d.ts
new file mode 100644
index 0000000000..7f76ee6987
--- /dev/null
+++ b/types/excel-style-dataformatter/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for excel-style-dataformatter 2.0
+// Project: https://github.com/fakundo/Excel-Style-Javascript-DataFormatter
+// Definitions by: SanderDeWaal1992 <https://github.com/SanderDeWaal1992>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class DataFormatter {
+	constructor(options?: DataFormatter.FormatterOptions);
+
+	/**
+	 * Format a value
+	 * @param value
+	 * @param type value type
+	 * @param format format preset
+	 */
+	format(value: any, type: string, format: string): DataFormatter.FormatResult;
+	/**
+	 * Defines locales
+	 * @param  locales
+	 */
+	defineLocales(locales: DataFormatter.LocalesOptions[]): void;
+	/**
+	 * Sets locale
+	 * If locale doesn't exist, sets default
+	 * @param locale
+	 */
+	setLocale(locale: string): void;
+	/**
+	 * Sets UTC offset for dates
+	 * @param offset in minutes
+	 */
+	setUTCOffset(offset: number | null): void;
+}
+
+declare namespace DataFormatter {
+	interface LocalesOptions {
+		name: string;
+		months: string[];
+		monthsShort: string[];
+		days: string[];
+		daysShort: string[];
+		thousandSeparator: string;
+		decimalSeparator: string;
+		formats: {
+			[index: string]: string
+		};
+	}
+	interface FormatterOptions {
+		debug?: boolean;
+		UTCOffset?: number | null;
+		locale?: string;
+		transformCode?: (code: any) => any;
+		locales?: LocalesOptions[];
+	}
+
+	interface FormatResult {
+		value: string;
+		align: string;
+		color: string;
+		pattern: string;
+	}
+}
+
+export = DataFormatter;
diff --git a/types/excel-style-dataformatter/lib/locales/en-US.d.ts b/types/excel-style-dataformatter/lib/locales/en-US.d.ts
new file mode 100644
index 0000000000..591678aea8
--- /dev/null
+++ b/types/excel-style-dataformatter/lib/locales/en-US.d.ts
@@ -0,0 +1,4 @@
+import * as DataFormatter from "../../index";
+
+declare const locale: DataFormatter.LocalesOptions;
+export = locale;
diff --git a/types/excel-style-dataformatter/lib/locales/ru.d.ts b/types/excel-style-dataformatter/lib/locales/ru.d.ts
new file mode 100644
index 0000000000..591678aea8
--- /dev/null
+++ b/types/excel-style-dataformatter/lib/locales/ru.d.ts
@@ -0,0 +1,4 @@
+import * as DataFormatter from "../../index";
+
+declare const locale: DataFormatter.LocalesOptions;
+export = locale;
diff --git a/types/excel-style-dataformatter/tsconfig.json b/types/excel-style-dataformatter/tsconfig.json
new file mode 100644
index 0000000000..563681d3ac
--- /dev/null
+++ b/types/excel-style-dataformatter/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+		"strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+		"lib/locales/en-US.d.ts",
+		"lib/locales/ru.d.ts",
+        "excel-style-dataformatter-tests.ts"
+    ]
+}
diff --git a/types/excel-style-dataformatter/tslint.json b/types/excel-style-dataformatter/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/excel-style-dataformatter/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/execa/execa-tests.ts b/types/execa/execa-tests.ts
index 2525091f2a..ecc966d3d5 100644
--- a/types/execa/execa-tests.ts
+++ b/types/execa/execa-tests.ts
@@ -1,46 +1,38 @@
 import assert = require('assert');
 import execa = require('execa');
-import { PassThrough } from "stream";
+import { PassThrough } from 'stream';
 
-execa('unicorns')
-    .then(result => {
-        assert(result.cmd === 'unicorns');
-        assert(result.code === 0);
-        assert(result.failed === false);
-        assert(result.killed === false);
-        assert(result.signal === null);
-        assert(result.stderr === 'bad unicorns');
-        assert(result.stdout === 'good unicorns');
-        assert(result.timedOut === false);
-    });
+execa('unicorns').then(result => {
+    assert(result.cmd === 'unicorns');
+    assert(result.code === 0);
+    assert(result.failed === false);
+    assert(result.killed === false);
+    assert(result.signal === null);
+    assert(result.stderr === 'bad unicorns');
+    assert(result.stdout === 'good unicorns');
+    assert(result.timedOut === false);
+});
 
-execa('foo')
-    .catch(error => {
-        assert(error.cmd === 'foo');
-        assert(error.code === 128);
-        assert(error.failed === true);
-        assert(error.killed === false);
-        assert(error.signal === 'SIGINT');
-        assert(error.stderr === 'stderr');
-        assert(error.stdout === 'stdout');
-        assert(error.timedOut === false);
-    });
+execa('foo').catch(error => {
+    assert(error.cmd === 'foo');
+    assert(error.code === 128);
+    assert(error.failed === true);
+    assert(error.killed === false);
+    assert(error.signal === 'SIGINT');
+    assert(error.stderr === 'stderr');
+    assert(error.stdout === 'stdout');
+    assert(error.timedOut === false);
+});
 
-execa('noop', ['foo'])
-    .then(result => result.stderr.toLocaleLowerCase());
+execa('noop', ['foo']).then(result => result.stderr.toLocaleLowerCase());
 
-execa.stdout('unicorns')
-    .then(stdout => stdout.toLocaleLowerCase());
-execa.stdout('echo', ['unicorns'])
-    .then(stdout => stdout.toLocaleLowerCase());
+execa.stdout('unicorns').then(stdout => stdout.toLocaleLowerCase());
+execa.stdout('echo', ['unicorns']).then(stdout => stdout.toLocaleLowerCase());
 
-execa.stderr('unicorns')
-    .then(stderr => stderr.toLocaleLowerCase());
-execa.stderr('echo', ['unicorns'])
-    .then(stderr => stderr.toLocaleLowerCase());
+execa.stderr('unicorns').then(stderr => stderr.toLocaleLowerCase());
+execa.stderr('echo', ['unicorns']).then(stderr => stderr.toLocaleLowerCase());
 
-execa.shell('echo unicorns')
-    .then(result => result.stdout.toLocaleLowerCase());
+execa.shell('echo unicorns').then(result => result.stdout.toLocaleLowerCase());
 
 {
     let result: string;
@@ -54,14 +46,14 @@ execa.shell('echo unicorns')
 execa('echo', ['unicorns']).stdout.pipe(process.stdout);
 execa('echo', ['unicorns']).stderr.pipe(process.stderr);
 
-execa('forever', {extendEnv: false}).pid;
-execa('forever', {argv0: 'hi'}).pid;
-execa('forever', {localDir: '~'}).pid;
-execa('forever', {reject: false}).pid;
-execa('forever', {cleanup: false}).pid;
-execa('forever', {stdin: 1}).pid;
-execa('forever', {stdout: 'ignore'}).pid;
-execa('forever', {stderr: undefined}).pid;
+execa('forever', { extendEnv: false }).pid;
+execa('forever', { argv0: 'hi' }).pid;
+execa('forever', { localDir: '~' }).pid;
+execa('forever', { reject: false }).pid;
+execa('forever', { cleanup: false }).pid;
+execa('forever', { stdin: 1 }).pid;
+execa('forever', { stdout: 'ignore' }).pid;
+execa('forever', { stderr: undefined }).pid;
 
 async () => {
     const { stdout } = await execa('noop', ['foo'], { stripEof: false });
@@ -119,7 +111,9 @@ async () => {
 }
 
 async () => {
-    const { timedOut, code } = await execa('delay', ['3000', '22'], { timeout: 9000 });
+    const { timedOut, code } = await execa('delay', ['3000', '22'], {
+        timeout: 9000
+    });
     assert(timedOut === true);
     assert(code === 22);
 };
@@ -131,3 +125,10 @@ async () => {
 
     assert(stdout === 'foo');
 };
+
+const args: ReadonlyArray<string> = ['bar'];
+const stdio: ReadonlyArray<'ignore'> = ['ignore'];
+execa('foo', args);
+execa('foo', args, {
+    stdio
+});
diff --git a/types/execa/index.d.ts b/types/execa/index.d.ts
index c3aced26ee..067d36c368 100644
--- a/types/execa/index.d.ts
+++ b/types/execa/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for execa 0.8
+// Type definitions for execa 0.9
 // Project: https://github.com/sindresorhus/execa#readme
 // Definitions by: Douglas Duteil <https://github.com/douglasduteil>
 //                 BendingBender <https://github.com/BendingBender>
@@ -23,7 +23,11 @@ declare namespace execa {
          * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
          * @returns a `child_process` instance which is enhanced to also be a `Promise` for a result `Object` with `stdout` and `stderr` properties.
          */
-        (file: string, args?: string[], options?: Options): ExecaChildProcess;
+        (
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: Options
+        ): ExecaChildProcess;
         (file: string, options?: Options): ExecaChildProcess;
 
         /**
@@ -32,7 +36,11 @@ declare namespace execa {
          * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
          * @returns a `child_process` instance which is enhanced to also be a `Promise` for `stdout`.
          */
-        stdout(file: string, args?: string[], options?: Options): Promise<string>;
+        stdout(
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: Options
+        ): Promise<string>;
         stdout(file: string, options?: Options): Promise<string>;
 
         /**
@@ -41,7 +49,11 @@ declare namespace execa {
          * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
          * @returns a `child_process` instance which is enhanced to also be a `Promise` for `stderr`.
          */
-        stderr(file: string, args?: string[], options?: Options): Promise<string>;
+        stderr(
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: Options
+        ): Promise<string>;
         stderr(file: string, options?: Options): Promise<string>;
 
         /**
@@ -59,7 +71,11 @@ declare namespace execa {
          * @returns the same result object as `child_process.spawnSync`.
          * @throws an `Error` if the command fails.
          */
-        sync(file: string, args?: string[], options?: SyncOptions): ExecaReturns;
+        sync(
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: SyncOptions
+        ): ExecaReturns;
         sync(file: string, options?: SyncOptions): ExecaReturns;
 
         /**
@@ -71,7 +87,15 @@ declare namespace execa {
         shellSync(command: string, options?: Options): ExecaReturns;
     }
 
-    type StdIOOption = 'pipe' | 'ipc' | 'ignore' | Stream | number | null | undefined;
+    type StdIOOption =
+        | 'pipe'
+        | 'ipc'
+        | 'ignore'
+        | 'inherit'
+        | Stream
+        | number
+        | null
+        | undefined;
 
     interface CommonOptions {
         /**
@@ -103,7 +127,7 @@ declare namespace execa {
          *
          * @see https://nodejs.org/api/child_process.html#child_process_options_stdio
          */
-        stdio?: 'pipe' | 'ignore' | 'inherit' | StdIOOption[];
+        stdio?: 'pipe' | 'ignore' | 'inherit' | ReadonlyArray<StdIOOption>;
         /**
          * Prepare child to run independently of its parent process.
          * Specific behavior depends on the platform.
@@ -253,10 +277,16 @@ declare namespace execa {
     type ExecaError = Error & ExecaReturns;
 
     interface ExecaChildPromise {
-        catch<TResult = never>(onrejected?: ((reason: ExecaError) => TResult | PromiseLike<TResult>) | null): Promise<ExecaReturns | TResult>;
+        catch<TResult = never>(
+            onrejected?:
+                | ((reason: ExecaError) => TResult | PromiseLike<TResult>)
+                | null
+        ): Promise<ExecaReturns | TResult>;
     }
 
-    type ExecaChildProcess = ChildProcess & ExecaChildPromise & Promise<ExecaReturns>;
+    type ExecaChildProcess = ChildProcess &
+        ExecaChildPromise &
+        Promise<ExecaReturns>;
 }
 
 declare var execa: execa.ExecaStatic;
diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index aead720f5b..d1b543c591 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -289,14 +289,37 @@ async () => {
 };
 
 async () => {
+    // Video test
     const result = await ImagePicker.launchImageLibraryAsync({
-        mediaTypes: ImagePicker.MediaTypeOptions.Videos
+        mediaTypes: ImagePicker.MediaTypeOptions.Videos,
     });
 
     if (!result.cancelled) {
         result.uri;
         result.width;
         result.height;
+        result.duration;
+        result.type;
+    }
+};
+
+async () => {
+    // Image test
+    const result = await ImagePicker.launchImageLibraryAsync({
+        mediaTypes: ImagePicker.MediaTypeOptions.Images,
+        base64: true,
+        aspect: [4, 3],
+        quality: 1,
+        exif: true,
+    });
+
+    if (!result.cancelled) {
+        result.uri;
+        result.width;
+        result.height;
+        result.exif;
+        result.base64;
+        result.type;
     }
 };
 
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 8f0463bf0d..8661cac727 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -1418,6 +1418,10 @@ export namespace ImagePicker {
         uri: string;
         width: number;
         height: number;
+        type: 'video' | 'image';
+        base64?: string;
+        exif?: object;
+        duration?: number;
     }
 
     type ImageResult = { cancelled: true } | ({ cancelled: false } & ImageInfo);
@@ -1434,6 +1438,8 @@ export namespace ImagePicker {
         allowsEditing?: boolean;
         aspect?: [number, number];
         quality?: number;
+        base64?: boolean;
+        exif?: boolean;
         mediaTypes?: keyof _MediaTypeOptions;
     }
 
diff --git a/types/express-graphql/express-graphql-tests.ts b/types/express-graphql/express-graphql-tests.ts
index 482b15c186..6fdfc0d945 100644
--- a/types/express-graphql/express-graphql-tests.ts
+++ b/types/express-graphql/express-graphql-tests.ts
@@ -14,13 +14,13 @@ const graphqlOption: graphqlHTTP.OptionsObj = {
     extensions: (args) => { }
 };
 
-const graphqlOptionRequest = (request: express.Request): graphqlHTTP.OptionsObj => ({
+const graphqlOptionRequest = (request: express.Request, response: express.Response): graphqlHTTP.OptionsObj => ({
     graphiql: true,
     schema: schema,
     context: request.session
 });
 
-const graphqlOptionRequestAsync = async (request: express.Request): Promise<graphqlHTTP.OptionsObj> => {
+const graphqlOptionRequestAsync = async (request: express.Request, response: express.Response): Promise<graphqlHTTP.OptionsObj> => {
     return {
         graphiql: true,
         schema: await Promise.resolve(schema),
diff --git a/types/express-graphql/index.d.ts b/types/express-graphql/index.d.ts
index 166bdae6e7..ade08f1729 100644
--- a/types/express-graphql/index.d.ts
+++ b/types/express-graphql/index.d.ts
@@ -16,7 +16,7 @@ declare namespace graphqlHTTP {
      * Used to configure the graphQLHTTP middleware by providing a schema
      * and other configuration options.
      */
-    export type Options = ((req: Request) => OptionsObj) | ((req: Request) => Promise<OptionsObj>) | OptionsObj
+    export type Options = ((req: Request, res: Response) => OptionsObj) | ((req: Request, res: Response) => Promise<OptionsObj>) | OptionsObj
     export type OptionsObj = {
         /**
          * A GraphQL schema from graphql-js.
diff --git a/types/feathersjs__socketio/index.d.ts b/types/feathersjs__socketio/index.d.ts
index 7ba889dfbe..f0e082bf45 100644
--- a/types/feathersjs__socketio/index.d.ts
+++ b/types/feathersjs__socketio/index.d.ts
@@ -4,8 +4,8 @@
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
 
-/// <reference types="socket.io" />
 /// <reference types="feathersjs__socket-commons"/>
+import SocketIO = require("socket.io");
 
 export default function feathersSocketIO(callback?: (io: SocketIO.Server) => void): () => void;
 export default function feathersSocketIO(options: number | SocketIO.ServerOptions, callback?: (io: SocketIO.Server) => void): () => void;
diff --git a/types/generate-changelog/generate-changelog-tests.ts b/types/generate-changelog/generate-changelog-tests.ts
new file mode 100644
index 0000000000..0b99857715
--- /dev/null
+++ b/types/generate-changelog/generate-changelog-tests.ts
@@ -0,0 +1,8 @@
+import * as changelog from 'generate-changelog';
+
+changelog.generate({
+    exclude: ['chore'],
+    minor: true,
+    repoUrl: 'https://github.com/lob/generate-changelog',
+    tag: 'v1.6.0...v1.7.0'
+}).then(changelog => changelog.trim());
diff --git a/types/generate-changelog/index.d.ts b/types/generate-changelog/index.d.ts
new file mode 100644
index 0000000000..2a6ba0ed56
--- /dev/null
+++ b/types/generate-changelog/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for generate-changelog 1.7
+// Project: https://github.com/lob/generate-changelog#readme
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Options {
+    /** exclude listed commit types (e.g. `['chore', 'style', 'refactor']`) */
+    exclude?: string[];
+    /** whether it should be a patch changelog */
+    patch?: boolean;
+    /** whether it should be a minor changelog */
+    minor?: boolean;
+    /** whether it should be a major changelog */
+    major?: boolean;
+    /** repo URL that will be used when linking commits */
+    repoUrl?: string;
+    /** generate from specific tag or range (e.g. `v1.2.3` or `v1.2.3..v1.2.4`)' */
+    tag?: string;
+}
+
+export function generate(options: Options): Promise<string>;
diff --git a/types/generate-changelog/tsconfig.json b/types/generate-changelog/tsconfig.json
new file mode 100644
index 0000000000..458186fe12
--- /dev/null
+++ b/types/generate-changelog/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "generate-changelog-tests.ts"
+    ]
+}
diff --git a/types/generate-changelog/tslint.json b/types/generate-changelog/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/generate-changelog/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/generic-pool/generic-pool-tests.ts b/types/generic-pool/generic-pool-tests.ts
index 970e83d870..9cc8707c86 100644
--- a/types/generic-pool/generic-pool-tests.ts
+++ b/types/generic-pool/generic-pool-tests.ts
@@ -41,6 +41,9 @@ const opts = {
 
 const pool = genericPool.createPool<Connection>(factory, opts);
 
+pool.use((conn: Connection) => 'test')
+    .then((result: string) => { });
+
 pool.acquire()
     .then((conn: Connection) => {
         return pool.release(conn);
diff --git a/types/generic-pool/index.d.ts b/types/generic-pool/index.d.ts
index 00f8852823..bcfbb907e1 100644
--- a/types/generic-pool/index.d.ts
+++ b/types/generic-pool/index.d.ts
@@ -22,6 +22,7 @@ export class Pool<T> extends EventEmitter {
     destroy(resource: T): void;
     drain(): PromiseLike<undefined>;
     clear(): PromiseLike<undefined[]>;
+    use<U>(cb: (resource: T) => U): PromiseLike<U>;
 }
 
 export interface Factory<T> {
diff --git a/types/gijgo/index.d.ts b/types/gijgo/index.d.ts
index 19d17deb22..188d8753b1 100644
--- a/types/gijgo/index.d.ts
+++ b/types/gijgo/index.d.ts
@@ -4,7 +4,11 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-declare module Gijgo {
+declare module 'gijgo' {
+    export = Types;
+}
+
+declare module Types {
 
     //Grid
     interface GridPager {
@@ -151,8 +155,8 @@ declare module Gijgo {
         count(): number;
         destroy(keepTableTag?: boolean, keepWrapperTag?: boolean): void;
         downloadCSV(filename?: string, includeAllRecords?: boolean): Grid<Entity, Params>;
-        edit(id: string): Grid<Entity, Params>; 
-        expandAll(): Grid<Entity, Params>; 
+        edit(id: string): Grid<Entity, Params>;
+        expandAll(): Grid<Entity, Params>;
         //get(position: number): Entity; //TODO: rename to getByPosition to avoid conflicts with jquery.get
         getAll(): Array<Entity>;
         getById(id: string): Entity;
@@ -263,7 +267,7 @@ declare module Gijgo {
         close(): DatePicker;
         destroy(): void;
         open(): DatePicker;
-        value(value: string):  string | DatePicker;
+        value(value?: string):  string | DatePicker;
     }
 
     // DropDown
@@ -306,7 +310,7 @@ declare module Gijgo {
     }
 
     interface Editor extends JQuery {
-        content(html: string):  string | Editor;
+        content(html?: string):  string | Editor;
         destroy(): void;
     }
 
@@ -332,7 +336,7 @@ declare module Gijgo {
         close(): TimePicker;
         destroy(): void;
         open(): TimePicker;
-        value(value: string):  string | TimePicker;
+        value(value?: string):  string | TimePicker;
     }
 
     // Tree
@@ -368,7 +372,7 @@ declare module Gijgo {
         checkedField?: string;
         cascadeCheck?: boolean;
         dragAndDrop?: boolean;
-        paramNames: TreeParamNames;
+        paramNames?: TreeParamNames;
         lazyLoading?: boolean;
 
 
@@ -408,9 +412,9 @@ declare module Gijgo {
         selectAll() : Tree;
         unselectAll() : Tree;
         getSelections() : Array<string>;
-        getChildren(node: any, cascade: boolean) : Array<any>;
-        enable(node: any, cascade: boolean) : Tree;
-        disable(node: any, cascade: boolean) : Tree;
+        getChildren(node: any, cascade?: boolean) : Array<any>;
+        enable(node: any, cascade?: boolean) : Tree;
+        disable(node: any, cascade?: boolean) : Tree;
         enableAll() : Tree;
         disableAll() : Tree;
 
@@ -424,21 +428,21 @@ declare module Gijgo {
 
 
 interface JQuery {
-    grid(settings: Gijgo.GridSettings<any>): Gijgo.Grid<any, any>;
-    grid<Entity>(settings: Gijgo.GridSettings<Entity>): Gijgo.Grid<Entity, any>;
-    grid<Entity, Params>(settings: Gijgo.GridSettings<Entity>): Gijgo.Grid<Entity, Params>;
+    grid(settings: Types.GridSettings<any>): Types.Grid<any, any>;
+    grid<Entity>(settings: Types.GridSettings<Entity>): Types.Grid<Entity, any>;
+    grid<Entity, Params>(settings: Types.GridSettings<Entity>): Types.Grid<Entity, Params>;
 
-    dialog(settings: Gijgo.DialogSettings): Gijgo.Dialog;
+    dialog(settings: Types.DialogSettings): Types.Dialog;
 
-    checkbox(settings: Gijgo.CheckboxSettings): Gijgo.Checkbox;
+    checkbox(settings: Types.CheckboxSettings): Types.Checkbox;
 
-    datepicker(settings: Gijgo.DatePickerSettings): Gijgo.DatePicker;
+    datepicker(settings: Types.DatePickerSettings): Types.DatePicker;
 
-    dropdown(settings: Gijgo.DropDownSettings): Gijgo.DropDown;
+    dropdown(settings: Types.DropDownSettings): Types.DropDown;
 
-    editor(settings: Gijgo.EditorSettings): Gijgo.Editor;
+    editor(settings: Types.EditorSettings): Types.Editor;
 
-    timepicker(settings: Gijgo.TimePickerSettings): Gijgo.TimePicker;
+    timepicker(settings: Types.TimePickerSettings): Types.TimePicker;
 
-    tree(settings: Gijgo.TreeSettings): Gijgo.Tree;
+    tree(settings: Types.TreeSettings): Types.Tree;
 }
diff --git a/types/google-apps-script-oauth2/google-apps-script-oauth2-tests.ts b/types/google-apps-script-oauth2/google-apps-script-oauth2-tests.ts
index ca6d874fa4..4bad3291ff 100644
--- a/types/google-apps-script-oauth2/google-apps-script-oauth2-tests.ts
+++ b/types/google-apps-script-oauth2/google-apps-script-oauth2-tests.ts
@@ -14,8 +14,7 @@ function getDriveService() {
         .setScope('https://www.googleapis.com/auth/drive')
         .setParam('login_hint', Session.getActiveUser().getEmail())
         .setParam('access_type', 'offline')
-        .setParam('approval_prompt', 'force')
-    ;
+        .setParam('approval_prompt', 'force');
 }
 
 /**
@@ -24,9 +23,5 @@ function getDriveService() {
 function authCallback(request: any) {
     const driveService = getDriveService();
     const isAuthorized = driveService.handleCallback(request);
-    if (isAuthorized) {
-        Logger.log('success');
-    } else {
-        Logger.log('denied');
-    }
+    Logger.log(isAuthorized ? 'success' : 'denied');
 }
diff --git a/types/googlemaps/index.d.ts b/types/googlemaps/index.d.ts
index 526f5b7e06..5c4cca2eb3 100644
--- a/types/googlemaps/index.d.ts
+++ b/types/googlemaps/index.d.ts
@@ -392,8 +392,8 @@ declare namespace google.maps {
     export module Data {
         export interface DataOptions {
             controlPosition?: ControlPosition;
-            controls?: string[];
-            drawingMode?: string;
+            controls?: DrawingMode[] | null;
+            drawingMode?: DrawingMode | null;
             featureFactory?: (geometry: Data.Geometry) => Data.Feature;
             map?: Map;
             style?: Data.StylingFunction|Data.StyleOptions;
@@ -1863,7 +1863,8 @@ declare namespace google.maps {
         getZIndex(): number;
         setMap(map: Map | null): void;
         setUrl(url: string): void;
-        setZIndez(zIndex: number): void;
+        setZIndex(zIndex: number): void;
+        setOptions(options: KmlLayerOptions): void;
     }
 
     export interface KmlLayerOptions {
diff --git a/types/got/got-tests.ts b/types/got/got-tests.ts
index 7857bddbab..7048533295 100644
--- a/types/got/got-tests.ts
+++ b/types/got/got-tests.ts
@@ -52,6 +52,20 @@ got('todomvc.com', {
     encoding: 'utf8',
     hostname: 'todomvc'
 }).then(response => str = response.body);
+got('todomvc.com', {
+    form: true,
+    body: [{}],
+    encoding: 'utf8',
+    hostname: 'todomvc',
+    timeout: 2000
+}).then(response => str = response.body);
+got('todomvc.com', {
+    form: true,
+    body: [{}],
+    encoding: 'utf8',
+    hostname: 'todomvc',
+    timeout: {connect: 20, request: 20, socket: 20}
+}).then(response => str = response.body);
 // following must lead to type checking error: got('todomvc.com', {form: true, body: ''}).then(response => str = response.body);
 
 got('todomvc.com', {encoding: null, hostname: 'todomvc'}).then(response => buf = response.body);
diff --git a/types/got/index.d.ts b/types/got/index.d.ts
index 30a5b2c0be..5872b4f993 100644
--- a/types/got/index.d.ts
+++ b/types/got/index.d.ts
@@ -98,7 +98,11 @@ declare namespace got {
         json?: boolean;
     }
 
-    type GotOptions<E extends string | null> = http.RequestOptions & {
+    interface TimoutRequestOptions extends http.RequestOptions {
+        timeout?: any;
+    }
+
+    interface GotOptions<E extends string | null> extends TimoutRequestOptions {
         encoding?: E;
         query?: string | object;
         timeout?: number | TimeoutOptions;
@@ -106,7 +110,7 @@ declare namespace got {
         followRedirect?: boolean;
         decompress?: boolean;
         useElectronNet?: boolean;
-    };
+    }
 
     interface TimeoutOptions {
         connect?: number;
diff --git a/types/graphql-list-fields/graphql-list-fields-tests.ts b/types/graphql-list-fields/graphql-list-fields-tests.ts
new file mode 100644
index 0000000000..7624a3cbd8
--- /dev/null
+++ b/types/graphql-list-fields/graphql-list-fields-tests.ts
@@ -0,0 +1,42 @@
+import getFieldNames = require("graphql-list-fields");
+
+import {
+    GraphQLID,
+    GraphQLInterfaceType,
+    GraphQLObjectType,
+    GraphQLResolveInfo,
+    GraphQLSchema,
+    GraphQLString
+} from "graphql";
+
+const sampleGraphQLResolveInfo: GraphQLResolveInfo = {
+    fieldName: "",
+    fieldNodes: [],
+    returnType: GraphQLString,
+    parentType: new GraphQLInterfaceType({
+        name: "Sample",
+        fields: {
+            name: { type: GraphQLString }
+        }
+    }),
+    path: undefined,
+    schema: new GraphQLSchema({
+        query: new GraphQLObjectType({
+            name: "SampleType",
+            fields: {}
+        })
+    }),
+    fragments: {},
+    rootValue: null,
+    operation: {
+        kind: "OperationDefinition",
+        operation: "query",
+        selectionSet: {
+            kind: "SelectionSet",
+            selections: []
+        }
+    },
+    variableValues: {}
+};
+
+const fieldNames: string[] = getFieldNames(sampleGraphQLResolveInfo);
diff --git a/types/graphql-list-fields/index.d.ts b/types/graphql-list-fields/index.d.ts
new file mode 100644
index 0000000000..362658deb9
--- /dev/null
+++ b/types/graphql-list-fields/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for graphql-list-fields 2.0
+// Project: https://github.com/jakepusateri/graphql-list-fields#readme
+// Definitions by: Chris Filipowski <https://github.com/filipows>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { GraphQLResolveInfo } from "graphql";
+
+declare function getFieldList(info: GraphQLResolveInfo): string[];
+
+export = getFieldList;
diff --git a/types/graphql-list-fields/tsconfig.json b/types/graphql-list-fields/tsconfig.json
new file mode 100644
index 0000000000..6f53c2c900
--- /dev/null
+++ b/types/graphql-list-fields/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "graphql-list-fields-tests.ts"
+    ]
+}
diff --git a/types/graphql-list-fields/tslint.json b/types/graphql-list-fields/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/graphql-list-fields/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/graphql-relay/index.d.ts b/types/graphql-relay/index.d.ts
index 50ed0c3b7d..fc1eb3aa1e 100644
--- a/types/graphql-relay/index.d.ts
+++ b/types/graphql-relay/index.d.ts
@@ -21,6 +21,9 @@ import {
     GraphQLOutputType,
     GraphQLFieldResolver,
     GraphQLTypeResolver,
+    GraphQLUnionType,
+    GraphQLEnumType,
+    GraphQLScalarType,
     Thunk
 } from "graphql";
 
@@ -58,9 +61,20 @@ export const backwardConnectionArgs: GraphQLFieldConfigArgumentMap & {
  */
 export const connectionArgs: GraphQLFieldConfigArgumentMap & ForwardConnectionArgs & BackwardConnectionArgs;
 
+export type ConnectionConfigNodeTypeNullable =
+    | GraphQLScalarType
+    | GraphQLObjectType
+    | GraphQLInterfaceType
+    | GraphQLUnionType
+    | GraphQLEnumType;
+
+export type ConnectionConfigNodeType =
+    | ConnectionConfigNodeTypeNullable
+    | GraphQLNonNull<ConnectionConfigNodeTypeNullable>;
+
 export interface ConnectionConfig {
     name?: string | null;
-    nodeType: GraphQLObjectType;
+    nodeType: ConnectionConfigNodeType;
     resolveNode?: GraphQLFieldResolver<any, any> | null;
     resolveCursor?: GraphQLFieldResolver<any, any> | null;
     edgeFields?: Thunk<GraphQLFieldConfigMap<any, any>> | null;
diff --git a/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts b/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
index 519a3a4088..9043cdaf0e 100644
--- a/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
+++ b/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
@@ -16,6 +16,14 @@ interface SomeTestResult {
     someTestResultProp: string;
 }
 
+const batchFunction = (sources: ReadonlyArray<SomeTestSource>) => {
+    const someTestResult: SomeTestResult = {
+        someTestResultProp: "Hello"
+    };
+
+    return sources.map(source => someTestResult);
+};
+
 const asyncBatchFunction = async (sources: ReadonlyArray<SomeTestSource>) => {
     return new Promise<SomeTestResult[]>(resolve => {
         const res = [
@@ -27,19 +35,35 @@ const asyncBatchFunction = async (sources: ReadonlyArray<SomeTestSource>) => {
     });
 };
 
+const asyncBatchFunctionWhenTReturnIsArray = async (
+    sources: ReadonlyArray<SomeTestSource>
+) => {
+    const sourceBatches = sources.map(() => {
+        return new Promise<SomeTestResult[]>(resolve => {
+            const res = [
+                {
+                    someTestResultProp: ""
+                }
+            ];
+            resolve(res);
+        });
+    });
+
+    return Promise.all(sourceBatches);
+};
+
+// $ExpectType ResolverFunction<SomeTestSource, any, any, SomeTestResult>
 const withSourceAndResultTyped = createBatchResolver<
     SomeTestSource,
     SomeTestResult
 >((sources, _, __) => {
-    return sources.map(source => {
-        const res: SomeTestResult = {
-            someTestResultProp: ""
-        };
+    // $ExpectType ReadonlyArray<SomeTestSource>
+    const verifySources = sources;
 
-        return res;
-    });
+    return batchFunction(sources);
 });
 
+// $ExpectType ResolverFunction<SomeTestSource, any, any, SomeTestResult>
 const withSourceAndResultTypedAsPromise = createBatchResolver<
     SomeTestSource,
     SomeTestResult
@@ -50,6 +74,7 @@ const withSourceAndResultTypedAsPromise = createBatchResolver<
     return result;
 });
 
+// $ExpectType ResolverFunction<SomeTestSource, SomeTestArgs, any, SomeTestResult>
 const withSourceAndArgsAndResultTyped = createBatchResolver<
     SomeTestSource,
     SomeTestResult,
@@ -64,6 +89,7 @@ const withSourceAndArgsAndResultTyped = createBatchResolver<
     return result;
 });
 
+// $ExpectType ResolverFunction<SomeTestSource, SomeTestArgs, SomeTestContext, SomeTestResult>
 const withSourceAndArgsAndContextTyped = createBatchResolver<
     SomeTestSource,
     SomeTestResult,
@@ -80,3 +106,13 @@ const withSourceAndArgsAndContextTyped = createBatchResolver<
     const result = await asyncBatchFunction(sources);
     return result;
 });
+
+// $ExpectType ResolverFunction<SomeTestSource, any, any, SomeTestResult[]>
+const withResultIsArray = createBatchResolver<SomeTestSource, SomeTestResult[]>(
+    (sources, _, __) => {
+        // $ExpectType ReadonlyArray<SomeTestSource>
+        const verifySources = sources;
+
+        return asyncBatchFunctionWhenTReturnIsArray(sources);
+    }
+);
diff --git a/types/graphql-resolve-batch/index.d.ts b/types/graphql-resolve-batch/index.d.ts
index e78ddafb37..ea90a83555 100644
--- a/types/graphql-resolve-batch/index.d.ts
+++ b/types/graphql-resolve-batch/index.d.ts
@@ -4,6 +4,22 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+/**
+ * Creates a GraphQL.js field resolver that batches together multiple resolves
+ * together that share the *exact* same GraphQL field selection.
+ *
+ * Note:
+ *  The batchResolveFunction you supply always expects you to return an array of TReturn (or a promise with this array).
+ *  This is because you will have to return a TReturn for every source given to you by the batch function.
+ *  For an example of this please see the examples in the original project repository:
+ *  https://github.com/calebmer/graphql-resolve-batch/tree/master/examples
+ *
+ * @template TSource The original type of a single source.
+ * @template TReturn The return type of the field resolver.
+ * @template TArgs The type of supplied arguments.
+ * @template TContext The type of the current resolver context.
+ * @param batchResolveFn A batch function to resolve all fields for the given sources in a single batch.
+ */
 export function createBatchResolver<
     TSource,
     TReturn,
@@ -13,12 +29,19 @@ export function createBatchResolver<
     batchResolveFn: BatchResolveFunction<TSource, TArgs, TContext, TReturn>
 ): ResolverFunction<TSource, TArgs, TContext, TReturn>;
 
+/**
+ * The resulting field resolver that batches together multiple resolves.
+ * Graphql-resolve-batch will always return a promise for this resulting resolver.
+ */
 export type ResolverFunction<TSource, TArgs, TContext, TReturn> = (
     source: TSource,
     args: TArgs,
     context: TContext
-) => Promise<TReturn> | Promise<TReturn[]>;
+) => Promise<TReturn>;
 
+/**
+ * A batch function to resolve all fields for the given sources in a single batch.
+ */
 export type BatchResolveFunction<TSource, TArgs, TContext, TReturn> = (
     sources: ReadonlyArray<TSource>,
     args: TArgs,
diff --git a/types/graphql/index.d.ts b/types/graphql/index.d.ts
index a8bead58fd..49185e11a1 100644
--- a/types/graphql/index.d.ts
+++ b/types/graphql/index.d.ts
@@ -12,6 +12,7 @@
 //                 Tim Griesser <https://github.com/tgriesser>
 //                 Dylan Stewart <https://github.com/dyst5422>
 //                 Alessio Dionisi <https://github.com/adnsio>
+//                 Divyendu Singh <https://github.com/divyenduz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -100,6 +101,9 @@ export {
     // Build a GraphQLSchema from a GraphQL schema language document.
     buildSchema,
 
+    // Get the description of an AST node
+    getDescription,
+
     // Extends an existing GraphQLSchema from a parsed GraphQL Schema
     // language AST.
     extendSchema,
diff --git a/types/graphql/type/schema.d.ts b/types/graphql/type/schema.d.ts
index 3263274dd9..26500c6ed3 100644
--- a/types/graphql/type/schema.d.ts
+++ b/types/graphql/type/schema.d.ts
@@ -61,6 +61,27 @@ export class GraphQLSchema {
   getDirective(name: string): GraphQLDirective;
 }
 
+export type GraphQLSchemaValidationOptions = {
+  /**
+   * When building a schema from a GraphQL service's introspection result, it
+   * might be safe to assume the schema is valid. Set to true to assume the
+   * produced schema is valid.
+   *
+   * Default: false
+   */
+  assumeValid?: boolean;
+
+  /**
+   * If provided, the schema will consider fields or types with names included
+   * in this list valid, even if they do not adhere to the specification's
+   * schema validation rules.
+   *
+   * This option is provided to ease adoption and may be removed in a future
+   * major release.
+   */
+  allowedLegacyNames?: ReadonlyArray<string>;
+};
+
 export interface GraphQLSchemaConfig {
   query: GraphQLObjectType;
   mutation?: GraphQLObjectType;
diff --git a/types/graphql/utilities/buildASTSchema.d.ts b/types/graphql/utilities/buildASTSchema.d.ts
index b20c8fc856..6b8aa56327 100644
--- a/types/graphql/utilities/buildASTSchema.d.ts
+++ b/types/graphql/utilities/buildASTSchema.d.ts
@@ -1,6 +1,17 @@
-import { DocumentNode, Location } from '../language/ast';
+import { DocumentNode, Location, StringValueNode } from '../language/ast';
 import { Source } from '../language/source';
-import { GraphQLSchema } from '../type/schema';
+import { GraphQLSchema, GraphQLSchemaValidationOptions } from '../type/schema';
+
+interface BuildSchemaOptions extends GraphQLSchemaValidationOptions {
+  /**
+   * Descriptions are defined as preceding string literals, however an older
+   * experimental version of the SDL supported preceding comments as
+   * descriptions. Set to true to enable this deprecated behavior.
+   *
+   * Default: false
+   */
+  commentDescriptions?: boolean;
+}
 
 /**
  * This takes the ast of a schema document produced by the parse function in
@@ -15,10 +26,18 @@ import { GraphQLSchema } from '../type/schema';
 export function buildASTSchema(ast: DocumentNode): GraphQLSchema;
 
 /**
- * Given an ast node, returns its string description based on a contiguous
- * block full-line of comments preceding it.
+ * Given an ast node, returns its string description.
+ *
+ * Accepts options as a second argument:
+ *
+ *    - commentDescriptions:
+ *        Provide true to use preceding comments as the description.
+ *
  */
-export function getDescription(node: { loc?: Location }): string;
+export function getDescription(
+  node: { description?: StringValueNode; loc?: Location },
+  options: BuildSchemaOptions
+): string;
 
 /**
  * A helper function to build a GraphQLSchema directly from a source
diff --git a/types/graphql/utilities/index.d.ts b/types/graphql/utilities/index.d.ts
index cd0e23948f..c2b2c182ff 100644
--- a/types/graphql/utilities/index.d.ts
+++ b/types/graphql/utilities/index.d.ts
@@ -27,7 +27,7 @@ export { getOperationAST } from './getOperationAST';
 export { buildClientSchema } from './buildClientSchema';
 
 // Build a GraphQLSchema from GraphQL Schema language.
-export { buildASTSchema, buildSchema } from './buildASTSchema';
+export { buildASTSchema, buildSchema, getDescription } from './buildASTSchema';
 
 // Extends an existing GraphQLSchema from a parsed GraphQL Schema language AST.
 export { extendSchema } from './extendSchema';
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index 210e1cc332..3628a7a931 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -120,7 +120,7 @@ export interface PluginBase<T> {
      * * server - the server object with a plugin-specific server.realm.
      * * options - any options passed to the plugin during registration via server.register().
      */
-    register: (server: Server, options: T) => Promise<void>;
+    register: (server: Server, options: T) => void | Promise<void>;
 
     /** (optional) if true, allows the plugin to be registered multiple times with the same server. Defaults to false. */
     multiple?: boolean;
@@ -1706,7 +1706,7 @@ export interface RouteOptions {
      * * credentials - if true, allows user credentials to be sent ('Access-Control-Allow-Credentials'). Defaults to false.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscors)
      */
-    cors?: false | RouteOptionsCors;
+    cors?: boolean | RouteOptionsCors;
 
     /**
      * Default value: none.
@@ -2586,7 +2586,7 @@ export interface ServerInjectOptions extends Shot.RequestOptions {
     /**
      * sets the initial value of request.app, defaults to {}.
      */
-    app?: ApplicationState;
+    app: ApplicationState;
     /**
      * sets the initial value of request.plugins, defaults to {}.
      */
@@ -3257,7 +3257,7 @@ export class Server extends Podium {
      * Initialized with an empty object.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverapp)
      */
-    app?: ApplicationState;
+    app: ApplicationState;
 
     /**
      * Server Auth: properties and methods
diff --git a/types/hapi/test/server/server-app.ts b/types/hapi/test/server/server-app.ts
index 8e9cff88b0..69bac86e2f 100644
--- a/types/hapi/test/server/server-app.ts
+++ b/types/hapi/test/server/server-app.ts
@@ -6,20 +6,20 @@ const options: ServerOptions = {
 };
 
 declare module "hapi" {
-	// Demonstrate augmenting the application state.
-	interface ApplicationState {
-		key?: string;
-	}
+    // Demonstrate augmenting the application state.
+    interface ApplicationState {
+        key?: string;
+    }
 }
 
 const server = new Server(options);
-server.app!.key = 'value2';
+server.app.key = 'value2';
 
 const serverRoute: ServerRoute = {
     path: '/',
     method: 'GET',
     handler(request, h) {
-        return 'key: ' + request.server.app!.key;
+        return 'key: ' + request.server.app.key;
     }
 };
 
diff --git a/types/hapi/test/server/server-plugins.ts b/types/hapi/test/server/server-plugins.ts
index 7f3d194f84..8de3fdc24f 100644
--- a/types/hapi/test/server/server-plugins.ts
+++ b/types/hapi/test/server/server-plugins.ts
@@ -13,6 +13,10 @@ interface Plugin3 {
 	three: 3;
 }
 
+interface Plugin4 {
+	four: 4;
+}
+
 declare module 'hapi' {
 	interface PluginProperties {
 		example: {
@@ -42,6 +46,11 @@ const plugin3: Plugin<Plugin3> = {
 	register: async (server: Server, options: Plugin3) => {}
 };
 
+const plugin4: Plugin<Plugin4> = {
+	name: 'plugin4',
+	register: (server: Server, options: Plugin4) => {}
+};
+
 const server = new Server({
     port: 8000,
 });
@@ -90,5 +99,9 @@ server.register([
 	{
 		plugin: plugin1,
 		options: {one: 1}
+	},
+	{
+		plugin: plugin4,
+		options: {four: 4}
 	}
 ]);
diff --git a/types/hapi/test/server/server-table.ts b/types/hapi/test/server/server-table.ts
index 9237a2be28..ab14938be4 100644
--- a/types/hapi/test/server/server-table.ts
+++ b/types/hapi/test/server/server-table.ts
@@ -6,7 +6,7 @@ const options: ServerOptions = {
 };
 
 const server = new Server(options);
-server.app!.key = 'value2';
+server.app.key = 'value2';
 
 server.route({
     path: '/',
diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 347c82576d..cf73a08e68 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -961,7 +961,7 @@ declare namespace Highcharts {
          * Use this in cases where a linear gradient between a minColor and maxColor is not sufficient.
          * The stops is an array of tuples, where the first item is a float between 0 and 1 assigning the relative position in the gradient, and the second item is the color.
          */
-        stops?: Array<[number, string]>;
+        stops?: Array<Array<number|string>>;
         /**
          * The amount of ticks to draw on the axis. This opens up for aligning the ticks of multiple charts or panes within
          * a chart. This option overrides the tickPixelInterval option.
@@ -1995,6 +1995,7 @@ declare namespace Highcharts {
         fontWeight?: string;
         left?: string;
         opacity?: number;
+		overflow?: string;
         padding?: string | number;
         position?: string;
         top?: string;
@@ -3076,7 +3077,7 @@ declare namespace Highcharts {
          * @default ['50%', '50%']
          * @since 2.3.0
          */
-        center?: [number | string, number | string];
+        center?: Array<number|string>;
         /**
          * The end angle of the polar X axis or gauge value axis, given in degrees where 0 is north.
          * @default startAngle + 360
diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index ad026a1e52..c4ea1bd7a8 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -1631,12 +1631,18 @@ function test_Gauge() {
             type: 'gauge'
         },
         pane: {
+            center: ['50%', '85%'],
             startAngle: -150,
             endAngle: 150
         },
         yAxis: {
             min: 0,
-            max: 100
+            max: 100,
+            stops: [
+                [0.1, '#DF5353'],
+                [0.5, '#DDDF0D'],
+                [0.9, '#55BF3B'],
+            ],
         },
         plotOptions: {
             gauge: {
diff --git a/types/html-void-elements/html-void-elements-tests.ts b/types/html-void-elements/html-void-elements-tests.ts
new file mode 100644
index 0000000000..584c353455
--- /dev/null
+++ b/types/html-void-elements/html-void-elements-tests.ts
@@ -0,0 +1,3 @@
+import voidElements = require('html-void-elements');
+
+voidElements.indexOf('br');
diff --git a/types/html-void-elements/index.d.ts b/types/html-void-elements/index.d.ts
new file mode 100644
index 0000000000..47f903aad0
--- /dev/null
+++ b/types/html-void-elements/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for html-void-elements 1.0
+// Project: https://github.com/wooorm/html-void-elements
+// Definitions by: rhysd <https://github.com/rhysd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare const TagNames: string[];
+export = TagNames;
diff --git a/types/html-void-elements/tsconfig.json b/types/html-void-elements/tsconfig.json
new file mode 100644
index 0000000000..964e5ebdd2
--- /dev/null
+++ b/types/html-void-elements/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "html-void-elements-tests.ts"
+    ]
+}
diff --git a/types/html-void-elements/tslint.json b/types/html-void-elements/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/html-void-elements/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/iban/iban-tests.ts b/types/iban/iban-tests.ts
index ac79e97a99..574769c461 100644
--- a/types/iban/iban-tests.ts
+++ b/types/iban/iban-tests.ts
@@ -39,7 +39,7 @@ function testIsValidBBAN() {
  */
 function testPrintFormat() {
     var iban: string = 'BE68539007547034';
-    var separator: string[] = ['fr'];
+    var separator: string = ' ';
     var format: string = IBAN.printFormat(iban, separator);
 }
 
@@ -48,6 +48,6 @@ function testPrintFormat() {
  */
 function testToBBAN() {
     var iban: string = 'BE68539007547034';
-    var separator: string[] = ['-'];
+    var separator: string = '-';
     var bban: string = IBAN.toBBAN(iban, separator);
-}
\ No newline at end of file
+}
diff --git a/types/iban/index.d.ts b/types/iban/index.d.ts
index a47cfa618f..2b14d73954 100644
--- a/types/iban/index.d.ts
+++ b/types/iban/index.d.ts
@@ -42,17 +42,17 @@ interface IBANStatic {
     /** 
      * @summary Returns the IBAN in a print format.
      * @param {string} iban The IBAN to convert.
-     * @param {string} The IBAN in print format.
+     * @param {string} separator The separator to use between IBAN blocks, defaults to ' '.
      */
-    printFormat(iban: string, separator: string[]): string;
+    printFormat(iban: string, separator?: string): string;
 
     /**
      * @summary Convert the passed IBAN to a country-specific BBAN.
      * @param {string} iban The IBAN to convert.
-     * @param {string[]} Separator the separator to use between BBAN blocks.
+     * @param {string} separator The separator to use between BBAN blocks, defaults to ' '.
      * @returns {string} The BBAN
      */
-    toBBAN(iban: string, separator: string[]): string;
+    toBBAN(iban: string, separator?: string): string;
 }
 
 declare var IBAN: IBANStatic;
diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index 37141876a7..7c4e9a1f2e 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -4,20 +4,21 @@
 //                 Parvez <https://github.com/ppathan>
 //                 Jouderian <https://github.com/jouderianjr>
 //                 Qibang <https://github.com/bang88>
+//                 Jason Dreyzehner <https://github.com/bitjson>
 //                 Synarque <https://github.com/synarque>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // TypeScript Version: 2.3
 /// <reference types="rx" />
 
-import through = require("through");
+import through = require('through');
 
 declare namespace inquirer {
     type Prompts = { [name: string]: PromptModule };
     type ChoiceType = string | objects.ChoiceOption | objects.Separator;
     type Questions<T> =
         | Question<T>
-        | Question<T>[]
+        | ReadonlyArray<Question<T>>
         | Rx.Observable<Question<T>>;
 
     interface Inquirer {
@@ -97,7 +98,10 @@ declare namespace inquirer {
          * Array values can be simple strings, or objects containing a name (to display) and a value properties
          * (to save in the answers hash). Values can also be a Separator.
          */
-        choices?: ChoiceType[] | ((answers: T) => ChoiceType[]) | ((answers: T) => Promise<ChoiceType[]>);
+        choices?:
+            | ReadonlyArray<ChoiceType>
+            | ((answers: T) => ReadonlyArray<ChoiceType>);
+            | ((answers: T) => Promise<ReadonlyArray<ChoiceType>>);
         /**
          * Receive the user input and should return true if the value is valid, and an error message (String)
          * otherwise. If false is returned, a default error message is provided.
@@ -254,11 +258,11 @@ declare namespace inquirer {
          */
         interface Choices {
             new <T = Answers>(
-                choices: (string | Separator | ChoiceOption)[],
+                choices: ReadonlyArray<string | Separator | ChoiceOption>,
                 answers?: T
             ): Choices;
-            choices: Choice[];
-            realChoices: Choice[];
+            choices: ReadonlyArray<Choice>;
+            realChoices: ReadonlyArray<Choice>;
             length: number;
             realLength: number;
             /**
diff --git a/types/inquirer/inquirer-tests.ts b/types/inquirer/inquirer-tests.ts
index bd1d6a5ac4..7cc0fddd2a 100644
--- a/types/inquirer/inquirer-tests.ts
+++ b/types/inquirer/inquirer-tests.ts
@@ -563,3 +563,24 @@ function likesFood(aFood: string) {
 inquirer.prompt<Answers4>(questions, function(answers) {
     console.log(JSON.stringify(answers, null, "  "));
 });
+
+// immutable usage
+const immutableChoices: ReadonlyArray<string> = [
+    'Order a pizza',
+    'Make a reservation',
+    'Ask opening hours',
+    'Talk to the receptionist'
+];
+inquirer.prompt(
+    [
+        {
+            type: 'rawlist',
+            name: 'theme',
+            message: 'What do you want to do?',
+            choices: immutableChoices
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, '  '));
+    }
+);
diff --git a/types/ioredis/index.d.ts b/types/ioredis/index.d.ts
index de71a9f083..d072e003a8 100644
--- a/types/ioredis/index.d.ts
+++ b/types/ioredis/index.d.ts
@@ -595,6 +595,7 @@ declare namespace IORedis {
         hget(key: string, field: string, callback?: (err: Error, res: string) => void): Pipeline;
 
         hmset(key: string, field: string, value: any, ...args: string[]): Pipeline;
+        hmset(key: string, data: any, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
         hmget(key: string, ...fields: string[]): Pipeline;
 
diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index 94ffd188cf..6e2b7be6c7 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -10,6 +10,7 @@
 //                 Youngrok Kim <https://github.com/rokoroku>
 //                 Dan Kraus <https://github.com/dankraus>
 //                 Anjun Wang <https://github.com/wanganjun>
+//                 Rafael Kallis <https://github.com/rafaelkallis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -376,7 +377,7 @@ export interface AnySchema extends JoiObject {
      * override, that error will be returned and the override will be ignored (unless the `abortEarly`
      * option has been set to `false`).
      */
-    error?(err: Error | ValidationErrorFunction): this;
+    error(err: Error | ValidationErrorFunction): this;
 
     /**
      * Returns a plain object representing the schema's rules and properties
diff --git a/types/jquery.browser/index.d.ts b/types/jquery.browser/index.d.ts
new file mode 100644
index 0000000000..01141b67db
--- /dev/null
+++ b/types/jquery.browser/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for jQuery Browser Plugin 0.1
+// Project: https://github.com/gabceb/jquery-browser-plugin
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export interface Matchs {
+    version?: string;
+    versionNumber?: number;
+    platform?: string;
+    mobile?: boolean;
+    desktop?: boolean;
+    webkit?: boolean;
+    name?: string;
+    android?: boolean;
+    bb?: boolean;
+    blackberry?: boolean;
+    ipad?: boolean;
+    iphone?: boolean;
+    ipod?: boolean;
+    kindle?: boolean;
+    playbook?: boolean;
+    silk?: boolean;
+    ['windows phone']?: boolean;
+    cros?: boolean;
+    mac?: boolean;
+    linux?: boolean;
+    win?: boolean;
+    chrome?: boolean;
+    opr?: boolean;
+    safari?: boolean;
+    rv?: boolean;
+    iemobile?: boolean;
+    msie?: boolean;
+    msedge?: boolean;
+    uaMatch: ((ua?: string) => Matchs);
+}
+declare global {
+    interface Window {
+        jQBrowser: Matchs;
+    }
+    interface JQueryStatic {
+        browser: Matchs;
+    }
+}
diff --git a/types/jquery.browser/jquery.browser-tests.ts b/types/jquery.browser/jquery.browser-tests.ts
new file mode 100644
index 0000000000..aacc014524
--- /dev/null
+++ b/types/jquery.browser/jquery.browser-tests.ts
@@ -0,0 +1,7 @@
+// basic usage
+$.browser;
+$.browser.android;
+$.browser.uaMatch();
+window.jQBrowser;
+window.jQBrowser.android;
+window.jQBrowser.uaMatch();
diff --git a/types/jquery.browser/tsconfig.json b/types/jquery.browser/tsconfig.json
new file mode 100644
index 0000000000..89c26d12bb
--- /dev/null
+++ b/types/jquery.browser/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.browser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery.browser/tslint.json b/types/jquery.browser/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery.browser/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file
diff --git a/types/json-schema/index.d.ts b/types/json-schema/index.d.ts
index 7f02b671a0..4c483dd42d 100644
--- a/types/json-schema/index.d.ts
+++ b/types/json-schema/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for json-schema 4.0 and 6.0
 // Project: https://www.npmjs.com/package/json-schema
-// Definitions by: Boris Cherny <https://github.com/bcherny>, Cyrille Tuzi <https://github.com/cyrilletuzi>
+// Definitions by: Boris Cherny <https://github.com/bcherny>
+//                 Cyrille Tuzi <https://github.com/cyrilletuzi>
+//                 Lucian Buzzo <https://github.com/lucianbuzzo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -197,6 +199,8 @@ export interface JSONSchema4 {
    * @see https://tools.ietf.org/html/draft-zyp-json-schema-04#section-5.6
    */
   [k: string]: any
+
+  format?: string
 }
 
 /* JSON Schema 6 */
@@ -470,4 +474,9 @@ export interface JSONSchema6 {
    * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-7.4
    */
   examples?: JSONSchema6Type[]
+
+  /**
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-8
+   */
+  format?: string
 }
diff --git a/types/json-schema/json-schema-tests.ts b/types/json-schema/json-schema-tests.ts
index 0fd15f5de9..fdfe4d0435 100644
--- a/types/json-schema/json-schema-tests.ts
+++ b/types/json-schema/json-schema-tests.ts
@@ -64,7 +64,8 @@ import { JSONSchema4, JSONSchema4Type, JSONSchema4TypeName, JSONSchema6, JSONSch
     oneOf: [{}],
     not: {},
     extends: 'foo',
-    bar: 4
+    bar: 4,
+    format: 'date-time'
   }
 }
 
@@ -134,6 +135,7 @@ import { JSONSchema4, JSONSchema4Type, JSONSchema4TypeName, JSONSchema6, JSONSch
     const: 'foo',
     contains: {},
     examples: [{}],
-    propertyNames: {}
+    propertyNames: {},
+    format: 'date-time'
   }
 }
diff --git a/types/json2csv/JSON2CSVBase.d.ts b/types/json2csv/JSON2CSVBase.d.ts
index 165497b4c8..d65a3cc297 100644
--- a/types/json2csv/JSON2CSVBase.d.ts
+++ b/types/json2csv/JSON2CSVBase.d.ts
@@ -10,9 +10,9 @@ export declare namespace json2csv {
     }
 
     export interface Options<T> {
-        fields?: (string | FieldInfo<T>);
+        fields?: Array<string | FieldInfo<T>>;
         ndjson?: boolean;
-        unwind?: string | string[];
+        unwind?: string | Array<string>;
         flatten?: boolean;
         defaultValue?: string;
         quote?: string;
diff --git a/types/json2csv/json2csv-tests.ts b/types/json2csv/json2csv-tests.ts
index 566cc06cee..67c46cd1c3 100644
--- a/types/json2csv/json2csv-tests.ts
+++ b/types/json2csv/json2csv-tests.ts
@@ -17,9 +17,27 @@ parse({});
 parse([]);
 parse({}, {});
 
+interface Car {
+    car: string;
+    price: number;
+}
+
 new Parser();
 const parser: Parser<ExampleObj> = new Parser({});
 s = parser.parse({ str: '', num: 1, obj: {} });
+
+const opts: json2csv.Options<Car> = {
+    fields: [{
+        label: 'Car Name',
+        value: 'car'
+    }, {
+        label: 'Price USD',
+        value: 'price'
+    }]
+};
+
+const json2csvParser = new Parser<Car>(opts);
+
 parser.parse([]);
 const transform: Transform<ExampleObj> = new Transform<ExampleObj>({ quote: '' });
 const nodeTransform: NodeTransform = transform;
diff --git a/types/jsonwebtoken/index.d.ts b/types/jsonwebtoken/index.d.ts
index 26e223df53..ddb2a3f6c3 100644
--- a/types/jsonwebtoken/index.d.ts
+++ b/types/jsonwebtoken/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jsonwebtoken 7.2.1
+// Type definitions for jsonwebtoken 7.2.2
 // Project: https://github.com/auth0/node-jsonwebtoken
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>,
 //                 Daniel Heim <https://github.com/danielheim>,
@@ -167,4 +167,4 @@ declare function verify(
 declare function decode(
     token: string,
     options?: DecodeOptions,
-): null | object | string;
+): null | { [key: string]: any } | string;
diff --git a/types/jsonwebtoken/jsonwebtoken-tests.ts b/types/jsonwebtoken/jsonwebtoken-tests.ts
index 0b04c23e63..f20fbba5cc 100644
--- a/types/jsonwebtoken/jsonwebtoken-tests.ts
+++ b/types/jsonwebtoken/jsonwebtoken-tests.ts
@@ -11,39 +11,44 @@ var token: string;
 var cert: Buffer;
 
 interface ITestObject {
-  'foo': string
+    foo: string;
 }
 
-const testObject = { foo: 'bar' }
+const testObject = { foo: "bar" };
 
 /**
  * jwt.sign
  * https://github.com/auth0/node-jsonwebtoken#usage
  */
 // sign with default (HMAC SHA256)
-token = jwt.sign(testObject, 'shhhhh');
+token = jwt.sign(testObject, "shhhhh");
 
 // sign with default (HMAC SHA256) and single audience
-token = jwt.sign(testObject, 'shhhhh', { audience: "theAudience"});
+token = jwt.sign(testObject, "shhhhh", { audience: "theAudience" });
 
 // sign with default (HMAC SHA256) and multiple audiences
-token = jwt.sign(testObject, 'shhhhh', { audience: ["audience1", "audience2"]});
+token = jwt.sign(testObject, "shhhhh", {
+    audience: ["audience1", "audience2"],
+});
 
 // sign with default (HMAC SHA256) and a keyid
-token = jwt.sign(testObject, 'shhhhh', { keyid: "theKeyId"});
+token = jwt.sign(testObject, "shhhhh", { keyid: "theKeyId" });
 
 // sign with RSA SHA256
-cert = fs.readFileSync('private.key');  // get private key
-token = jwt.sign(testObject, cert, { algorithm: 'RS256'});
+cert = fs.readFileSync("private.key"); // get private key
+token = jwt.sign(testObject, cert, { algorithm: "RS256" });
 
 // sign with encrypted RSA SHA256 private key (only PEM encoding is supported)
-const privKey: Buffer = fs.readFileSync('encrypted_private.key');  // get private key
-const secret = {key: privKey.toString(), passphrase: 'keypwd'}
-token = jwt.sign(testObject, secret, { algorithm: 'RS256' }); // the algorithm option is mandatory in this case
+const privKey: Buffer = fs.readFileSync("encrypted_private.key"); // get private key
+const secret = { key: privKey.toString(), passphrase: "keypwd" };
+token = jwt.sign(testObject, secret, { algorithm: "RS256" }); // the algorithm option is mandatory in this case
 
 // sign asynchronously
-jwt.sign(testObject, cert, { algorithm: 'RS256' }, function(err: Error, token: string) {
-  console.log(token);
+jwt.sign(testObject, cert, { algorithm: "RS256" }, function(
+    err: Error,
+    token: string,
+) {
+    console.log(token);
 });
 
 /**
@@ -51,10 +56,10 @@ jwt.sign(testObject, cert, { algorithm: 'RS256' }, function(err: Error, token: s
  * https://github.com/auth0/node-jsonwebtoken#jwtverifytoken-secretorpublickey-options-callback
  */
 // verify a token symmetric
-jwt.verify(token, 'shhhhh', function(err, decoded) {
-  const result = decoded as ITestObject
+jwt.verify(token, "shhhhh", function(err, decoded) {
+    const result = decoded as ITestObject;
 
-  console.log(result.foo) // bar
+    console.log(result.foo); // bar
 });
 
 // use external time for verifying
@@ -65,41 +70,44 @@ jwt.verify(token, 'shhhhh', { clockTimestamp: 1 }, function(err, decoded) {
 });
 
 // invalid token
-jwt.verify(token, 'wrong-secret', function(err, decoded) {
-  // err
-  // decoded undefined
+jwt.verify(token, "wrong-secret", function(err, decoded) {
+    // err
+    // decoded undefined
 });
 
 // verify a token asymmetric
-cert = fs.readFileSync('public.pem');  // get public key
-jwt.verify(token, cert, function (err, decoded) {
-  const result = decoded as ITestObject
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, function(err, decoded) {
+    const result = decoded as ITestObject;
 
-  console.log(result.foo) // bar
+    console.log(result.foo); // bar
 });
 
 // verify audience
-cert = fs.readFileSync('public.pem');  // get public key
-jwt.verify(token, cert, { audience: 'urn:foo' }, function(err, decoded) {
-  // if audience mismatch, err == invalid audience
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, { audience: "urn:foo" }, function(err, decoded) {
+    // if audience mismatch, err == invalid audience
 });
 
 // verify issuer
-cert = fs.readFileSync('public.pem');  // get public key
-jwt.verify(token, cert, { audience: 'urn:foo', issuer: 'urn:issuer' }, function(err, decoded) {
-  // if issuer mismatch, err == invalid issuer
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, { audience: "urn:foo", issuer: "urn:issuer" }, function(
+    err,
+    decoded,
+) {
+    // if issuer mismatch, err == invalid issuer
 });
 
 // verify algorithm
-cert = fs.readFileSync('public.pem');  // get public key
-jwt.verify(token, cert, { algorithms: ['RS256'] }, function(err, decoded) {
-  // if algorithm mismatch, err == invalid algorithm
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, { algorithms: ["RS256"] }, function(err, decoded) {
+    // if algorithm mismatch, err == invalid algorithm
 });
 
 // verify without expiration check
-cert = fs.readFileSync('public.pem');  // get public key
+cert = fs.readFileSync("public.pem"); // get public key
 jwt.verify(token, cert, { ignoreExpiration: true }, function(err, decoded) {
-  // if ignoreExpration == false and token is expired, err == expired token
+    // if ignoreExpration == false and token is expired, err == expired token
 });
 
 /**
@@ -110,6 +118,10 @@ var decoded = jwt.decode(token);
 
 decoded = jwt.decode(token, { complete: false });
 
+if (decoded !== null && typeof decoded === "object") {
+    console.log(decoded.foo);
+}
+
 decoded = jwt.decode(token, { json: false });
 
 decoded = jwt.decode(token, { complete: false, json: false });
diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index d0136216ed..0f77605b2c 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -5,6 +5,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
+export interface ToCssOptions {
+	indent?: number;
+}
+
 export interface Rule {
 	className: string;
 	selector: string;
@@ -62,7 +66,7 @@ export interface StyleSheet<T> {
 	/**
 	 * Convert rules to a CSS string.
 	 */
-	toString(options?: { indent?: number }): string;
+	toString(options?: ToCssOptions): string;
 }
 export type GenerateClassName<T> = (rule: Rule, sheet?: StyleSheet<T>) => string;
 export interface Style {
@@ -96,6 +100,15 @@ export interface RuleOptions {
 	index: number;
 	className: string;
 }
+export declare class SheetsRegistry {
+    constructor();
+    registry: ReadonlyArray<StyleSheet<any>>;
+    readonly index: number;
+    add(sheet: StyleSheet<any>): void;
+    reset(): void;
+    remove(sheet: StyleSheet<any>): void;
+    toString(options?: ToCssOptions): string;
+}
 declare class JSS {
 	constructor(options?: Partial<JSSOptions>);
 	createStyleSheet<T>(
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 0cf3f51350..a5c6f34126 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -2,7 +2,8 @@
 
 import {
 	create as createJSS,
-	default as sharedInstance
+	SheetsRegistry,
+	default as sharedInstance,
 } from 'jss';
 
 const jss = createJSS().setup({});
@@ -21,28 +22,30 @@ const styleSheet = jss.createStyleSheet(
 	{
 		link: true,
 	}
-).attach();
+);
 
-styleSheet.classes.container; // $ExpectType string
-styleSheet.classes.ruleWithMockObservable; // $ExpectType string
+const attachedStyleSheet = styleSheet.attach();
 
-const rule = styleSheet.addRule('dynamicRule', { color: 'indigo' });
+attachedStyleSheet.classes.container; // $ExpectType string
+attachedStyleSheet.classes.ruleWithMockObservable; // $ExpectType string
+
+const rule = attachedStyleSheet.addRule('dynamicRule', { color: 'indigo' });
 rule.prop('border-radius', 5).prop('color'); // $ExpectType string
-styleSheet.classes.dynamicRule; // $ExpectType string
+attachedStyleSheet.classes.dynamicRule; // $ExpectType string
 
-styleSheet.deleteRule('dynamicRule');
+attachedStyleSheet.deleteRule('dynamicRule');
 
 // test that `addRule` supports the shorthand signature
-const dynamicRule = styleSheet.addRule({ color: 'red' });
+const dynamicRule = attachedStyleSheet.addRule({ color: 'red' });
 
 const div = document.createElement('div');
 dynamicRule.applyTo(div);
 
-const containerRule = styleSheet.getRule('container');
+const containerRule = attachedStyleSheet.getRule('container');
 const containerJSON = containerRule.toJSON();
-const css = styleSheet.toString();
+const css = attachedStyleSheet.toString();
 
-styleSheet.addRules({
+attachedStyleSheet.addRules({
 	rule1: {
 		fontFamily: 'Roboto',
 		color: '#FFFFFF',
@@ -53,10 +56,42 @@ styleSheet.addRules({
 	},
 });
 
-styleSheet.detach();
+attachedStyleSheet.detach();
 
 sharedInstance.createStyleSheet({
 	container: {
 		background: '#000099',
 	}
 });
+
+/* SheetsRegistry test */
+const sheetsRegistry = new SheetsRegistry();
+sheetsRegistry.add(styleSheet);
+
+const secondStyleSheet = jss.createStyleSheet(
+	{
+		ruleWithMockObservable: {
+			subscribe() {}
+		},
+		container2: {
+			display: 'flex',
+			width: 150,
+			opacity: .8,
+		},
+	},
+	{
+		link: true,
+	}
+);
+
+sheetsRegistry.add(secondStyleSheet);
+sheetsRegistry.registry.length; // $ExpectType number
+sheetsRegistry.remove(secondStyleSheet);
+
+sheetsRegistry.index; // $ExpectType number
+sheetsRegistry.index = 5; // $ExpectError
+sheetsRegistry.toString(); // $ExpectType string
+// With css options
+sheetsRegistry.toString({indent: 5}); // $ExpectType string
+
+sheetsRegistry.reset();
diff --git a/types/kcors/index.d.ts b/types/kcors/index.d.ts
index 04c45d365a..c4c33bbb4f 100644
--- a/types/kcors/index.d.ts
+++ b/types/kcors/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/koajs/cors
 // Definitions by: Xavier Stouder <https://github.com/Xstoudi>, Izayoi Ko <https://github.com/izayoiko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as Koa from "koa";
 
@@ -11,7 +11,7 @@ export = cors;
 
 declare namespace cors {
     interface Options {
-        origin?: ((req: Koa.Request) => string) | string;
+        origin?: ((ctx: Koa.Context) => string) | string;
         allowMethods?: string[] | string;
         exposeHeaders?: string[] | string;
         allowHeaders?: string[] | string;
diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index eecfde8774..1d405f54b0 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -153,6 +153,7 @@ declare namespace Knex {
         pluck(column: string): QueryBuilder;
 
         insert(data: any, returning?: string | string[]): QueryBuilder;
+        modify(callback: QueryCallback, ...args: any[]): QueryBuilder;
         update(data: any, returning?: string | string[]): QueryBuilder;
         update(columnName: string, value: Value, returning?: string | string[]): QueryBuilder;
         returning(column: string | string[]): QueryBuilder;
@@ -403,6 +404,7 @@ declare namespace Knex {
     interface SchemaBuilder extends Bluebird<any> {
         createTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
         createTableIfNotExists(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
+        alterTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
         renameTable(oldTableName: string, newTableName: string): Bluebird<void>;
         dropTable(tableName: string): SchemaBuilder;
         hasTable(tableName: string): Bluebird<boolean>;
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index 3e8e798212..1afd65ef6d 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -763,6 +763,10 @@ knex.schema.createTable('users', function (table) {
   table.timestamps(true, true);
 });
 
+knex.schema.alterTable('users', function (table) {
+  table.string('role').nullable();
+});
+
 knex.schema.renameTable('users', 'old_users');
 
 knex.schema.dropTable('users');
@@ -1026,6 +1030,9 @@ knex('users')
   }).unionAll(function(builder) {
     let self: Knex.QueryBuilder = this;
     self = builder;
+  }).modify(function(builder) {
+    let self: Knex.QueryBuilder = this;
+    self = builder;
   });
 
 //
diff --git a/types/lodash/common/collection.d.ts b/types/lodash/common/collection.d.ts
index 31e5b1c212..c8b2770610 100644
--- a/types/lodash/common/collection.d.ts
+++ b/types/lodash/common/collection.d.ts
@@ -36,14 +36,6 @@ declare module "../index" {
             iteratee?: ListIteratee<T>
         ): Dictionary<number>;
 
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): Dictionary<number>;
-
         /**
          * @see _.countBy
          */
@@ -77,14 +69,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIteratee<T>
         ): LoDashImplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<number>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -111,14 +95,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIteratee<T>
         ): LoDashExplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<number>>;
     }
 
     // each
@@ -217,14 +193,6 @@ declare module "../index" {
             predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
-        /**
-         * @see _.every
-         */
-        every<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
-
         /**
          * @see _.every
          */
@@ -250,14 +218,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -276,14 +236,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
     }
 
     // filter
@@ -712,14 +664,6 @@ declare module "../index" {
             iteratee: ListIterator<T, Many<TResult>>
         ): TResult[];
 
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): TResult[];
-
         /**
          * @see _.flatMap
          */
@@ -772,14 +716,6 @@ declare module "../index" {
             iteratee: ObjectIterator<T, Many<TResult>>
         ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMap
          */
@@ -814,14 +750,6 @@ declare module "../index" {
             iteratee: ListIterator<T, Many<TResult>>
         ): LoDashExplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): LoDashExplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMap
          */
@@ -878,14 +806,6 @@ declare module "../index" {
             iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): TResult[];
 
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): TResult[];
-
         /**
          * @see _.flatMapDeep
          */
@@ -927,14 +847,6 @@ declare module "../index" {
             iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDeep
          */
@@ -976,14 +888,6 @@ declare module "../index" {
             iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): LoDashExplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDeep
          */
@@ -1044,15 +948,6 @@ declare module "../index" {
             depth?: number
         ): TResult[];
 
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): TResult[];
-
         /**
          * @see _.flatMapDepth
          */
@@ -1098,15 +993,6 @@ declare module "../index" {
             depth?: number
         ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDepth
          */
@@ -1152,15 +1038,6 @@ declare module "../index" {
             depth?: number
         ): LoDashExplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashExplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDepth
          */
@@ -1446,14 +1323,6 @@ declare module "../index" {
             iteratee?: ListIteratee<T>
         ): Dictionary<T[]>;
 
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): Dictionary<T[]>;
-
         /**
          * @see _.groupBy
          */
@@ -1487,14 +1356,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIteratee<T>
         ): LoDashImplicitWrapper<Dictionary<Array<T[keyof T]>>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<T[]>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -1514,14 +1375,6 @@ declare module "../index" {
             iteratee?: ListIteratee<T>
         ): LoDashExplicitWrapper<Dictionary<T[]>>;
 
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<T[]>>;
-
         /**
          * @see _.groupBy
          */
@@ -1544,7 +1397,7 @@ declare module "../index" {
          * @return True if the target element is found, else false.
          */
         includes<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             target: T,
             fromIndex?: number
         ): boolean;
@@ -1555,7 +1408,7 @@ declare module "../index" {
          * @see _.includes
          */
         includes<T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             target: T,
             fromIndex?: number
         ): boolean;
@@ -1566,7 +1419,7 @@ declare module "../index" {
          * @see _.includes
          */
         includes<T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             target: T,
             fromIndex?: number
         ): LoDashExplicitWrapper<boolean>;
@@ -1673,14 +1526,6 @@ declare module "../index" {
             collection: T | null | undefined,
             iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): Dictionary<T[keyof T]>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): Dictionary<T>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -1707,14 +1552,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): LoDashImplicitWrapper<Dictionary<T[keyof T]>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -1741,14 +1578,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): LoDashExplicitWrapper<Dictionary<T[keyof T]>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
     }
 
     // map
@@ -1780,6 +1609,14 @@ declare module "../index" {
          * @param thisArg The this binding of iteratee.
          * @return Returns the new mapped array.
          */
+        map<T, TResult>(
+            collection: T[] | null | undefined,
+            iteratee: ArrayIterator<T, TResult>
+        ): TResult[];
+
+        /**
+         * @see _.map
+         */
         map<T, TResult>(
             collection: List<T> | null | undefined,
             iteratee: ListIterator<T, TResult>
@@ -1788,46 +1625,48 @@ declare module "../index" {
         /**
          * @see _.map
          */
-        map<T>(collection: List<T> | Dictionary<T> | null | undefined): T[];
+        map<T>(collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined): T[];
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee: DictionaryIterator<T, TResult>
+        map<T extends object, TResult>(
+            collection: T | null | undefined,
+            iteratee: ObjectIterator<T, TResult>
         ): TResult[];
 
         /** @see _.map */
         map<T, K extends keyof T>(
-            collection: List<T> | Dictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             iteratee: K
         ): Array<T[K]>;
 
-        /** @see _.map */
-        map<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): TResult[];
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            iteratee?: string
-        ): TResult[];
-
         /**
          * @see _.map
          */
         map<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
+            iteratee?: string
+        ): any[];
+
+        /**
+         * @see _.map
+         */
+        map<T>(
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             iteratee?: object
         ): boolean[];
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashImplicitWrapper<T[] | null | undefined>,
+            iteratee: ArrayIterator<T, TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
+
         /**
          * @see _.map
          */
@@ -1839,35 +1678,29 @@ declare module "../index" {
         /**
          * @see _.map
          */
-        map<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+        map<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee: DictionaryIterator<T, TResult>
+        map<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, TResult>
         ): LoDashImplicitWrapper<TResult[]>;
 
         /** @see _.map */
         map<T, K extends keyof T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: K
         ): LoDashImplicitWrapper<Array<T[K]>>;
 
-        /** @see _.map */
-        map<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.map
          */
-        map<T, TResult>(
+        map<T>(
             this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee?: string
-        ): LoDashImplicitWrapper<TResult[]>;
+        ): LoDashImplicitWrapper<any[]>;
 
         /**
          * @see _.map
@@ -1879,6 +1712,14 @@ declare module "../index" {
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashExplicitWrapper<T[] | null | undefined>,
+            iteratee: ArrayIterator<T, TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
         /**
          * @see _.map
          */
@@ -1890,37 +1731,29 @@ declare module "../index" {
         /**
          * @see _.map
          */
-        map<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+        map<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee: DictionaryIterator<T, TResult>
+        map<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, TResult>
         ): LoDashExplicitWrapper<TResult[]>;
 
         /** @see _.map */
         map<T, K extends keyof T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: K
         ): LoDashExplicitWrapper<Array<T[K]>>;
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
+        map<T>(
             this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee?: string
-        ): LoDashExplicitWrapper<TResult[]>;
+        ): LoDashExplicitWrapper<any[]>;
 
         /**
          * @see _.map
@@ -1991,24 +1824,6 @@ declare module "../index" {
             iteratees?: Many<ObjectIteratee<T>>,
             orders?: Many<boolean|string>
         ): Array<T[keyof T]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): T[];
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2047,24 +1862,6 @@ declare module "../index" {
             iteratees?: Many<ObjectIteratee<T>>,
             orders?: Many<boolean|string>
         ): LoDashImplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<T[]>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2103,24 +1900,6 @@ declare module "../index" {
             iteratees?: Many<ObjectIteratee<T>>,
             orders?: Many<boolean|string>
         ): LoDashExplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<T[]>;
     }
 
     // partition
@@ -2233,15 +2012,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduce
         **/
@@ -2265,14 +2035,6 @@ declare module "../index" {
             collection: T | null | undefined,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2303,15 +2065,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduce
         **/
@@ -2335,14 +2088,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2373,15 +2118,6 @@ declare module "../index" {
             accumulator: TResult
         ): LoDashExplicitWrapper<TResult>;
 
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
         /**
         * @see _.reduce
         **/
@@ -2405,14 +2141,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): LoDashExplicitWrapper<TResult | undefined>;
     }
 
     // reduceRight
@@ -2450,15 +2178,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduceRight
         **/
@@ -2482,14 +2201,6 @@ declare module "../index" {
             collection: T | null | undefined,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2520,15 +2231,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduceRight
         **/
@@ -2552,14 +2254,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2590,15 +2284,6 @@ declare module "../index" {
             accumulator: TResult
         ): LoDashExplicitWrapper<TResult>;
 
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
         /**
         * @see _.reduceRight
         **/
@@ -2622,14 +2307,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-         * @see _.reduceRight
-         **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): LoDashExplicitWrapper<TResult | undefined>;
     }
 
     // reject
@@ -2731,13 +2408,6 @@ declare module "../index" {
             collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined
         ): T | undefined;
 
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            collection: T
-        ): T[keyof T];
-
         /**
          * @see _.sample
          */
@@ -2754,13 +2424,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
         ): T | undefined;
 
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            this: LoDashImplicitWrapper<T>,
-        ): T[keyof T];
-
         /**
          * @see _.sample
          */
@@ -2777,13 +2440,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
         ): LoDashExplicitWrapper<T | undefined>;
 
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            this: LoDashExplicitWrapper<T>,
-        ): LoDashExplicitWrapper<T[keyof T]>;
-
         /**
          * @see _.sample
          */
@@ -2803,7 +2459,7 @@ declare module "../index" {
          * @return Returns the random elements.
          */
         sampleSize<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             n?: number
         ): T[];
 
@@ -2821,7 +2477,7 @@ declare module "../index" {
          * @see _.sampleSize
          */
         sampleSize<T>(
-            this: LoDashImplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             n?: number
         ): LoDashImplicitWrapper<T[]>;
 
@@ -2839,7 +2495,7 @@ declare module "../index" {
          * @see _.sampleSize
          */
         sampleSize<T>(
-            this: LoDashExplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             n?: number
         ): LoDashExplicitWrapper<T[]>;
 
@@ -2943,14 +2599,6 @@ declare module "../index" {
             collection: T | null | undefined,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2969,14 +2617,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2995,14 +2635,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
     }
 
     // sortBy
diff --git a/types/lodash/common/common.d.ts b/types/lodash/common/common.d.ts
index ac3e137b12..468019ea53 100644
--- a/types/lodash/common/common.d.ts
+++ b/types/lodash/common/common.d.ts
@@ -188,17 +188,9 @@ declare module "../index" {
     // Note: key should be string, not keyof T, because the actual object may contain extra properties that were not specified in the type.
     type ObjectIterator<TObject, TResult> = (value: TObject[keyof TObject], key: string, collection: TObject) => TResult;
     type ObjectIteratee<TObject> = ObjectIterator<TObject, NotVoid> | string | [string, any] | PartialDeep<TObject[keyof TObject]>;
-    type ObjectIterateeCustom<TObject, TResult> = ObjectIterator<TObject, TResult> | string | object | [string, any] | PartialDeep<TObject[keyof TObject]>;
+    type ObjectIterateeCustom<TObject, TResult> = ObjectIterator<TObject, TResult> | string | [string, any] | PartialDeep<TObject[keyof TObject]>;
     type ObjectIteratorTypeGuard<TObject, S extends TObject[keyof TObject]> = (value: TObject[keyof TObject], key: string, collection: TObject) => value is S;
 
-    type DictionaryIterator<T, TResult> = ObjectIterator<Dictionary<T>, TResult>;
-    type DictionaryIteratee<T> = ObjectIteratee<Dictionary<T>>;
-    type DictionaryIteratorTypeGuard<T, S extends T> = ObjectIteratorTypeGuard<Dictionary<T>, S>;
-
-    type NumericDictionaryIterator<T, TResult> = (value: T, key: number, collection: NumericDictionary<T>) => TResult;
-    type NumericDictionaryIteratee<T> = NumericDictionaryIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
-    type NumericDictionaryIterateeCustom<T, TResult> = NumericDictionaryIterator<T, TResult> | string | [string, any] | PartialDeep<T>;
-
     type StringIterator<TResult> = (char: string, index: number, string: string) => TResult;
 
     type MemoVoidIterator<T, TResult> = (prev: TResult, curr: T, indexOrKey: any, list: T[]) => void;
@@ -230,6 +222,11 @@ declare module "../index" {
         [index: number]: T;
     }
 
+    // Crazy typedef needed get _.omit to work properly with Dictionary and NumericDictionary
+    type AnyKindOfDictionary =
+        | Dictionary<{} | null | undefined>
+        | NumericDictionary<{} | null | undefined>;
+
     interface Cancelable {
         cancel(): void;
         flush(): void;
@@ -252,4 +249,12 @@ declare module "../index" {
     type LoDashExplicitNillableObjectWrapper<T> = LoDashExplicitWrapper<T | null | undefined>;
     type LoDashExplicitNumberArrayWrapper = LoDashExplicitWrapper<number[]>;
     type LoDashExplicitStringWrapper = LoDashExplicitWrapper<string>;
+
+    type DictionaryIterator<T, TResult> = ObjectIterator<Dictionary<T>, TResult>;
+    type DictionaryIteratee<T> = ObjectIteratee<Dictionary<T>>;
+    type DictionaryIteratorTypeGuard<T, S extends T> = ObjectIteratorTypeGuard<Dictionary<T>, S>;
+    // NOTE: keys of objects at run time are always strings, even when a NumericDictionary is being iterated.
+    type NumericDictionaryIterator<T, TResult> = (value: T, key: string, collection: NumericDictionary<T>) => TResult;
+    type NumericDictionaryIteratee<T> = NumericDictionaryIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
+    type NumericDictionaryIterateeCustom<T, TResult> = NumericDictionaryIterator<T, TResult> | string | [string, any] | PartialDeep<T>;
 }
diff --git a/types/lodash/common/object.d.ts b/types/lodash/common/object.d.ts
index 6100e25c43..3063072b17 100644
--- a/types/lodash/common/object.d.ts
+++ b/types/lodash/common/object.d.ts
@@ -718,7 +718,7 @@ declare module "../index" {
          * @return Returns the new array of picked elements.
          */
         at<T>(
-            object: List<T> | Dictionary<T> | null | undefined,
+            object: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             ...props: PropertyPath[]
         ): T[];
 
@@ -736,7 +736,7 @@ declare module "../index" {
          * @see _.at
          */
         at<T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             ...props: PropertyPath[]
         ): LoDashImplicitWrapper<T[]>;
 
@@ -754,7 +754,7 @@ declare module "../index" {
          * @see _.at
          */
         at<T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             ...props: PropertyPath[]
         ): LoDashExplicitWrapper<T[]>;
 
@@ -987,7 +987,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        entries<T>(object?: Dictionary<T>): Array<[string, T]>;
+        entries<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.toPairs
@@ -999,7 +999,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        entries<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        entries<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -1011,7 +1011,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        entries<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        entries<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -1025,7 +1025,7 @@ declare module "../index" {
         /**
          * @see _.entriesIn
          */
-        entriesIn<T>(object?: Dictionary<T>): Array<[string, T]>;
+        entriesIn<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.entriesIn
@@ -1037,7 +1037,7 @@ declare module "../index" {
         /**
          * @see _.entriesIn
          */
-        entriesIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        entriesIn<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.entriesIn
@@ -1049,7 +1049,7 @@ declare module "../index" {
         /**
          * @see _.entriesIn
          */
-        entriesIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        entriesIn<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.entriesIn
@@ -2210,18 +2210,10 @@ declare module "../index" {
         /**
          * @see _.mapKeys
          */
-        mapKeys<T>(
-            object: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIteratee<T>
-        ): Dictionary<T>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            object: object | null | undefined,
-            iteratee?: ObjectIteratee<any>
-        ): Dictionary<any>;
+        mapKeys<T extends object>(
+            object: T | null | undefined,
+            iteratee?: ObjectIteratee<T>
+        ): Dictionary<T[keyof T]>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2236,18 +2228,10 @@ declare module "../index" {
         /**
          * @see _.mapKeys
          */
-        mapKeys<T>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee?: DictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            this: LoDashImplicitWrapper<object | null | undefined>,
-            iteratee?: ObjectIteratee<any>
-        ): LoDashImplicitWrapper<Dictionary<any>>;
+        mapKeys<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T[keyof T]>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2262,18 +2246,10 @@ declare module "../index" {
         /**
          * @see _.mapKeys
          */
-        mapKeys<T>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee?: DictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            this: LoDashExplicitWrapper<object | null | undefined>,
-            iteratee?: ObjectIteratee<any>
-        ): LoDashExplicitWrapper<Dictionary<any>>;
+        mapKeys<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T[keyof T]>>;
     }
 
     // mapValues
@@ -2298,8 +2274,27 @@ declare module "../index" {
         * @param [thisArg] The `this` binding of `iteratee`.
         * @return Returns the new mapped object.
         */
+        mapValues<TResult>(obj: string | null | undefined, callback: StringIterator<TResult>): NumericDictionary<TResult>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T, TResult>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, callback: ObjectIterator<Dictionary<T>, TResult>): Dictionary<TResult>;
+
+        /**
+         * @see _.mapValues
+         */
         mapValues<T extends object, TResult>(obj: T | null | undefined, callback: ObjectIterator<T, TResult>): { [P in keyof T]: TResult };
 
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, iteratee: object): Dictionary<boolean>;
+
         /**
          * @see _.mapValues
          */
@@ -2307,23 +2302,34 @@ declare module "../index" {
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T, TKey extends keyof T>(obj: Dictionary<T> | null | undefined, iteratee: TKey): Dictionary<T[TKey]>;
+        mapValues<T, TKey extends keyof T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, iteratee: TKey): Dictionary<T[TKey]>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, iteratee: string): Dictionary<any>;
 
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object, TKey extends keyof T>(obj: T | null | undefined, iteratee: string): { [P in keyof T]: any };
+        mapValues<T extends object>(obj: T | null | undefined, iteratee: string): { [P in keyof T]: any };
 
         /**
          * @see _.mapValues
          */
-        mapValues<TResult>(obj: string | null | undefined, callback: StringIterator<TResult>): NumericDictionary<TResult>;
+        mapValues(obj: string | null | undefined): NumericDictionary<string>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T>(obj: Dictionary<T> | null | undefined): Dictionary<T>;
+        mapValues<T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined): Dictionary<T>;
 
         /**
          * @see _.mapValues
@@ -2333,15 +2339,28 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object>(obj: T | null | undefined): T | {};
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(obj: string | null | undefined): NumericDictionary<string>;
+        mapValues<T extends object>(obj: T | null | undefined): PartialObject<T>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            callback: StringIterator<TResult>
+        ): LoDashImplicitWrapper<NumericDictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T, TResult>(
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            callback: ObjectIterator<Dictionary<T>, TResult>
+        ): LoDashImplicitWrapper<Dictionary<TResult>>;
+
         /**
          * @see _.mapValues
          */
@@ -2350,6 +2369,16 @@ declare module "../index" {
             callback: ObjectIterator<T, TResult>
         ): LoDashImplicitWrapper<{ [P in keyof T]: TResult }>;
 
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: object
+        ): LoDashImplicitWrapper<Dictionary<boolean>>;
+
         /**
          * @see _.mapValues
          */
@@ -2360,16 +2389,28 @@ declare module "../index" {
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
         mapValues<T, TKey extends keyof T>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: TKey
         ): LoDashImplicitWrapper<Dictionary<T[TKey]>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T extends object, TKey extends keyof T>(
+        mapValues<T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: string
+        ): LoDashImplicitWrapper<Dictionary<any>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee: string
         ): LoDashImplicitWrapper<{ [P in keyof T]: any }>;
@@ -2377,15 +2418,14 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<TResult>(
-            this: LoDashImplicitWrapper<string | null | undefined>,
-            callback: StringIterator<TResult>
-        ): LoDashImplicitWrapper<NumericDictionary<TResult>>;
+        mapValues(this: LoDashImplicitWrapper<string | null | undefined>): LoDashImplicitWrapper<NumericDictionary<string>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T>(this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>): LoDashImplicitWrapper<Dictionary<T>>;
+        mapValues<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashImplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.mapValues
@@ -2395,15 +2435,28 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<T | {}>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(this: LoDashImplicitWrapper<string | null | undefined>): LoDashImplicitWrapper<NumericDictionary<string>>;
+        mapValues<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<PartialObject<T>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            callback: StringIterator<TResult>
+        ): LoDashExplicitWrapper<NumericDictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T, TResult>(
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            callback: ObjectIterator<Dictionary<T>, TResult>
+        ): LoDashExplicitWrapper<Dictionary<TResult>>;
+
         /**
          * @see _.mapValues
          */
@@ -2412,6 +2465,16 @@ declare module "../index" {
             callback: ObjectIterator<T, TResult>
         ): LoDashExplicitWrapper<{ [P in keyof T]: TResult }>;
 
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: object
+        ): LoDashExplicitWrapper<Dictionary<boolean>>;
+
         /**
          * @see _.mapValues
          */
@@ -2422,16 +2485,28 @@ declare module "../index" {
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
         mapValues<T, TKey extends keyof T>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: TKey
         ): LoDashExplicitWrapper<Dictionary<T[TKey]>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T extends object, TKey extends keyof T>(
+        mapValues<T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: string
+        ): LoDashExplicitWrapper<Dictionary<any>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
             iteratee: string
         ): LoDashExplicitWrapper<{ [P in keyof T]: any }>;
@@ -2439,15 +2514,14 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<TResult>(
-            this: LoDashExplicitWrapper<string | null | undefined>,
-            callback: StringIterator<TResult>
-        ): LoDashExplicitWrapper<NumericDictionary<TResult>>;
+        mapValues(this: LoDashExplicitWrapper<string | null | undefined>): LoDashExplicitWrapper<NumericDictionary<string>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T>(this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>): LoDashExplicitWrapper<Dictionary<T>>;
+        mapValues<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashExplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.mapValues
@@ -2457,12 +2531,7 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<T | {}>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(this: LoDashExplicitWrapper<string | null | undefined>): LoDashExplicitWrapper<NumericDictionary<string>>;
+        mapValues<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<PartialObject<T>>;
     }
 
     // merge
@@ -2773,10 +2842,10 @@ declare module "../index" {
          * _.omit(object, ['a', 'c']);
          * // => { 'b': '2' }
          */
-        omit<T>(
-            object: Dictionary<T>,
+        omit<T extends AnyKindOfDictionary>(
+            object: T | null | undefined,
             ...paths: PropertyPath[]
-        ): Dictionary<T>;
+        ): T;
 
         /**
          * @see _.omit
@@ -2791,10 +2860,10 @@ declare module "../index" {
         /**
          * @see _.omit
          */
-        omit<T>(
-            this: LoDashImplicitWrapper<Dictionary<T>>,
+        omit<T extends AnyKindOfDictionary>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
             ...paths: PropertyPath[]
-        ): LoDashImplicitWrapper<Dictionary<T>>;
+        ): LoDashImplicitWrapper<T>;
 
         /**
          * @see _.omit
@@ -2809,10 +2878,10 @@ declare module "../index" {
         /**
          * @see _.omit
          */
-        omit<T>(
-            this: LoDashExplicitWrapper<Dictionary<T>>,
+        omit<T extends AnyKindOfDictionary>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
             ...paths: PropertyPath[]
-        ): LoDashExplicitWrapper<Dictionary<T>>;
+        ): LoDashExplicitWrapper<T>;
 
         /**
          * @see _.omit
@@ -3164,7 +3233,7 @@ declare module "../index" {
          * @param object The object to query.
          * @return Returns the new array of key-value pairs.
          */
-        toPairs<T>(object?: Dictionary<T>): Array<[string, T]>;
+        toPairs<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.toPairs
@@ -3176,7 +3245,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        toPairs<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        toPairs<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -3188,7 +3257,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        toPairs<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        toPairs<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -3205,7 +3274,7 @@ declare module "../index" {
          * @param object The object to query.
          * @return Returns the new array of key-value pairs.
          */
-        toPairsIn<T>(object?: Dictionary<T>): Array<[string, T]>;
+        toPairsIn<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.toPairsIn
@@ -3217,7 +3286,7 @@ declare module "../index" {
         /**
          * @see _.toPairsIn
          */
-        toPairsIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        toPairsIn<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairsIn
@@ -3229,7 +3298,7 @@ declare module "../index" {
         /**
          * @see _.toPairsIn
          */
-        toPairsIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        toPairsIn<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairsIn
@@ -3563,7 +3632,7 @@ declare module "../index" {
          * @param object The object to query.
          * @return Returns an array of property values.
          */
-        values<T>(object: Dictionary<T>|NumericDictionary<T>|List<T> | null | undefined): T[];
+        values<T>(object: Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined): T[];
 
         /**
          * @see _.values
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 7646cd02a6..20bde973aa 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -109,11 +109,11 @@ namespace TestChunk {
     {
         let result: AbcObject[][];
 
-        result = _.chunk<AbcObject>(array);
-        result = _.chunk<AbcObject>(array, 42);
+        result = _.chunk(array);
+        result = _.chunk(array, 42);
 
-        result = _.chunk<AbcObject>(list);
-        result = _.chunk<AbcObject>(list, 42);
+        result = _.chunk(list);
+        result = _.chunk(list, 42);
     }
 
     {
@@ -122,8 +122,8 @@ namespace TestChunk {
         result = _(array).chunk();
         result = _(array).chunk(42);
 
-        result = _(list).chunk<AbcObject>();
-        result = _(list).chunk<AbcObject>(42);
+        result = _(list).chunk();
+        result = _(list).chunk(42);
     }
 
     {
@@ -133,8 +133,8 @@ namespace TestChunk {
         result = _(array).chain().chunk();
         result = _(array).chain().chunk(42);
 
-        result = _(list).chain().chunk<AbcObject>();
-        result = _(list).chain().chunk<AbcObject>(42);
+        result = _(list).chain().chunk();
+        result = _(list).chain().chunk(42);
     }
 }
 
@@ -148,8 +148,8 @@ namespace TestCompact {
     {
         let result: AbcObject[];
 
-        result = _.compact<AbcObject>(array);
-        result = _.compact<AbcObject>(list);
+        result = _.compact(array);
+        result = _.compact(list);
         result = _.compact(array2);
         result = _.compact(list2);
     }
@@ -158,14 +158,14 @@ namespace TestCompact {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).compact();
-        result = _(list).compact<AbcObject>();
+        result = _(list).compact();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().compact();
-        result = _(list).chain().compact<AbcObject>();
+        result = _(list).chain().compact();
     }
 }
 
@@ -198,10 +198,10 @@ namespace TestDifference {
         result = _(array).difference(listParam, arrayParam);
         result = _(array).difference(arrayParam, listParam, arrayParam);
 
-        result = _(list).difference<AbcObject>();
-        result = _(list).difference<AbcObject>(listParam);
-        result = _(list).difference<AbcObject>(arrayParam, listParam);
-        result = _(list).difference<AbcObject>(listParam, arrayParam, listParam);
+        result = _(list).difference();
+        result = _(list).difference(listParam);
+        result = _(list).difference(arrayParam, listParam);
+        result = _(list).difference(listParam, arrayParam, listParam);
     }
 
     {
@@ -212,10 +212,10 @@ namespace TestDifference {
         result = _(array).chain().difference(listParam, arrayParam);
         result = _(array).chain().difference(arrayParam, listParam, arrayParam);
 
-        result = _(list).chain().difference<AbcObject>();
-        result = _(list).chain().difference<AbcObject>(listParam);
-        result = _(list).chain().difference<AbcObject>(arrayParam, listParam);
-        result = _(list).chain().difference<AbcObject>(listParam, arrayParam, listParam);
+        result = _(list).chain().difference();
+        result = _(list).chain().difference(listParam);
+        result = _(list).chain().difference(arrayParam, listParam);
+        result = _(list).chain().difference(listParam, arrayParam, listParam);
     }
 }
 
@@ -231,12 +231,12 @@ namespace TestDifferenceBy {
         let result: AbcObject[];
 
         result = _.differenceBy(array);
-        result = _.differenceBy<AbcObject>(array, arrayParam);
-        result = _.differenceBy<AbcObject>(array, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, arrayParam, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, listParam, arrayParam, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, arrayParam);
+        result = _.differenceBy(array, listParam, arrayParam);
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
         result = _.differenceBy(array, arrayParam, iteratee);
         result = _.differenceBy(array, listParam, arrayParam, iteratee);
@@ -260,12 +260,12 @@ namespace TestDifferenceBy {
         result = _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
         result = _.differenceBy(list);
-        result = _.differenceBy<AbcObject>(list, listParam);
-        result = _.differenceBy<AbcObject>(list, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, listParam, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, arrayParam, listParam, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, listParam);
+        result = _.differenceBy(list, arrayParam, listParam);
+        result = _.differenceBy(list, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
         result = _.differenceBy(list, listParam, iteratee);
         result = _.differenceBy(list, arrayParam, listParam, iteratee);
@@ -292,12 +292,12 @@ namespace TestDifferenceBy {
     {
         let result: _.LoDashImplicitWrapper<AbcObject[]>;
 
-        result = _(array).differenceBy<AbcObject>(arrayParam);
-        result = _(array).differenceBy<AbcObject>(listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(arrayParam);
+        result = _(array).differenceBy(listParam, arrayParam);
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
         result = _(array).differenceBy(arrayParam, iteratee);
         result = _(array).differenceBy(listParam, arrayParam, iteratee);
@@ -320,12 +320,12 @@ namespace TestDifferenceBy {
         result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
         result = _(array).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
-        result = _(list).differenceBy<AbcObject>(listParam);
-        result = _(list).differenceBy<AbcObject>(arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(listParam, arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).differenceBy(listParam);
+        result = _(list).differenceBy(arrayParam, listParam);
+        result = _(list).differenceBy(listParam, arrayParam, listParam);
+        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam);
+        result = _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
         result = _(list).differenceBy(listParam, iteratee);
         result = _(list).differenceBy(arrayParam, listParam, iteratee);
@@ -352,12 +352,12 @@ namespace TestDifferenceBy {
     {
         let result: _.LoDashExplicitWrapper<AbcObject[]>;
 
-        result = _(array).chain().differenceBy<AbcObject>(arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(arrayParam);
+        result = _(array).chain().differenceBy(listParam, arrayParam);
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
         result = _(array).chain().differenceBy(arrayParam, iteratee);
         result = _(array).chain().differenceBy(listParam, arrayParam, iteratee);
@@ -380,12 +380,12 @@ namespace TestDifferenceBy {
         result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
         result = _(array).chain().differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
-        result = _(list).chain().differenceBy<AbcObject>(listParam);
-        result = _(list).chain().differenceBy<AbcObject>(arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(listParam);
+        result = _(list).chain().differenceBy(arrayParam, listParam);
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
         result = _(list).chain().differenceBy(listParam, iteratee);
         result = _(list).chain().differenceBy(arrayParam, listParam, iteratee);
@@ -653,11 +653,11 @@ namespace TestDifferenceBy {
 
     {
         let result: AbcObject[];
-        result = _.drop<AbcObject>(array);
-        result = _.drop<AbcObject>(array, 42);
+        result = _.drop(array);
+        result = _.drop(array, 42);
 
-        result = _.drop<AbcObject>(list);
-        result = _.drop<AbcObject>(list, 42);
+        result = _.drop(list);
+        result = _.drop(list, 42);
     }
 
     {
@@ -666,8 +666,8 @@ namespace TestDifferenceBy {
         result = _(array).drop();
         result = _(array).drop(42);
 
-        result = _(list).drop<AbcObject>();
-        result = _(list).drop<AbcObject>(42);
+        result = _(list).drop();
+        result = _(list).drop(42);
     }
 
     {
@@ -676,8 +676,8 @@ namespace TestDifferenceBy {
         result = _(array).chain().drop();
         result = _(array).chain().drop(42);
 
-        result = _(list).chain().drop<AbcObject>();
-        result = _(list).chain().drop<AbcObject>(42);
+        result = _(list).chain().drop();
+        result = _(list).chain().drop(42);
     }
 }
 
@@ -689,11 +689,11 @@ namespace TestDropRight {
     {
         let result: AbcObject[];
 
-        result = _.dropRight<AbcObject>(array);
-        result = _.dropRight<AbcObject>(array, 42);
+        result = _.dropRight(array);
+        result = _.dropRight(array, 42);
 
-        result = _.dropRight<AbcObject>(list);
-        result = _.dropRight<AbcObject>(list, 42);
+        result = _.dropRight(list);
+        result = _.dropRight(list, 42);
     }
 
     {
@@ -702,8 +702,8 @@ namespace TestDropRight {
         result = _(array).dropRight();
         result = _(array).dropRight(42);
 
-        result = _(list).dropRight<AbcObject>();
-        result = _(list).dropRight<AbcObject>(42);
+        result = _(list).dropRight();
+        result = _(list).dropRight(42);
     }
 
     {
@@ -712,8 +712,8 @@ namespace TestDropRight {
         result = _(array).chain().dropRight();
         result = _(array).chain().dropRight(42);
 
-        result = _(list).chain().dropRight<AbcObject>();
-        result = _(list).chain().dropRight<AbcObject>(42);
+        result = _(list).chain().dropRight();
+        result = _(list).chain().dropRight(42);
     }
 }
 
@@ -726,14 +726,14 @@ namespace TestDropRightWhile {
     {
         let result: AbcObject[];
 
-        result = _.dropRightWhile<AbcObject>(array);
-        result = _.dropRightWhile<AbcObject>(array, predicateFn);
-        result = _.dropRightWhile<AbcObject>(array, '');
+        result = _.dropRightWhile(array);
+        result = _.dropRightWhile(array, predicateFn);
+        result = _.dropRightWhile(array, '');
         result = _.dropRightWhile(array, {a: 42});
 
-        result = _.dropRightWhile<AbcObject>(list);
-        result = _.dropRightWhile<AbcObject>(list, predicateFn);
-        result = _.dropRightWhile<AbcObject>(list, '');
+        result = _.dropRightWhile(list);
+        result = _.dropRightWhile(list, predicateFn);
+        result = _.dropRightWhile(list, '');
         result = _.dropRightWhile(list, {a: 42});
     }
 
@@ -745,9 +745,9 @@ namespace TestDropRightWhile {
         result = _(array).dropRightWhile('');
         result = _(array).dropRightWhile({a: 42});
 
-        result = _(list).dropRightWhile<AbcObject>();
-        result = _(list).dropRightWhile<AbcObject>(predicateFn);
-        result = _(list).dropRightWhile<AbcObject>('');
+        result = _(list).dropRightWhile();
+        result = _(list).dropRightWhile(predicateFn);
+        result = _(list).dropRightWhile('');
         result = _(list).dropRightWhile({a: 42});
     }
 
@@ -759,9 +759,9 @@ namespace TestDropRightWhile {
         result = _(array).chain().dropRightWhile('');
         result = _(array).chain().dropRightWhile({a: 42});
 
-        result = _(list).chain().dropRightWhile<AbcObject>();
-        result = _(list).chain().dropRightWhile<AbcObject>(predicateFn);
-        result = _(list).chain().dropRightWhile<AbcObject>('');
+        result = _(list).chain().dropRightWhile();
+        result = _(list).chain().dropRightWhile(predicateFn);
+        result = _(list).chain().dropRightWhile('');
         result = _(list).chain().dropRightWhile({a: 42});
     }
 }
@@ -775,14 +775,14 @@ namespace TestDropWhile {
     {
         let result: AbcObject[];
 
-        result = _.dropWhile<AbcObject>(array);
-        result = _.dropWhile<AbcObject>(array, predicateFn);
-        result = _.dropWhile<AbcObject>(array, '');
+        result = _.dropWhile(array);
+        result = _.dropWhile(array, predicateFn);
+        result = _.dropWhile(array, '');
         result = _.dropWhile(array, {a: 42});
 
-        result = _.dropWhile<AbcObject>(list);
-        result = _.dropWhile<AbcObject>(list, predicateFn);
-        result = _.dropWhile<AbcObject>(list, '');
+        result = _.dropWhile(list);
+        result = _.dropWhile(list, predicateFn);
+        result = _.dropWhile(list, '');
         result = _.dropWhile(list, {a: 42});
     }
 
@@ -794,9 +794,9 @@ namespace TestDropWhile {
         result = _(array).dropWhile('');
         result = _(array).dropWhile({a: 42});
 
-        result = _(list).dropWhile<AbcObject>();
-        result = _(list).dropWhile<AbcObject>(predicateFn);
-        result = _(list).dropWhile<AbcObject>('');
+        result = _(list).dropWhile();
+        result = _(list).dropWhile(predicateFn);
+        result = _(list).dropWhile('');
         result = _(list).dropWhile({a: 42});
     }
 
@@ -808,9 +808,9 @@ namespace TestDropWhile {
         result = _(array).chain().dropWhile('');
         result = _(array).chain().dropWhile({a: 42});
 
-        result = _(list).chain().dropWhile<AbcObject>();
-        result = _(list).chain().dropWhile<AbcObject>(predicateFn);
-        result = _(list).chain().dropWhile<AbcObject>('');
+        result = _(list).chain().dropWhile();
+        result = _(list).chain().dropWhile(predicateFn);
+        result = _(list).chain().dropWhile('');
         result = _(list).chain().dropWhile({a: 42});
     }
 }
@@ -879,17 +879,17 @@ namespace TestFindIndex {
     {
         let result: number;
 
-        result = _.findIndex<AbcObject>(array);
-        result = _.findIndex<AbcObject>(array, predicateFn);
-        result = _.findIndex<AbcObject>(array, '');
+        result = _.findIndex(array);
+        result = _.findIndex(array, predicateFn);
+        result = _.findIndex(array, '');
         result = _.findIndex(array, {a: 42});
-        result = _.findIndex<AbcObject>(array, predicateFn, fromIndex);
+        result = _.findIndex(array, predicateFn, fromIndex);
 
-        result = _.findIndex<AbcObject>(list);
-        result = _.findIndex<AbcObject>(list, predicateFn);
-        result = _.findIndex<AbcObject>(list, '');
+        result = _.findIndex(list);
+        result = _.findIndex(list, predicateFn);
+        result = _.findIndex(list, '');
         result = _.findIndex(list, {a: 42});
-        result = _.findIndex<AbcObject>(list, predicateFn, fromIndex);
+        result = _.findIndex(list, predicateFn, fromIndex);
         result = _.findIndex([{ b: 5 }], ['b', 5]);
 
         result = _(array).findIndex();
@@ -899,10 +899,10 @@ namespace TestFindIndex {
         result = _(array).findIndex(predicateFn, fromIndex);
 
         result = _(list).findIndex();
-        result = _(list).findIndex<AbcObject>(predicateFn);
+        result = _(list).findIndex(predicateFn);
         result = _(list).findIndex('');
         result = _(list).findIndex<{a: number}>({a: 42});
-        result = _(list).findIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).findIndex(predicateFn, fromIndex);
     }
 
     {
@@ -915,10 +915,10 @@ namespace TestFindIndex {
         result = _(array).chain().findIndex(predicateFn, fromIndex);
 
         result = _(list).chain().findIndex();
-        result = _(list).chain().findIndex<AbcObject>(predicateFn);
+        result = _(list).chain().findIndex(predicateFn);
         result = _(list).chain().findIndex('');
         result = _(list).chain().findIndex<{a: number}>({a: 42});
-        result = _(list).chain().findIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).chain().findIndex(predicateFn, fromIndex);
     }
 }
 
@@ -933,17 +933,17 @@ namespace TestFindLastIndex {
     {
         let result: number;
 
-        result = _.findLastIndex<AbcObject>(array);
-        result = _.findLastIndex<AbcObject>(array, predicateFn);
-        result = _.findLastIndex<AbcObject>(array, '');
+        result = _.findLastIndex(array);
+        result = _.findLastIndex(array, predicateFn);
+        result = _.findLastIndex(array, '');
         result = _.findLastIndex(array, {a: 42});
-        result = _.findLastIndex<AbcObject>(array, predicateFn, fromIndex);
+        result = _.findLastIndex(array, predicateFn, fromIndex);
 
-        result = _.findLastIndex<AbcObject>(list);
-        result = _.findLastIndex<AbcObject>(list, predicateFn);
-        result = _.findLastIndex<AbcObject>(list, '');
+        result = _.findLastIndex(list);
+        result = _.findLastIndex(list, predicateFn);
+        result = _.findLastIndex(list, '');
         result = _.findLastIndex(list, {a: 42});
-        result = _.findLastIndex<AbcObject>(list, predicateFn, fromIndex);
+        result = _.findLastIndex(list, predicateFn, fromIndex);
         result = _.findLastIndex([{ b: 5 }], ['b', 5]);
 
         result = _(array).findLastIndex();
@@ -953,10 +953,10 @@ namespace TestFindLastIndex {
         result = _(array).findLastIndex(predicateFn, fromIndex);
 
         result = _(list).findLastIndex();
-        result = _(list).findLastIndex<AbcObject>(predicateFn);
+        result = _(list).findLastIndex(predicateFn);
         result = _(list).findLastIndex('');
         result = _(list).findLastIndex<{a: number}>({a: 42});
-        result = _(list).findLastIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).findLastIndex(predicateFn, fromIndex);
     }
 
     {
@@ -969,10 +969,10 @@ namespace TestFindLastIndex {
         result = _(array).chain().findLastIndex(predicateFn, fromIndex);
 
         result = _(list).chain().findLastIndex();
-        result = _(list).chain().findLastIndex<AbcObject>(predicateFn);
+        result = _(list).chain().findLastIndex(predicateFn);
         result = _(list).chain().findLastIndex('');
         result = _(list).chain().findLastIndex<{a: number}>({a: 42});
-        result = _(list).chain().findLastIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).chain().findLastIndex(predicateFn, fromIndex);
     }
 }
 
@@ -991,11 +991,11 @@ namespace TestFirst {
     {
         let result: AbcObject | undefined;
 
-        result = _.first<AbcObject>(array);
-        result = _.first<AbcObject>(list);
+        result = _.first(array);
+        result = _.first(list);
 
         result = _(array).first();
-        result = _(list).first<AbcObject>();
+        result = _(list).first();
     }
 
     {
@@ -1240,11 +1240,11 @@ namespace TestHead {
     {
         let result: AbcObject | undefined;
 
-        result = _.head<AbcObject>(array);
-        result = _.head<AbcObject>(list);
+        result = _.head(array);
+        result = _.head(list);
 
         result = _(array).head();
-        result = _(list).head<AbcObject>();
+        result = _(list).head();
     }
 
     {
@@ -1270,21 +1270,21 @@ namespace TestIndexOf {
     {
         let result: number;
 
-        result = _.indexOf<AbcObject>(array, value);
-        result = _.indexOf<AbcObject>(array, value, true);
-        result = _.indexOf<AbcObject>(array, value, 42);
+        result = _.indexOf(array, value);
+        result = _.indexOf(array, value, true);
+        result = _.indexOf(array, value, 42);
 
-        result = _.indexOf<AbcObject>(list, value);
-        result = _.indexOf<AbcObject>(list, value, true);
-        result = _.indexOf<AbcObject>(list, value, 42);
+        result = _.indexOf(list, value);
+        result = _.indexOf(list, value, true);
+        result = _.indexOf(list, value, 42);
 
         result = _(array).indexOf(value);
         result = _(array).indexOf(value, true);
         result = _(array).indexOf(value, 42);
 
-        result = _(list).indexOf<AbcObject>(value);
-        result = _(list).indexOf<AbcObject>(value, true);
-        result = _(list).indexOf<AbcObject>(value, 42);
+        result = _(list).indexOf(value);
+        result = _(list).indexOf(value, true);
+        result = _(list).indexOf(value, 42);
     }
 
     {
@@ -1294,9 +1294,9 @@ namespace TestIndexOf {
         result = _(array).chain().indexOf(value, true);
         result = _(array).chain().indexOf(value, 42);
 
-        result = _(list).chain().indexOf<AbcObject>(value);
-        result = _(list).chain().indexOf<AbcObject>(value, true);
-        result = _(list).chain().indexOf<AbcObject>(value, 42);
+        result = _(list).chain().indexOf(value);
+        result = _(list).chain().indexOf(value, true);
+        result = _(list).chain().indexOf(value, 42);
     }
 }
 
@@ -1309,17 +1309,17 @@ namespace TestIndexOf {
     {
         let result: number;
 
-        result = _.sortedIndexOf<AbcObject>(array, value);
-        result = _.sortedIndexOf<AbcObject>(list, value);
+        result = _.sortedIndexOf(array, value);
+        result = _.sortedIndexOf(list, value);
         result = _(array).sortedIndexOf(value);
-        result = _(list).sortedIndexOf<AbcObject>(value);
+        result = _(list).sortedIndexOf(value);
     }
 
     {
         let result: _.LoDashExplicitWrapper<number>;
 
         result = _(array).chain().sortedIndexOf(value);
-        result = _(list).chain().sortedIndexOf<AbcObject>(value);
+        result = _(list).chain().sortedIndexOf(value);
     }
 }
 
@@ -1331,22 +1331,22 @@ namespace TestInitial {
     {
         let result: AbcObject[];
 
-        result = _.initial<AbcObject>(array);
-        result = _.initial<AbcObject>(list);
+        result = _.initial(array);
+        result = _.initial(list);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).initial();
-        result = _(list).initial<AbcObject>();
+        result = _(list).initial();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().initial();
-        result = _(list).chain().initial<AbcObject>();
+        result = _(list).chain().initial();
     }
 }
 
@@ -1360,28 +1360,28 @@ namespace TestIntersection {
     {
         let result: AbcObject[];
 
-        result = _.intersection<AbcObject>(array, list);
-        result = _.intersection<AbcObject>(list, array, list);
+        result = _.intersection(array, list);
+        result = _.intersection(list, array, list);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
-        result = _(array).intersection<AbcObject>(arrayParam);
-        result = _(array).intersection<AbcObject>(listParam, arrayParam);
+        result = _(array).intersection(arrayParam);
+        result = _(array).intersection(listParam, arrayParam);
 
-        result = _(list).intersection<AbcObject>(arrayParam);
-        result = _(list).intersection<AbcObject>(listParam, arrayParam);
+        result = _(list).intersection(arrayParam);
+        result = _(list).intersection(listParam, arrayParam);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
-        result = _(array).chain().intersection<AbcObject>(arrayParam);
-        result = _(array).chain().intersection<AbcObject>(listParam, arrayParam);
+        result = _(array).chain().intersection(arrayParam);
+        result = _(array).chain().intersection(listParam, arrayParam);
 
-        result = _(list).chain().intersection<AbcObject>(arrayParam);
-        result = _(list).chain().intersection<AbcObject>(listParam, arrayParam);
+        result = _(list).chain().intersection(arrayParam);
+        result = _(list).chain().intersection(listParam, arrayParam);
     }
 }
 
@@ -1632,11 +1632,11 @@ namespace TestLast {
     {
         let result: AbcObject | undefined;
 
-        result = _.last<AbcObject>(array);
-        result = _.last<AbcObject>(list);
+        result = _.last(array);
+        result = _.last(list);
 
         result = _(array).last();
-        result = _(list).last<AbcObject>();
+        result = _(list).last();
     }
 
     {
@@ -1667,21 +1667,21 @@ namespace TestLastIndexOf {
     {
         let result: number;
 
-        result = _.lastIndexOf<AbcObject>(array, value);
-        result = _.lastIndexOf<AbcObject>(array, value, true);
-        result = _.lastIndexOf<AbcObject>(array, value, 42);
+        result = _.lastIndexOf(array, value);
+        result = _.lastIndexOf(array, value, true);
+        result = _.lastIndexOf(array, value, 42);
 
-        result = _.lastIndexOf<AbcObject>(list, value);
-        result = _.lastIndexOf<AbcObject>(list, value, true);
-        result = _.lastIndexOf<AbcObject>(list, value, 42);
+        result = _.lastIndexOf(list, value);
+        result = _.lastIndexOf(list, value, true);
+        result = _.lastIndexOf(list, value, 42);
 
         result = _(array).lastIndexOf(value);
         result = _(array).lastIndexOf(value, true);
         result = _(array).lastIndexOf(value, 42);
 
-        result = _(list).lastIndexOf<AbcObject>(value);
-        result = _(list).lastIndexOf<AbcObject>(value, true);
-        result = _(list).lastIndexOf<AbcObject>(value, 42);
+        result = _(list).lastIndexOf(value);
+        result = _(list).lastIndexOf(value, true);
+        result = _(list).lastIndexOf(value, 42);
     }
 
     {
@@ -1691,9 +1691,9 @@ namespace TestLastIndexOf {
         result = _(array).chain().lastIndexOf(value, true);
         result = _(array).chain().lastIndexOf(value, 42);
 
-        result = _(list).chain().lastIndexOf<AbcObject>(value);
-        result = _(list).chain().lastIndexOf<AbcObject>(value, true);
-        result = _(list).chain().lastIndexOf<AbcObject>(value, 42);
+        result = _(list).chain().lastIndexOf(value);
+        result = _(list).chain().lastIndexOf(value, true);
+        result = _(list).chain().lastIndexOf(value, 42);
     }
 }
 
@@ -1706,15 +1706,15 @@ namespace TestNth {
     {
         let result: AbcObject | undefined;
 
-        result = _.nth<AbcObject>(array);
+        result = _.nth(array);
 
-        result = _.nth<AbcObject>(array, 42);
+        result = _.nth(array, 42);
 
         result = _(array).nth();
         result = _(array).nth(42);
 
-        result = _(list).nth<AbcObject>();
-        result = _(list).nth<AbcObject>(42);
+        result = _(list).nth();
+        result = _(list).nth(42);
     }
 
     {
@@ -1723,8 +1723,8 @@ namespace TestNth {
         result = _(array).chain().nth();
         result = _(array).chain().nth(42);
 
-        result = _(list).chain().nth<AbcObject>();
-        result = _(list).chain().nth<AbcObject>(42);
+        result = _(list).chain().nth();
+        result = _(list).chain().nth(42);
     }
 }
 
@@ -1737,19 +1737,19 @@ namespace TestPull {
     {
         let result: AbcObject[];
 
-        result = _.pull<AbcObject>(array);
-        result = _.pull<AbcObject>(array, value);
-        result = _.pull<AbcObject>(array, value, value);
-        result = _.pull<AbcObject>(array, value, value, value);
+        result = _.pull(array);
+        result = _.pull(array, value);
+        result = _.pull(array, value, value);
+        result = _.pull(array, value, value, value);
     }
 
     {
         let result: _.List<AbcObject>;
 
-        result = _.pull<AbcObject>(list);
-        result = _.pull<AbcObject>(list, value);
-        result = _.pull<AbcObject>(list, value, value);
-        result = _.pull<AbcObject>(list, value, value, value);
+        result = _.pull(list);
+        result = _.pull(list, value);
+        result = _.pull(list, value, value);
+        result = _.pull(list, value, value, value);
     }
 
     {
@@ -1764,10 +1764,10 @@ namespace TestPull {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).pull<AbcObject>();
-        result = _(list).pull<AbcObject>(value);
-        result = _(list).pull<AbcObject>(value, value);
-        result = _(list).pull<AbcObject>(value, value, value);
+        result = _(list).pull();
+        result = _(list).pull(value);
+        result = _(list).pull(value, value);
+        result = _(list).pull(value, value, value);
     }
 
     {
@@ -1782,10 +1782,10 @@ namespace TestPull {
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).chain().pull<AbcObject>();
-        result = _(list).chain().pull<AbcObject>(value);
-        result = _(list).chain().pull<AbcObject>(value, value);
-        result = _(list).chain().pull<AbcObject>(value, value, value);
+        result = _(list).chain().pull();
+        result = _(list).chain().pull(value);
+        result = _(list).chain().pull(value, value);
+        result = _(list).chain().pull(value, value, value);
     }
 }
 
@@ -1797,19 +1797,19 @@ namespace TestPullAt {
     {
         let result: AbcObject[];
 
-        result = _.pullAt<AbcObject>(array);
-        result = _.pullAt<AbcObject>(array, 1);
-        result = _.pullAt<AbcObject>(array, [2, 3], 1);
-        result = _.pullAt<AbcObject>(array, 4, [2, 3], 1);
+        result = _.pullAt(array);
+        result = _.pullAt(array, 1);
+        result = _.pullAt(array, [2, 3], 1);
+        result = _.pullAt(array, 4, [2, 3], 1);
     }
 
     {
         let result: ArrayLike<AbcObject>;
 
-        result = _.pullAt<AbcObject>(list);
-        result = _.pullAt<AbcObject>(list, 1);
-        result = _.pullAt<AbcObject>(list, [2, 3], 1);
-        result = _.pullAt<AbcObject>(list, 4, [2, 3], 1);
+        result = _.pullAt(list);
+        result = _.pullAt(list, 1);
+        result = _.pullAt(list, [2, 3], 1);
+        result = _.pullAt(list, 4, [2, 3], 1);
     }
 
     {
@@ -2117,14 +2117,14 @@ namespace TestRemove {
     {
         let result: AbcObject[];
 
-        result = _.remove<AbcObject>(array);
-        result = _.remove<AbcObject>(array, predicateFn);
-        result = _.remove<AbcObject>(array, '');
+        result = _.remove(array);
+        result = _.remove(array, predicateFn);
+        result = _.remove(array, '');
         result = _.remove(array, {a: 42});
 
-        result = _.remove<AbcObject>(list);
-        result = _.remove<AbcObject>(list, predicateFn);
-        result = _.remove<AbcObject>(list, '');
+        result = _.remove(list);
+        result = _.remove(list, predicateFn);
+        result = _.remove(list, '');
         result = _.remove(list, {a: 42});
     }
 
@@ -2136,9 +2136,9 @@ namespace TestRemove {
         result = _(array).remove('');
         result = _(array).remove({a: 42});
 
-        result = _(list).remove<AbcObject>();
-        result = _(list).remove<AbcObject>(predicateFn);
-        result = _(list).remove<AbcObject>('');
+        result = _(list).remove();
+        result = _(list).remove(predicateFn);
+        result = _(list).remove('');
         result = _(list).remove({a: 42});
     }
 
@@ -2150,9 +2150,9 @@ namespace TestRemove {
         result = _(array).chain().remove('');
         result = _(array).chain().remove({a: 42});
 
-        result = _(list).chain().remove<AbcObject>();
-        result = _(list).chain().remove<AbcObject>(predicateFn);
-        result = _(list).chain().remove<AbcObject>('');
+        result = _(list).chain().remove();
+        result = _(list).chain().remove(predicateFn);
+        result = _(list).chain().remove('');
         result = _(list).chain().remove({a: 42});
     }
 }
@@ -2165,22 +2165,22 @@ namespace TestTail {
     {
         let result: AbcObject[];
 
-        result = _.tail<AbcObject>(array);
-        result = _.tail<AbcObject>(list);
+        result = _.tail(array);
+        result = _.tail(list);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).tail();
-        result = _(list).tail<AbcObject>();
+        result = _(list).tail();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().tail();
-        result = _(list).chain().tail<AbcObject>();
+        result = _(list).chain().tail();
     }
 }
 
@@ -2191,7 +2191,7 @@ namespace TestSlice {
     {
         let result: AbcObject[];
 
-        result = _.slice<AbcObject>(array);
+        result = _.slice(array);
         result = _.slice(array, 42);
         result = _.slice(array, 42, 42);
     }
@@ -2405,11 +2405,11 @@ namespace TestTake {
     {
         let result: AbcObject[];
 
-        result = _.take<AbcObject>(array);
-        result = _.take<AbcObject>(array, 42);
+        result = _.take(array);
+        result = _.take(array, 42);
 
-        result = _.take<AbcObject>(list);
-        result = _.take<AbcObject>(list, 42);
+        result = _.take(list);
+        result = _.take(list, 42);
     }
 
     {
@@ -2418,8 +2418,8 @@ namespace TestTake {
         result = _(array).take();
         result = _(array).take(42);
 
-        result = _(list).take<AbcObject>();
-        result = _(list).take<AbcObject>(42);
+        result = _(list).take();
+        result = _(list).take(42);
     }
 
     {
@@ -2428,8 +2428,8 @@ namespace TestTake {
         result = _(array).chain().take();
         result = _(array).chain().take(42);
 
-        result = _(list).chain().take<AbcObject>();
-        result = _(list).chain().take<AbcObject>(42);
+        result = _(list).chain().take();
+        result = _(list).chain().take(42);
     }
 }
 
@@ -2441,11 +2441,11 @@ namespace TestTakeRight {
     {
         let result: AbcObject[];
 
-        result = _.takeRight<AbcObject>(array);
-        result = _.takeRight<AbcObject>(array, 42);
+        result = _.takeRight(array);
+        result = _.takeRight(array, 42);
 
-        result = _.takeRight<AbcObject>(list);
-        result = _.takeRight<AbcObject>(list, 42);
+        result = _.takeRight(list);
+        result = _.takeRight(list, 42);
     }
 
     {
@@ -2454,8 +2454,8 @@ namespace TestTakeRight {
         result = _(array).takeRight();
         result = _(array).takeRight(42);
 
-        result = _(list).takeRight<AbcObject>();
-        result = _(list).takeRight<AbcObject>(42);
+        result = _(list).takeRight();
+        result = _(list).takeRight(42);
     }
 
     {
@@ -2464,8 +2464,8 @@ namespace TestTakeRight {
         result = _(array).chain().takeRight();
         result = _(array).chain().takeRight(42);
 
-        result = _(list).chain().takeRight<AbcObject>();
-        result = _(list).chain().takeRight<AbcObject>(42);
+        result = _(list).chain().takeRight();
+        result = _(list).chain().takeRight(42);
     }
 }
 
@@ -2478,14 +2478,14 @@ namespace TestTakeRightWhile {
     {
         let result: AbcObject[];
 
-        result = _.takeRightWhile<AbcObject>(array);
-        result = _.takeRightWhile<AbcObject>(array, predicateFn);
-        result = _.takeRightWhile<AbcObject>(array, '');
+        result = _.takeRightWhile(array);
+        result = _.takeRightWhile(array, predicateFn);
+        result = _.takeRightWhile(array, '');
         result = _.takeRightWhile(array, {a: 42});
 
-        result = _.takeRightWhile<AbcObject>(list);
-        result = _.takeRightWhile<AbcObject>(list, predicateFn);
-        result = _.takeRightWhile<AbcObject>(list, '');
+        result = _.takeRightWhile(list);
+        result = _.takeRightWhile(list, predicateFn);
+        result = _.takeRightWhile(list, '');
         result = _.takeRightWhile(list, {a: 42});
     }
 
@@ -2497,9 +2497,9 @@ namespace TestTakeRightWhile {
         result = _(array).takeRightWhile('');
         result = _(array).takeRightWhile({a: 42});
 
-        result = _(list).takeRightWhile<AbcObject>();
-        result = _(list).takeRightWhile<AbcObject>(predicateFn);
-        result = _(list).takeRightWhile<AbcObject>('');
+        result = _(list).takeRightWhile();
+        result = _(list).takeRightWhile(predicateFn);
+        result = _(list).takeRightWhile('');
         result = _(list).takeRightWhile({a: 42});
     }
 
@@ -2511,9 +2511,9 @@ namespace TestTakeRightWhile {
         result = _(array).chain().takeRightWhile('');
         result = _(array).chain().takeRightWhile({a: 42});
 
-        result = _(list).chain().takeRightWhile<AbcObject>();
-        result = _(list).chain().takeRightWhile<AbcObject>(predicateFn);
-        result = _(list).chain().takeRightWhile<AbcObject>('');
+        result = _(list).chain().takeRightWhile();
+        result = _(list).chain().takeRightWhile(predicateFn);
+        result = _(list).chain().takeRightWhile('');
         result = _(list).chain().takeRightWhile({a: 42});
     }
 }
@@ -2527,14 +2527,14 @@ namespace TestTakeWhile {
     {
         let result: AbcObject[];
 
-        result = _.takeWhile<AbcObject>(array);
-        result = _.takeWhile<AbcObject>(array, predicateFn);
-        result = _.takeWhile<AbcObject>(array, '');
+        result = _.takeWhile(array);
+        result = _.takeWhile(array, predicateFn);
+        result = _.takeWhile(array, '');
         result = _.takeWhile(array, {a: 42});
 
-        result = _.takeWhile<AbcObject>(list);
-        result = _.takeWhile<AbcObject>(list, predicateFn);
-        result = _.takeWhile<AbcObject>(list, '');
+        result = _.takeWhile(list);
+        result = _.takeWhile(list, predicateFn);
+        result = _.takeWhile(list, '');
         result = _.takeWhile(list, {a: 42});
     }
 
@@ -2546,9 +2546,9 @@ namespace TestTakeWhile {
         result = _(array).takeWhile('');
         result = _(array).takeWhile({a: 42});
 
-        result = _(list).takeWhile<AbcObject>();
-        result = _(list).takeWhile<AbcObject>(predicateFn);
-        result = _(list).takeWhile<AbcObject>('');
+        result = _(list).takeWhile();
+        result = _(list).takeWhile(predicateFn);
+        result = _(list).takeWhile('');
         result = _(list).takeWhile({a: 42});
     }
 
@@ -2560,9 +2560,9 @@ namespace TestTakeWhile {
         result = _(array).chain().takeWhile('');
         result = _(array).chain().takeWhile({a: 42});
 
-        result = _(list).chain().takeWhile<AbcObject>();
-        result = _(list).chain().takeWhile<AbcObject>(predicateFn);
-        result = _(list).chain().takeWhile<AbcObject>('');
+        result = _(list).chain().takeWhile();
+        result = _(list).chain().takeWhile(predicateFn);
+        result = _(list).chain().takeWhile('');
         result = _(list).chain().takeWhile({a: 42});
     }
 }
@@ -2575,15 +2575,16 @@ namespace TestUnion {
     {
         let result: AbcObject[];
 
-        result = _.union<AbcObject>();
+        // $ExpectType {}[]
+        _.union();
 
-        result = _.union<AbcObject>(array);
-        result = _.union<AbcObject>(array, list);
-        result = _.union<AbcObject>(array, list, array);
+        result = _.union(array);
+        result = _.union(array, list);
+        result = _.union(array, list, array);
 
-        result = _.union<AbcObject>(list);
-        result = _.union<AbcObject>(list, array);
-        result = _.union<AbcObject>(list, array, list);
+        result = _.union(list);
+        result = _.union(list, array);
+        result = _.union(list, array, list);
     }
 
     {
@@ -2593,13 +2594,13 @@ namespace TestUnion {
         result = _(array).union(list);
         result = _(array).union(list, array);
 
-        result = _(array).union<AbcObject>();
-        result = _(array).union<AbcObject>(list);
-        result = _(array).union<AbcObject>(list, array);
+        result = _(array).union();
+        result = _(array).union(list);
+        result = _(array).union(list, array);
 
-        result = _(list).union<AbcObject>();
-        result = _(list).union<AbcObject>(array);
-        result = _(list).union<AbcObject>(array, list);
+        result = _(list).union();
+        result = _(list).union(array);
+        result = _(list).union(array, list);
     }
 
     {
@@ -2609,13 +2610,13 @@ namespace TestUnion {
         result = _(array).chain().union(list);
         result = _(array).chain().union(list, array);
 
-        result = _(array).chain().union<AbcObject>();
-        result = _(array).chain().union<AbcObject>(list);
-        result = _(array).chain().union<AbcObject>(list, array);
+        result = _(array).chain().union();
+        result = _(array).chain().union(list);
+        result = _(array).chain().union(list, array);
 
-        result = _(list).chain().union<AbcObject>();
-        result = _(list).chain().union<AbcObject>(array);
-        result = _(list).chain().union<AbcObject>(array, list);
+        result = _(list).chain().union();
+        result = _(list).chain().union(array);
+        result = _(list).chain().union(array, list);
     }
 }
 
@@ -2628,20 +2629,21 @@ namespace TestUnionBy {
     {
         let result: AbcObject[];
 
-        result = _.unionBy<AbcObject>(array, array);
-        result = _.unionBy<AbcObject>(array, list, array);
-        result = _.unionBy<AbcObject>(array, array, list, array);
-        result = _.unionBy<AbcObject>(array, list, array, list, array);
-        result = _.unionBy<AbcObject>(array, array, list, array, list, array);
+        result = _.unionBy(array, array);
+        result = _.unionBy(array, list, array);
+        result = _.unionBy(array, array, list, array);
+        result = _.unionBy(array, list, array, list, array);
+        result = _.unionBy(array, array, list, array, list, array);
 
-        result = _.unionBy<AbcObject>(array, array, iteratee);
-        result = _.unionBy<AbcObject>(array, list, array, iteratee);
-        result = _.unionBy<AbcObject>(array, array, list, array, iteratee);
-        result = _.unionBy<AbcObject>(array, list, array, list, array, iteratee);
-        result = _.unionBy<AbcObject>(array, array, list, array, list, array, iteratee);
+        result = _.unionBy(array, array, iteratee);
+        result = _.unionBy(array, list, array, iteratee);
+        result = _.unionBy(array, array, list, array, iteratee);
+        result = _.unionBy(array, list, array, list, array, iteratee);
+        result = _.unionBy(array, array, list, array, list, array, iteratee);
 
-        result = _.unionBy<AbcObject>(array, array, 'a');
-        result = _.unionBy<AbcObject>(array, list, array, 'a');
+        result = _.unionBy(array, array, 'a');
+        result = _.unionBy(array, list, array, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _.unionBy<AbcObject>(array, array, list, array, 'a');
         result = _.unionBy<AbcObject>(array, list, array, list, array, 'a');
         result = _.unionBy<AbcObject>(array, array, list, array, list, array, 'a');
@@ -2650,22 +2652,23 @@ namespace TestUnionBy {
         result = _.unionBy(array, list, array, {a: 1});
         result = _.unionBy(array, array, list, array, {a: 1});
         result = _.unionBy(array, list, array, list, array, {a: 1});
-        result = _.unionBy<AbcObject>(array, list, array, list, array, list, {a: 1});
+        result = _.unionBy(array, list, array, list, array, list, {a: 1});
 
-        result = _.unionBy<AbcObject>(list, list);
-        result = _.unionBy<AbcObject>(list, array, list);
-        result = _.unionBy<AbcObject>(list, list, array, list);
-        result = _.unionBy<AbcObject>(list, array, list, array, list);
-        result = _.unionBy<AbcObject>(list, list, array, list, array, list);
+        result = _.unionBy(list, list);
+        result = _.unionBy(list, array, list);
+        result = _.unionBy(list, list, array, list);
+        result = _.unionBy(list, array, list, array, list);
+        result = _.unionBy(list, list, array, list, array, list);
 
-        result = _.unionBy<AbcObject>(list, list, iteratee);
-        result = _.unionBy<AbcObject>(list, array, list, iteratee);
-        result = _.unionBy<AbcObject>(list, list, array, list, iteratee);
-        result = _.unionBy<AbcObject>(list, array, list, array, list, iteratee);
-        result = _.unionBy<AbcObject>(list, list, array, list, array, list, iteratee);
+        result = _.unionBy(list, list, iteratee);
+        result = _.unionBy(list, array, list, iteratee);
+        result = _.unionBy(list, list, array, list, iteratee);
+        result = _.unionBy(list, array, list, array, list, iteratee);
+        result = _.unionBy(list, list, array, list, array, list, iteratee);
 
-        result = _.unionBy<AbcObject>(list, list, 'a');
-        result = _.unionBy<AbcObject>(list, array, list, 'a');
+        result = _.unionBy(list, list, 'a');
+        result = _.unionBy(list, array, list, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _.unionBy<AbcObject>(list, list, array, list, 'a');
         result = _.unionBy<AbcObject>(list, array, list, array, list, 'a');
         result = _.unionBy<AbcObject>(list, list, array, list, array, list, 'a');
@@ -2674,26 +2677,27 @@ namespace TestUnionBy {
         result = _.unionBy(list, array, list, {a: 1});
         result = _.unionBy(list, list, array, list, {a: 1});
         result = _.unionBy(list, array, list, array, list, {a: 1});
-        result = _.unionBy<AbcObject>(list, array, list, array, list, array, {a: 1});
+        result = _.unionBy(list, array, list, array, list, array, {a: 1});
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
-        result = _(array).unionBy<AbcObject>(array);
-        result = _(array).unionBy<AbcObject>(list, array);
-        result = _(array).unionBy<AbcObject>(array, list, array);
-        result = _(array).unionBy<AbcObject>(list, array, list, array);
-        result = _(array).unionBy<AbcObject>(array, list, array, list, array);
+        result = _(array).unionBy(array);
+        result = _(array).unionBy(list, array);
+        result = _(array).unionBy(array, list, array);
+        result = _(array).unionBy(list, array, list, array);
+        result = _(array).unionBy(array, list, array, list, array);
 
-        result = _(array).unionBy<AbcObject>(array, iteratee);
-        result = _(array).unionBy<AbcObject>(list, array, iteratee);
-        result = _(array).unionBy<AbcObject>(array, list, array, iteratee);
-        result = _(array).unionBy<AbcObject>(list, array, list, array, iteratee);
-        result = _(array).unionBy<AbcObject>(array, list, array, list, array, iteratee);
+        result = _(array).unionBy(array, iteratee);
+        result = _(array).unionBy(list, array, iteratee);
+        result = _(array).unionBy(array, list, array, iteratee);
+        result = _(array).unionBy(list, array, list, array, iteratee);
+        result = _(array).unionBy(array, list, array, list, array, iteratee);
 
-        result = _(array).unionBy<AbcObject>(array, 'a');
-        result = _(array).unionBy<AbcObject>(list, array, 'a');
+        result = _(array).unionBy(array, 'a');
+        result = _(array).unionBy(list, array, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(array).unionBy<AbcObject>(array, list, array, 'a');
         result = _(array).unionBy<AbcObject>(list, array, list, array, 'a');
         result = _(array).unionBy<AbcObject>(array, list, array, list, array, 'a');
@@ -2702,22 +2706,23 @@ namespace TestUnionBy {
         result = _(array).unionBy(list, array, {a: 1});
         result = _(array).unionBy(array, list, array, {a: 1});
         result = _(array).unionBy(list, array, list, array, {a: 1});
-        result = _(array).unionBy<AbcObject>(list, array, list, array, list, {a: 1});
+        result = _(array).unionBy(list, array, list, array, list, {a: 1});
 
-        result = _(list).unionBy<AbcObject>(list);
-        result = _(list).unionBy<AbcObject>(array, list);
-        result = _(list).unionBy<AbcObject>(list, array, list);
-        result = _(list).unionBy<AbcObject>(array, list, array, list);
-        result = _(list).unionBy<AbcObject>(list, array, list, array, list);
+        result = _(list).unionBy(list);
+        result = _(list).unionBy(array, list);
+        result = _(list).unionBy(list, array, list);
+        result = _(list).unionBy(array, list, array, list);
+        result = _(list).unionBy(list, array, list, array, list);
 
-        result = _(list).unionBy<AbcObject>(list, iteratee);
-        result = _(list).unionBy<AbcObject>(array, list, iteratee);
-        result = _(list).unionBy<AbcObject>(list, array, list, iteratee);
-        result = _(list).unionBy<AbcObject>(array, list, array, list, iteratee);
-        result = _(list).unionBy<AbcObject>(list, array, list, array, list, iteratee);
+        result = _(list).unionBy(list, iteratee);
+        result = _(list).unionBy(array, list, iteratee);
+        result = _(list).unionBy(list, array, list, iteratee);
+        result = _(list).unionBy(array, list, array, list, iteratee);
+        result = _(list).unionBy(list, array, list, array, list, iteratee);
 
-        result = _(list).unionBy<AbcObject>(list, 'a');
-        result = _(list).unionBy<AbcObject>(array, list, 'a');
+        result = _(list).unionBy(list, 'a');
+        result = _(list).unionBy(array, list, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(list).unionBy<AbcObject>(list, array, list, 'a');
         result = _(list).unionBy<AbcObject>(array, list, array, list, 'a');
         result = _(list).unionBy<AbcObject>(list, array, list, array, list, 'a');
@@ -2726,27 +2731,28 @@ namespace TestUnionBy {
         result = _(list).unionBy(array, list, {a: 1});
         result = _(list).unionBy(list, array, list, {a: 1});
         result = _(list).unionBy(array, list, array, list, {a: 1});
-        result = _(list).unionBy<AbcObject>(array, list, array, list, array, {a: 1});
+        result = _(list).unionBy(array, list, array, list, array, {a: 1});
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
-        result = _(array).chain().unionBy<AbcObject>(array);
-        result = _(array).chain().unionBy<AbcObject>(list, array);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array);
-        result = _(array).chain().unionBy<AbcObject>(list, array, list, array);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, list, array);
+        result = _(array).chain().unionBy(array);
+        result = _(array).chain().unionBy(list, array);
+        result = _(array).chain().unionBy(array, list, array);
+        result = _(array).chain().unionBy(list, array, list, array);
+        result = _(array).chain().unionBy(array, list, array, list, array);
 
-        result = _(array).chain().unionBy<AbcObject>(array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(list, array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(list, array, list, array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, list, array, iteratee);
+        result = _(array).chain().unionBy(array, iteratee);
+        result = _(array).chain().unionBy(list, array, iteratee);
+        result = _(array).chain().unionBy(array, list, array, iteratee);
+        result = _(array).chain().unionBy(list, array, list, array, iteratee);
+        result = _(array).chain().unionBy(array, list, array, list, array, iteratee);
 
-        result = _(array).chain().unionBy<AbcObject>(array, 'a');
-        result = _(array).chain().unionBy<AbcObject>(list, array, 'a');
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, 'a');
+        result = _(array).chain().unionBy(array, 'a');
+        result = _(array).chain().unionBy(list, array, 'a');
+        result = _(array).chain().unionBy(array, list, array, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(array).chain().unionBy<AbcObject>(list, array, list, array, 'a');
         result = _(array).chain().unionBy<AbcObject>(array, list, array, list, array, 'a');
 
@@ -2754,23 +2760,24 @@ namespace TestUnionBy {
         result = _(array).chain().unionBy(list, array, {a: 1});
         result = _(array).chain().unionBy(array, list, array, {a: 1});
         result = _(array).chain().unionBy(list, array, list, array, {a: 1});
-        result = _(array).chain().unionBy<AbcObject>(list, array, list, array, list, {a: 1});
+        result = _(array).chain().unionBy(list, array, list, array, list, {a: 1});
 
-        result = _(list).chain().unionBy<AbcObject>(list);
-        result = _(list).chain().unionBy<AbcObject>(array, list);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list);
-        result = _(list).chain().unionBy<AbcObject>(array, list, array, list);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, array, list);
+        result = _(list).chain().unionBy(list);
+        result = _(list).chain().unionBy(array, list);
+        result = _(list).chain().unionBy(list, array, list);
+        result = _(list).chain().unionBy(array, list, array, list);
+        result = _(list).chain().unionBy(list, array, list, array, list);
 
-        result = _(list).chain().unionBy<AbcObject>(list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(array, list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(array, list, array, list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, array, list, iteratee);
+        result = _(list).chain().unionBy(list, iteratee);
+        result = _(list).chain().unionBy(array, list, iteratee);
+        result = _(list).chain().unionBy(list, array, list, iteratee);
+        result = _(list).chain().unionBy(array, list, array, list, iteratee);
+        result = _(list).chain().unionBy(list, array, list, array, list, iteratee);
 
-        result = _(list).chain().unionBy<AbcObject>(list, 'a');
-        result = _(list).chain().unionBy<AbcObject>(array, list, 'a');
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, 'a');
+        result = _(list).chain().unionBy(list, 'a');
+        result = _(list).chain().unionBy(array, list, 'a');
+        result = _(list).chain().unionBy(list, array, list, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(list).chain().unionBy<AbcObject>(array, list, array, list, 'a');
         result = _(list).chain().unionBy<AbcObject>(list, array, list, array, list, 'a');
 
@@ -2778,7 +2785,7 @@ namespace TestUnionBy {
         result = _(list).chain().unionBy(array, list, {a: 1});
         result = _(list).chain().unionBy(list, array, list, {a: 1});
         result = _(list).chain().unionBy(array, list, array, list, {a: 1});
-        result = _(list).chain().unionBy<AbcObject>(array, list, array, list, array, {a: 1});
+        result = _(list).chain().unionBy(array, list, array, list, array, {a: 1});
     }
 }
 
@@ -3155,15 +3162,16 @@ namespace TestXor {
     {
         let result: AbcObject[];
 
-        result = _.xor<AbcObject>();
+        // $ExpectType {}[]
+        _.xor();
 
-        result = _.xor<AbcObject>(array);
-        result = _.xor<AbcObject>(array, list);
-        result = _.xor<AbcObject>(array, list, array);
+        result = _.xor(array);
+        result = _.xor(array, list);
+        result = _.xor(array, list, array);
 
-        result = _.xor<AbcObject>(list);
-        result = _.xor<AbcObject>(list, array);
-        result = _.xor<AbcObject>(list, array, list);
+        result = _.xor(list);
+        result = _.xor(list, array);
+        result = _.xor(list, array, list);
     }
 
     {
@@ -3173,9 +3181,9 @@ namespace TestXor {
         result = _(array).xor(list);
         result = _(array).xor(list, array);
 
-        result = _(list).xor<AbcObject>();
-        result = _(list).xor<AbcObject>(array);
-        result = _(list).xor<AbcObject>(array, list);
+        result = _(list).xor();
+        result = _(list).xor(array);
+        result = _(list).xor(array, list);
     }
 
     {
@@ -3185,9 +3193,9 @@ namespace TestXor {
         result = _(array).chain().xor(list);
         result = _(array).chain().xor(list, array);
 
-        result = _(list).chain().xor<AbcObject>();
-        result = _(list).chain().xor<AbcObject>(array);
-        result = _(list).chain().xor<AbcObject>(array, list);
+        result = _(list).chain().xor();
+        result = _(list).chain().xor(array);
+        result = _(list).chain().xor(array, list);
     }
 }
 
@@ -3198,18 +3206,18 @@ namespace TestXor {
 
     {
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(array);
+        _.zip(array);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(array, list);
+        _.zip(array, list);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(array, list, array);
+        _.zip(array, list, array);
 
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(list);
+        _.zip(list);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(list, array);
+        _.zip(list, array);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(list, array, list);
+        _.zip(list, array, list);
 
         // $ExpectType (AbcObject | undefined)[][]
         _.zip(list, array, list, array, list, array);
@@ -3217,26 +3225,26 @@ namespace TestXor {
 
     {
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).zip<AbcObject>(list);
+        _(array).zip(list);
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).zip<AbcObject>(list, array);
+        _(array).zip(list, array);
 
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).zip<AbcObject>(array);
+        _(list).zip(array);
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).zip<AbcObject>(array, list);
+        _(list).zip(array, list);
     }
 
     {
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).chain().zip<AbcObject>(list);
+        _(array).chain().zip(list);
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).chain().zip<AbcObject>(list, array);
+        _(array).chain().zip(list, array);
 
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).chain().zip<AbcObject>(array);
+        _(list).chain().zip(array);
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).chain().zip<AbcObject>(array, list);
+        _(list).chain().zip(array, list);
     }
 
     {
@@ -4062,29 +4070,52 @@ namespace TestAt {
     let array: AbcObject[] | null | undefined = [] as any;
     let list: _.List<AbcObject> | null | undefined = [] as any;
     let dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    let numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    let abcObject: AbcObject | null | undefined = anything;
 
     {
         let result: AbcObject[];
 
-        result = _.at<AbcObject>(array, 0, '1', [2], ['3'], [4, '5']);
-        result = _.at<AbcObject>(list, 0, '1', [2], ['3'], [4, '5']);
-        result = _.at<AbcObject>(dictionary, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(array, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(list, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(dictionary, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(numericDictionary, 0, '1', [2], ['3'], [4, '5']);
+    }
+
+    {
+        let result: Array<AbcObject[keyof AbcObject]>;
+
+        result = _.at(abcObject, 'a', ['b'], ['a', 'b']);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).at(0, '1', [2], ['3'], [4, '5']);
-        result = _(list).at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
-        result = _(dictionary).at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
+        result = _(list).at(0, '1', [2], ['3'], [4, '5']);
+        result = _(dictionary).at(0, '1', [2], ['3'], [4, '5']);
+        result = _(numericDictionary).at(0, '1', [2], ['3'], [4, '5']);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<AbcObject[keyof AbcObject]>;
+
+        result = _(abcObject).at('a', ['b'], ['a', 'b']);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().at(0, '1', [2], ['3'], [4, '5']);
-        result = _(list).chain().at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
-        result = _(dictionary).chain().at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
+        result = _(list).chain().at(0, '1', [2], ['3'], [4, '5']);
+        result = _(dictionary).chain().at(0, '1', [2], ['3'], [4, '5']);
+        result = _(numericDictionary).chain().at(0, '1', [2], ['3'], [4, '5']);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<AbcObject[keyof AbcObject]>;
+
+        result = _(abcObject).chain().at('a', ['b'], ['a', 'b']);
     }
 }
 
@@ -4099,37 +4130,34 @@ namespace TestCountBy {
     let stringIterator: (value: string, index: number, collection: string) => any = (value: string, index: number, collection: string) => 1;
     let listIterator: (value: AbcObject, index: number, collection: _.List<AbcObject>) => any = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 1;
     let dictionaryIterator: (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => any = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 1;
-    let numericDictionaryIterator: (value: AbcObject, key: number, collection: _.NumericDictionary<AbcObject>) => any = (value: AbcObject, key: number, collection: _.NumericDictionary<AbcObject>) => 1;
+    let numericDictionaryIterator: (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => any = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => 1;
 
     {
         let result: _.Dictionary<number>;
 
-        result = _.countBy<string>('');
-        result = _.countBy<string>('', stringIterator);
+        result = _.countBy('');
+        result = _.countBy('', stringIterator);
 
-        result = _.countBy<AbcObject>(array);
-        result = _.countBy<AbcObject>(array, listIterator);
-        result = _.countBy<AbcObject>(array, '');
+        result = _.countBy(array);
+        result = _.countBy(array, listIterator);
+        result = _.countBy(array, '');
+        result = _.countBy(array, {a: 42});
         result = _.countBy(array, {a: 42});
-        result = _.countBy<AbcObject>(array, {a: 42});
 
-        result = _.countBy<AbcObject>(list);
-        result = _.countBy<AbcObject>(list, listIterator);
-        result = _.countBy<AbcObject>(list, '');
+        result = _.countBy(list);
+        result = _.countBy(list, listIterator);
+        result = _.countBy(list, '');
         result = _.countBy(list, {a: 42});
-        result = _.countBy<AbcObject>(list, {a: 42});
 
-        result = _.countBy<AbcObject>(dictionary);
+        result = _.countBy(dictionary);
         result = _.countBy(dictionary, dictionaryIterator);
-        result = _.countBy<AbcObject>(dictionary, '');
+        result = _.countBy(dictionary, '');
         result = _.countBy(dictionary, {a: 42});
-        result = _.countBy<AbcObject>(dictionary, {a: 42});
 
-        result = _.countBy<AbcObject>(numericDictionary);
-        result = _.countBy<AbcObject>(numericDictionary, numericDictionaryIterator);
-        result = _.countBy<AbcObject>(numericDictionary, '');
+        result = _.countBy(numericDictionary);
+        result = _.countBy(numericDictionary, numericDictionaryIterator);
+        result = _.countBy(numericDictionary, '');
         result = _.countBy(numericDictionary, {a: 42});
-        result = _.countBy<AbcObject>(numericDictionary, {a: 42});
     }
 
     {
@@ -4145,7 +4173,7 @@ namespace TestCountBy {
         result = _(array).countBy({a: 42});
 
         result = _(list).countBy();
-        result = _(list).countBy<AbcObject>(listIterator);
+        result = _(list).countBy(listIterator);
         result = _(list).countBy('');
         result = _(list).countBy<{a: number}>({a: 42});
         result = _(list).countBy({a: 42});
@@ -4153,13 +4181,11 @@ namespace TestCountBy {
         result = _(dictionary).countBy();
         result = _(dictionary).countBy(dictionaryIterator);
         result = _(dictionary).countBy('');
-        result = _(dictionary).countBy<{a: number}>({a: 42});
         result = _(dictionary).countBy({a: 42});
 
         result = _(numericDictionary).countBy();
-        result = _(numericDictionary).countBy<AbcObject>(numericDictionaryIterator);
+        result = _(numericDictionary).countBy(numericDictionaryIterator);
         result = _(numericDictionary).countBy('');
-        result = _(numericDictionary).countBy<{a: number}>({a: 42});
         result = _(numericDictionary).countBy({a: 42});
     }
 
@@ -4172,25 +4198,21 @@ namespace TestCountBy {
         result = _(array).chain().countBy();
         result = _(array).chain().countBy(listIterator);
         result = _(array).chain().countBy('');
-        result = _(array).chain().countBy<{a: number}>({a: 42});
         result = _(array).chain().countBy({a: 42});
 
         result = _(list).chain().countBy();
-        result = _(list).chain().countBy<AbcObject>(listIterator);
+        result = _(list).chain().countBy(listIterator);
         result = _(list).chain().countBy('');
-        result = _(list).chain().countBy<{a: number}>({a: 42});
         result = _(list).chain().countBy({a: 42});
 
         result = _(dictionary).chain().countBy();
         result = _(dictionary).chain().countBy(dictionaryIterator);
         result = _(dictionary).chain().countBy('');
-        result = _(dictionary).chain().countBy<{a: number}>({a: 42});
         result = _(dictionary).chain().countBy({a: 42});
 
         result = _(numericDictionary).chain().countBy();
-        result = _(numericDictionary).chain().countBy<AbcObject>(numericDictionaryIterator);
+        result = _(numericDictionary).chain().countBy(numericDictionaryIterator);
         result = _(numericDictionary).chain().countBy('');
-        result = _(numericDictionary).chain().countBy<{a: number}>({a: 42});
         result = _(numericDictionary).chain().countBy({a: 42});
     }
 }
@@ -4271,7 +4293,7 @@ namespace TestEach {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).each<AbcObject>(listIterator);
+        result = _(list).each(listIterator);
     }
 
     {
@@ -4295,7 +4317,7 @@ namespace TestEach {
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).chain().each<AbcObject>(listIterator);
+        result = _(list).chain().each(listIterator);
     }
 
     {
@@ -4381,7 +4403,7 @@ namespace TestEachRight {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).eachRight<AbcObject>(listIterator);
+        result = _(list).eachRight(listIterator);
     }
 
     {
@@ -4405,7 +4427,7 @@ namespace TestEachRight {
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).chain().eachRight<AbcObject>(listIterator);
+        result = _(list).chain().eachRight(listIterator);
     }
 
     {
@@ -4427,34 +4449,34 @@ namespace TestEvery {
 
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => true;
     let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => true;
-    let numericDictionaryIterator = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => true;
+    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => true;
 
     {
         let result: boolean;
 
-        result = _.every<SampleObject>(array);
-        result = _.every<SampleObject>(array, listIterator);
-        result = _.every<SampleObject>(array, 'a');
-        result = _.every<SampleObject>(array, ['a', 42]);
-        result = _.every<SampleObject>(array, {a: 42});
+        result = _.every(array);
+        result = _.every(array, listIterator);
+        result = _.every(array, 'a');
+        result = _.every(array, ['a', 42]);
+        result = _.every(array, {a: 42});
 
-        result = _.every<SampleObject>(list);
-        result = _.every<SampleObject>(list, listIterator);
-        result = _.every<SampleObject>(list, 'a');
-        result = _.every<SampleObject>(list, ['a', 42]);
-        result = _.every<SampleObject>(list, {a: 42});
+        result = _.every(list);
+        result = _.every(list, listIterator);
+        result = _.every(list, 'a');
+        result = _.every(list, ['a', 42]);
+        result = _.every(list, {a: 42});
 
-        result = _.every<SampleObject>(dictionary);
+        result = _.every(dictionary);
         result = _.every(dictionary, dictionaryIterator);
-        result = _.every<SampleObject>(dictionary, 'a');
-        result = _.every<SampleObject>(dictionary, ['a', 42]);
-        result = _.every<SampleObject>(dictionary, {a: 42});
+        result = _.every(dictionary, 'a');
+        result = _.every(dictionary, ['a', 42]);
+        result = _.every(dictionary, {a: 42});
 
-        result = _.every<SampleObject>(numericDictionary);
-        result = _.every<SampleObject>(numericDictionary, numericDictionaryIterator);
-        result = _.every<SampleObject>(numericDictionary, 'a');
-        result = _.every<SampleObject>(numericDictionary, ['a', 42]);
-        result = _.every<SampleObject>(numericDictionary, {a: 42});
+        result = _.every(numericDictionary);
+        result = _.every(numericDictionary, numericDictionaryIterator);
+        result = _.every(numericDictionary, 'a');
+        result = _.every(numericDictionary, ['a', 42]);
+        result = _.every(numericDictionary, {a: 42});
 
         result = _(array).every();
         result = _(array).every(listIterator);
@@ -4462,20 +4484,20 @@ namespace TestEvery {
         result = _(array).every(['a', 42]);
         result = _(array).every({a: 42});
 
-        result = _(list).every<SampleObject>();
-        result = _(list).every<SampleObject>(listIterator);
+        result = _(list).every();
+        result = _(list).every(listIterator);
         result = _(list).every('a');
         result = _(list).every(['a', 42]);
         result = _(list).every({a: 42});
 
-        result = _(dictionary).every<SampleObject>();
+        result = _(dictionary).every();
         result = _(dictionary).every(dictionaryIterator);
         result = _(dictionary).every('a');
         result = _(dictionary).every(['a', 42]);
         result = _(dictionary).every({a: 42});
 
-        result = _(numericDictionary).every<SampleObject>();
-        result = _(numericDictionary).every<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).every();
+        result = _(numericDictionary).every(numericDictionaryIterator);
         result = _(numericDictionary).every('a');
         result = _(numericDictionary).every(['a', 42]);
         result = _(numericDictionary).every({a: 42});
@@ -4490,23 +4512,23 @@ namespace TestEvery {
         result = _(array).chain().every(['a', 42]);
         result = _(array).chain().every({a: 42});
 
-        result = _(list).chain().every<SampleObject>();
-        result = _(list).chain().every<SampleObject>(listIterator);
+        result = _(list).chain().every();
+        result = _(list).chain().every(listIterator);
         result = _(list).chain().every('a');
         result = _(list).chain().every(['a', 42]);
-        result = _(list).chain().every<SampleObject>({a: 42});
+        result = _(list).chain().every({a: 42});
 
-        result = _(dictionary).chain().every<SampleObject>();
+        result = _(dictionary).chain().every();
         result = _(dictionary).chain().every(dictionaryIterator);
         result = _(dictionary).chain().every('a');
         result = _(dictionary).chain().every(['a', 42]);
-        result = _(dictionary).chain().every<SampleObject>({a: 42});
+        result = _(dictionary).chain().every({a: 42});
 
-        result = _(numericDictionary).chain().every<SampleObject>();
-        result = _(numericDictionary).chain().every<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).chain().every();
+        result = _(numericDictionary).chain().every(numericDictionaryIterator);
         result = _(numericDictionary).chain().every('a');
         result = _(numericDictionary).chain().every(['a', 42]);
-        result = _(numericDictionary).chain().every<{a: number}>({a: 42});
+        result = _(numericDictionary).chain().every({a: 42});
     }
 }
 
@@ -4530,15 +4552,15 @@ namespace TestFilter {
     {
         let result: AbcObject[];
 
-        result = _.filter<AbcObject>(array, listIterator);
-        result = _.filter<AbcObject>(array, '');
-        result = _.filter<AbcObject>(array, {a: 42});
-        result = _.filter<AbcObject>(array, ["a", 42]);
+        result = _.filter(array, listIterator);
+        result = _.filter(array, '');
+        result = _.filter(array, {a: 42});
+        result = _.filter(array, ["a", 42]);
 
-        result = _.filter<AbcObject>(list, listIterator);
-        result = _.filter<AbcObject>(list, '');
-        result = _.filter<AbcObject>(list, {a: 42});
-        result = _.filter<AbcObject>(list, ["a", 42]);
+        result = _.filter(list, listIterator);
+        result = _.filter(list, '');
+        result = _.filter(list, {a: 42});
+        result = _.filter(list, ["a", 42]);
 
         result = _.filter(dictionary, dictionaryIterator);
         result = _.filter(dictionary, '');
@@ -4560,10 +4582,10 @@ namespace TestFilter {
         result = _(array).filter({a: 42});
         result = _(array).filter(["a", 42]);
 
-        result = _(list).filter<AbcObject>(listIterator);
-        result = _(list).filter<AbcObject>('');
-        result = _(list).filter<AbcObject>({a: 42});
-        result = _(list).filter<AbcObject>(["a", 42]);
+        result = _(list).filter(listIterator);
+        result = _(list).filter('');
+        result = _(list).filter({a: 42});
+        result = _(list).filter(["a", 42]);
 
         result = _(dictionary).filter(dictionaryIterator);
         result = _(dictionary).filter('');
@@ -4585,10 +4607,10 @@ namespace TestFilter {
         result = _(array).chain().filter({a: 42});
         result = _(array).chain().filter(["a", 42]);
 
-        result = _(list).chain().filter<AbcObject>(listIterator);
-        result = _(list).chain().filter<AbcObject>('');
-        result = _(list).chain().filter<AbcObject>({a: 42});
-        result = _(list).chain().filter<AbcObject>(["a", 42]);
+        result = _(list).chain().filter(listIterator);
+        result = _(list).chain().filter('');
+        result = _(list).chain().filter({a: 42});
+        result = _(list).chain().filter(["a", 42]);
 
         result = _(dictionary).chain().filter(dictionaryIterator);
         result = _(dictionary).chain().filter('');
@@ -4623,28 +4645,25 @@ namespace TestFind {
     let result: AbcObject | undefined;
 
     result = _.find(array);
-    result = _.find<AbcObject>(array);
-    result = _.find<AbcObject>(array, listIterator);
-    result = _.find<AbcObject>(array, listIterator, 1);
-    result = _.find<AbcObject>(array, '');
-    result = _.find<AbcObject>(array, '', 1);
-    result = _.find<AbcObject>(array, {a: 42});
-    result = _.find<AbcObject>(array, {a: 42}, 1);
+    result = _.find(array, listIterator);
+    result = _.find(array, listIterator, 1);
+    result = _.find(array, '');
+    result = _.find(array, '', 1);
+    result = _.find(array, {a: 42});
+    result = _.find(array, {a: 42}, 1);
     result = _.find(array, ['a', 5]);
     result = _.find(array, ['a', 5], 1);
 
     result = _.find(list);
-    result = _.find<AbcObject>(list);
-    result = _.find<AbcObject>(list, listIterator);
-    result = _.find<AbcObject>(list, listIterator, 1);
-    result = _.find<AbcObject>(list, '');
-    result = _.find<AbcObject>(list, '', 1);
-    result = _.find<AbcObject>(list, {a: 42});
-    result = _.find<AbcObject>(list, {a: 42}, 1);
+    result = _.find(list, listIterator);
+    result = _.find(list, listIterator, 1);
+    result = _.find(list, '');
+    result = _.find(list, '', 1);
+    result = _.find(list, {a: 42});
+    result = _.find(list, {a: 42}, 1);
     result = _.find(list, ['a', 5]);
     result = _.find(list, ['a', 5], 1);
 
-    result = _.find(dictionary);
     result = _.find(dictionary);
     result = _.find(dictionary, dictionaryIterator);
     result = _.find(dictionary, dictionaryIterator, 1);
@@ -4665,15 +4684,15 @@ namespace TestFind {
     result = _(array).find(['a', 5]);
     result = _(array).find(['a', 5], 1);
 
-    result = _(list).find<AbcObject>();
-    result = _(list).find<AbcObject>(listIterator);
-    result = _(list).find<AbcObject>(listIterator, 1);
-    result = _(list).find<AbcObject>('');
-    result = _(list).find<AbcObject>('', 1);
-    result = _(list).find<AbcObject>({a: 42});
-    result = _(list).find<AbcObject>({a: 42}, 1);
-    result = _(list).find<AbcObject>(['a', 5]);
-    result = _(list).find<AbcObject>(['a', 5], 1);
+    result = _(list).find();
+    result = _(list).find(listIterator);
+    result = _(list).find(listIterator, 1);
+    result = _(list).find('');
+    result = _(list).find('', 1);
+    result = _(list).find({a: 42});
+    result = _(list).find({a: 42}, 1);
+    result = _(list).find(['a', 5]);
+    result = _(list).find(['a', 5], 1);
 
     result = _(dictionary).find();
     result = _(dictionary).find(dictionaryIterator);
@@ -4702,24 +4721,23 @@ namespace TestFindLast {
     let result: AbcObject | undefined;
 
     result = _.findLast(array);
-    result = _.findLast<AbcObject>(array);
-    result = _.findLast<AbcObject>(array, listIterator);
-    result = _.findLast<AbcObject>(array, listIterator, 1);
-    result = _.findLast<AbcObject>(array, '');
-    result = _.findLast<AbcObject>(array, '', 1);
-    result = _.findLast<AbcObject>(array, {a: 42});
-    result = _.findLast<AbcObject>(array, {a: 42}, 1);
+    result = _.findLast(array, listIterator);
+    result = _.findLast(array, listIterator, 1);
+    result = _.findLast(array, '');
+    result = _.findLast(array, '', 1);
+    result = _.findLast(array, {a: 42});
+    result = _.findLast(array, {a: 42}, 1);
     result = _.findLast(array, ['a', 5]);
     result = _.findLast(array, ['a', 5], 1);
 
     result = _.findLast(list);
-    result = _.findLast<AbcObject>(list);
-    result = _.findLast<AbcObject>(list, listIterator);
-    result = _.findLast<AbcObject>(list, listIterator, 1);
-    result = _.findLast<AbcObject>(list, '');
-    result = _.findLast<AbcObject>(list, '', 1);
-    result = _.findLast<AbcObject>(list, {a: 42});
-    result = _.findLast<AbcObject>(list, {a: 42}, 1);
+    result = _.findLast(list);
+    result = _.findLast(list, listIterator);
+    result = _.findLast(list, listIterator, 1);
+    result = _.findLast(list, '');
+    result = _.findLast(list, '', 1);
+    result = _.findLast(list, {a: 42});
+    result = _.findLast(list, {a: 42}, 1);
     result = _.findLast(list, ['a', 5]);
     result = _.findLast(list, ['a', 5], 1);
 
@@ -4744,15 +4762,15 @@ namespace TestFindLast {
     result = _(array).findLast(['a', 5]);
     result = _(array).findLast(['a', 5], 1);
 
-    result = _(list).findLast<AbcObject>();
-    result = _(list).findLast<AbcObject>(listIterator);
-    result = _(list).findLast<AbcObject>(listIterator, 1);
-    result = _(list).findLast<AbcObject>('');
-    result = _(list).findLast<AbcObject>('', 1);
-    result = _(list).findLast<AbcObject>({a: 42});
-    result = _(list).findLast<AbcObject>({a: 42}, 1);
-    result = _(list).findLast<AbcObject>(['a', 5]);
-    result = _(list).findLast<AbcObject>(['a', 5], 1);
+    result = _(list).findLast();
+    result = _(list).findLast(listIterator);
+    result = _(list).findLast(listIterator, 1);
+    result = _(list).findLast('');
+    result = _(list).findLast('', 1);
+    result = _(list).findLast({a: 42});
+    result = _(list).findLast({a: 42}, 1);
+    result = _(list).findLast(['a', 5]);
+    result = _(list).findLast(['a', 5], 1);
 
     result = _(dictionary).findLast();
     result = _(dictionary).findLast(dictionaryIterator);
@@ -4789,7 +4807,7 @@ namespace TestFlatMap {
 
     let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) => number|number[] = (a, b, c) => 1;
 
-    let numericDictionaryIterator: (value: number|number[], key: number, collection: _.NumericDictionary<number|number[]>) => number|number[] = (a, b, c) => 1;
+    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => number|number[] = (a, b, c) => 1;
 
     {
         let result: string[];
@@ -4831,7 +4849,6 @@ namespace TestFlatMap {
         result = _.flatMap<number>(numNumericDictionary);
 
         result = _.flatMap(numNumericDictionary, numericDictionaryIterator);
-        result = _.flatMap<number|number[], number>(numNumericDictionary, numericDictionaryIterator);
 
         result = _.flatMap(objNumericDictionary, 'a');
     }
@@ -4861,20 +4878,20 @@ namespace TestFlatMap {
     {
         let result: _.LoDashImplicitArrayWrapper<number>;
 
-        result = _(numArray).flatMap<number>();
+        result = _(numArray).flatMap();
         result = _(numArray).flatMap(listIterator);
         result = _(objArray).flatMap('a');
 
-        result = _(numList).flatMap<number>();
-        result = _(numList).flatMap<number|number[], number>(listIterator);
+        result = _(numList).flatMap();
+        result = _(numList).flatMap(listIterator);
         result = _(objList).flatMap('a');
 
-        result = _(numDictionary).flatMap<number>();
+        result = _(numDictionary).flatMap();
         result = _(numDictionary).flatMap(dictionaryIterator);
         result = _(objDictionary).flatMap('a');
 
-        result = _(numNumericDictionary).flatMap<number>();
-        result = _(numNumericDictionary).flatMap<number|number[], number>(numericDictionaryIterator);
+        result = _(numNumericDictionary).flatMap();
+        result = _(numNumericDictionary).flatMap(numericDictionaryIterator);
         result = _(objNumericDictionary).flatMap('a');
     }
 
@@ -4903,20 +4920,20 @@ namespace TestFlatMap {
     {
         let result: _.LoDashExplicitArrayWrapper<number>;
 
-        result = _(numArray).chain().flatMap<number>();
+        result = _(numArray).chain().flatMap();
         result = _(numArray).chain().flatMap(listIterator);
         result = _(objArray).chain().flatMap('a');
 
-        result = _(numList).chain().flatMap<number>();
-        result = _(numList).chain().flatMap<number|number[], number>(listIterator);
+        result = _(numList).chain().flatMap();
+        result = _(numList).chain().flatMap(listIterator);
         result = _(objList).chain().flatMap('a');
 
-        result = _(numDictionary).chain().flatMap<number>();
+        result = _(numDictionary).chain().flatMap();
         result = _(numDictionary).chain().flatMap(dictionaryIterator);
         result = _(objDictionary).chain().flatMap('a');
 
-        result = _(numNumericDictionary).chain().flatMap<number>();
-        result = _(numNumericDictionary).chain().flatMap<number|number[], number>(numericDictionaryIterator);
+        result = _(numNumericDictionary).chain().flatMap();
+        result = _(numNumericDictionary).chain().flatMap(numericDictionaryIterator);
         result = _(objNumericDictionary).chain().flatMap('a');
     }
 
@@ -4972,7 +4989,7 @@ namespace TestFlatMapDeep {
 
     let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) =>_.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
-    let numericDictionaryIterator: (value: number|number[], key: number, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
+    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
     {
         let result: string[];
@@ -5133,7 +5150,7 @@ namespace TestFlatMapDepth {
 
     let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
-    let numericDictionaryIterator: (value: number|number[], key: number, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
+    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
     {
         let result: string[];
@@ -5276,219 +5293,242 @@ namespace TestFlatMapDepth {
 
 // _.forEach
 namespace TestForEach {
-    let array: AbcObject[] = [];
-    let list: _.List<AbcObject> = [];
-    let dictionary: _.Dictionary<AbcObject> = {};
-    let nilArray: AbcObject[] | null | undefined = [] as any;
-    let nilList: _.List<AbcObject> | null | undefined = [] as any;
-    let nilDictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const str: string = anything;
+    const nilStr: string | null | undefined = anything;
+    const array: AbcObject[] = anything;
+    const list: _.List<AbcObject> = anything;
+    const dictionary: _.Dictionary<AbcObject> = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> = anything;
+    const nilArray: AbcObject[] | null | undefined = anything;
+    const nilList: _.List<AbcObject> | null | undefined = anything;
+    const nilDictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const nilNumericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const abcObject: AbcObject = anything;
+    const nilAbcObject: AbcObject | null | undefined = anything;
 
-    let listIterator: (value: AbcObject, index: number, collection: _.List<AbcObject>) => any = (value, index, collection) => 1;
-    let dictionaryIterator: (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => any = (value, key, collection) => 1;
-    let objectIterator: (value: number | string | boolean, key: string, collection: AbcObject) => any = (value, key, collection) => 1;
+    // $ExpectType string
+    _.forEach(str, (value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-    {
-        let result: string;
+    // $ExpectType string | null | undefined
+    _.forEach(nilStr, (value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-        result = _.forEach('', (value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
+    // $ExpectType AbcObject[]
+    _.forEach(array, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-    {
-        let result: string | null | undefined;
+    // $ExpectType AbcObject[] | null | undefined
+    _.forEach(nilArray, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-        result = _.forEach('' as (string | null | undefined), (value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
+    // $ExpectType ArrayLike<AbcObject>
+    _.forEach(list, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: AbcObject[];
-        result = _.forEach(array, (value, index, collection: ArrayLike<AbcObject>) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-        });
-        result = _.forEach(array, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType ArrayLike<AbcObject> | null | undefined
+    _.forEach(nilList, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: AbcObject[] | null | undefined;
+    // $ExpectType Dictionary<AbcObject>
+    _.forEach(dictionary, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-        result = _.forEach(array, (value, index, collection: ArrayLike<AbcObject>) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-        });
-        result = _.forEach(nilArray, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType Dictionary<AbcObject> | null | undefined
+    _.forEach(nilDictionary, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-    {
-        let result: _.List<AbcObject>;
+    // $ExpectType NumericDictionary<AbcObject>
+    _.forEach(numericDictionary, (value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-        result = _.forEach(list, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<AbcObject>
-        });
-    }
+    // $ExpectType NumericDictionary<AbcObject> | null | undefined
+    _.forEach(nilNumericDictionary, (value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-    {
-        let result: _.List<AbcObject> | null | undefined;
+    // $ExpectType AbcObject
+    _.forEach(abcObject, (value, index, collection) => {
+        value; // $ExpectType string | number | boolean
+        index; // $ExpectType string
+        collection; // $ExpectType AbcObject
+    });
 
-        result = _.forEach(nilList, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<AbcObject>
-        });
-    }
+    // $ExpectType AbcObject | null | undefined
+    _.forEach(nilAbcObject, (value, index, collection) => {
+        value; // $ExpectType string | number | boolean
+        index; // $ExpectType string
+        collection; // $ExpectType AbcObject
+    });
 
-    {
-        let result: _.Dictionary<AbcObject>;
+    // $ExpectType LoDashImplicitWrapper<string>
+    _(str).forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-        result = _.forEach(dictionary, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<string | null | undefined>
+    _(nilStr).forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-    {
-        let result: _.Dictionary<AbcObject> | null | undefined;
+    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-        result = _.forEach(nilDictionary, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<AbcObject[] | null | undefined>
+    _(nilArray).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-    {
-        let sample1: AbcObject = anything;
-        sample1 = _.forEach(sample1, objectIterator);
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-        let sample2: AbcObject | null | undefined = anything;
-        sample2 = _.forEach(sample2, objectIterator);
-    }
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _(nilList).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitWrapper<string>;
+    // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-        result = _('').forEach((value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject> | null | undefined>
+    _(nilDictionary).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
+    // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
+    _(numericDictionary).forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-        result = _(array).forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject> | null | undefined>
+    _(nilNumericDictionary).forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitNillableArrayWrapper<AbcObject>;
+    // $ExpectType LoDashExplicitWrapper<string>
+    _(str).chain().forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-        result = _(nilArray).forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType LoDashExplicitWrapper<string | null | undefined>
+    _(nilStr).chain().forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _(array).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-        result = _(list).forEach<AbcObject>(listIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<AbcObject[] | null | undefined>
+    _(nilArray).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.List<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _(list).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-        result = _(nilList).forEach<AbcObject>(listIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _(nilList).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-        result = _(dictionary).forEach(dictionaryIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject> | null | undefined>
+    _(nilDictionary).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
+    _(numericDictionary).chain().forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-        result = _(nilDictionary).forEach(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('').chain().forEach((value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitNillableArrayWrapper<AbcObject>;
-
-        result = _(nilArray).chain().forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
-
-        result = _(list).chain().forEach<AbcObject>(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.List<AbcObject>>;
-
-        result = _(nilList).chain().forEach<AbcObject>(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(dictionary).chain().forEach(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(nilDictionary).chain().forEach(dictionaryIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject> | null | undefined>
+    _(nilNumericDictionary).chain().forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 }
 
 // _.forEachRight
@@ -5608,13 +5648,13 @@ namespace TestForEachRight {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).forEachRight<AbcObject>(listIterator);
+        result = _(list).forEachRight(listIterator);
     }
 
     {
         let result: _.LoDashImplicitNillableObjectWrapper<_.List<AbcObject>>;
 
-        result = _(nilList).forEachRight<AbcObject>(listIterator);
+        result = _(nilList).forEachRight(listIterator);
     }
 
     {
@@ -5668,7 +5708,7 @@ namespace TestForEachRight {
     {
         let result: _.LoDashExplicitNillableObjectWrapper<_.List<AbcObject>>;
 
-        result = _(nilList).chain().forEachRight<AbcObject>(listIterator);
+        result = _(nilList).chain().forEachRight(listIterator);
     }
 
     {
@@ -5690,8 +5730,7 @@ namespace TestGroupBy {
 
     let array: SampleType[] | null | undefined = [] as any;
     let list: _.List<SampleType> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<SampleType> | null | undefined = obj;
+    let dictionary: _.Dictionary<SampleType> | null | undefined = anything;
 
     let stringIterator = (char: string, index: number, string: string) => 0;
     let listIterator = (value: SampleType, index: number, collection: _.List<SampleType>) => 0;
@@ -5738,15 +5777,15 @@ namespace TestGroupBy {
         result = _(array).groupBy('');
         result = _(array).groupBy({a: 42});
 
-        result = _(list).groupBy<SampleType>();
-        result = _(list).groupBy<SampleType>(listIterator);
-        result = _(list).groupBy<SampleType>('');
-        result = _(list).groupBy<SampleType>({a: 42});
+        result = _(list).groupBy();
+        result = _(list).groupBy(listIterator);
+        result = _(list).groupBy('');
+        result = _(list).groupBy({a: 42});
 
-        result = _(dictionary).groupBy<SampleType>();
+        result = _(dictionary).groupBy();
         result = _(dictionary).groupBy(dictionaryIterator);
-        result = _(dictionary).groupBy<SampleType>('');
-        result = _(dictionary).groupBy<SampleType>({a: 42});
+        result = _(dictionary).groupBy('');
+        result = _(dictionary).groupBy({a: 42});
     }
 
     {
@@ -5764,15 +5803,15 @@ namespace TestGroupBy {
         result = _(array).chain().groupBy('');
         result = _(array).chain().groupBy({a: 42});
 
-        result = _(list).chain().groupBy<SampleType>();
-        result = _(list).chain().groupBy<SampleType>(listIterator);
-        result = _(list).chain().groupBy<SampleType>('');
-        result = _(list).chain().groupBy<SampleType>({a: 42});
+        result = _(list).chain().groupBy();
+        result = _(list).chain().groupBy(listIterator);
+        result = _(list).chain().groupBy('');
+        result = _(list).chain().groupBy({a: 42});
 
-        result = _(dictionary).chain().groupBy<SampleType>();
+        result = _(dictionary).chain().groupBy();
         result = _(dictionary).chain().groupBy(dictionaryIterator);
-        result = _(dictionary).chain().groupBy<SampleType>('');
-        result = _(dictionary).chain().groupBy<SampleType>({a: 42});
+        result = _(dictionary).chain().groupBy('');
+        result = _(dictionary).chain().groupBy({a: 42});
     }
 }
 
@@ -5836,7 +5875,7 @@ namespace TestKeyBy {
     let stringIterator = (value: string, index: number, collection: string) => "a";
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 1;
     let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => Symbol.name;
-    let numericDictionaryIterator = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => "a";
+    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => "a";
 
     {
         let result: _.Dictionary<string>;
@@ -5848,20 +5887,20 @@ namespace TestKeyBy {
     {
         let result: _.Dictionary<SampleObject>;
 
-        result = _.keyBy<SampleObject>(array);
-        result = _.keyBy<SampleObject>(array, listIterator);
-        result = _.keyBy<SampleObject>(array, 'a');
-        result = _.keyBy<SampleObject>(array, {a: 42});
+        result = _.keyBy(array);
+        result = _.keyBy(array, listIterator);
+        result = _.keyBy(array, 'a');
+        result = _.keyBy(array, {a: 42});
 
-        result = _.keyBy<SampleObject>(list);
-        result = _.keyBy<SampleObject>(list, listIterator);
-        result = _.keyBy<SampleObject>(list, 'a');
-        result = _.keyBy<SampleObject>(list, {a: 42});
+        result = _.keyBy(list);
+        result = _.keyBy(list, listIterator);
+        result = _.keyBy(list, 'a');
+        result = _.keyBy(list, {a: 42});
 
-        result = _.keyBy<SampleObject>(numericDictionary);
-        result = _.keyBy<SampleObject>(numericDictionary, numericDictionaryIterator);
-        result = _.keyBy<SampleObject>(numericDictionary, 'a');
-        result = _.keyBy<SampleObject>(numericDictionary, {a: 42});
+        result = _.keyBy(numericDictionary);
+        result = _.keyBy(numericDictionary, numericDictionaryIterator);
+        result = _.keyBy(numericDictionary, 'a');
+        result = _.keyBy(numericDictionary, {a: 42});
 
         result = _.keyBy(dictionary);
         result = _.keyBy(dictionary, dictionaryIterator);
@@ -5884,15 +5923,15 @@ namespace TestKeyBy {
         result = _(array).keyBy('a');
         result = _(array).keyBy({a: 42});
 
-        result = _(list).keyBy<SampleObject>();
-        result = _(list).keyBy<SampleObject>(listIterator);
-        result = _(list).keyBy<SampleObject>('a');
-        result = _(list).keyBy<SampleObject>({a: 42});
+        result = _(list).keyBy();
+        result = _(list).keyBy(listIterator);
+        result = _(list).keyBy('a');
+        result = _(list).keyBy({a: 42});
 
-        result = _(numericDictionary).keyBy<SampleObject>();
-        result = _(numericDictionary).keyBy<SampleObject>(numericDictionaryIterator);
-        result = _(numericDictionary).keyBy<SampleObject>('a');
-        result = _(numericDictionary).keyBy<SampleObject>({a: 42});
+        result = _(numericDictionary).keyBy();
+        result = _(numericDictionary).keyBy(numericDictionaryIterator);
+        result = _(numericDictionary).keyBy('a');
+        result = _(numericDictionary).keyBy({a: 42});
 
         result = _(dictionary).keyBy();
         result = _(dictionary).keyBy(dictionaryIterator);
@@ -5915,15 +5954,15 @@ namespace TestKeyBy {
         result = _(array).chain().keyBy('a');
         result = _(array).chain().keyBy({a: 42});
 
-        result = _(list).chain().keyBy<SampleObject>();
-        result = _(list).chain().keyBy<SampleObject>(listIterator);
-        result = _(list).chain().keyBy<SampleObject>('a');
-        result = _(list).chain().keyBy<SampleObject>({a: 42});
+        result = _(list).chain().keyBy();
+        result = _(list).chain().keyBy(listIterator);
+        result = _(list).chain().keyBy('a');
+        result = _(list).chain().keyBy({a: 42});
 
-        result = _(numericDictionary).chain().keyBy<SampleObject>();
-        result = _(numericDictionary).chain().keyBy<SampleObject>(numericDictionaryIterator);
-        result = _(numericDictionary).chain().keyBy<SampleObject>('a');
-        result = _(numericDictionary).chain().keyBy<SampleObject>({a: 42});
+        result = _(numericDictionary).chain().keyBy();
+        result = _(numericDictionary).chain().keyBy(numericDictionaryIterator);
+        result = _(numericDictionary).chain().keyBy('a');
+        result = _(numericDictionary).chain().keyBy({a: 42});
 
         result = _(dictionary).chain().keyBy();
         result = _(dictionary).chain().keyBy(dictionaryIterator);
@@ -6065,66 +6104,170 @@ namespace TestInvokeMap {
 
 // _.map
 namespace TestMap {
-    let array: number[] | null | undefined = [] as any;
-    let list: _.List<number> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<number> | null | undefined = obj;
-
-    let listIterator: (value: number, index: number, collection: _.List<number>) => AbcObject = (value: number, index: number, collection: _.List<number>) => ({ a: 1, b: "", c: true });
-    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => AbcObject = (value: number, key: string, collection: _.Dictionary<number>) => ({ a: 1, b: "", c: true });
+    const array: AbcObject[] | null | undefined = anything;
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const abcObject: AbcObject = anything;
 
     {
-        _.map(array);  // $ExpectType number[]
-        _.map(array, listIterator);  // $ExpectType AbcObject[]
+        _.map(array);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(array, (value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType AbcObject[]
+            return 0;
+        });
 
-        _.map(list);  // $ExpectType number[]
-        _.map(list, listIterator);  // $ExpectType AbcObject[]
+        _.map(list);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(list, (value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType ArrayLike<AbcObject>
+            return 0;
+        });
 
-        _.map(dictionary);  // $ExpectType number[]
-        _.map(dictionary, dictionaryIterator);  // $ExpectType AbcObject[]
-    }
+        _.map(dictionary);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(dictionary, (value, key, collection) => {
+            value; // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return 0;
+        });
+
+        _.map(numericDictionary);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(numericDictionary, (value, key, collection) => {
+            /* Broken in TS 2.4: value; // AbcObject */
+            key; // $ExpectType string
+            collection; // $ExpectType NumericDictionary<AbcObject>
+            return 0;
+        });
+
+        _.map(array, 'a'); // $ExpectType number[]
+        _.map(list, 'a'); // $ExpectType number[]
+        _.map(dictionary, 'a'); // $ExpectType number[]
+        _.map(numericDictionary, 'a'); // $ExpectType number[]
+
+        _.map(array, 'd.0.b'); // $ExpectType any[]
+        _.map(list, 'd.0.b'); // $ExpectType any[]
+        _.map(dictionary, 'd.0.b'); // $ExpectType any[]
+        _.map(numericDictionary, 'd.0.b'); // $ExpectType any[]
 
-    {
         // _.matches iteratee shorthand.
         _.map(array, {});  // $ExpectType boolean[]
         _.map(list, {});  // $ExpectType boolean[]
         _.map(dictionary, {});  // $ExpectType boolean[]
+        _.map(numericDictionary, {});  // $ExpectType boolean[]
     }
 
     {
-        _(array).map().value();  // $ExpectType number[]
-        _(array).map(listIterator).value();  // $ExpectType AbcObject[]
+        _(array).map(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(array).map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType AbcObject[]
+            return 0;
+        });
 
-        _(list).map().value();  // $ExpectType number[]
-        _(list).map(listIterator).value();  // $ExpectType AbcObject[]
+        _(list).map(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(list).map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType ArrayLike<AbcObject>
+            return 0;
+        });
 
-        _(dictionary).map().value();  // $ExpectType number[]
-        _(dictionary).map(dictionaryIterator).value();  // $ExpectType AbcObject[]
+        _(dictionary).map();  // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(dictionary).map((value, key, collection) => {
+            value; // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return 0;
+        });
+
+        _(numericDictionary).map();  // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(numericDictionary).map((value, key, collection) => {
+            /* Broken in TS 2.4: value; // AbcObject */
+            key; // $ExpectType string
+            collection; // $ExpectType NumericDictionary<AbcObject>
+            return 0;
+        });
+
+        _(array).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+        _(list).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+        _(dictionary).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+        _(numericDictionary).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+
+        _(array).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+        _(list).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+        _(dictionary).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+        _(numericDictionary).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+
+        _(array).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
+        _(list).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
+        _(dictionary).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
+        _(numericDictionary).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
     }
 
     {
-        _(array).map({}).value();  // $ExpectType boolean[]
-        _(list).map({}).value();  // $ExpectType boolean[]
-        _(dictionary).map({}).value();  // $ExpectType boolean[]
-    }
+        _(array).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(array).chain().map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType AbcObject[]
+            return 0;
+        });
 
-    {
-        _(array).chain().map().value();  // $ExpectType number[]
-        _(array).chain().map(listIterator).value();  // $ExpectType AbcObject[]
+        _(list).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(list).chain().map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType ArrayLike<AbcObject>
+            return 0;
+        });
 
-        _(list).chain().map().value();  // $ExpectType number[]
-        _(list).chain().map(listIterator).value();  // $ExpectType AbcObject[]
+        _(dictionary).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(dictionary).chain().map((value, key, collection) => {
+            value; // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return 0;
+        });
 
-        _(dictionary).chain().map().value();  // $ExpectType number[]
-        _(dictionary).chain().map(dictionaryIterator).value();  // $ExpectType AbcObject[]
-    }
+        _(numericDictionary).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(numericDictionary).chain().map((value, key, collection) => {
+            /* Broken in TS 2.4: value; // AbcObject */
+            key; // $ExpectType string
+            collection; // $ExpectType NumericDictionary<AbcObject>
+            return 0;
+        });
 
-    {
-        let result: _.LoDashExplicitArrayWrapper<boolean>;
+        _(array).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
+        _(list).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
+        _(dictionary).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
+        _(numericDictionary).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
 
-        result = _(array).chain().map({});
-        result = _(list).chain().map({});
-        result = _(dictionary).chain().map({});
+        _(array).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+        _(list).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+        _(dictionary).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+        _(numericDictionary).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+
+        _(array).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
+        _(list).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
+        _(dictionary).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
+        _(numericDictionary).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
     }
 
     {
@@ -6290,69 +6433,6 @@ namespace TestPartition {
     }
 }
 
-// TODO
-// _.map with iteratee shorthand
-// module TestMapInsteadOfPluck {
-//     interface SampleObject {
-//         d: {b: AbcObject}[];
-//     }
-//
-//     let array: SampleObject[] = [];
-//     let list: _.List<SampleObject> = [];
-//     let dictionary: _.Dictionary<SampleObject> = {};
-//
-//     {
-//         let result: any[];
-//
-//         result = _.map<SampleObject>(array, 'd.0.b');
-//         result = _.map<SampleObject>(array, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject>(list, 'd.0.b');
-//         result = _.map<SampleObject>(list, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject>(dictionary, 'd.0.b');
-//         result = _.map<SampleObject>(dictionary, ['d', 0, 'b']);
-//     }
-//
-//     {
-//         let result: AbcObject[];
-//
-//         result = _.map<SampleObject, AbcObject>(array, 'd.0.b');
-//         result = _.map<SampleObject, AbcObject>(array, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject, AbcObject>(list, 'd.0.b');
-//         result = _.map<SampleObject, AbcObject>(list, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject, AbcObject>(dictionary, 'd.0.b');
-//         result = _.map<SampleObject, AbcObject>(dictionary, ['d', 0, 'b']);
-//     }
-//
-//     {
-//         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-//
-//         result = _(array).map<AbcObject>('d.0.b');
-//         result = _(array).map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(list).map<AbcObject>('d.0.b');
-//         result = _(list).map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(dictionary).map<AbcObject>('d.0.b');
-//         result = _(dictionary).map<AbcObject>(['d', 0, 'b']);
-//     }
-//
-//     {
-//         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-//
-//         result = _(array).chain().map<AbcObject>('d.0.b');
-//         result = _(array).chain().map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(list).chain().map<AbcObject>('d.0.b');
-//         result = _(list).chain().map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(dictionary).chain().map<AbcObject>('d.0.b');
-//         result = _(dictionary).chain().map<AbcObject>(['d', 0, 'b']);
-//     }
-// }
 namespace TestReduce {
     interface ABC {
         [key: string]: number;
@@ -6412,12 +6492,12 @@ namespace TestReject {
     {
         let result: AbcObject[];
 
-        result = _.reject<AbcObject>(array, listIterator);
-        result = _.reject<AbcObject>(array, '');
+        result = _.reject(array, listIterator);
+        result = _.reject(array, '');
         result = _.reject(array, {a: 42});
 
-        result = _.reject<AbcObject>(list, listIterator);
-        result = _.reject<AbcObject>(list, '');
+        result = _.reject(list, listIterator);
+        result = _.reject(list, '');
         result = _.reject(list, {a: 42});
 
         result = _.reject(dictionary, dictionaryIterator);
@@ -6438,8 +6518,8 @@ namespace TestReject {
         result = _(array).reject('');
         result = _(array).reject({a: 42});
 
-        result = _(list).reject<AbcObject>(listIterator);
-        result = _(list).reject<AbcObject>('');
+        result = _(list).reject(listIterator);
+        result = _(list).reject('');
         result = _(list).reject({a: 42});
 
         result = _(dictionary).reject(dictionaryIterator);
@@ -6460,8 +6540,8 @@ namespace TestReject {
         result = _(array).chain().reject('');
         result = _(array).chain().reject({a: 42});
 
-        result = _(list).chain().reject<AbcObject>(listIterator);
-        result = _(list).chain().reject<AbcObject>('');
+        result = _(list).chain().reject(listIterator);
+        result = _(list).chain().reject('');
         result = _(list).chain().reject({a: 42});
 
         result = _(dictionary).chain().reject(dictionaryIterator);
@@ -6587,8 +6667,8 @@ namespace TestShuffle {
     {
         let result: AbcObject[];
 
-        result = _.shuffle<AbcObject>(array);
-        result = _.shuffle<AbcObject>(list);
+        result = _.shuffle(array);
+        result = _.shuffle(list);
         result = _.shuffle(dictionary);
     }
 
@@ -6602,7 +6682,7 @@ namespace TestShuffle {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).shuffle();
-        result = _(list).shuffle<AbcObject>();
+        result = _(list).shuffle();
         result = _(dictionary).shuffle();
     }
 
@@ -6616,7 +6696,7 @@ namespace TestShuffle {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().shuffle();
-        result = _(list).chain().shuffle<AbcObject>();
+        result = _(list).chain().shuffle();
         result = _(dictionary).chain().shuffle();
     }
 }
@@ -6667,47 +6747,46 @@ namespace TestSome {
 
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => true;
     let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => true;
-    let numericDictionaryIterator = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => true;
+    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => true;
     let objectIterator = (value: any, key: string, collection: any) => true;
 
     {
         let result: boolean;
 
-        result = _.some<SampleObject>(array);
-        result = _.some<SampleObject>(array, listIterator);
-        result = _.some<SampleObject>(array, 'a');
-        result = _.some<SampleObject>(array, ['a', 42]);
-        result = _.some<SampleObject>(array, {a: 42});
+        result = _.some(array);
+        result = _.some(array, listIterator);
+        result = _.some(array, 'a');
+        result = _.some(array, ['a', 42]);
+        result = _.some(array, {a: 42});
 
-        result = _.some<SampleObject>(list);
-        result = _.some<SampleObject>(list, listIterator);
-        result = _.some<SampleObject>(list, 'a');
-        result = _.some<SampleObject>(list, ['a', 42]);
-        result = _.some<SampleObject>(list, {a: 42});
+        result = _.some(list);
+        result = _.some(list, listIterator);
+        result = _.some(list, 'a');
+        result = _.some(list, ['a', 42]);
+        result = _.some(list, {a: 42});
 
-        result = _.some<SampleObject>(dictionary);
-        result = _.some<SampleObject>(numericDictionary, numericDictionaryIterator);
+        result = _.some(dictionary);
+        result = _.some(numericDictionary, numericDictionaryIterator);
         result = _.some(dictionary, (value, key, collection) => {
             value; // $ExpectType SampleObject
             key; // $ExpectType string
             collection; // $ExpectType Dictionary<SampleObject>
             return true;
         });
-        result = _.some<SampleObject>(dictionary, 'a');
-        result = _.some<SampleObject>(dictionary, ['a', 42]);
-        result = _.some<SampleObject>(dictionary, {a: 42});
+        result = _.some(dictionary, 'a');
+        result = _.some(dictionary, ['a', 42]);
+        result = _.some(dictionary, {a: 42});
 
-        result = _.some<SampleObject>(numericDictionary);
-        result = _.some<SampleObject>(numericDictionary, numericDictionaryIterator);
-        result = _.some<SampleObject>(numericDictionary, 'a');
-        result = _.some<SampleObject>(numericDictionary, ['a', 42]);
-        result = _.some<SampleObject>(numericDictionary, {a: 42});
+        result = _.some(numericDictionary);
+        result = _.some(numericDictionary, numericDictionaryIterator);
+        result = _.some(numericDictionary, 'a');
+        result = _.some(numericDictionary, ['a', 42]);
+        result = _.some(numericDictionary, {a: 42});
 
         result = _.some(sampleObject);
         result = _.some(sampleObject, objectIterator);
         result = _.some(sampleObject, 'a');
         result = _.some(sampleObject, ['a', 42]);
-        result = _.some<{a: number}>(sampleObject, {a: 42});
 
         result = _(array).some();
         result = _(array).some(listIterator);
@@ -6715,29 +6794,28 @@ namespace TestSome {
         result = _(array).some(['a', 42]);
         result = _(array).some({a: 42});
 
-        result = _(list).some<SampleObject>();
-        result = _(list).some<SampleObject>(listIterator);
+        result = _(list).some();
+        result = _(list).some(listIterator);
         result = _(list).some('a');
         result = _(list).some(['a', 42]);
-        result = _(list).some<SampleObject>({a: 42});
+        result = _(list).some({a: 42});
 
-        result = _(dictionary).some<SampleObject>();
+        result = _(dictionary).some();
         result = _(dictionary).some(dictionaryIterator);
         result = _(dictionary).some('a');
         result = _(dictionary).some(['a', 42]);
-        result = _(dictionary).some<SampleObject>({a: 42});
+        result = _(dictionary).some({a: 42});
 
-        result = _(numericDictionary).some<SampleObject>();
-        result = _(numericDictionary).some<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).some();
+        result = _(numericDictionary).some(numericDictionaryIterator);
         result = _(numericDictionary).some('a');
         result = _(numericDictionary).some(['a', 42]);
-        result = _(numericDictionary).some<SampleObject>({a: 42});
+        result = _(numericDictionary).some({a: 42});
 
         result = _(sampleObject).some();
         result = _(sampleObject).some(objectIterator);
         result = _(sampleObject).some('a');
         result = _(sampleObject).some(['a', 42]);
-        result = _(sampleObject).some<SampleObject>({a: 42});
     }
 
     {
@@ -6749,29 +6827,28 @@ namespace TestSome {
         result = _(array).chain().some(['a', 42]);
         result = _(array).chain().some({a: 42});
 
-        result = _(list).chain().some<SampleObject>();
-        result = _(list).chain().some<SampleObject>(listIterator);
+        result = _(list).chain().some();
+        result = _(list).chain().some(listIterator);
         result = _(list).chain().some('a');
         result = _(list).chain().some(['a', 42]);
-        result = _(list).chain().some<SampleObject>({a: 42});
+        result = _(list).chain().some({a: 42});
 
-        result = _(dictionary).chain().some<SampleObject>();
+        result = _(dictionary).chain().some();
         result = _(dictionary).chain().some(dictionaryIterator);
         result = _(dictionary).chain().some('a');
         result = _(dictionary).chain().some(['a', 42]);
-        result = _(dictionary).chain().some<SampleObject>({a: 42});
+        result = _(dictionary).chain().some({a: 42});
 
-        result = _(numericDictionary).chain().some<SampleObject>();
-        result = _(numericDictionary).chain().some<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).chain().some();
+        result = _(numericDictionary).chain().some(numericDictionaryIterator);
         result = _(numericDictionary).chain().some('a');
         result = _(numericDictionary).chain().some(['a', 42]);
-        result = _(numericDictionary).chain().some<SampleObject>({a: 42});
+        result = _(numericDictionary).chain().some({a: 42});
 
         result = _(sampleObject).chain().some();
         result = _(sampleObject).chain().some(objectIterator);
         result = _(sampleObject).chain().some('a');
         result = _(sampleObject).chain().some(['a', 42]);
-        result = _(sampleObject).chain().some<AbcObject>({a: 42});
     }
 }
 
@@ -6873,23 +6950,15 @@ namespace TestorderBy {
 
         result = _.orderBy(array, iteratees);
         result = _.orderBy(array, iteratees, orders);
-        result = _.orderBy<SampleObject>(array, iteratees);
-        result = _.orderBy<SampleObject>(array, iteratees, orders);
 
         result = _.orderBy(list, iteratees);
         result = _.orderBy(list, iteratees, orders);
-        result = _.orderBy<SampleObject>(list, iteratees);
-        result = _.orderBy<SampleObject>(list, iteratees, orders);
 
         result = _.orderBy(numericDictionary, iteratees);
         result = _.orderBy(numericDictionary, iteratees, orders);
-        result = _.orderBy<SampleObject>(numericDictionary, iteratees);
-        result = _.orderBy<SampleObject>(numericDictionary, iteratees, orders);
 
         result = _.orderBy(dictionary, iteratees);
         result = _.orderBy(dictionary, iteratees, orders);
-        result = _.orderBy<SampleObject>(dictionary, iteratees);
-        result = _.orderBy<SampleObject>(dictionary, iteratees, orders);
     }
 
     {
@@ -6901,18 +6970,12 @@ namespace TestorderBy {
 
         result = _(list).orderBy(iteratees);
         result = _(list).orderBy(iteratees, orders);
-        result = _(list).orderBy<SampleObject>(iteratees);
-        result = _(list).orderBy<SampleObject>(iteratees, orders);
 
         result = _(numericDictionary).orderBy(iteratees);
         result = _(numericDictionary).orderBy(iteratees, orders);
-        result = _(numericDictionary).orderBy<SampleObject>(iteratees);
-        result = _(numericDictionary).orderBy<SampleObject>(iteratees, orders);
 
         result = _(dictionary).orderBy(iteratees);
         result = _(dictionary).orderBy(iteratees, orders);
-        result = _(dictionary).orderBy<SampleObject>(iteratees);
-        result = _(dictionary).orderBy<SampleObject>(iteratees, orders);
     }
 
     {
@@ -6924,18 +6987,12 @@ namespace TestorderBy {
 
         result = _(list).chain().orderBy(iteratees);
         result = _(list).chain().orderBy(iteratees, orders);
-        result = _(list).chain().orderBy<SampleObject>(iteratees);
-        result = _(list).chain().orderBy<SampleObject>(iteratees, orders);
 
         result = _(numericDictionary).chain().orderBy(iteratees);
         result = _(numericDictionary).chain().orderBy(iteratees, orders);
-        result = _(numericDictionary).chain().orderBy<SampleObject>(iteratees);
-        result = _(numericDictionary).chain().orderBy<SampleObject>(iteratees, orders);
 
         result = _(dictionary).chain().orderBy(iteratees);
         result = _(dictionary).chain().orderBy(iteratees, orders);
-        result = _(dictionary).chain().orderBy<SampleObject>(iteratees);
-        result = _(dictionary).chain().orderBy<SampleObject>(iteratees, orders);
     }
 }
 
@@ -9261,10 +9318,10 @@ namespace TestToArray {
     {
         let result: AbcObject[];
 
-        result = _.toArray<AbcObject>(array);
-        result = _.toArray<AbcObject>(list);
-        result = _.toArray<AbcObject>(dictionary);
-        result = _.toArray<AbcObject>(numericDictionary);
+        result = _.toArray(array);
+        result = _.toArray(list);
+        result = _.toArray(dictionary);
+        result = _.toArray(numericDictionary);
 
         result = _.toArray(array);
         result = _.toArray(list);
@@ -9284,18 +9341,18 @@ namespace TestToArray {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).toArray();
-        result = _(list).toArray<AbcObject>();
-        result = _(dictionary).toArray<AbcObject>();
-        result = _(numericDictionary).toArray<AbcObject>();
+        result = _(list).toArray();
+        result = _(dictionary).toArray();
+        result = _(numericDictionary).toArray();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().toArray();
-        result = _(list).chain().toArray<AbcObject>();
-        result = _(dictionary).chain().toArray<AbcObject>();
-        result = _(numericDictionary).chain().toArray<AbcObject>();
+        result = _(list).chain().toArray();
+        result = _(dictionary).chain().toArray();
+        result = _(numericDictionary).chain().toArray();
     }
 }
 
@@ -10488,53 +10545,51 @@ result = <DefaultsDeepResult>_(TestDefaultsDeepObject).defaultsDeep(TestDefaults
 
 // _.entries
 namespace TestEntries {
-    let object: _.Dictionary<string> = {};
+    const dictionary: _.Dictionary<number> = anything;
+    const numericDictionary: _.NumericDictionary<number> = anything;
+    const abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.entries(object);
+        _.entries(dictionary); // $ExpectType [string, number][]
+        _.entries(numericDictionary); // $ExpectType [string, number][]
+        _.entries(abcObject); // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).entries();
+        _(dictionary).entries(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).entries(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).entries(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().entries();
+        _(dictionary).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
 // _.entriesIn
 namespace TestEntriesIn {
-    let object: _.Dictionary<string> = {};
+    const dictionary: _.Dictionary<number> = anything;
+    const numericDictionary: _.NumericDictionary<number> = anything;
+    const abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.entriesIn(object);
+        _.entriesIn(dictionary); // $ExpectType [string, number][]
+        _.entriesIn(numericDictionary); // $ExpectType [string, number][]
+        _.entriesIn(abcObject); // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).entriesIn();
+        _(dictionary).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().entriesIn<string>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<[string, any]>;
-
-        result = _(object).chain().entriesIn();
+        _(dictionary).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
@@ -11556,65 +11611,280 @@ namespace TestMapKeys {
     let array: AbcObject[] | null | undefined = [] as any;
     let list: _.List<AbcObject>| null | undefined = [] as any;
     let dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    let numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    let abcObject: AbcObject = anything;
 
     let listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => "";
     let dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => "";
+    let numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => "";
+    let abcObjectIterator = (value: AbcObject[keyof AbcObject], key: string, collection: AbcObject) => "";
 
     {
-        let result: _.Dictionary<AbcObject>;
+        _.mapKeys(array); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(array, listIterator); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(array, ''); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(array, {}); // $ExpectType Dictionary<AbcObject>
 
-        result = _.mapKeys(array);
-        result = _.mapKeys(array, listIterator);
-        result = _.mapKeys(array, '');
-        result = _.mapKeys(array, {});
+        _.mapKeys(list); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(list, listIterator); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(list, ''); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(list, {}); // $ExpectType Dictionary<AbcObject>
 
-        result = _.mapKeys(list);
-        result = _.mapKeys(list, listIterator);
-        result = _.mapKeys(list, '');
-        result = _.mapKeys(list, {});
+        _.mapKeys(dictionary); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(dictionary, dictionaryIterator); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(dictionary, ''); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(dictionary, {}); // $ExpectType Dictionary<AbcObject>
 
-        result = _.mapKeys(dictionary);
-        result = _.mapKeys(dictionary, dictionaryIterator);
-        result = _.mapKeys(dictionary, '');
-        result = _.mapKeys(dictionary, {});
+        /* Broken in TS 2.4
+        _.mapKeys(numericDictionary); // Dictionary<AbcObject>
+        _.mapKeys(numericDictionary, numericDictionaryIterator); // Dictionary<AbcObject>
+        _.mapKeys(numericDictionary, ''); // Dictionary<AbcObject>
+        _.mapKeys(numericDictionary, {}); // Dictionary<AbcObject>
+        */
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(array).mapKeys();
-        result = _(array).mapKeys(listIterator);
-        result = _(array).mapKeys('');
-        result = _(array).mapKeys({});
-
-        result = _(list).mapKeys();
-        result = _(list).mapKeys(listIterator);
-        result = _(list).mapKeys('');
-        result = _(list).mapKeys({});
-
-        result = _(dictionary).mapKeys();
-        result = _(dictionary).mapKeys(dictionaryIterator);
-        result = _(dictionary).mapKeys('');
-        result = _(dictionary).mapKeys({});
+        _.mapKeys(abcObject); // $ExpectType Dictionary<string | number | boolean>
+        _.mapKeys(abcObject, abcObjectIterator); // $ExpectType Dictionary<string | number | boolean>
+        _.mapKeys(abcObject, ''); // $ExpectType Dictionary<string | number | boolean>
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<AbcObject>>;
+        _(array).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(array).mapKeys(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(array).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(array).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-        result = _(array).chain().mapKeys();
-        result = _(array).chain().mapKeys(listIterator);
-        result = _(array).chain().mapKeys('');
-        result = _(array).chain().mapKeys({});
+        _(list).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(list).mapKeys(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(list).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(list).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-        result = _(list).chain().mapKeys();
-        result = _(list).chain().mapKeys(listIterator);
-        result = _(list).chain().mapKeys('');
-        result = _(list).chain().mapKeys({});
+        _(dictionary).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).mapKeys(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-        result = _(dictionary).chain().mapKeys();
-        result = _(dictionary).chain().mapKeys(dictionaryIterator);
-        result = _(dictionary).chain().mapKeys('');
-        result = _(dictionary).chain().mapKeys({});
+        /* Broken in TS 2.4
+        _(numericDictionary).mapKeys(); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).mapKeys(numericDictionaryIterator); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).mapKeys(''); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).mapKeys({}); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        */
+    }
+
+    {
+        _(abcObject).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).mapKeys(abcObjectIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
+    }
+
+    {
+        _(array).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(array).chain().mapKeys(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(array).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(array).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        _(list).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(list).chain().mapKeys(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(list).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(list).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        _(dictionary).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).chain().mapKeys(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        /* Broken in TS 2.4
+        _(numericDictionary).chain().mapKeys(); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().mapKeys(numericDictionaryIterator); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().mapKeys(''); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().mapKeys({}); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        */
+    }
+
+    {
+        _(abcObject).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).chain().mapKeys(abcObjectIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
+    }
+}
+
+// _.mapValues
+{
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const abcObject: AbcObject = anything;
+    const abcObjectOrNull: AbcObject | null = anything;
+    const key: string = anything;
+
+    {
+        // $ExpectType NumericDictionary<AbcObject>
+        _.mapValues("foo", (char, index, str) => {
+            char; // $ExpectType string
+            index; // $ExpectType number
+            str; // $ExpectType string
+            return abcObject;
+        });
+
+        // $ExpectType Dictionary<string>
+        _.mapValues(dictionary, (value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        // $ExpectType Dictionary<string>
+        _.mapValues(numericDictionary, (value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // $ExpectType { a: string; b: string; c: string; }
+        _.mapValues(abcObject, (value, key, collection) => {
+            value;  // $ExpectType string | number | boolean
+            key; // $ExpectType string
+            collection; // $ExpectType AbcObject
+            return "";
+        });
+
+        _.mapValues(dictionary, {}); // $ExpectType Dictionary<boolean>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary, {}); // $ExpectType Dictionary<boolean>
+        _.mapValues(abcObject, {}); // $ExpectType { a: boolean; b: boolean; c: boolean; }
+
+        _.mapValues(dictionary, "a"); // $ExpectType Dictionary<number>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary, "a"); // $ExpectType Dictionary<number>
+
+        _.mapValues(abcObject, key); // $ExpectType { a: any; b: any; c: any; }
+        _.mapValues(dictionary, key); // $ExpectType Dictionary<any>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary, key); // $ExpectType Dictionary<any>
+
+        _.mapValues("a"); // $ExpectType NumericDictionary<string>
+        _.mapValues(dictionary); // $ExpectType Dictionary<AbcObject>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary); // $ExpectType Dictionary<AbcObject>
+        _.mapValues(abcObject); // $ExpectType AbcObject
+        _.mapValues(abcObjectOrNull); // $ExpectType Partial<AbcObject>
+    }
+
+    {
+        // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
+        _("foo").mapValues((char, index, str) => {
+            char; // $ExpectType string
+            index; // $ExpectType number
+            str; // $ExpectType string
+            return abcObject;
+        });
+
+        // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
+        _(dictionary).mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
+        _(numericDictionary).mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // $ExpectType LoDashImplicitWrapper<{ a: string; b: string; c: string; }>
+        _(abcObject).mapValues((value, key, collection) => {
+            value;  // $ExpectType string | number | boolean
+            key; // $ExpectType string
+            collection; // $ExpectType AbcObject
+            return "";
+        });
+
+        _(dictionary).mapValues({}); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues({}); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
+        _(abcObject).mapValues({}); // $ExpectType LoDashImplicitWrapper<{ a: boolean; b: boolean; c: boolean; }>
+
+        _(dictionary).mapValues("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+
+        _(abcObject).mapValues(key); // $ExpectType LoDashImplicitWrapper<{ a: any; b: any; c: any; }>
+        _(dictionary).mapValues(key); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues(key); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
+
+        _("a").mapValues(); // $ExpectType LoDashImplicitWrapper<NumericDictionary<string>>
+        _(dictionary).mapValues(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(abcObject).mapValues(); // $ExpectType LoDashImplicitWrapper<AbcObject>
+        _(abcObjectOrNull).mapValues(); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    }
+
+    {
+        // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
+        _("foo").chain().mapValues((char, index, str) => {
+            char; // $ExpectType string
+            index; // $ExpectType number
+            str; // $ExpectType string
+            return abcObject;
+        });
+
+        // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
+        _(dictionary).chain().mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
+        _(numericDictionary).chain().mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // $ExpectType LoDashExplicitWrapper<{ a: string; b: string; c: string; }>
+        _(abcObject).chain().mapValues((value, key, collection) => {
+            value;  // $ExpectType string | number | boolean
+            key; // $ExpectType string
+            collection; // $ExpectType AbcObject
+            return "";
+        });
+
+        _(dictionary).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
+        _(abcObject).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<{ a: boolean; b: boolean; c: boolean; }>
+
+        _(dictionary).chain().mapValues("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+
+        _(abcObject).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<{ a: any; b: any; c: any; }>
+        _(dictionary).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<Dictionary<any>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<Dictionary<any>>
+
+        _("a").chain().mapValues(); // $ExpectType LoDashExplicitWrapper<NumericDictionary<string>>
+        _(dictionary).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        _(abcObject).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<AbcObject>
+        _(abcObjectOrNull).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     }
 }
 
@@ -11741,36 +12011,55 @@ namespace TestMergeWith {
 // _.omit
 namespace TestOmit {
     let obj: AbcObject | null | undefined = anything;
-    let dict: { [key: string]: AbcObject } = { };
+    let dictionary:_.Dictionary<AbcObject> = anything;
+    let numericDictionary:_.NumericDictionary<AbcObject> = anything;
+    let dictionaryWithNull:_.Dictionary<AbcObject | null> = anything;
+    let numericDictionaryWithNull:_.NumericDictionary<AbcObject | null> = anything;
+    let dictionaryWithUndefined:_.Dictionary<AbcObject | undefined> = anything;
+    let numericDictionaryWithUndefined:_.NumericDictionary<AbcObject | undefined> = anything;
+    let dictionaryWithNullAndUndefined:_.Dictionary<AbcObject | null | undefined> = anything;
+    let numericDictionaryWithNullAndUndefined:_.NumericDictionary<AbcObject | null | undefined> = anything;
 
     {
-        let result: Partial<AbcObject>;
-
-        result = _.omit(obj, 'a');
-        result = _.omit(obj, 0, 'a');
-        result = _.omit(obj, ['b', 1], 0, 'a');
-
-        dict = _.omit(dict, 'a');
+        _.omit(obj, 'a'); // $ExpectType Partial<AbcObject>
+        _.omit(obj, 0, 'a'); // $ExpectType Partial<AbcObject>
+        _.omit(obj, ['b', 1], 0, 'a'); // $ExpectType Partial<AbcObject>
+        _.omit(dictionary, 'a'); // $ExpectType Dictionary<AbcObject>
+        _.omit(numericDictionary, 'a');  // $ExpectType NumericDictionary<AbcObject>
+        _.omit(dictionaryWithNull, 'a'); // $ExpectType Dictionary<AbcObject | null>
+        _.omit(numericDictionaryWithNull, 'a');  // $ExpectType NumericDictionary<AbcObject | null>
+        _.omit(dictionaryWithUndefined, 'a'); // $ExpectType Dictionary<AbcObject | undefined>
+        _.omit(numericDictionaryWithUndefined, 'a');  // $ExpectType NumericDictionary<AbcObject | undefined>
+        _.omit(dictionaryWithNullAndUndefined, 'a'); // $ExpectType Dictionary<AbcObject | null | undefined>
+        _.omit(numericDictionaryWithNullAndUndefined, 'a');  // $ExpectType NumericDictionary<AbcObject | null | undefined>
     }
 
     {
-        let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj).omit('a');
-        result = _(obj).omit(0, 'a');
-        result = _(obj).omit(['b', 1], 0, 'a');
-
-        dict = _(dict).omit('a').value();
+        _(obj).omit('a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+        _(obj).omit(0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+        _(obj).omit(['b', 1], 0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+        _(dictionary).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
+        _(dictionaryWithNull).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | null>>
+        _(numericDictionaryWithNull).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | null>>
+        _(dictionaryWithUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | undefined>>
+        _(numericDictionaryWithUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | undefined>>
+        _(dictionaryWithNullAndUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | null | undefined>>
+        _(numericDictionaryWithNullAndUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | null | undefined>>
     }
 
     {
-        let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj).chain().omit('a');
-        result = _(obj).chain().omit(0, 'a');
-        result = _(obj).chain().omit(['b', 1], 0, 'a');
-
-        dict = _(dict).chain().omit('a').value();
+        _(obj).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+        _(obj).chain().omit(0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+        _(obj).chain().omit(['b', 1], 0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+        _(dictionary).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
+        _(dictionaryWithNull).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | null>>
+        _(numericDictionaryWithNull).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | null>>
+        _(dictionaryWithUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | undefined>>
+        _(numericDictionaryWithUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | undefined>>
+        _(dictionaryWithNullAndUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | null | undefined>>
+        _(numericDictionaryWithNullAndUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | null | undefined>>
     }
 }
 
@@ -11788,13 +12077,13 @@ namespace TestOmitBy {
     {
         let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).omitBy<AbcObject>(predicate);
+        result = _(obj).omitBy(predicate);
     }
 
     {
         let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).chain().omitBy<AbcObject>(predicate);
+        result = _(obj).chain().omitBy(predicate);
     }
 }
 
@@ -11810,7 +12099,8 @@ namespace TestPick {
     _.pick(obj1, 0, 'a'); // $ExpectType PartialDeep<AbcObject>
     _.pick(obj1, ['b', 1], 0, 'a'); // $ExpectType PartialDeep<AbcObject>
     _.pick(obj1, readonlyArray); // $ExpectType PartialDeep<AbcObject>
-    _.pick(obj2, 'a', 'b'); // $ExpectType Pick<AbcObject, "a" | "b">
+    // Broken in TS 2.4
+    // _.pick(obj2, 'a', 'b'); // Pick<AbcObject, "a" | "b">
     _.pick(obj2, literalsArray); // $ExpectType Pick<AbcObject, "a" | "b">
     _.pick(obj2, roLiteralsArray); // $ExpectType Pick<AbcObject, "a" | "b">
 
@@ -11818,7 +12108,8 @@ namespace TestPick {
     _(obj1).pick(0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(obj1).pick(['b', 1], 0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(obj1).pick(readonlyArray); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
-    _(obj2).pick('a', 'b'); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
+    // Broken in TS 2.4
+    // _(obj2).pick('a', 'b'); // LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
     _(obj2).pick(literalsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
     _(obj2).pick(roLiteralsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
 
@@ -11826,7 +12117,8 @@ namespace TestPick {
     _.chain(obj1).pick(0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(obj1).pick(['b', 1], 0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(obj1).pick(readonlyArray); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
-    _.chain(obj2).pick('a', 'b'); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
+    // Broken in TS 2.4
+    // _.chain(obj2).pick('a', 'b'); // LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
     _.chain(obj2).pick(literalsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
     _.chain(obj2).pick(roLiteralsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
 }
@@ -11845,13 +12137,13 @@ namespace TestPickBy {
     {
         let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).pickBy<AbcObject>(predicate);
+        result = _(obj).pickBy(predicate);
     }
 
     {
         let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).chain().pickBy<AbcObject>(predicate);
+        result = _(obj).chain().pickBy(predicate);
     }
 }
 
@@ -12013,53 +12305,51 @@ namespace TestSetWith {
 
 // _.toPairs
 namespace TestToPairs {
-    let object: _.Dictionary<string> = {};
+    let dictionary: _.Dictionary<number> = {};
+    let numericDictionary: _.NumericDictionary<number> = {};
+    let abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.toPairs(object);
+        _.toPairs(dictionary); // $ExpectType [string, number][]
+        _.toPairs(numericDictionary); // $ExpectType [string, number][]
+        _.toPairs(abcObject);  // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).toPairs();
+        _(dictionary).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().toPairs();
+        _(dictionary).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
 // _.toPairsIn
 namespace TestToPairsIn {
-    let object: _.Dictionary<string> = {};
+    let dictionary: _.Dictionary<number> = {};
+    let numericDictionary: _.NumericDictionary<number> = {};
+    let abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.toPairsIn(object);
+        _.toPairsIn(dictionary); // $ExpectType [string, number][]
+        _.toPairsIn(numericDictionary); // $ExpectType [string, number][]
+        _.toPairsIn(abcObject);  // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).toPairsIn();
+        _(dictionary).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().toPairsIn<string>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<[string, any]>;
-
-        result = _(object).chain().toPairsIn();
+        _(dictionary).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
@@ -12256,7 +12546,7 @@ namespace TestValues {
         result = _.values(dict);
         result = _.values(numDict);
         result = _.values(list);
-        result = _.values<SampleObject>(object);
+        result = _.values(object);
     }
 
     // Implicit wrapper
@@ -12295,10 +12585,10 @@ namespace TestValues {
         let object: {a: SampleObject} = { a: { a: {} } };
         let result: _.LoDashImplicitArrayWrapper<SampleObject>;
 
-        result = _(dict).values<SampleObject>();
-        result = _(numDict).values<SampleObject>();
-        result = _(list).values<SampleObject>();
-        result = _(object).values<SampleObject>();
+        result = _(dict).values();
+        result = _(numDict).values();
+        result = _(list).values();
+        result = _(object).values();
     }
 
     // Explicit wrapper
@@ -12337,10 +12627,10 @@ namespace TestValues {
         let object: {a: SampleObject} = { a: { a: {} } };
         let result: _.LoDashExplicitArrayWrapper<SampleObject>;
 
-        result = _(dict).chain().values<SampleObject>();
-        result = _(numDict).chain().values<SampleObject>();
-        result = _(list).chain().values<SampleObject>();
-        result = _(object).chain().values<SampleObject>();
+        result = _(dict).chain().values();
+        result = _(numDict).chain().values();
+        result = _(list).chain().values();
+        result = _(object).chain().values();
     }
 }
 
@@ -12364,19 +12654,19 @@ namespace TestValuesIn {
     {
         let result: AbcObject[];
 
-        result = _.values(object);
+        result = _.valuesIn(object);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
-        result = _(object).valuesIn<AbcObject>();
+        result = _(object).valuesIn();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
-        result = _(object).chain().valuesIn<AbcObject>();
+        result = _(object).chain().valuesIn();
     }
 }
 
@@ -13340,7 +13630,7 @@ namespace TestMatches {
 
     {
         let result: (value: any) => boolean;
-        result = _.matches<AbcObject>(source);
+        result = _.matches(source);
     }
 
     {
@@ -13350,12 +13640,12 @@ namespace TestMatches {
 
     {
         let result: _.LoDashImplicitObjectWrapper<(value: AbcObject) => boolean>;
-        result = _(source).matches<AbcObject>();
+        result = _(source).matches();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(value: AbcObject) => boolean>;
-        result = _(source).chain().matches<AbcObject>();
+        result = _(source).chain().matches();
     }
 }
 
@@ -13367,7 +13657,7 @@ namespace TestMatches {
     {
         let result: (value: any) => boolean;
 
-        result = _.matchesProperty<AbcObject>(path, source);
+        result = _.matchesProperty(path, source);
     }
 
     {
@@ -13379,7 +13669,7 @@ namespace TestMatches {
     {
         let result: _.LoDashImplicitObjectWrapper<(value: any) => boolean>;
 
-        result = _(path).matchesProperty<AbcObject>(source);
+        result = _(path).matchesProperty(source);
     }
 
     {
@@ -13391,7 +13681,7 @@ namespace TestMatches {
     {
         let result: _.LoDashExplicitObjectWrapper<(value: any) => boolean>;
 
-        result = _(path).chain().matchesProperty<AbcObject>(source);
+        result = _(path).chain().matchesProperty(source);
     }
 
     {
diff --git a/types/lory.js/index.d.ts b/types/lory.js/index.d.ts
index 37ff46d4be..dd37fb8efa 100644
--- a/types/lory.js/index.d.ts
+++ b/types/lory.js/index.d.ts
@@ -4,7 +4,7 @@
 //                 philip bulley <https://github.com/milkisevil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare var lory: LoryStatic;
+export declare var lory: LoryStatic;
 
 interface LoryStatic {
     (element: Element, options?: LoryOptions): LoryStatic;
diff --git a/types/lory.js/lory.js-tests.ts b/types/lory.js/lory.js-tests.ts
index bad97dadf3..616073f180 100644
--- a/types/lory.js/lory.js-tests.ts
+++ b/types/lory.js/lory.js-tests.ts
@@ -1,4 +1,4 @@
-
+import { lory } from 'lory.js';
 
 (function() {
     var elm = document.querySelector('.js-foo');
diff --git a/types/microrouter/index.d.ts b/types/microrouter/index.d.ts
index 6d65adc8a1..934affd630 100644
--- a/types/microrouter/index.d.ts
+++ b/types/microrouter/index.d.ts
@@ -8,12 +8,13 @@
 
 import { IncomingMessage, ServerResponse, Server } from 'http';
 import { RequestHandler } from 'micro';
-
+export type ServerResponse = ServerResponse;
+export type ServerRequest = IncomingMessage & {
+    params: { [key: string]: string },
+    query: { [key: string]: string }
+};
 export type AugmentedRequestHandler = (
-    req: IncomingMessage & {
-        params: {[key: string]: string},
-        query: {[key: string]: string}
-    },
+    req: ServerRequest,
     res: ServerResponse
 ) => any;
 
diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index b7c5e52792..ba27943739 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -43,7 +43,7 @@ export class MongoClient extends EventEmitter {
     close(force?: boolean): Promise<void>;
     close(force: boolean, callback: MongoCallback<void>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#db */
-    db(name: string, options?: MongoClientCommonOption): Db
+    db(dbName?: string, options?: MongoClientCommonOption): Db
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#isConnected */
     isConnected(name: string, options?: MongoClientCommonOption): boolean;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#logout */
diff --git a/types/ndarray/index.d.ts b/types/ndarray/index.d.ts
index eb889d31af..039401b6e2 100644
--- a/types/ndarray/index.d.ts
+++ b/types/ndarray/index.d.ts
@@ -24,7 +24,7 @@ interface ndarray<T = number> {
 	hi(...args: number[]): ndarray<T>;
 	step(...args: number[]): ndarray<T>;
 	transpose(...args: number[]): ndarray<T>;
-	pick(...args: number[]): ndarray<T>;
+	pick(...args: Array<number | null>): ndarray<T>;
 	reshape(...shapes: number[]): ndarray<T>;
 	T: ndarray<T>;
 }
diff --git a/types/ndarray/ndarray-tests.ts b/types/ndarray/ndarray-tests.ts
index aa4f4fcefb..09bd7b2f00 100644
--- a/types/ndarray/ndarray-tests.ts
+++ b/types/ndarray/ndarray-tests.ts
@@ -22,3 +22,5 @@ console.log(a.get(0, 0, 0) === 1);
 console.log(a.index(1, 1, 1) === 12);
 
 const b = a.lo(0, 0, 0).hi(1, 1, 1);
+
+a.pick(null, null, 1);
diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 3c87320827..9dc5461f5e 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -11,34 +11,56 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Definitions partially generated using tsd-jsdoc (https://github.com/englercj/tsd-jsdoc)
 
-interface GlobalObject { [key: string]: any; }
+export as namespace ol;
 
-declare namespace ol {
+export interface GlobalObject { [key: string]: any; }
+
+/**
+ * Error object thrown when an assertion failed. This is an ECMA-262 Error,
+ * extended with a `code` property.
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
+ * @param code Error code.
+ */
+export class AssertionError extends Error {
     /**
      * Error object thrown when an assertion failed. This is an ECMA-262 Error,
      * extended with a `code` property.
      * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
      * @param code Error code.
      */
-    class AssertionError extends Error {
-        /**
-         * Error object thrown when an assertion failed. This is an ECMA-262 Error,
-         * extended with a `code` property.
-         * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
-         * @param code Error code.
-         */
-        constructor(code: number);
+    constructor(code: number);
 
-        /**
-         * Error code. The meaning of the code can be found on
-         * {@link http://openlayers.org/en/latest/errors.html} (replace `latest` with
-         * the version found in the OpenLayers script's header comment if a version
-         * other than the latest is used).
-         * @api
-         */
-        code: number;
-    }
+    /**
+     * Error code. The meaning of the code can be found on
+     * {@link http://openlayers.org/en/latest/errors.html} (replace `latest` with
+     * the version found in the OpenLayers script's header comment if a version
+     * other than the latest is used).
+     * @api
+     */
+    code: number;
+}
 
+/**
+ * @classdesc
+ * An attribution for a layer source.
+ *
+ * Example:
+ *
+ *     source: new ol.source.OSM({
+ *       attributions: [
+ *         new ol.Attribution({
+ *           html: 'All maps &copy; ' +
+ *               '<a href="http://www.opencyclemap.org/">OpenCycleMap</a>'
+ *         }),
+ *         ol.source.OSM.ATTRIBUTION
+ *       ],
+ *     ..
+ *
+ * @param options Attribution options.
+ * @struct
+ * @api stable
+ */
+export class Attribution {
     /**
      * @classdesc
      * An attribution for a layer source.
@@ -59,37 +81,30 @@ declare namespace ol {
      * @struct
      * @api stable
      */
-    class Attribution {
-        /**
-         * @classdesc
-         * An attribution for a layer source.
-         *
-         * Example:
-         *
-         *     source: new ol.source.OSM({
-         *       attributions: [
-         *         new ol.Attribution({
-         *           html: 'All maps &copy; ' +
-         *               '<a href="http://www.opencyclemap.org/">OpenCycleMap</a>'
-         *         }),
-         *         ol.source.OSM.ATTRIBUTION
-         *       ],
-         *     ..
-         *
-         * @param options Attribution options.
-         * @struct
-         * @api stable
-         */
-        constructor(options: olx.AttributionOptions);
+    constructor(options: olx.AttributionOptions);
 
-        /**
-         * Get the attribution markup.
-         * @return The attribution HTML.
-         * @api stable
-         */
-        getHTML(): string;
-    }
+    /**
+     * Get the attribution markup.
+     * @return The attribution HTML.
+     * @api stable
+     */
+    getHTML(): string;
+}
 
+/**
+ * @classdesc
+ * An expanded version of standard JS Array, adding convenience methods for
+ * manipulation. Add and remove changes to the Collection trigger a Collection
+ * event. Note that this does not cover changes to the objects _within_ the
+ * Collection; they trigger events on the appropriate object, not on the
+ * Collection as a whole.
+ *
+ * @fires ol.Collection.Event
+ * @param opt_array Array.
+ * @template T
+ * @api stable
+ */
+export class Collection<T> extends Object {
     /**
      * @classdesc
      * An expanded version of standard JS Array, adding convenience methods for
@@ -103,127 +118,122 @@ declare namespace ol {
      * @template T
      * @api stable
      */
-    class Collection<T> extends ol.Object {
-        /**
-         * @classdesc
-         * An expanded version of standard JS Array, adding convenience methods for
-         * manipulation. Add and remove changes to the Collection trigger a Collection
-         * event. Note that this does not cover changes to the objects _within_ the
-         * Collection; they trigger events on the appropriate object, not on the
-         * Collection as a whole.
-         *
-         * @fires ol.Collection.Event
-         * @param opt_array Array.
-         * @template T
-         * @api stable
-         */
-        constructor(opt_array?: T[]);
+    constructor(opt_array?: T[]);
 
-        /**
-         * Remove all elements from the collection.
-         * @api stable
-         */
-        clear(): void;
+    /**
+     * Remove all elements from the collection.
+     * @api stable
+     */
+    clear(): void;
 
-        /**
-         * Add elements to the collection.  This pushes each item in the provided array
-         * to the end of the collection.
-         * @param arr Array.
-         * @return This collection.
-         * @api stable
-         */
-        extend(arr: T[]): ol.Collection<T>;
+    /**
+     * Add elements to the collection.  This pushes each item in the provided array
+     * to the end of the collection.
+     * @param arr Array.
+     * @return This collection.
+     * @api stable
+     */
+    extend(arr: T[]): ol.Collection<T>;
 
-        /**
-         * Iterate over each element, calling the provided callback.
-         * @param f The function to call
-         *     for every element. This function takes 3 arguments (the element, the
-         *     index and the array). The return value is ignored.
-         * @param opt_this The object to use as `this` in `f`.
-         * @template S
-         * @api stable
-         */
-        forEach<S>(f: ((item: T, index: number, array: T[]) => any), opt_this?: S): void;
+    /**
+     * Iterate over each element, calling the provided callback.
+     * @param f The function to call
+     *     for every element. This function takes 3 arguments (the element, the
+     *     index and the array). The return value is ignored.
+     * @param opt_this The object to use as `this` in `f`.
+     * @template S
+     * @api stable
+     */
+    forEach(f: ((item: T, index: number, array: T[]) => any), opt_this?: any): void;
 
-        /**
-         * Get a reference to the underlying Array object. Warning: if the array
-         * is mutated, no events will be dispatched by the collection, and the
-         * collection's "length" property won't be in sync with the actual length
-         * of the array.
-         * @return Array.
-         * @api stable
-         */
-        getArray(): T[];
+    /**
+     * Get a reference to the underlying Array object. Warning: if the array
+     * is mutated, no events will be dispatched by the collection, and the
+     * collection's "length" property won't be in sync with the actual length
+     * of the array.
+     * @return Array.
+     * @api stable
+     */
+    getArray(): T[];
 
-        /**
-         * Get the element at the provided index.
-         * @param index Index.
-         * @return Element.
-         * @api stable
-         */
-        item(index: number): T;
+    /**
+     * Get the element at the provided index.
+     * @param index Index.
+     * @return Element.
+     * @api stable
+     */
+    item(index: number): T;
 
-        /**
-         * Get the length of this collection.
-         * @return The length of the array.
-         * @observable
-         * @api stable
-         */
-        getLength(): number;
+    /**
+     * Get the length of this collection.
+     * @return The length of the array.
+     * @observable
+     * @api stable
+     */
+    getLength(): number;
 
-        /**
-         * Insert an element at the provided index.
-         * @param index Index.
-         * @param elem Element.
-         * @api stable
-         */
-        insertAt(index: number, elem: T): void;
+    /**
+     * Insert an element at the provided index.
+     * @param index Index.
+     * @param elem Element.
+     * @api stable
+     */
+    insertAt(index: number, elem: T): void;
 
-        /**
-         * Remove the last element of the collection and return it.
-         * Return `undefined` if the collection is empty.
-         * @return Element.
-         * @api stable
-         */
-        pop(): (T);
+    /**
+     * Remove the last element of the collection and return it.
+     * Return `undefined` if the collection is empty.
+     * @return Element.
+     * @api stable
+     */
+    pop(): (T);
 
-        /**
-         * Insert the provided element at the end of the collection.
-         * @param elem Element.
-         * @return Length.
-         * @api stable
-         */
-        push(elem: T): number;
+    /**
+     * Insert the provided element at the end of the collection.
+     * @param elem Element.
+     * @return Length.
+     * @api stable
+     */
+    push(elem: T): number;
 
-        /**
-         * Remove the first occurrence of an element from the collection.
-         * @param elem Element.
-         * @return The removed element or undefined if none found.
-         * @api stable
-         */
-        remove(elem: T): (T);
+    /**
+     * Remove the first occurrence of an element from the collection.
+     * @param elem Element.
+     * @return The removed element or undefined if none found.
+     * @api stable
+     */
+    remove(elem: T): (T);
 
-        /**
-         * Remove the element at the provided index and return it.
-         * Return `undefined` if the collection does not contain this index.
-         * @param index Index.
-         * @return Value.
-         * @api stable
-         */
-        removeAt(index: number): (T);
+    /**
+     * Remove the element at the provided index and return it.
+     * Return `undefined` if the collection does not contain this index.
+     * @param index Index.
+     * @return Value.
+     * @api stable
+     */
+    removeAt(index: number): (T);
 
-        /**
-         * Set the element at the provided index.
-         * @param index Index.
-         * @param elem Element.
-         * @api stable
-         */
-        setAt(index: number, elem: T): void;
-    }
+    /**
+     * Set the element at the provided index.
+     * @param index Index.
+     * @param elem Element.
+     * @api stable
+     */
+    setAt(index: number, elem: T): void;
+}
 
-    namespace Collection {
-        type EventType = string;
+export namespace Collection {
+    type EventType = string;
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.Collection} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param opt_element Element.
+     */
+    class Event extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.Collection} instances are instances of this
@@ -232,65 +242,67 @@ declare namespace ol {
          * @param type Type.
          * @param opt_element Element.
          */
-        class Event extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.Collection} instances are instances of this
-             * type.
-             *
-             * @param type Type.
-             * @param opt_element Element.
-             */
-            constructor(type: ol.Collection.EventType, opt_element?: any);
+        constructor(type: EventType, opt_element?: any);
 
-            /**
-             * The element that is added to or removed from the collection.
-             * @api stable
-             */
-            element: any;
-        }
+        /**
+         * The element that is added to or removed from the collection.
+         * @api stable
+         */
+        element: any;
     }
+}
+
+/**
+ * Colors can be defined as a {@link ol.Color} array, or as strings in
+ * `rgb(r,g,b)` or `rgba(r,g,b,a)` format, or in hex `#rrggbb` or `#rgb` format.
+ * Color names, like 'red', 'blue' or 'green', may also be used with the
+ * Canvas renderer.
+ *
+ */
+export namespace color {
+    /**
+     * Return the color as an array. This function maintains a cache of calculated
+     * arrays which means the result should not be modified.
+     * @param color Color.
+     * @return Color.
+     * @api
+     */
+    function asArray(color: (ol.Color | string)): ol.Color;
 
     /**
-     * Colors can be defined as a {@link ol.Color} array, or as strings in
-     * `rgb(r,g,b)` or `rgba(r,g,b,a)` format, or in hex `#rrggbb` or `#rgb` format.
-     * Color names, like 'red', 'blue' or 'green', may also be used with the
-     * Canvas renderer.
+     * Return the color as an rgba string.
+     * @param color Color.
+     * @return Rgba string.
+     * @api
+     */
+    function asString(color: (ol.Color | string)): string;
+}
+
+/**
+ * An {@link ol.ColorLike} can be a color, gradient or pattern accepted by
+ * [CanvasRenderingContext2D.fillStyle](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/fillStyle).
+ */
+export namespace colorlike {
+    /**
+     * @param color Color.
+     * @return The color as an ol.ColorLike
+     * @api
+     */
+    function asColorLike(color: (ol.Color | ol.ColorLike)): ol.ColorLike;
+}
+
+export namespace control {
+    /**
+     * @classdesc
+     * Control to show all the attributions associated with the layer sources
+     * in the map. This control is one of the default controls included in maps.
+     * By default it will show in the bottom right portion of the map, but this can
+     * be changed by using a css selector for `.ol-attribution`.
      *
+     * @param opt_options Attribution options.
+     * @api stable
      */
-    namespace color {
-        /**
-         * Return the color as an array. This function maintains a cache of calculated
-         * arrays which means the result should not be modified.
-         * @param color Color.
-         * @return Color.
-         * @api
-         */
-        function asArray(color: (ol.Color | string)): ol.Color;
-
-        /**
-         * Return the color as an rgba string.
-         * @param color Color.
-         * @return Rgba string.
-         * @api
-         */
-        function asString(color: (ol.Color | string)): string;
-    }
-
-    /**
-     * An {@link ol.ColorLike} can be a color, gradient or pattern accepted by
-     * [CanvasRenderingContext2D.fillStyle](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/fillStyle).
-     */
-    namespace colorlike {
-        /**
-         * @param color Color.
-         * @return The color as an ol.ColorLike
-         * @api
-         */
-        function asColorLike(color: (ol.Color | ol.ColorLike)): ol.ColorLike;
-    }
-
-    namespace control {
+    class Attribution extends Control {
         /**
          * @classdesc
          * Control to show all the attributions associated with the layer sources
@@ -301,58 +313,74 @@ declare namespace ol {
          * @param opt_options Attribution options.
          * @api stable
          */
-        class Attribution extends ol.control.Control {
-            /**
-             * @classdesc
-             * Control to show all the attributions associated with the layer sources
-             * in the map. This control is one of the default controls included in maps.
-             * By default it will show in the bottom right portion of the map, but this can
-             * be changed by using a css selector for `.ol-attribution`.
-             *
-             * @param opt_options Attribution options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.AttributionOptions);
+        constructor(opt_options?: olx.control.AttributionOptions);
 
-            /**
-             * Update the attribution element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the attribution element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Return `true` if the attribution is collapsible, `false` otherwise.
-             * @return True if the widget is collapsible.
-             * @api stable
-             */
-            getCollapsible(): boolean;
+        /**
+         * Return `true` if the attribution is collapsible, `false` otherwise.
+         * @return True if the widget is collapsible.
+         * @api stable
+         */
+        getCollapsible(): boolean;
 
-            /**
-             * Set whether the attribution should be collapsible.
-             * @param collapsible True if the widget is collapsible.
-             * @api stable
-             */
-            setCollapsible(collapsible: boolean): void;
+        /**
+         * Set whether the attribution should be collapsible.
+         * @param collapsible True if the widget is collapsible.
+         * @api stable
+         */
+        setCollapsible(collapsible: boolean): void;
 
-            /**
-             * Collapse or expand the attribution according to the passed parameter. Will
-             * not do anything if the attribution isn't collapsible or if the current
-             * collapsed state is already the one requested.
-             * @param collapsed True if the widget is collapsed.
-             * @api stable
-             */
-            setCollapsed(collapsed: boolean): void;
+        /**
+         * Collapse or expand the attribution according to the passed parameter. Will
+         * not do anything if the attribution isn't collapsible or if the current
+         * collapsed state is already the one requested.
+         * @param collapsed True if the widget is collapsed.
+         * @api stable
+         */
+        setCollapsed(collapsed: boolean): void;
 
-            /**
-             * Return `true` when the attribution is currently collapsed or `false`
-             * otherwise.
-             * @return True if the widget is collapsed.
-             * @api stable
-             */
-            getCollapsed(): boolean;
-        }
+        /**
+         * Return `true` when the attribution is currently collapsed or `false`
+         * otherwise.
+         * @return True if the widget is collapsed.
+         * @api stable
+         */
+        getCollapsed(): boolean;
+    }
 
+    /**
+     * @classdesc
+     * A control is a visible widget with a DOM element in a fixed position on the
+     * screen. They can involve user input (buttons), or be informational only;
+     * the position is determined using CSS. By default these are placed in the
+     * container with CSS class name `ol-overlaycontainer-stopevent`, but can use
+     * any outside DOM element.
+     *
+     * This is the base class for controls. You can use it for simple custom
+     * controls by creating the element with listeners, creating an instance:
+     * ```js
+     * var myControl = new ol.control.Control({element: myElement});
+     * ```
+     * and then adding this to the map.
+     *
+     * The main advantage of having this as a control rather than a simple separate
+     * DOM element is that preventing propagation is handled for you. Controls
+     * will also be `ol.Object`s in a `ol.Collection`, so you can use their
+     * methods.
+     *
+     * You can also extend this base for your own control class. See
+     * examples/custom-controls for an example of how to do this.
+     *
+     * @param options Control options.
+     * @api stable
+     */
+    class Control extends Object {
         /**
          * @classdesc
          * A control is a visible widget with a DOM element in a fixed position on the
@@ -379,63 +407,52 @@ declare namespace ol {
          * @param options Control options.
          * @api stable
          */
-        class Control extends ol.Object {
-            /**
-             * @classdesc
-             * A control is a visible widget with a DOM element in a fixed position on the
-             * screen. They can involve user input (buttons), or be informational only;
-             * the position is determined using CSS. By default these are placed in the
-             * container with CSS class name `ol-overlaycontainer-stopevent`, but can use
-             * any outside DOM element.
-             *
-             * This is the base class for controls. You can use it for simple custom
-             * controls by creating the element with listeners, creating an instance:
-             * ```js
-             * var myControl = new ol.control.Control({element: myElement});
-             * ```
-             * and then adding this to the map.
-             *
-             * The main advantage of having this as a control rather than a simple separate
-             * DOM element is that preventing propagation is handled for you. Controls
-             * will also be `ol.Object`s in a `ol.Collection`, so you can use their
-             * methods.
-             *
-             * You can also extend this base for your own control class. See
-             * examples/custom-controls for an example of how to do this.
-             *
-             * @param options Control options.
-             * @api stable
-             */
-            constructor(options: olx.control.ControlOptions);
+        constructor(options: olx.control.ControlOptions);
 
-            /**
-             * Get the map associated with this control.
-             * @return Map.
-             * @api stable
-             */
-            getMap(): ol.Map;
+        /**
+         * Get the map associated with this control.
+         * @return Map.
+         * @api stable
+         */
+        getMap(): ol.Map;
 
-            /**
-             * Remove the control from its current map and attach it to the new map.
-             * Subclasses may set up event handlers to get notified about changes to
-             * the map here.
-             * @param map Map.
-             * @api stable
-             */
-            setMap(map: ol.Map): void;
+        /**
+         * Remove the control from its current map and attach it to the new map.
+         * Subclasses may set up event handlers to get notified about changes to
+         * the map here.
+         * @param map Map.
+         * @api stable
+         */
+        setMap(map: ol.Map): void;
 
-            /**
-             * This function is used to set a target element for the control. It has no
-             * effect if it is called after the control has been added to the map (i.e.
-             * after `setMap` is called on the control). If no `target` is set in the
-             * options passed to the control constructor and if `setTarget` is not called
-             * then the control is added to the map's overlay container.
-             * @param target Target.
-             * @api
-             */
-            setTarget(target: (Element | string)): void;
-        }
+        /**
+         * This function is used to set a target element for the control. It has no
+         * effect if it is called after the control has been added to the map (i.e.
+         * after `setMap` is called on the control). If no `target` is set in the
+         * options passed to the control constructor and if `setTarget` is not called
+         * then the control is added to the map's overlay container.
+         * @param target Target.
+         * @api
+         */
+        setTarget(target: (Element | string)): void;
+    }
 
+    /**
+     * @classdesc
+     * Provides a button that when clicked fills up the full screen with the map.
+     * The full screen source element is by default the element containing the map viewport unless
+     * overriden by providing the `source` option. In which case, the dom
+     * element introduced using this parameter will be displayed in full screen.
+     *
+     * When in full screen mode, a close button is shown to exit full screen mode.
+     * The [Fullscreen API](http://www.w3.org/TR/fullscreen/) is used to
+     * toggle the map in full screen mode.
+     *
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class FullScreen extends Control {
         /**
          * @classdesc
          * Provides a button that when clicked fills up the full screen with the map.
@@ -451,39 +468,35 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class FullScreen extends ol.control.Control {
-            /**
-             * @classdesc
-             * Provides a button that when clicked fills up the full screen with the map.
-             * The full screen source element is by default the element containing the map viewport unless
-             * overriden by providing the `source` option. In which case, the dom
-             * element introduced using this parameter will be displayed in full screen.
-             *
-             * When in full screen mode, a close button is shown to exit full screen mode.
-             * The [Fullscreen API](http://www.w3.org/TR/fullscreen/) is used to
-             * toggle the map in full screen mode.
-             *
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.FullScreenOptions);
-        }
+        constructor(opt_options?: olx.control.FullScreenOptions);
+    }
 
-        /**
-         * Set of controls included in maps by default. Unless configured otherwise,
-         * this returns a collection containing an instance of each of the following
-         * controls:
-         * * {@link ol.control.Zoom}
-         * * {@link ol.control.Rotate}
-         * * {@link ol.control.Attribution}
-         *
-         * @param opt_options Defaults options.
-         * @return Controls.
-         * @api stable
-         */
-        function defaults(opt_options?: olx.control.DefaultsOptions): ol.Collection<ol.control.Control>;
+    /**
+     * Set of controls included in maps by default. Unless configured otherwise,
+     * this returns a collection containing an instance of each of the following
+     * controls:
+     * * {@link ol.control.Zoom}
+     * * {@link ol.control.Rotate}
+     * * {@link ol.control.Attribution}
+     *
+     * @param opt_options Defaults options.
+     * @return Controls.
+     * @api stable
+     */
+    function defaults(opt_options?: olx.control.DefaultsOptions): ol.Collection<Control>;
 
+    /**
+     * @classdesc
+     * A control to show the 2D coordinates of the mouse cursor. By default, these
+     * are in the view projection, but can be in any supported projection.
+     * By default the control is shown in the top right corner of the map, but this
+     * can be changed by using the css selector `.ol-mouse-position`.
+     *
+     * @param opt_options Mouse position
+     *     options.
+     * @api stable
+     */
+    class MousePosition extends Control {
         /**
          * @classdesc
          * A control to show the 2D coordinates of the mouse cursor. By default, these
@@ -495,125 +508,123 @@ declare namespace ol {
          *     options.
          * @api stable
          */
-        class MousePosition extends ol.control.Control {
-            /**
-             * @classdesc
-             * A control to show the 2D coordinates of the mouse cursor. By default, these
-             * are in the view projection, but can be in any supported projection.
-             * By default the control is shown in the top right corner of the map, but this
-             * can be changed by using the css selector `.ol-mouse-position`.
-             *
-             * @param opt_options Mouse position
-             *     options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.MousePositionOptions);
+        constructor(opt_options?: olx.control.MousePositionOptions);
 
-            /**
-             * Update the mouseposition element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the mouseposition element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Return the coordinate format type used to render the current position or
-             * undefined.
-             * @return The format to render the current
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            getCoordinateFormat(): (ol.CoordinateFormatType);
+        /**
+         * Return the coordinate format type used to render the current position or
+         * undefined.
+         * @return The format to render the current
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        getCoordinateFormat(): (ol.CoordinateFormatType);
 
-            /**
-             * Return the projection that is used to report the mouse position.
-             * @return The projection to report mouse
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            getProjection(): (ol.proj.Projection);
+        /**
+         * Return the projection that is used to report the mouse position.
+         * @return The projection to report mouse
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        getProjection(): (ol.proj.Projection);
 
-            /**
-             * Set the coordinate format type used to render the current position.
-             * @param format The format to render the current
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            setCoordinateFormat(format: ol.CoordinateFormatType): void;
+        /**
+         * Set the coordinate format type used to render the current position.
+         * @param format The format to render the current
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        setCoordinateFormat(format: ol.CoordinateFormatType): void;
 
-            /**
-             * Set the projection that is used to report the mouse position.
-             * @param projection The projection to report mouse
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            setProjection(projection: ol.proj.Projection): void;
-        }
+        /**
+         * Set the projection that is used to report the mouse position.
+         * @param projection The projection to report mouse
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        setProjection(projection: ol.proj.Projection): void;
+    }
 
+    /**
+     * Create a new control with a map acting as an overview map for an other
+     * defined map.
+     * @param opt_options OverviewMap options.
+     * @api
+     */
+    class OverviewMap extends Control {
         /**
          * Create a new control with a map acting as an overview map for an other
          * defined map.
          * @param opt_options OverviewMap options.
          * @api
          */
-        class OverviewMap extends ol.control.Control {
-            /**
-             * Create a new control with a map acting as an overview map for an other
-             * defined map.
-             * @param opt_options OverviewMap options.
-             * @api
-             */
-            constructor(opt_options?: olx.control.OverviewMapOptions);
+        constructor(opt_options?: olx.control.OverviewMapOptions);
 
-            /**
-             * Update the overview map element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the overview map element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Return `true` if the overview map is collapsible, `false` otherwise.
-             * @return True if the widget is collapsible.
-             * @api stable
-             */
-            getCollapsible(): boolean;
+        /**
+         * Return `true` if the overview map is collapsible, `false` otherwise.
+         * @return True if the widget is collapsible.
+         * @api stable
+         */
+        getCollapsible(): boolean;
 
-            /**
-             * Set whether the overview map should be collapsible.
-             * @param collapsible True if the widget is collapsible.
-             * @api stable
-             */
-            setCollapsible(collapsible: boolean): void;
+        /**
+         * Set whether the overview map should be collapsible.
+         * @param collapsible True if the widget is collapsible.
+         * @api stable
+         */
+        setCollapsible(collapsible: boolean): void;
 
-            /**
-             * Collapse or expand the overview map according to the passed parameter. Will
-             * not do anything if the overview map isn't collapsible or if the current
-             * collapsed state is already the one requested.
-             * @param collapsed True if the widget is collapsed.
-             * @api stable
-             */
-            setCollapsed(collapsed: boolean): void;
+        /**
+         * Collapse or expand the overview map according to the passed parameter. Will
+         * not do anything if the overview map isn't collapsible or if the current
+         * collapsed state is already the one requested.
+         * @param collapsed True if the widget is collapsed.
+         * @api stable
+         */
+        setCollapsed(collapsed: boolean): void;
 
-            /**
-             * Determine if the overview map is collapsed.
-             * @return The overview map is collapsed.
-             * @api stable
-             */
-            getCollapsed(): boolean;
+        /**
+         * Determine if the overview map is collapsed.
+         * @return The overview map is collapsed.
+         * @api stable
+         */
+        getCollapsed(): boolean;
 
-            /**
-             * Return the overview map.
-             * @return Overview map.
-             * @api
-             */
-            getOverviewMap(): ol.Map;
-        }
+        /**
+         * Return the overview map.
+         * @return Overview map.
+         * @api
+         */
+        getOverviewMap(): ol.Map;
+    }
 
+    /**
+     * @classdesc
+     * A button control to reset rotation to 0.
+     * To style this control use css selector `.ol-rotate`. A `.ol-hidden` css
+     * selector is added to the button when the rotation is 0.
+     *
+     * @param opt_options Rotate options.
+     * @api stable
+     */
+    class Rotate extends Control {
         /**
          * @classdesc
          * A button control to reset rotation to 0.
@@ -623,26 +634,30 @@ declare namespace ol {
          * @param opt_options Rotate options.
          * @api stable
          */
-        class Rotate extends ol.control.Control {
-            /**
-             * @classdesc
-             * A button control to reset rotation to 0.
-             * To style this control use css selector `.ol-rotate`. A `.ol-hidden` css
-             * selector is added to the button when the rotation is 0.
-             *
-             * @param opt_options Rotate options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.RotateOptions);
+        constructor(opt_options?: olx.control.RotateOptions);
 
-            /**
-             * Update the rotate control element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
-        }
+        /**
+         * Update the rotate control element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
+    }
 
+    /**
+     * @classdesc
+     * A control displaying rough y-axis distances, calculated for the center of the
+     * viewport. For conformal projections (e.g. EPSG:3857, the default view
+     * projection in OpenLayers), the scale is valid for all directions.
+     * No scale line will be shown when the y-axis distance of a pixel at the
+     * viewport center cannot be calculated in the view projection.
+     * By default the scale line will show in the bottom left portion of the map,
+     * but this can be changed by using the css selector `.ol-scale-line`.
+     *
+     * @param opt_options Scale line options.
+     * @api stable
+     */
+    class ScaleLine extends Control {
         /**
          * @classdesc
          * A control displaying rough y-axis distances, calculated for the center of the
@@ -656,60 +671,56 @@ declare namespace ol {
          * @param opt_options Scale line options.
          * @api stable
          */
-        class ScaleLine extends ol.control.Control {
-            /**
-             * @classdesc
-             * A control displaying rough y-axis distances, calculated for the center of the
-             * viewport. For conformal projections (e.g. EPSG:3857, the default view
-             * projection in OpenLayers), the scale is valid for all directions.
-             * No scale line will be shown when the y-axis distance of a pixel at the
-             * viewport center cannot be calculated in the view projection.
-             * By default the scale line will show in the bottom left portion of the map,
-             * but this can be changed by using the css selector `.ol-scale-line`.
-             *
-             * @param opt_options Scale line options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ScaleLineOptions);
+        constructor(opt_options?: olx.control.ScaleLineOptions);
 
-            /**
-             * Return the units to use in the scale line.
-             * @return The units to use in the scale
-             *     line.
-             * @observable
-             * @api stable
-             */
-            getUnits(): (ol.control.ScaleLine.Units);
+        /**
+         * Return the units to use in the scale line.
+         * @return The units to use in the scale
+         *     line.
+         * @observable
+         * @api stable
+         */
+        getUnits(): (ScaleLine.Units);
 
-            /**
-             * Update the scale line element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the scale line element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Set the units to use in the scale line.
-             * @param units The units to use in the scale line.
-             * @observable
-             * @api stable
-             */
-            setUnits(units: ol.control.ScaleLine.Units): void;
-        }
+        /**
+         * Set the units to use in the scale line.
+         * @param units The units to use in the scale line.
+         * @observable
+         * @api stable
+         */
+        setUnits(units: ScaleLine.Units): void;
+    }
 
-        namespace ScaleLine {
-            /**
-             * @api
-             */
-            type Property = string;
+    namespace ScaleLine {
+        /**
+         * @api
+         */
+        type Property = string;
 
-            /**
-             * Units for the scale line. Supported values are `'degrees'`, `'imperial'`,
-             * `'nautical'`, `'metric'`, `'us'`.
-             */
-            type Units = "degrees" | "imperial" | "nautical" | "metric" | "us";
-        }
+        /**
+         * Units for the scale line. Supported values are `'degrees'`, `'imperial'`,
+         * `'nautical'`, `'metric'`, `'us'`.
+         */
+        type Units = "degrees" | "imperial" | "nautical" | "metric" | "us";
+    }
 
+    /**
+     * @classdesc
+     * A control with 2 buttons, one for zoom in and one for zoom out.
+     * This control is one of the default controls of a map. To style this control
+     * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
+     *
+     * @param opt_options Zoom options.
+     * @api stable
+     */
+    class Zoom extends Control {
         /**
          * @classdesc
          * A control with 2 buttons, one for zoom in and one for zoom out.
@@ -719,19 +730,21 @@ declare namespace ol {
          * @param opt_options Zoom options.
          * @api stable
          */
-        class Zoom extends ol.control.Control {
-            /**
-             * @classdesc
-             * A control with 2 buttons, one for zoom in and one for zoom out.
-             * This control is one of the default controls of a map. To style this control
-             * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
-             *
-             * @param opt_options Zoom options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ZoomOptions);
-        }
+        constructor(opt_options?: olx.control.ZoomOptions);
+    }
 
+    /**
+     * @classdesc
+     * A slider type of control for zooming.
+     *
+     * Example:
+     *
+     *     map.addControl(new ol.control.ZoomSlider());
+     *
+     * @param opt_options Zoom slider options.
+     * @api stable
+     */
+    class ZoomSlider extends Control {
         /**
          * @classdesc
          * A slider type of control for zooming.
@@ -743,28 +756,25 @@ declare namespace ol {
          * @param opt_options Zoom slider options.
          * @api stable
          */
-        class ZoomSlider extends ol.control.Control {
-            /**
-             * @classdesc
-             * A slider type of control for zooming.
-             *
-             * Example:
-             *
-             *     map.addControl(new ol.control.ZoomSlider());
-             *
-             * @param opt_options Zoom slider options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ZoomSliderOptions);
+        constructor(opt_options?: olx.control.ZoomSliderOptions);
 
-            /**
-             * Update the zoomslider element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
-        }
+        /**
+         * Update the zoomslider element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
+    }
 
+    /**
+     * @classdesc
+     * A button control which, when pressed, changes the map view to a specific
+     * extent. To style this control use the css selector `.ol-zoom-extent`.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class ZoomToExtent extends Control {
         /**
          * @classdesc
          * A button control which, when pressed, changes the map view to a specific
@@ -773,157 +783,202 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class ZoomToExtent extends ol.control.Control {
-            /**
-             * @classdesc
-             * A button control which, when pressed, changes the map view to a specific
-             * extent. To style this control use the css selector `.ol-zoom-extent`.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ZoomToExtentOptions);
-        }
+        constructor(opt_options?: olx.control.ZoomToExtentOptions);
     }
+}
 
-    namespace coordinate {
-        /**
-         * Add `delta` to `coordinate`. `coordinate` is modified in place and returned
-         * by the function.
-         *
-         * Example:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     ol.coordinate.add(coord, [-2, 4]);
-         *     // coord is now [5.85, 51.983333]
-         *
-         * @param coordinate Coordinate.
-         * @param delta Delta.
-         * @return The input coordinate adjusted by the given delta.
-         * @api stable
-         */
-        function add(coordinate: ol.Coordinate, delta: ol.Coordinate): ol.Coordinate;
+export namespace coordinate {
+    /**
+     * Add `delta` to `coordinate`. `coordinate` is modified in place and returned
+     * by the function.
+     *
+     * Example:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     ol.coordinate.add(coord, [-2, 4]);
+     *     // coord is now [5.85, 51.983333]
+     *
+     * @param coordinate Coordinate.
+     * @param delta Delta.
+     * @return The input coordinate adjusted by the given delta.
+     * @api stable
+     */
+    function add(coordinate: ol.Coordinate, delta: ol.Coordinate): ol.Coordinate;
 
-        /**
-         * Returns a {@link ol.CoordinateFormatType} function that can be used to format
-         * a {ol.Coordinate} to a string.
-         *
-         * Example without specifying the fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var stringifyFunc = ol.coordinate.createStringXY();
-         *     var out = stringifyFunc(coord);
-         *     // out is now '8, 48'
-         *
-         * Example with explicitly specifying 2 fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var stringifyFunc = ol.coordinate.createStringXY(2);
-         *     var out = stringifyFunc(coord);
-         *     // out is now '7.85, 47.98'
-         *
-         * @param opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return Coordinate format.
-         * @api stable
-         */
-        function createStringXY(opt_fractionDigits?: number): ol.CoordinateFormatType;
+    /**
+     * Returns a {@link ol.CoordinateFormatType} function that can be used to format
+     * a {ol.Coordinate} to a string.
+     *
+     * Example without specifying the fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var stringifyFunc = ol.coordinate.createStringXY();
+     *     var out = stringifyFunc(coord);
+     *     // out is now '8, 48'
+     *
+     * Example with explicitly specifying 2 fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var stringifyFunc = ol.coordinate.createStringXY(2);
+     *     var out = stringifyFunc(coord);
+     *     // out is now '7.85, 47.98'
+     *
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return Coordinate format.
+     * @api stable
+     */
+    function createStringXY(opt_fractionDigits?: number): ol.CoordinateFormatType;
 
-        /**
-         * Transforms the given {@link ol.Coordinate} to a string using the given string
-         * template. The strings `{x}` and `{y}` in the template will be replaced with
-         * the first and second coordinate values respectively.
-         *
-         * Example without specifying the fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var template = 'Coordinate is ({x}|{y}).';
-         *     var out = ol.coordinate.format(coord, template);
-         *     // out is now 'Coordinate is (8|48).'
-         *
-         * Example explicitly specifying the fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var template = 'Coordinate is ({x}|{y}).';
-         *     var out = ol.coordinate.format(coord, template, 2);
-         *     // out is now 'Coordinate is (7.85|47.98).'
-         *
-         * @param coordinate Coordinate.
-         * @param template A template string with `{x}` and `{y}` placeholders
-         *     that will be replaced by first and second coordinate values.
-         * @param opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return Formatted coordinate.
-         * @api stable
-         */
-        function format(coordinate: (ol.Coordinate), template: string, opt_fractionDigits?: number): string;
+    /**
+     * Transforms the given {@link ol.Coordinate} to a string using the given string
+     * template. The strings `{x}` and `{y}` in the template will be replaced with
+     * the first and second coordinate values respectively.
+     *
+     * Example without specifying the fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var template = 'Coordinate is ({x}|{y}).';
+     *     var out = ol.coordinate.format(coord, template);
+     *     // out is now 'Coordinate is (8|48).'
+     *
+     * Example explicitly specifying the fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var template = 'Coordinate is ({x}|{y}).';
+     *     var out = ol.coordinate.format(coord, template, 2);
+     *     // out is now 'Coordinate is (7.85|47.98).'
+     *
+     * @param coordinate Coordinate.
+     * @param template A template string with `{x}` and `{y}` placeholders
+     *     that will be replaced by first and second coordinate values.
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return Formatted coordinate.
+     * @api stable
+     */
+    function format(coordinate: (ol.Coordinate), template: string, opt_fractionDigits?: number): string;
 
-        /**
-         * Rotate `coordinate` by `angle`. `coordinate` is modified in place and
-         * returned by the function.
-         *
-         * Example:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var rotateRadians = Math.PI / 2; // 90 degrees
-         *     ol.coordinate.rotate(coord, rotateRadians);
-         *     // coord is now [-47.983333, 7.85]
-         *
-         * @param coordinate Coordinate.
-         * @param angle Angle in radian.
-         * @return Coordinate.
-         * @api stable
-         */
-        function rotate(coordinate: ol.Coordinate, angle: number): ol.Coordinate;
+    /**
+     * Rotate `coordinate` by `angle`. `coordinate` is modified in place and
+     * returned by the function.
+     *
+     * Example:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var rotateRadians = Math.PI / 2; // 90 degrees
+     *     ol.coordinate.rotate(coord, rotateRadians);
+     *     // coord is now [-47.983333, 7.85]
+     *
+     * @param coordinate Coordinate.
+     * @param angle Angle in radian.
+     * @return Coordinate.
+     * @api stable
+     */
+    function rotate(coordinate: ol.Coordinate, angle: number): ol.Coordinate;
 
-        /**
-         * Format a geographic coordinate with the hemisphere, degrees, minutes, and
-         * seconds.
-         *
-         * Example without specifying fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringHDMS(coord);
-         *     // out is now '47° 58′ 60″ N 7° 50′ 60″ E'
-         *
-         * Example explicitly specifying 1 fractional digit:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringHDMS(coord, 1);
-         *     // out is now '47° 58′ 60.0″ N 7° 50′ 60.0″ E'
-         *
-         * @param coordinate Coordinate.
-         * @param opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return Hemisphere, degrees, minutes and seconds.
-         * @api stable
-         */
-        function toStringHDMS(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
+    /**
+     * Format a geographic coordinate with the hemisphere, degrees, minutes, and
+     * seconds.
+     *
+     * Example without specifying fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringHDMS(coord);
+     *     // out is now '47° 58′ 60″ N 7° 50′ 60″ E'
+     *
+     * Example explicitly specifying 1 fractional digit:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringHDMS(coord, 1);
+     *     // out is now '47° 58′ 60.0″ N 7° 50′ 60.0″ E'
+     *
+     * @param coordinate Coordinate.
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return Hemisphere, degrees, minutes and seconds.
+     * @api stable
+     */
+    function toStringHDMS(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
 
-        /**
-         * Format a coordinate as a comma delimited string.
-         *
-         * Example without specifying fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringXY(coord);
-         *     // out is now '8, 48'
-         *
-         * Example explicitly specifying 1 fractional digit:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringXY(coord, 1);
-         *     // out is now '7.8, 48.0'
-         *
-         * @param coordinate Coordinate.
-         * @param opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return XY.
-         * @api stable
-         */
-        function toStringXY(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
-    }
+    /**
+     * Format a coordinate as a comma delimited string.
+     *
+     * Example without specifying fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringXY(coord);
+     *     // out is now '8, 48'
+     *
+     * Example explicitly specifying 1 fractional digit:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringXY(coord, 1);
+     *     // out is now '7.8, 48.0'
+     *
+     * @param coordinate Coordinate.
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return XY.
+     * @api stable
+     */
+    function toStringXY(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
+}
 
+/**
+ * @classdesc
+ * The ol.DeviceOrientation class provides access to information from
+ * DeviceOrientation events.  See the [HTML 5 DeviceOrientation Specification](
+ * http://www.w3.org/TR/orientation-event/) for more details.
+ *
+ * Many new computers, and especially mobile phones
+ * and tablets, provide hardware support for device orientation. Web
+ * developers targeting mobile devices will be especially interested in this
+ * class.
+ *
+ * Device orientation data are relative to a common starting point. For mobile
+ * devices, the starting point is to lay your phone face up on a table with the
+ * top of the phone pointing north. This represents the zero state. All
+ * angles are then relative to this state. For computers, it is the same except
+ * the screen is open at 90 degrees.
+ *
+ * Device orientation is reported as three angles - `alpha`, `beta`, and
+ * `gamma` - relative to the starting position along the three planar axes X, Y
+ * and Z. The X axis runs from the left edge to the right edge through the
+ * middle of the device. Similarly, the Y axis runs from the bottom to the top
+ * of the device through the middle. The Z axis runs from the back to the front
+ * through the middle. In the starting position, the X axis points to the
+ * right, the Y axis points away from you and the Z axis points straight up
+ * from the device lying flat.
+ *
+ * The three angles representing the device orientation are relative to the
+ * three axes. `alpha` indicates how much the device has been rotated around the
+ * Z axis, which is commonly interpreted as the compass heading (see note
+ * below). `beta` indicates how much the device has been rotated around the X
+ * axis, or how much it is tilted from front to back.  `gamma` indicates how
+ * much the device has been rotated around the Y axis, or how much it is tilted
+ * from left to right.
+ *
+ * For most browsers, the `alpha` value returns the compass heading so if the
+ * device points north, it will be 0.  With Safari on iOS, the 0 value of
+ * `alpha` is calculated from when device orientation was first requested.
+ * ol.DeviceOrientation provides the `heading` property which normalizes this
+ * behavior across all browsers for you.
+ *
+ * It is important to note that the HTML 5 DeviceOrientation specification
+ * indicates that `alpha`, `beta` and `gamma` are in degrees while the
+ * equivalent properties in ol.DeviceOrientation are in radians for consistency
+ * with all other uses of angles throughout OpenLayers.
+ *
+ * To get notified of device orientation changes, register a listener for the
+ * generic `change` event on your `ol.DeviceOrientation` instance.
+ *
+ * @see {@link http://www.w3.org/TR/orientation-event/}
+ *
+ * @param opt_options Options.
+ * @api
+ */
+export class DeviceOrientation extends Object {
     /**
      * @classdesc
      * The ol.DeviceOrientation class provides access to information from
@@ -977,325 +1032,285 @@ declare namespace ol {
      * @param opt_options Options.
      * @api
      */
-    class DeviceOrientation extends ol.Object {
-        /**
-         * @classdesc
-         * The ol.DeviceOrientation class provides access to information from
-         * DeviceOrientation events.  See the [HTML 5 DeviceOrientation Specification](
-         * http://www.w3.org/TR/orientation-event/) for more details.
-         *
-         * Many new computers, and especially mobile phones
-         * and tablets, provide hardware support for device orientation. Web
-         * developers targeting mobile devices will be especially interested in this
-         * class.
-         *
-         * Device orientation data are relative to a common starting point. For mobile
-         * devices, the starting point is to lay your phone face up on a table with the
-         * top of the phone pointing north. This represents the zero state. All
-         * angles are then relative to this state. For computers, it is the same except
-         * the screen is open at 90 degrees.
-         *
-         * Device orientation is reported as three angles - `alpha`, `beta`, and
-         * `gamma` - relative to the starting position along the three planar axes X, Y
-         * and Z. The X axis runs from the left edge to the right edge through the
-         * middle of the device. Similarly, the Y axis runs from the bottom to the top
-         * of the device through the middle. The Z axis runs from the back to the front
-         * through the middle. In the starting position, the X axis points to the
-         * right, the Y axis points away from you and the Z axis points straight up
-         * from the device lying flat.
-         *
-         * The three angles representing the device orientation are relative to the
-         * three axes. `alpha` indicates how much the device has been rotated around the
-         * Z axis, which is commonly interpreted as the compass heading (see note
-         * below). `beta` indicates how much the device has been rotated around the X
-         * axis, or how much it is tilted from front to back.  `gamma` indicates how
-         * much the device has been rotated around the Y axis, or how much it is tilted
-         * from left to right.
-         *
-         * For most browsers, the `alpha` value returns the compass heading so if the
-         * device points north, it will be 0.  With Safari on iOS, the 0 value of
-         * `alpha` is calculated from when device orientation was first requested.
-         * ol.DeviceOrientation provides the `heading` property which normalizes this
-         * behavior across all browsers for you.
-         *
-         * It is important to note that the HTML 5 DeviceOrientation specification
-         * indicates that `alpha`, `beta` and `gamma` are in degrees while the
-         * equivalent properties in ol.DeviceOrientation are in radians for consistency
-         * with all other uses of angles throughout OpenLayers.
-         *
-         * To get notified of device orientation changes, register a listener for the
-         * generic `change` event on your `ol.DeviceOrientation` instance.
-         *
-         * @see {@link http://www.w3.org/TR/orientation-event/}
-         *
-         * @param opt_options Options.
-         * @api
-         */
-        constructor(opt_options?: olx.DeviceOrientationOptions);
+    constructor(opt_options?: olx.DeviceOrientationOptions);
 
-        /**
-         * Rotation around the device z-axis (in radians).
-         * @return The euler angle in radians of the device from the
-         *     standard Z axis.
-         * @observable
-         * @api
-         */
-        getAlpha(): (number);
+    /**
+     * Rotation around the device z-axis (in radians).
+     * @return The euler angle in radians of the device from the
+     *     standard Z axis.
+     * @observable
+     * @api
+     */
+    getAlpha(): (number);
 
-        /**
-         * Rotation around the device x-axis (in radians).
-         * @return The euler angle in radians of the device from the
-         *     planar X axis.
-         * @observable
-         * @api
-         */
-        getBeta(): (number);
+    /**
+     * Rotation around the device x-axis (in radians).
+     * @return The euler angle in radians of the device from the
+     *     planar X axis.
+     * @observable
+     * @api
+     */
+    getBeta(): (number);
 
-        /**
-         * Rotation around the device y-axis (in radians).
-         * @return The euler angle in radians of the device from the
-         *     planar Y axis.
-         * @observable
-         * @api
-         */
-        getGamma(): (number);
+    /**
+     * Rotation around the device y-axis (in radians).
+     * @return The euler angle in radians of the device from the
+     *     planar Y axis.
+     * @observable
+     * @api
+     */
+    getGamma(): (number);
 
-        /**
-         * The heading of the device relative to north (in radians).
-         * @return The heading of the device relative to north, in
-         *     radians, normalizing for different browser behavior.
-         * @observable
-         * @api
-         */
-        getHeading(): (number);
+    /**
+     * The heading of the device relative to north (in radians).
+     * @return The heading of the device relative to north, in
+     *     radians, normalizing for different browser behavior.
+     * @observable
+     * @api
+     */
+    getHeading(): (number);
 
-        /**
-         * Determine if orientation is being tracked.
-         * @return Changes in device orientation are being tracked.
-         * @observable
-         * @api
-         */
-        getTracking(): boolean;
+    /**
+     * Determine if orientation is being tracked.
+     * @return Changes in device orientation are being tracked.
+     * @observable
+     * @api
+     */
+    getTracking(): boolean;
 
-        /**
-         * Enable or disable tracking of device orientation events.
-         * @param tracking The status of tracking changes to alpha, beta and
-         *     gamma. If true, changes are tracked and reported immediately.
-         * @observable
-         * @api
-         */
-        setTracking(tracking: boolean): void;
-    }
+    /**
+     * Enable or disable tracking of device orientation events.
+     * @param tracking The status of tracking changes to alpha, beta and
+     *     gamma. If true, changes are tracked and reported immediately.
+     * @observable
+     * @api
+     */
+    setTracking(tracking: boolean): void;
+}
 
+/**
+ * Objects that need to clean up after themselves.
+ */
+/* tslint:disable-next-line:no-unnecessary-class */
+export class Disposable {
     /**
      * Objects that need to clean up after themselves.
      */
-    class Disposable {
-        /**
-         * Objects that need to clean up after themselves.
-         */
-        constructor();
-    }
+    constructor();
+}
 
+/**
+ * Easing functions for {@link ol.animation}.
+ */
+export namespace easing {
     /**
-     * Easing functions for {@link ol.animation}.
+     * Start slow and speed up.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
      */
-    namespace easing {
+    function easeIn(t: number): number;
+
+    /**
+     * Start fast and slow down.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function easeOut(t: number): number;
+
+    /**
+     * Start slow, speed up, and then slow down again.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function inAndOut(t: number): number;
+
+    /**
+     * Maintain a constant speed over time.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function linear(t: number): number;
+
+    /**
+     * Start slow, speed up, and at the very end slow down again.  This has the
+     * same general behavior as {@link ol.easing.inAndOut}, but the final slowdown
+     * is delayed.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function upAndDown(t: number): number;
+}
+
+/**
+ * Applications do not normally create event instances. They register (and
+ * unregister) event listener functions, which, when called by the library as
+ * the result of an event being dispatched, are passed event instances as their
+ * first argument. Listeners can be registered and unregistered on all objects
+ * descending from {@link ol.Observable}. All event instances have a `target`
+ * property, which corresponds to the object on which the event was dispatched.
+ * By default, `this` within the listener also refers to the target, though
+ * this can be configured in the listener registration function.
+ * Some classes have their own event type, which return additional
+ * properties; see the specific event class page for details.
+ *
+ */
+export namespace events {
+    namespace condition {
         /**
-         * Start slow and speed up.
-         * @param t Input between 0 and 1.
-         * @return Output between 0 and 1.
-         * @api
+         * Return `true` if only the alt-key is pressed, `false` otherwise (e.g. when
+         * additionally the shift-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the alt key is pressed.
+         * @api stable
          */
-        function easeIn(t: number): number;
+        function altKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
         /**
-         * Start fast and slow down.
-         * @param t Input between 0 and 1.
-         * @return Output between 0 and 1.
-         * @api
+         * Return `true` if only the alt-key and shift-key is pressed, `false` otherwise
+         * (e.g. when additionally the platform-modifier-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the alt and shift keys are pressed.
+         * @api stable
          */
-        function easeOut(t: number): number;
+        function altShiftKeysOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
         /**
-         * Start slow, speed up, and then slow down again.
-         * @param t Input between 0 and 1.
-         * @return Output between 0 and 1.
-         * @api
+         * Return always true.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True.
+         * @api stable
          */
-        function inAndOut(t: number): number;
+        function always(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
         /**
-         * Maintain a constant speed over time.
-         * @param t Input between 0 and 1.
-         * @return Output between 0 and 1.
-         * @api
+         * Return `true` if the event is a `click` event, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event is a map `click` event.
+         * @api stable
          */
-        function linear(t: number): number;
+        function click(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
         /**
-         * Start slow, speed up, and at the very end slow down again.  This has the
-         * same general behavior as {@link ol.easing.inAndOut}, but the final slowdown
-         * is delayed.
-         * @param t Input between 0 and 1.
-         * @return Output between 0 and 1.
+         * Return always false.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return False.
+         * @api stable
+         */
+        function never(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the browser event is a `pointermove` event, `false`
+         * otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the browser event is a `pointermove` event.
          * @api
          */
-        function upAndDown(t: number): number;
+        function pointerMove(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event is a map `singleclick` event, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event is a map `singleclick` event.
+         * @api stable
+         */
+        function singleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event is a map `dblclick` event, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event is a map `dblclick` event.
+         * @api stable
+         */
+        function doubleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if no modifier key (alt-, shift- or platform-modifier-key) is
+         * pressed.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True only if there no modifier keys are pressed.
+         * @api stable
+         */
+        function noModifierKeys(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if only the platform-modifier-key (the meta-key on Mac,
+         * ctrl-key otherwise) is pressed, `false` otherwise (e.g. when additionally
+         * the shift-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the platform modifier key is pressed.
+         * @api stable
+         */
+        function platformModifierKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if only the shift-key is pressed, `false` otherwise (e.g. when
+         * additionally the alt-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the shift key is pressed.
+         * @api stable
+         */
+        function shiftKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the target element is not editable, i.e. not a `<input>`-,
+         * `<select>`- or `<textarea>`-element, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True only if the target element is not editable.
+         * @api
+         */
+        function targetNotEditable(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event originates from a mouse device.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event originates from a mouse device.
+         * @api stable
+         */
+        function mouseOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event originates from a primary pointer in
+         * contact with the surface or if the left mouse button is pressed.
+         * @see http://www.w3.org/TR/pointerevents/#button-states
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event originates from a primary pointer.
+         * @api
+         */
+        function primaryAction(mapBrowserEvent: ol.MapBrowserEvent): boolean;
     }
 
     /**
-     * Applications do not normally create event instances. They register (and
-     * unregister) event listener functions, which, when called by the library as
-     * the result of an event being dispatched, are passed event instances as their
-     * first argument. Listeners can be registered and unregistered on all objects
-     * descending from {@link ol.Observable}. All event instances have a `target`
-     * property, which corresponds to the object on which the event was dispatched.
-     * By default, `this` within the listener also refers to the target, though
-     * this can be configured in the listener registration function.
-     * Some classes have their own event type, which return additional
-     * properties; see the specific event class page for details.
+     * @classdesc
+     * Stripped down implementation of the W3C DOM Level 2 Event interface.
+     * @see {@link https://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-interface}
      *
+     * This implementation only provides `type` and `target` properties, and
+     * `stopPropagation` and `preventDefault` methods. It is meant as base class
+     * for higher level events defined in the library, and works with
+     * {@link ol.events.EventTarget}.
+     *
+     * @param type Type.
      */
-    namespace events {
-        namespace condition {
-            /**
-             * Return `true` if only the alt-key is pressed, `false` otherwise (e.g. when
-             * additionally the shift-key is pressed).
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if only the alt key is pressed.
-             * @api stable
-             */
-            function altKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if only the alt-key and shift-key is pressed, `false` otherwise
-             * (e.g. when additionally the platform-modifier-key is pressed).
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if only the alt and shift keys are pressed.
-             * @api stable
-             */
-            function altShiftKeysOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return always true.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True.
-             * @api stable
-             */
-            function always(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event is a `click` event, `false` otherwise.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the event is a map `click` event.
-             * @api stable
-             */
-            function click(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return always false.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return False.
-             * @api stable
-             */
-            function never(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the browser event is a `pointermove` event, `false`
-             * otherwise.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the browser event is a `pointermove` event.
-             * @api
-             */
-            function pointerMove(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event is a map `singleclick` event, `false` otherwise.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the event is a map `singleclick` event.
-             * @api stable
-             */
-            function singleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event is a map `dblclick` event, `false` otherwise.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the event is a map `dblclick` event.
-             * @api stable
-             */
-            function doubleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if no modifier key (alt-, shift- or platform-modifier-key) is
-             * pressed.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True only if there no modifier keys are pressed.
-             * @api stable
-             */
-            function noModifierKeys(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if only the platform-modifier-key (the meta-key on Mac,
-             * ctrl-key otherwise) is pressed, `false` otherwise (e.g. when additionally
-             * the shift-key is pressed).
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if only the platform modifier key is pressed.
-             * @api stable
-             */
-            function platformModifierKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if only the shift-key is pressed, `false` otherwise (e.g. when
-             * additionally the alt-key is pressed).
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if only the shift key is pressed.
-             * @api stable
-             */
-            function shiftKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the target element is not editable, i.e. not a `<input>`-,
-             * `<select>`- or `<textarea>`-element, `false` otherwise.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True only if the target element is not editable.
-             * @api
-             */
-            function targetNotEditable(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event originates from a mouse device.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the event originates from a mouse device.
-             * @api stable
-             */
-            function mouseOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event originates from a primary pointer in
-             * contact with the surface or if the left mouse button is pressed.
-             * @see http://www.w3.org/TR/pointerevents/#button-states
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the event originates from a primary pointer.
-             * @api
-             */
-            function primaryAction(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
-
+    class Event {
         /**
          * @classdesc
          * Stripped down implementation of the W3C DOM Level 2 Event interface.
@@ -1308,46 +1323,50 @@ declare namespace ol {
          *
          * @param type Type.
          */
-        class Event {
-            /**
-             * @classdesc
-             * Stripped down implementation of the W3C DOM Level 2 Event interface.
-             * @see {@link https://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-interface}
-             *
-             * This implementation only provides `type` and `target` properties, and
-             * `stopPropagation` and `preventDefault` methods. It is meant as base class
-             * for higher level events defined in the library, and works with
-             * {@link ol.events.EventTarget}.
-             *
-             * @param type Type.
-             */
-            constructor(type: string);
+        constructor(type: string);
 
-            /**
-             * The event type.
-             * @api stable
-             */
-            type: string;
+        /**
+         * The event type.
+         * @api stable
+         */
+        type: string;
 
-            /**
-             * The event target.
-             * @api stable
-             */
-            target: GlobalObject;
+        /**
+         * The event target.
+         * @api stable
+         */
+        target: GlobalObject;
 
-            /**
-             * Stop event propagation.
-             * @api stable
-             */
-            preventDefault(): void;
+        /**
+         * Stop event propagation.
+         * @api stable
+         */
+        preventDefault(): void;
 
-            /**
-             * Stop event propagation.
-             * @api stable
-             */
-            stopPropagation(): void;
-        }
+        /**
+         * Stop event propagation.
+         * @api stable
+         */
+        stopPropagation(): void;
+    }
 
+    /**
+     * @classdesc
+     * A simplified implementation of the W3C DOM Level 2 EventTarget interface.
+     * @see {@link https://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/events.html#Events-EventTarget}
+     *
+     * There are two important simplifications compared to the specification:
+     *
+     * 1. The handling of `useCapture` in `addEventListener` and
+     *    `removeEventListener`. There is no real capture model.
+     * 2. The handling of `stopPropagation` and `preventDefault` on `dispatchEvent`.
+     *    There is no event target hierarchy. When a listener calls
+     *    `stopPropagation` or `preventDefault` on an event object, it means that no
+     *    more listeners after this one will be called. Same as when the listener
+     *    returns false.
+     *
+     */
+    class EventTarget extends Disposable {
         /**
          * @classdesc
          * A simplified implementation of the W3C DOM Level 2 EventTarget interface.
@@ -1364,213 +1383,240 @@ declare namespace ol {
          *    returns false.
          *
          */
-        class EventTarget extends ol.Disposable {
-            /**
-             * @classdesc
-             * A simplified implementation of the W3C DOM Level 2 EventTarget interface.
-             * @see {@link https://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/events.html#Events-EventTarget}
-             *
-             * There are two important simplifications compared to the specification:
-             *
-             * 1. The handling of `useCapture` in `addEventListener` and
-             *    `removeEventListener`. There is no real capture model.
-             * 2. The handling of `stopPropagation` and `preventDefault` on `dispatchEvent`.
-             *    There is no event target hierarchy. When a listener calls
-             *    `stopPropagation` or `preventDefault` on an event object, it means that no
-             *    more listeners after this one will be called. Same as when the listener
-             *    returns false.
-             *
-             */
-            constructor();
-        }
+        constructor();
     }
+}
 
-    /* From ol/typedefs.js */
-    type EventsListenerFunctionType = ((evt: ol.events.Event) => void) | ((evt: ol.events.Event) => boolean);
+/* From ol/typedefs.js */
+export type EventsListenerFunctionType = ((evt: ol.events.Event) => void) | ((evt: ol.events.Event) => boolean);
 
-    namespace extent {
-        /**
-         * Build an extent that includes all given coordinates.
-         *
-         * @param coordinates Coordinates.
-         * @return Bounding extent.
-         * @api stable
-         */
-        function boundingExtent(coordinates: ol.Coordinate[]): ol.Extent;
+export namespace extent {
+    /**
+     * Build an extent that includes all given coordinates.
+     *
+     * @param coordinates Coordinates.
+     * @return Bounding extent.
+     * @api stable
+     */
+    function boundingExtent(coordinates: ol.Coordinate[]): ol.Extent;
 
-        /**
-         * Return extent increased by the provided value.
-         * @param extent Extent.
-         * @param value The amount by which the extent should be buffered.
-         * @param opt_extent Extent.
-         * @return Extent.
-         * @api stable
-         */
-        function buffer(extent: ol.Extent, value: number, opt_extent?: ol.Extent): ol.Extent;
+    /**
+     * Return extent increased by the provided value.
+     * @param extent Extent.
+     * @param value The amount by which the extent should be buffered.
+     * @param opt_extent Extent.
+     * @return Extent.
+     * @api stable
+     */
+    function buffer(extent: ol.Extent, value: number, opt_extent?: ol.Extent): ol.Extent;
 
-        /**
-         * Check if the passed coordinate is contained or on the edge of the extent.
-         *
-         * @param extent Extent.
-         * @param coordinate Coordinate.
-         * @return The coordinate is contained in the extent.
-         * @api stable
-         */
-        function containsCoordinate(extent: ol.Extent, coordinate: ol.Coordinate): boolean;
+    /**
+     * Check if the passed coordinate is contained or on the edge of the extent.
+     *
+     * @param extent Extent.
+     * @param coordinate Coordinate.
+     * @return The coordinate is contained in the extent.
+     * @api stable
+     */
+    function containsCoordinate(extent: ol.Extent, coordinate: ol.Coordinate): boolean;
 
-        /**
-         * Check if one extent contains another.
-         *
-         * An extent is deemed contained if it lies completely within the other extent,
-         * including if they share one or more edges.
-         *
-         * @param extent1 Extent 1.
-         * @param extent2 Extent 2.
-         * @return The second extent is contained by or on the edge of the
-         *     first.
-         * @api stable
-         */
-        function containsExtent(extent1: ol.Extent, extent2: ol.Extent): boolean;
+    /**
+     * Check if one extent contains another.
+     *
+     * An extent is deemed contained if it lies completely within the other extent,
+     * including if they share one or more edges.
+     *
+     * @param extent1 Extent 1.
+     * @param extent2 Extent 2.
+     * @return The second extent is contained by or on the edge of the
+     *     first.
+     * @api stable
+     */
+    function containsExtent(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
-        /**
-         * Check if the passed coordinate is contained or on the edge of the extent.
-         *
-         * @param extent Extent.
-         * @param x X coordinate.
-         * @param y Y coordinate.
-         * @return The x, y values are contained in the extent.
-         * @api stable
-         */
-        function containsXY(extent: ol.Extent, x: number, y: number): boolean;
+    /**
+     * Check if the passed coordinate is contained or on the edge of the extent.
+     *
+     * @param extent Extent.
+     * @param x X coordinate.
+     * @param y Y coordinate.
+     * @return The x, y values are contained in the extent.
+     * @api stable
+     */
+    function containsXY(extent: ol.Extent, x: number, y: number): boolean;
 
-        /**
-         * Create an empty extent.
-         * @return Empty extent.
-         * @api stable
-         */
-        function createEmpty(): ol.Extent;
+    /**
+     * Create an empty extent.
+     * @return Empty extent.
+     * @api stable
+     */
+    function createEmpty(): ol.Extent;
 
-        /**
-         * Determine if two extents are equivalent.
-         * @param extent1 Extent 1.
-         * @param extent2 Extent 2.
-         * @return The two extents are equivalent.
-         * @api stable
-         */
-        function equals(extent1: ol.Extent, extent2: ol.Extent): boolean;
+    /**
+     * Determine if two extents are equivalent.
+     * @param extent1 Extent 1.
+     * @param extent2 Extent 2.
+     * @return The two extents are equivalent.
+     * @api stable
+     */
+    function equals(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
-        /**
-         * Modify an extent to include another extent.
-         * @param extent1 The extent to be modified.
-         * @param extent2 The extent that will be included in the first.
-         * @return A reference to the first (extended) extent.
-         * @api stable
-         */
-        function extend(extent1: ol.Extent, extent2: ol.Extent): ol.Extent;
+    /**
+     * Modify an extent to include another extent.
+     * @param extent1 The extent to be modified.
+     * @param extent2 The extent that will be included in the first.
+     * @return A reference to the first (extended) extent.
+     * @api stable
+     */
+    function extend(extent1: ol.Extent, extent2: ol.Extent): ol.Extent;
 
-        /**
-         * Get the bottom left coordinate of an extent.
-         * @param extent Extent.
-         * @return Bottom left coordinate.
-         * @api stable
-         */
-        function getBottomLeft(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the bottom left coordinate of an extent.
+     * @param extent Extent.
+     * @return Bottom left coordinate.
+     * @api stable
+     */
+    function getBottomLeft(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the bottom right coordinate of an extent.
-         * @param extent Extent.
-         * @return Bottom right coordinate.
-         * @api stable
-         */
-        function getBottomRight(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the bottom right coordinate of an extent.
+     * @param extent Extent.
+     * @return Bottom right coordinate.
+     * @api stable
+     */
+    function getBottomRight(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the center coordinate of an extent.
-         * @param extent Extent.
-         * @return Center.
-         * @api stable
-         */
-        function getCenter(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the center coordinate of an extent.
+     * @param extent Extent.
+     * @return Center.
+     * @api stable
+     */
+    function getCenter(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the height of an extent.
-         * @param extent Extent.
-         * @return Height.
-         * @api stable
-         */
-        function getHeight(extent: ol.Extent): number;
+    /**
+     * Get the height of an extent.
+     * @param extent Extent.
+     * @return Height.
+     * @api stable
+     */
+    function getHeight(extent: ol.Extent): number;
 
-        /**
-         * Get the intersection of two extents.
-         * @param extent1 Extent 1.
-         * @param extent2 Extent 2.
-         * @param opt_extent Optional extent to populate with intersection.
-         * @return Intersecting extent.
-         * @api stable
-         */
-        function getIntersection(extent1: ol.Extent, extent2: ol.Extent, opt_extent?: ol.Extent): ol.Extent;
+    /**
+     * Get the intersection of two extents.
+     * @param extent1 Extent 1.
+     * @param extent2 Extent 2.
+     * @param opt_extent Optional extent to populate with intersection.
+     * @return Intersecting extent.
+     * @api stable
+     */
+    function getIntersection(extent1: ol.Extent, extent2: ol.Extent, opt_extent?: ol.Extent): ol.Extent;
 
-        /**
-         * Get the size (width, height) of an extent.
-         * @param extent The extent.
-         * @return The extent size.
-         * @api stable
-         */
-        function getSize(extent: ol.Extent): ol.Size;
+    /**
+     * Get the size (width, height) of an extent.
+     * @param extent The extent.
+     * @return The extent size.
+     * @api stable
+     */
+    function getSize(extent: ol.Extent): ol.Size;
 
-        /**
-         * Get the top left coordinate of an extent.
-         * @param extent Extent.
-         * @return Top left coordinate.
-         * @api stable
-         */
-        function getTopLeft(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the top left coordinate of an extent.
+     * @param extent Extent.
+     * @return Top left coordinate.
+     * @api stable
+     */
+    function getTopLeft(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the top right coordinate of an extent.
-         * @param extent Extent.
-         * @return Top right coordinate.
-         * @api stable
-         */
-        function getTopRight(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the top right coordinate of an extent.
+     * @param extent Extent.
+     * @return Top right coordinate.
+     * @api stable
+     */
+    function getTopRight(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the width of an extent.
-         * @param extent Extent.
-         * @return Width.
-         * @api stable
-         */
-        function getWidth(extent: ol.Extent): number;
+    /**
+     * Get the width of an extent.
+     * @param extent Extent.
+     * @return Width.
+     * @api stable
+     */
+    function getWidth(extent: ol.Extent): number;
 
-        /**
-         * Determine if one extent intersects another.
-         * @param extent1 Extent 1.
-         * @param extent2 Extent.
-         * @return The two extents intersect.
-         * @api stable
-         */
-        function intersects(extent1: ol.Extent, extent2: ol.Extent): boolean;
+    /**
+     * Determine if one extent intersects another.
+     * @param extent1 Extent 1.
+     * @param extent2 Extent.
+     * @return The two extents intersect.
+     * @api stable
+     */
+    function intersects(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
-        /**
-         * Determine if an extent is empty.
-         * @param extent Extent.
-         * @return Is empty.
-         * @api stable
-         */
-        function isEmpty(extent: ol.Extent): boolean;
+    /**
+     * Determine if an extent is empty.
+     * @param extent Extent.
+     * @return Is empty.
+     * @api stable
+     */
+    function isEmpty(extent: ol.Extent): boolean;
 
-        /**
-         * Apply a transform function to the extent.
-         * @param extent Extent.
-         * @param transformFn Transform function.  Called with
-         * [minX, minY, maxX, maxY] extent coordinates.
-         * @param opt_extent Destination extent.
-         * @return Extent.
-         * @api stable
-         */
-        function applyTransform(extent: ol.Extent, transformFn: ol.TransformFunction, opt_extent?: ol.Extent): ol.Extent;
-    }
+    /**
+     * Apply a transform function to the extent.
+     * @param extent Extent.
+     * @param transformFn Transform function.  Called with
+     * [minX, minY, maxX, maxY] extent coordinates.
+     * @param opt_extent Destination extent.
+     * @return Extent.
+     * @api stable
+     */
+    function applyTransform(extent: ol.Extent, transformFn: ol.TransformFunction, opt_extent?: ol.Extent): ol.Extent;
+}
 
+/**
+ * @classdesc
+ * A vector object for geographic features with a geometry and other
+ * attribute properties, similar to the features in vector file formats like
+ * GeoJSON.
+ *
+ * Features can be styled individually with `setStyle`; otherwise they use the
+ * style of their vector layer.
+ *
+ * Note that attribute properties are set as {@link ol.Object} properties on
+ * the feature object, so they are observable, and have get/set accessors.
+ *
+ * Typically, a feature has a single geometry property. You can set the
+ * geometry using the `setGeometry` method and get it with `getGeometry`.
+ * It is possible to store more than one geometry on a feature using attribute
+ * properties. By default, the geometry used for rendering is identified by
+ * the property name `geometry`. If you want to use another geometry property
+ * for rendering, use the `setGeometryName` method to change the attribute
+ * property associated with the geometry for the feature.  For example:
+ *
+ * ```js
+ * var feature = new ol.Feature({
+ *   geometry: new ol.geom.Polygon(polyCoords),
+ *   labelPoint: new ol.geom.Point(labelCoords),
+ *   name: 'My Polygon'
+ * });
+ *
+ * // get the polygon geometry
+ * var poly = feature.getGeometry();
+ *
+ * // Render the feature as a point using the coordinates from labelPoint
+ * feature.setGeometryName('labelPoint');
+ *
+ * // get the point geometry
+ * var point = feature.getGeometry();
+ * ```
+ *
+ * @param opt_geometryOrProperties
+ *     You may pass a Geometry object directly, or an object literal
+ *     containing properties.  If you pass an object literal, you may
+ *     include a Geometry associated with a `geometry` key.
+ * @api stable
+ */
+export class Feature extends Object {
     /**
      * @classdesc
      * A vector object for geographic features with a geometry and other
@@ -1614,174 +1660,138 @@ declare namespace ol {
      *     include a Geometry associated with a `geometry` key.
      * @api stable
      */
-    class Feature extends ol.Object {
-        /**
-         * @classdesc
-         * A vector object for geographic features with a geometry and other
-         * attribute properties, similar to the features in vector file formats like
-         * GeoJSON.
-         *
-         * Features can be styled individually with `setStyle`; otherwise they use the
-         * style of their vector layer.
-         *
-         * Note that attribute properties are set as {@link ol.Object} properties on
-         * the feature object, so they are observable, and have get/set accessors.
-         *
-         * Typically, a feature has a single geometry property. You can set the
-         * geometry using the `setGeometry` method and get it with `getGeometry`.
-         * It is possible to store more than one geometry on a feature using attribute
-         * properties. By default, the geometry used for rendering is identified by
-         * the property name `geometry`. If you want to use another geometry property
-         * for rendering, use the `setGeometryName` method to change the attribute
-         * property associated with the geometry for the feature.  For example:
-         *
-         * ```js
-         * var feature = new ol.Feature({
-         *   geometry: new ol.geom.Polygon(polyCoords),
-         *   labelPoint: new ol.geom.Point(labelCoords),
-         *   name: 'My Polygon'
-         * });
-         *
-         * // get the polygon geometry
-         * var poly = feature.getGeometry();
-         *
-         * // Render the feature as a point using the coordinates from labelPoint
-         * feature.setGeometryName('labelPoint');
-         *
-         * // get the point geometry
-         * var point = feature.getGeometry();
-         * ```
-         *
-         * @param opt_geometryOrProperties
-         *     You may pass a Geometry object directly, or an object literal
-         *     containing properties.  If you pass an object literal, you may
-         *     include a Geometry associated with a `geometry` key.
-         * @api stable
-         */
-        constructor(opt_geometryOrProperties?: (ol.geom.Geometry | { [k: string]: any }));
-
-        /**
-         * Clone this feature. If the original feature has a geometry it
-         * is also cloned. The feature id is not set in the clone.
-         * @return The clone.
-         * @api stable
-         */
-        clone(): ol.Feature;
-
-        /**
-         * Get the feature's default geometry.  A feature may have any number of named
-         * geometries.  The "default" geometry (the one that is rendered by default) is
-         * set when calling {@link ol.Feature#setGeometry}.
-         * @return The default geometry for the feature.
-         * @api stable
-         * @observable
-         */
-        getGeometry(): (ol.geom.Geometry);
-
-        /**
-         * Get the feature identifier.  This is a stable identifier for the feature and
-         * is either set when reading data from a remote source or set explicitly by
-         * calling {@link ol.Feature#setId}.
-         * @return Id.
-         * @api stable
-         * @observable
-         */
-        getId(): (number | string);
-
-        /**
-         * Get the name of the feature's default geometry.  By default, the default
-         * geometry is named `geometry`.
-         * @return Get the property name associated with the default geometry
-         *     for this feature.
-         * @api stable
-         */
-        getGeometryName(): string;
-
-        /**
-         * Get the feature's style.  This return for this method depends on what was
-         * provided to the {@link ol.Feature#setStyle} method.
-         * @return The feature style.
-         * @api stable
-         * @observable
-         */
-        getStyle(): (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction);
-
-        /**
-         * Get the feature's style function.
-         * @return Return a function
-         * representing the current style of this feature.
-         * @api stable
-         */
-        getStyleFunction(): (ol.FeatureStyleFunction);
-
-        /**
-         * Set the default geometry for the feature.  This will update the property
-         * with the name returned by {@link ol.Feature#getGeometryName}.
-         * @param geometry The new geometry.
-         * @api stable
-         * @observable
-         */
-        setGeometry(geometry: (ol.geom.Geometry)): void;
-
-        /**
-         * Set the style for the feature.  This can be a single style object, an array
-         * of styles, or a function that takes a resolution and returns an array of
-         * styles. If it is `null` the feature has no style (a `null` style).
-         * @param style Style for this feature.
-         * @api stable
-         * @observable
-         */
-        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction)): void;
-
-        /**
-         * Set the feature id.  The feature id is considered stable and may be used when
-         * requesting features or comparing identifiers returned from a remote source.
-         * The feature id can be used with the {@link ol.source.Vector#getFeatureById}
-         * method.
-         * @param id The feature id.
-         * @api stable
-         * @observable
-         */
-        setId(id: (number | string)): void;
-
-        /**
-         * Set the property name to be used when getting the feature's default geometry.
-         * When calling {@link ol.Feature#getGeometry}, the value of the property with
-         * this name will be returned.
-         * @param name The property name of the default geometry.
-         * @api stable
-         */
-        setGeometryName(name: string): void;
-    }
+    constructor(opt_geometryOrProperties?: (ol.geom.Geometry | { [k: string]: any }));
 
     /**
-     * Loading mechanisms for vector data.
+     * Clone this feature. If the original feature has a geometry it
+     * is also cloned. The feature id is not set in the clone.
+     * @return The clone.
+     * @api stable
      */
-    namespace featureloader {
-        /**
-         * Create an XHR feature loader for a `url` and `format`. The feature loader
-         * loads features (with XHR), parses the features, and adds them to the
-         * vector tile.
-         * @param url Feature URL service.
-         * @param format Feature format.
-         * @return The feature loader.
-         * @api
-         */
-        function tile(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
+    clone(): ol.Feature;
 
-        /**
-         * Create an XHR feature loader for a `url` and `format`. The feature loader
-         * loads features (with XHR), parses the features, and adds them to the
-         * vector source.
-         * @param url Feature URL service.
-         * @param format Feature format.
-         * @return The feature loader.
-         * @api
-         */
-        function xhr(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
-    }
+    /**
+     * Get the feature's default geometry.  A feature may have any number of named
+     * geometries.  The "default" geometry (the one that is rendered by default) is
+     * set when calling {@link ol.Feature#setGeometry}.
+     * @return The default geometry for the feature.
+     * @api stable
+     * @observable
+     */
+    getGeometry(): (ol.geom.Geometry);
 
-    namespace format {
+    /**
+     * Get the feature identifier.  This is a stable identifier for the feature and
+     * is either set when reading data from a remote source or set explicitly by
+     * calling {@link ol.Feature#setId}.
+     * @return Id.
+     * @api stable
+     * @observable
+     */
+    getId(): (number | string);
+
+    /**
+     * Get the name of the feature's default geometry.  By default, the default
+     * geometry is named `geometry`.
+     * @return Get the property name associated with the default geometry
+     *     for this feature.
+     * @api stable
+     */
+    getGeometryName(): string;
+
+    /**
+     * Get the feature's style.  This return for this method depends on what was
+     * provided to the {@link ol.Feature#setStyle} method.
+     * @return The feature style.
+     * @api stable
+     * @observable
+     */
+    getStyle(): (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction);
+
+    /**
+     * Get the feature's style function.
+     * @return Return a function
+     * representing the current style of this feature.
+     * @api stable
+     */
+    getStyleFunction(): (ol.FeatureStyleFunction);
+
+    /**
+     * Set the default geometry for the feature.  This will update the property
+     * with the name returned by {@link ol.Feature#getGeometryName}.
+     * @param geometry The new geometry.
+     * @api stable
+     * @observable
+     */
+    setGeometry(geometry: (ol.geom.Geometry)): void;
+
+    /**
+     * Set the style for the feature.  This can be a single style object, an array
+     * of styles, or a function that takes a resolution and returns an array of
+     * styles. If it is `null` the feature has no style (a `null` style).
+     * @param style Style for this feature.
+     * @api stable
+     * @observable
+     */
+    setStyle(style: (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction)): void;
+
+    /**
+     * Set the feature id.  The feature id is considered stable and may be used when
+     * requesting features or comparing identifiers returned from a remote source.
+     * The feature id can be used with the {@link ol.source.Vector#getFeatureById}
+     * method.
+     * @param id The feature id.
+     * @api stable
+     * @observable
+     */
+    setId(id: (number | string)): void;
+
+    /**
+     * Set the property name to be used when getting the feature's default geometry.
+     * When calling {@link ol.Feature#getGeometry}, the value of the property with
+     * this name will be returned.
+     * @param name The property name of the default geometry.
+     * @api stable
+     */
+    setGeometryName(name: string): void;
+}
+
+/**
+ * Loading mechanisms for vector data.
+ */
+export namespace featureloader {
+    /**
+     * Create an XHR feature loader for a `url` and `format`. The feature loader
+     * loads features (with XHR), parses the features, and adds them to the
+     * vector tile.
+     * @param url Feature URL service.
+     * @param format Feature format.
+     * @return The feature loader.
+     * @api
+     */
+    function tile(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
+
+    /**
+     * Create an XHR feature loader for a `url` and `format`. The feature loader
+     * loads features (with XHR), parses the features, and adds them to the
+     * vector source.
+     * @param url Feature URL service.
+     * @param format Feature format.
+     * @return The feature loader.
+     * @api
+     */
+    function xhr(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
+}
+
+export namespace format {
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the EsriJSON format.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class EsriJSON extends JSONFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the EsriJSON format.
@@ -1789,120 +1799,125 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class EsriJSON extends ol.format.JSONFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the EsriJSON format.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.EsriJSONOptions);
+        constructor(opt_options?: olx.format.EsriJSONOptions);
 
-            /**
-             * Read a feature from a EsriJSON Feature source.  Only works for Feature,
-             * use `readFeatures` to read FeatureCollection source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api
-             */
-            readFeature(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read a feature from a EsriJSON Feature source.  Only works for Feature,
+         * use `readFeatures` to read FeatureCollection source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api
+         */
+        readFeature(source: (ArrayBuffer | Document | Node | GlobalObject| string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a EsriJSON source.  Works with both Feature and
-             * FeatureCollection sources.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api
-             */
-            readFeatures(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a EsriJSON source.  Works with both Feature and
+         * FeatureCollection sources.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api
+         */
+        readFeatures(source: (ArrayBuffer | Document | Node | GlobalObject| string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read a geometry from a EsriJSON source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Geometry.
-             * @api
-             */
-            readGeometry(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read a geometry from a EsriJSON source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api
+         */
+        readGeometry(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Read the projection from a EsriJSON source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api
-             */
-            readProjection(source: (ArrayBuffer | Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a EsriJSON source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api
+         */
+        readProjection(source: (ArrayBuffer | Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Encode a geometry as a EsriJSON string.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Write options.
-             * @return EsriJSON.
-             * @api
-             */
-            writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a geometry as a EsriJSON string.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return EsriJSON.
+         * @api
+         */
+        writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a geometry as a EsriJSON object.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Write options.
-             * @return Object.
-             * @api
-             */
-            writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): EsriJSONGeometry;
+        /**
+         * Encode a geometry as a EsriJSON object.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api
+         */
+        writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): EsriJSONGeometry;
 
-            /**
-             * Encode a feature as a EsriJSON Feature string.
-             *
-             * @param feature Feature.
-             * @param opt_options Write options.
-             * @return EsriJSON.
-             * @api
-             */
-            writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a feature as a EsriJSON Feature string.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return EsriJSON.
+         * @api
+         */
+        writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a feature as a esriJSON Feature object.
-             *
-             * @param feature Feature.
-             * @param opt_options Write options.
-             * @return Object.
-             * @api
-             */
-            writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GlobalObject;
+        /**
+         * Encode a feature as a esriJSON Feature object.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api
+         */
+        writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GlobalObject;
 
-            /**
-             * Encode an array of features as EsriJSON.
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return EsriJSON.
-             * @api
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features as EsriJSON.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return EsriJSON.
+         * @api
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features as a EsriJSON object.
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return EsriJSON Object.
-             * @api
-             */
-            writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GlobalObject;
-        }
+        /**
+         * Encode an array of features as a EsriJSON object.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return EsriJSON Object.
+         * @api
+         */
+        writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GlobalObject;
+    }
 
-        type EsriJSONGeometry = JSON;
+    type EsriJSONGeometry = JSON;
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for feature formats.
+     * {ol.format.Feature} subclasses provide the ability to decode and encode
+     * {@link ol.Feature} objects from a variety of commonly used geospatial
+     * file formats.  See the documentation for each format for more details.
+     *
+     * @api stable
+     */
+    /* tslint:disable-next-line:no-unnecessary-class */
+    class Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -1914,26 +1929,22 @@ declare namespace ol {
          *
          * @api stable
          */
-        class Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for feature formats.
-             * {ol.format.Feature} subclasses provide the ability to decode and encode
-             * {@link ol.Feature} objects from a variety of commonly used geospatial
-             * file formats.  See the documentation for each format for more details.
-             *
-             * @api stable
-             */
-            constructor();
-        }
+        constructor();
+    }
 
-        type GeoJSONFeature = JSON;
-        type GeoJSONFeatureCollection = JSON;
-        type GeoJSONGeometry = JSON;
-        type GeoJSONGeometryCollection = JSON;
+    type GeoJSONFeature = JSON;
+    type GeoJSONFeatureCollection = JSON;
+    type GeoJSONGeometry = JSON;
+    type GeoJSONGeometryCollection = JSON;
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GeoJSON format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class GeoJSON extends JSONFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GeoJSON format.
@@ -1941,118 +1952,121 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class GeoJSON extends ol.format.JSONFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GeoJSON format.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.GeoJSONOptions);
+        constructor(opt_options?: olx.format.GeoJSONOptions);
 
-            /**
-             * Read a feature from a GeoJSON Feature source.  Only works for Feature,
-             * use `readFeatures` to read FeatureCollection source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read a feature from a GeoJSON Feature source.  Only works for Feature,
+         * use `readFeatures` to read FeatureCollection source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a GeoJSON source.  Works with both Feature and
-             * FeatureCollection sources.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a GeoJSON source.  Works with both Feature and
+         * FeatureCollection sources.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read a geometry from a GeoJSON source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Geometry.
-             * @api stable
-             */
-            readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read a geometry from a GeoJSON source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api stable
+         */
+        readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Read the projection from a GeoJSON source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a GeoJSON source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Encode a feature as a GeoJSON Feature string.
-             *
-             * @param feature Feature.
-             * @param opt_options Write options.
-             * @return GeoJSON.
-             * @api stable
-             */
-            writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a feature as a GeoJSON Feature string.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return GeoJSON.
+         * @api stable
+         */
+        writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a feature as a GeoJSON Feature object.
-             *
-             * @param feature Feature.
-             * @param opt_options Write options.
-             * @return Object.
-             * @api stable
-             */
-            writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GeoJSONFeature;
+        /**
+         * Encode a feature as a GeoJSON Feature object.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api stable
+         */
+        writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GeoJSONFeature;
 
-            /**
-             * Encode an array of features as GeoJSON.
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return GeoJSON.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features as GeoJSON.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return GeoJSON.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features as a GeoJSON object.
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return GeoJSON Object.
-             * @api stable
-             */
-            writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GeoJSONFeatureCollection;
+        /**
+         * Encode an array of features as a GeoJSON object.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return GeoJSON Object.
+         * @api stable
+         */
+        writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GeoJSONFeatureCollection;
 
-            /**
-             * Encode a geometry as a GeoJSON string.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Write options.
-             * @return GeoJSON.
-             * @api stable
-             */
-            writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a geometry as a GeoJSON string.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return GeoJSON.
+         * @api stable
+         */
+        writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a geometry as a GeoJSON object.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Write options.
-             * @return Object.
-             * @api stable
-             */
-            writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): (GeoJSONGeometry | GeoJSONGeometryCollection);
-        }
+        /**
+         * Encode a geometry as a GeoJSON object.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api stable
+         */
+        writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): (GeoJSONGeometry | GeoJSONGeometryCollection);
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GML format
+     * version 3.1.1.
+     * Currently only supports GML 3.1.1 Simple Features profile.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api stable
+     */
+    class GML extends GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format
@@ -2063,40 +2077,38 @@ declare namespace ol {
          *     Optional configuration object.
          * @api stable
          */
-        class GML extends ol.format.GMLBase {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GML format
-             * version 3.1.1.
-             * Currently only supports GML 3.1.1 Simple Features profile.
-             *
-             * @param opt_options
-             *     Optional configuration object.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
+        constructor(opt_options?: olx.format.GMLOptions);
 
-            /**
-             * Encode an array of features in GML 3.1.1 Simple Features.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features in GML 3.1.1 Simple Features.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features in the GML 3.1.1 format as an XML node.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        /**
+         * Encode an array of features in the GML 3.1.1 format as an XML node.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GML format,
+     * version 2.1.2.
+     *
+     * @param opt_options Optional configuration object.
+     * @api
+     */
+    class GML2 extends GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format,
@@ -2105,18 +2117,20 @@ declare namespace ol {
          * @param opt_options Optional configuration object.
          * @api
          */
-        class GML2 extends ol.format.GMLBase {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GML format,
-             * version 2.1.2.
-             *
-             * @param opt_options Optional configuration object.
-             * @api
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
-        }
+        constructor(opt_options?: olx.format.GMLOptions);
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GML format
+     * version 3.1.1.
+     * Currently only supports GML 3.1.1 Simple Features profile.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api
+     */
+    class GML3 extends GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format
@@ -2127,50 +2141,52 @@ declare namespace ol {
          *     Optional configuration object.
          * @api
          */
-        class GML3 extends ol.format.GMLBase {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GML format
-             * version 3.1.1.
-             * Currently only supports GML 3.1.1 Simple Features profile.
-             *
-             * @param opt_options
-             *     Optional configuration object.
-             * @api
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
+        constructor(opt_options?: olx.format.GMLOptions);
 
-            /**
-             * Encode a geometry in GML 3.1.1 Simple Features.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Options.
-             * @return Node.
-             * @api
-             */
-            writeGeometryNode(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): Node;
+        /**
+         * Encode a geometry in GML 3.1.1 Simple Features.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeGeometryNode(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): Node;
 
-            /**
-             * Encode an array of features in GML 3.1.1 Simple Features.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features in GML 3.1.1 Simple Features.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features in the GML 3.1.1 format as an XML node.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        /**
+         * Encode an array of features in the GML 3.1.1 format as an XML node.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Feature base format for reading and writing data in the GML format.
+     * This class cannot be instantiated, it contains only base content that
+     * is shared with versioned format classes ol.format.GML2 and
+     * ol.format.GML3.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     */
+    class GMLBase extends XMLFeature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -2183,32 +2199,27 @@ declare namespace ol {
          * @param opt_options
          *     Optional configuration object.
          */
-        class GMLBase extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Feature base format for reading and writing data in the GML format.
-             * This class cannot be instantiated, it contains only base content that
-             * is shared with versioned format classes ol.format.GML2 and
-             * ol.format.GML3.
-             *
-             * @param opt_options
-             *     Optional configuration object.
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
+        constructor(opt_options?: olx.format.GMLOptions);
 
-            /**
-             * Read all features from a GML FeatureCollection.
-             *
-             * @param source Source.
-             * @param opt_options Options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
-        }
+        /**
+         * Read all features from a GML FeatureCollection.
+         *
+         * @param source Source.
+         * @param opt_options Options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GPX format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class GPX extends XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GPX format.
@@ -2216,79 +2227,79 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class GPX extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GPX format.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.GPXOptions);
-
-            /**
-             * Read the first feature from a GPX source.
-             * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
-             * into MultiLineString. Any properties on route and track waypoints are ignored.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
-
-            /**
-             * Read all features from a GPX source.
-             * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
-             * into MultiLineString. Any properties on route and track waypoints are ignored.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
-
-            /**
-             * Read the projection from a GPX source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-
-            /**
-             * Encode an array of features in the GPX format.
-             * LineString geometries are output as routes (`<rte>`), and MultiLineString
-             * as tracks (`<trk>`).
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
-
-            /**
-             * Encode an array of features in the GPX format as an XML node.
-             * LineString geometries are output as routes (`<rte>`), and MultiLineString
-             * as tracks (`<trk>`).
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        constructor(opt_options?: olx.format.GPXOptions);
 
         /**
-         * IGC altitude/z. One of 'barometric', 'gps', 'none'.
+         * Read the first feature from a GPX source.
+         * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
+         * into MultiLineString. Any properties on route and track waypoints are ignored.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
          */
-        type IGCZ = "barometric" | "gps" | "none";
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
+        /**
+         * Read all features from a GPX source.
+         * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
+         * into MultiLineString. Any properties on route and track waypoints are ignored.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+
+        /**
+         * Read the projection from a GPX source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+
+        /**
+         * Encode an array of features in the GPX format.
+         * LineString geometries are output as routes (`<rte>`), and MultiLineString
+         * as tracks (`<trk>`).
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+
+        /**
+         * Encode an array of features in the GPX format as an XML node.
+         * LineString geometries are output as routes (`<rte>`), and MultiLineString
+         * as tracks (`<trk>`).
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
+
+    /**
+     * IGC altitude/z. One of 'barometric', 'gps', 'none'.
+     */
+    type IGCZ = "barometric" | "gps" | "none";
+
+    /**
+     * @classdesc
+     * Feature format for `*.igc` flight recording files.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class IGC extends TextFeature {
         /**
          * @classdesc
          * Feature format for `*.igc` flight recording files.
@@ -2296,47 +2307,47 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class IGC extends ol.format.TextFeature {
-            /**
-             * @classdesc
-             * Feature format for `*.igc` flight recording files.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.IGCOptions);
+        constructor(opt_options?: olx.format.IGCOptions);
 
-            /**
-             * Read the feature from the IGC source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read the feature from the IGC source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read the feature from the source. As IGC sources contain a single
-             * feature, this will return the feature in an array.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read the feature from the source. As IGC sources contain a single
+         * feature, this will return the feature in an array.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the projection from the IGC source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from the IGC source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for JSON feature formats.
+     *
+     */
+    class JSONFeature extends Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -2344,17 +2355,20 @@ declare namespace ol {
          * Base class for JSON feature formats.
          *
          */
-        class JSONFeature extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for JSON feature formats.
-             *
-             */
-            constructor();
-        }
+        constructor();
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the KML format.
+     *
+     * Note that the KML format uses the URL() constructor. Older browsers such as IE
+     * which do not support this will need a URL polyfill to be loaded before use.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class KML extends XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the KML format.
@@ -2365,93 +2379,90 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class KML extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the KML format.
-             *
-             * Note that the KML format uses the URL() constructor. Older browsers such as IE
-             * which do not support this will need a URL polyfill to be loaded before use.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.KMLOptions);
+        constructor(opt_options?: olx.format.KMLOptions);
 
-            /**
-             * Read the first feature from a KML source. MultiGeometries are converted into
-             * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
-             * MultiLineString/MultiPolygon if they are all of the same type.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read the first feature from a KML source. MultiGeometries are converted into
+         * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
+         * MultiLineString/MultiPolygon if they are all of the same type.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a KML source. MultiGeometries are converted into
-             * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
-             * MultiLineString/MultiPolygon if they are all of the same type.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a KML source. MultiGeometries are converted into
+         * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
+         * MultiLineString/MultiPolygon if they are all of the same type.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the name of the KML.
-             *
-             * @param source Souce.
-             * @return Name.
-             * @api stable
-             */
-            readName(source: (Document | Node | string)): (string);
+        /**
+         * Read the name of the KML.
+         *
+         * @param source Souce.
+         * @return Name.
+         * @api stable
+         */
+        readName(source: (Document | Node | string)): (string);
 
-            /**
-             * Read the network links of the KML.
-             *
-             * @param source Source.
-             * @return Network links.
-             * @api
-             */
-            readNetworkLinks(source: (Document | Node | string)): GlobalObject[];
+        /**
+         * Read the network links of the KML.
+         *
+         * @param source Source.
+         * @return Network links.
+         * @api
+         */
+        readNetworkLinks(source: (Document | Node | string)): GlobalObject[];
 
-            /**
-             * Read the projection from a KML source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a KML source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Encode an array of features in the KML format. GeometryCollections, MultiPoints,
-             * MultiLineStrings, and MultiPolygons are output as MultiGeometries.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features in the KML format. GeometryCollections, MultiPoints,
+         * MultiLineStrings, and MultiPolygons are output as MultiGeometries.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features in the KML format as an XML node. GeometryCollections,
-             * MultiPoints, MultiLineStrings, and MultiPolygons are output as MultiGeometries.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        /**
+         * Encode an array of features in the KML format as an XML node. GeometryCollections,
+         * MultiPoints, MultiLineStrings, and MultiPolygons are output as MultiGeometries.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading data in the Mapbox MVT format.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class MVT extends Feature {
         /**
          * @classdesc
          * Feature format for reading data in the Mapbox MVT format.
@@ -2459,216 +2470,218 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class MVT extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Feature format for reading data in the Mapbox MVT format.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.MVTOptions);
+        constructor(opt_options?: olx.format.MVTOptions);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            readFeatures(source: (Document | Node | ArrayBuffer | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        readFeatures(source: (Document | Node | ArrayBuffer | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * @inheritDoc
+         * @api
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Sets the layers that features will be read from.
-             * @param layers Layers.
-             * @api
-             */
-            setLayers(layers: string[]): void;
-        }
+        /**
+         * Sets the layers that features will be read from.
+         * @param layers Layers.
+         * @api
+         */
+        setLayers(layers: string[]): void;
+    }
 
-        namespace filter {
-            /**
-             * Create a `<Intersects>` operator to test whether a geometry-valued property
-             * intersects a given geometry.
-             *
-             * @param geometryName Geometry name to use.
-             * @param geometry Geometry.
-             * @param opt_srsName SRS name. No srsName attribute will be
-             *    set on geometries when this is not provided.
-             * @returns `<Intersects>` operator.
-             * @api
-             */
-            function intersects(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Intersects;
+    namespace filter {
+        /**
+         * Create a `<Intersects>` operator to test whether a geometry-valued property
+         * intersects a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @returns `<Intersects>` operator.
+         * @api
+         */
+        function intersects(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): Intersects;
 
-            /**
-             * Create a logical `<Or>` operator between two or more filter conditions.
-             *
-             * @param conditions Filter conditions.
-             * @returns `<Or>` operator.
-             * @api
-             */
-            function or(...conditions: ol.format.filter.Filter[]): ol.format.filter.Or;
+        /**
+         * Create a logical `<Or>` operator between two or more filter conditions.
+         *
+         * @param conditions Filter conditions.
+         * @returns `<Or>` operator.
+         * @api
+         */
+        function or(...conditions: Filter[]): Or;
 
-            /**
-             * Create a logical `<And>` operator between two or more filter conditions.
-             *
-             * @param conditions Filter conditions.
-             * @returns `<And>` operator.
-             * @api
-             */
-            function and(...conditions: ol.format.filter.Filter[]): ol.format.filter.And;
+        /**
+         * Create a logical `<And>` operator between two or more filter conditions.
+         *
+         * @param conditions Filter conditions.
+         * @returns `<And>` operator.
+         * @api
+         */
+        function and(...conditions: Filter[]): And;
 
-            /**
-             * Represents a logical `<Not>` operator for a filter condition.
-             *
-             * @param condition Filter condition.
-             * @returns `<Not>` operator.
-             * @api
-             */
-            function not(condition: ol.format.filter.Filter): ol.format.filter.Not;
+        /**
+         * Represents a logical `<Not>` operator for a filter condition.
+         *
+         * @param condition Filter condition.
+         * @returns `<Not>` operator.
+         * @api
+         */
+        function not(condition: Filter): Not;
 
-            /**
-             * Create a `<BBOX>` operator to test whether a geometry-valued property
-             * intersects a fixed bounding box
-             *
-             * @param geometryName Geometry name to use.
-             * @param extent Extent.
-             * @param opt_srsName SRS name. No srsName attribute will be
-             *    set on geometries when this is not provided.
-             * @returns `<BBOX>` operator.
-             * @api
-             */
-            function bbox(geometryName: string, extent: ol.Extent, opt_srsName?: string): ol.format.filter.Bbox;
+        /**
+         * Create a `<BBOX>` operator to test whether a geometry-valued property
+         * intersects a fixed bounding box
+         *
+         * @param geometryName Geometry name to use.
+         * @param extent Extent.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @returns `<BBOX>` operator.
+         * @api
+         */
+        function bbox(geometryName: string, extent: ol.Extent, opt_srsName?: string): Bbox;
 
-            /**
-             * Create a `<Within>` operator to test whether a geometry-valued property
-             * is within a given geometry.
-             *
-             * @param geometryName Geometry name to use.
-             * @param geometry Geometry.
-             * @param opt_srsName SRS name. No srsName attribute will be
-             *    set on geometries when this is not provided.
-             * @returns `<Within>` operator.
-             * @api
-             */
-            function within(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Within;
+        /**
+         * Create a `<Within>` operator to test whether a geometry-valued property
+         * is within a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @returns `<Within>` operator.
+         * @api
+         */
+        function within(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): Within;
 
-            /**
-             * Creates a `<PropertyIsEqualTo>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @param opt_matchCase Case-sensitive?
-             * @returns `<PropertyIsEqualTo>` operator.
-             * @api
-             */
-            function equalTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.EqualTo;
+        /**
+         * Creates a `<PropertyIsEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @returns `<PropertyIsEqualTo>` operator.
+         * @api
+         */
+        function equalTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): EqualTo;
 
-            /**
-             * Creates a `<PropertyIsNotEqualTo>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @param opt_matchCase Case-sensitive?
-             * @returns `<PropertyIsNotEqualTo>` operator.
-             * @api
-             */
-            function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.NotEqualTo;
+        /**
+         * Creates a `<PropertyIsNotEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @returns `<PropertyIsNotEqualTo>` operator.
+         * @api
+         */
+        function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): NotEqualTo;
 
-            /**
-             * Creates a `<PropertyIsLessThan>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @returns `<PropertyIsLessThan>` operator.
-             * @api
-             */
-            function lessThan(propertyName: string, expression: number): ol.format.filter.LessThan;
+        /**
+         * Creates a `<PropertyIsLessThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsLessThan>` operator.
+         * @api
+         */
+        function lessThan(propertyName: string, expression: number): LessThan;
 
-            /**
-             * Creates a `<PropertyIsLessThanOrEqualTo>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @returns `<PropertyIsLessThanOrEqualTo>` operator.
-             * @api
-             */
-            function lessThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.LessThanOrEqualTo;
+        /**
+         * Creates a `<PropertyIsLessThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsLessThanOrEqualTo>` operator.
+         * @api
+         */
+        function lessThanOrEqualTo(propertyName: string, expression: number): LessThanOrEqualTo;
 
-            /**
-             * Creates a `<PropertyIsGreaterThan>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @returns `<PropertyIsGreaterThan>` operator.
-             * @api
-             */
-            function greaterThan(propertyName: string, expression: number): ol.format.filter.GreaterThan;
+        /**
+         * Creates a `<PropertyIsGreaterThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsGreaterThan>` operator.
+         * @api
+         */
+        function greaterThan(propertyName: string, expression: number): GreaterThan;
 
-            /**
-             * Creates a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @returns `<PropertyIsGreaterThanOrEqualTo>` operator.
-             * @api
-             */
-            function greaterThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.GreaterThanOrEqualTo;
+        /**
+         * Creates a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsGreaterThanOrEqualTo>` operator.
+         * @api
+         */
+        function greaterThanOrEqualTo(propertyName: string, expression: number): GreaterThanOrEqualTo;
 
-            /**
-             * Creates a `<PropertyIsNull>` comparison operator to test whether a property value
-             * is null.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @returns `<PropertyIsNull>` operator.
-             * @api
-             */
-            function isNull(propertyName: string): ol.format.filter.IsNull;
+        /**
+         * Creates a `<PropertyIsNull>` comparison operator to test whether a property value
+         * is null.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @returns `<PropertyIsNull>` operator.
+         * @api
+         */
+        function isNull(propertyName: string): IsNull;
 
-            /**
-             * Creates a `<PropertyIsBetween>` comparison operator to test whether an expression
-             * value lies within a range given by a lower and upper bound (inclusive).
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param lowerBoundary The lower bound of the range.
-             * @param upperBoundary The upper bound of the range.
-             * @returns `<PropertyIsBetween>` operator.
-             * @api
-             */
-            function between(propertyName: string, lowerBoundary: number, upperBoundary: number): ol.format.filter.IsBetween;
+        /**
+         * Creates a `<PropertyIsBetween>` comparison operator to test whether an expression
+         * value lies within a range given by a lower and upper bound (inclusive).
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param lowerBoundary The lower bound of the range.
+         * @param upperBoundary The upper bound of the range.
+         * @returns `<PropertyIsBetween>` operator.
+         * @api
+         */
+        function between(propertyName: string, lowerBoundary: number, upperBoundary: number): IsBetween;
 
-            /**
-             * Represents a `<PropertyIsLike>` comparison operator that matches a string property
-             * value against a text pattern.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param pattern Text pattern.
-             * @param opt_wildCard Pattern character which matches any sequence of
-             *    zero or more string characters. Default is '*'.
-             * @param opt_singleChar pattern character which matches any single
-             *    string character. Default is '.'.
-             * @param opt_escapeChar Escape character which can be used to escape
-             *    the pattern characters. Default is '!'.
-             * @param opt_matchCase Case-sensitive?
-             * @returns `<PropertyIsLike>` operator.
-             * @api
-             */
-            function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): ol.format.filter.IsLike;
+        /**
+         * Represents a `<PropertyIsLike>` comparison operator that matches a string property
+         * value against a text pattern.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param pattern Text pattern.
+         * @param opt_wildCard Pattern character which matches any sequence of
+         *    zero or more string characters. Default is '*'.
+         * @param opt_singleChar pattern character which matches any single
+         *    string character. Default is '.'.
+         * @param opt_escapeChar Escape character which can be used to escape
+         *    the pattern characters. Default is '!'.
+         * @param opt_matchCase Case-sensitive?
+         * @returns `<PropertyIsLike>` operator.
+         * @api
+         */
+        function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): IsLike;
 
-            /**
-             * Create a `<During>` temporal operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param begin The begin date in ISO-8601 format.
-             * @param end The end date in ISO-8601 format.
-             * @returns `<During>` operator.
-             * @api
-             */
-            function during(propertyName: string, begin: string, end: string): ol.format.filter.During;
+        /**
+         * Create a `<During>` temporal operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param begin The begin date in ISO-8601 format.
+         * @param end The end date in ISO-8601 format.
+         * @returns `<During>` operator.
+         * @api
+         */
+        function during(propertyName: string, begin: string, end: string): During;
 
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature filters.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @struct
+         * @api
+         */
+        class Filter {
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
@@ -2678,25 +2691,28 @@ declare namespace ol {
              * @struct
              * @api
              */
-            class Filter {
-                /**
-                 * @classdesc
-                 * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-                 * Base class for WFS GetFeature filters.
-                 *
-                 * @param tagName The XML tag name for this filter.
-                 * @struct
-                 * @api
-                 */
-                constructor(tagName: string);
+            constructor(tagName: string);
 
-                /**
-                 * The XML tag name for a filter.
-                 * @returns Name.
-                 */
-                getTagName(): string;
-            }
+            /**
+             * The XML tag name for a filter.
+             * @returns Name.
+             */
+            getTagName(): string;
+        }
 
+        /**
+         * @classdesc
+         * Represents a spatial operator to test whether a geometry-valued property
+         * relates to a given geometry.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Spatial extends Filter {
             /**
              * @classdesc
              * Represents a spatial operator to test whether a geometry-valued property
@@ -2709,22 +2725,21 @@ declare namespace ol {
              *    set on geometries when this is not provided.
              * @api
              */
-            class Spatial extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Represents a spatial operator to test whether a geometry-valued property
-                 * relates to a given geometry.
-                 *
-                 * @param tagName The XML tag name for this filter.
-                 * @param geometryName Geometry name to use.
-                 * @param geometry Geometry.
-                 * @param opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @api
-                 */
-                constructor(tagName: string, geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
-            }
+            constructor(tagName: string, geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<Intersects>` operator to test whether a geometry-valued property
+         * intersects a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Intersects extends Spatial {
             /**
              * @classdesc
              * Represents a `<Intersects>` operator to test whether a geometry-valued property
@@ -2736,21 +2751,21 @@ declare namespace ol {
              *    set on geometries when this is not provided.
              * @api
              */
-            class Intersects extends ol.format.filter.Spatial {
-                /**
-                 * @classdesc
-                 * Represents a `<Intersects>` operator to test whether a geometry-valued property
-                 * intersects a given geometry.
-                 *
-                 * @param geometryName Geometry name to use.
-                 * @param geometry Geometry.
-                 * @param opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @api
-                 */
-                constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
-            }
+            constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<Within>` operator to test whether a geometry-valued property
+         * is within a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Within extends Spatial {
             /**
              * @classdesc
              * Represents a `<Within>` operator to test whether a geometry-valued property
@@ -2762,28 +2777,24 @@ declare namespace ol {
              *    set on geometries when this is not provided.
              * @api
              */
-            class Within extends ol.format.filter.Spatial {
-                /**
-                 * @classdesc
-                 * Represents a `<Within>` operator to test whether a geometry-valued property
-                 * is within a given geometry.
-                 *
-                 * @param geometryName Geometry name to use.
-                 * @param geometry Geometry.
-                 * @param opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @api
-                 */
-                constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
-            }
+            constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
+        }
 
-            /**
-             * @classdesc
-             * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-             * Base class for WFS GetFeature n-ary logical filters.
-             */
-            class LogicalNary extends ol.format.filter.Filter { }
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature n-ary logical filters.
+         */
+        class LogicalNary extends Filter { }
 
+        /**
+         * @classdesc
+         * Represents a logical <And> operator between two or more filter conditions.
+         *
+         * @param conditions Conditions
+         * @api
+         */
+        class And extends LogicalNary {
             /**
              * @classdesc
              * Represents a logical <And> operator between two or more filter conditions.
@@ -2791,17 +2802,17 @@ declare namespace ol {
              * @param conditions Conditions
              * @api
              */
-            class And extends ol.format.filter.LogicalNary {
-                /**
-                 * @classdesc
-                 * Represents a logical <And> operator between two or more filter conditions.
-                 *
-                 * @param conditions Conditions
-                 * @api
-                 */
-                constructor(...conditions: ol.format.filter.Filter[]);
-            }
+            constructor(...conditions: Filter[]);
+        }
 
+        /**
+         * @classdesc
+         * Represents a logical <Or> operator between two or more filter conditions.
+         *
+         * @param conditions Conditions
+         * @api
+         */
+        class Or extends LogicalNary {
             /**
              * @classdesc
              * Represents a logical <Or> operator between two or more filter conditions.
@@ -2809,17 +2820,21 @@ declare namespace ol {
              * @param conditions Conditions
              * @api
              */
-            class Or extends ol.format.filter.LogicalNary {
-                /**
-                 * @classdesc
-                 * Represents a logical <Or> operator between two or more filter conditions.
-                 *
-                 * @param conditions Conditions
-                 * @api
-                 */
-                constructor(...conditions: ol.format.filter.Filter[]);
-            }
+            constructor(...conditions: Filter[]);
+        }
 
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature property comparison filters.
+         *
+         * deprecated: This class will no longer be exported starting from the next major version.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @param propertyName Name of the context property to compare.
+         * @api
+         */
+        class Comparison extends Filter {
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
@@ -2831,21 +2846,23 @@ declare namespace ol {
              * @param propertyName Name of the context property to compare.
              * @api
              */
-            class Comparison extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-                 * Base class for WFS GetFeature property comparison filters.
-                 *
-                 * deprecated: This class will no longer be exported starting from the next major version.
-                 *
-                 * @param tagName The XML tag name for this filter.
-                 * @param propertyName Name of the context property to compare.
-                 * @api
-                 */
-                constructor(tagName: string, propertyName: string);
-            }
+            constructor(tagName: string, propertyName: string);
+        }
 
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature property binary comparison filters.
+         *
+         * deprecated: This class will no longer be exported starting from the next major version.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class ComparisonBinary extends Comparison {
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
@@ -2859,23 +2876,19 @@ declare namespace ol {
              * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class ComparisonBinary extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-                 * Base class for WFS GetFeature property binary comparison filters.
-                 *
-                 * deprecated: This class will no longer be exported starting from the next major version.
-                 *
-                 * @param tagName The XML tag name for this filter.
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @param opt_matchCase Case-sensitive?
-                 * @api
-                 */
-                constructor(tagName: string, propertyName: string, expression: string | number, opt_matchCase?: boolean);
-            }
+            constructor(tagName: string, propertyName: string, expression: string | number, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class EqualTo extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsEqualTo>` comparison operator.
@@ -2885,19 +2898,18 @@ declare namespace ol {
              * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class EqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsEqualTo>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @param opt_matchCase Case-sensitive?
-                 * @api
-                 */
-                constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
-            }
+            constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsGreaterThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class GreaterThan extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsGreaterThan>` comparison operator.
@@ -2906,18 +2918,18 @@ declare namespace ol {
              * @param expression The value to compare.
              * @api
              */
-            class GreaterThan extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsGreaterThan>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class GreaterThanOrEqualTo extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
@@ -2926,18 +2938,18 @@ declare namespace ol {
              * @param expression The value to compare.
              * @api
              */
-            class GreaterThanOrEqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsLessThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class LessThan extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsLessThan>` comparison operator.
@@ -2946,18 +2958,18 @@ declare namespace ol {
              * @param expression The value to compare.
              * @api
              */
-            class LessThan extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsLessThan>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class LessThanOrEqualTo extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
@@ -2966,18 +2978,19 @@ declare namespace ol {
              * @param expression The value to compare.
              * @api
              */
-            class LessThanOrEqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsNotEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class NotEqualTo extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsNotEqualTo>` comparison operator.
@@ -2987,19 +3000,19 @@ declare namespace ol {
              * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class NotEqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsNotEqualTo>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @param opt_matchCase Case-sensitive?
-                 * @api
-                 */
-                constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
-            }
+            constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<During>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param begin The begin date in ISO-8601 format.
+         * @param end The end date in ISO-8601 format.
+         * @api
+         */
+        class During extends Comparison {
             /**
              * @classdesc
              * Represents a `<During>` comparison operator.
@@ -3009,19 +3022,19 @@ declare namespace ol {
              * @param end The end date in ISO-8601 format.
              * @api
              */
-            class During extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<During>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param begin The begin date in ISO-8601 format.
-                 * @param end The end date in ISO-8601 format.
-                 * @api
-                 */
-                constructor(propertyName: string, begin: string, end: string);
-            }
+            constructor(propertyName: string, begin: string, end: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsBetween>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param lowerBoundary The lower bound of the range.
+         * @param upperBoundary The upper bound of the range.
+         * @api
+         */
+        class IsBetween extends Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsBetween>` comparison operator.
@@ -3031,19 +3044,25 @@ declare namespace ol {
              * @param upperBoundary The upper bound of the range.
              * @api
              */
-            class IsBetween extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsBetween>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param lowerBoundary The lower bound of the range.
-                 * @param upperBoundary The upper bound of the range.
-                 * @api
-                 */
-                constructor(propertyName: string, lowerBoundary: number, upperBoundary: number);
-            }
+            constructor(propertyName: string, lowerBoundary: number, upperBoundary: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsLike>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param pattern Text pattern.
+         * @param opt_wildCard Pattern character which matches any sequence of
+         *    zero or more string characters. Default is '*'.
+         * @param opt_singleChar pattern character which matches any single
+         *    string character. Default is '.'.
+         * @param opt_escapeChar Escape character which can be used to escape
+         *    the pattern characters. Default is '!'.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class IsLike extends Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsLike>` comparison operator.
@@ -3059,25 +3078,17 @@ declare namespace ol {
              * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class IsLike extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsLike>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param pattern Text pattern.
-                 * @param opt_wildCard Pattern character which matches any sequence of
-                 *    zero or more string characters. Default is '*'.
-                 * @param opt_singleChar pattern character which matches any single
-                 *    string character. Default is '.'.
-                 * @param opt_escapeChar Escape character which can be used to escape
-                 *    the pattern characters. Default is '!'.
-                 * @param opt_matchCase Case-sensitive?
-                 * @api
-                 */
-                constructor(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean);
-            }
+            constructor(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsNull>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @api
+         */
+        class IsNull extends Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsNull>` comparison operator.
@@ -3085,17 +3096,17 @@ declare namespace ol {
              * @param propertyName Name of the context property to compare.
              * @api
              */
-            class IsNull extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsNull>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @api
-                 */
-                constructor(propertyName: string);
-            }
+            constructor(propertyName: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a logical `<Not>` operator for a filter condition.
+         *
+         * @param condition Filter condition.
+         * @api
+         */
+        class Not extends Filter {
             /**
              * @classdesc
              * Represents a logical `<Not>` operator for a filter condition.
@@ -3103,17 +3114,21 @@ declare namespace ol {
              * @param condition Filter condition.
              * @api
              */
-            class Not extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Represents a logical `<Not>` operator for a filter condition.
-                 *
-                 * @param condition Filter condition.
-                 * @api
-                 */
-                constructor(condition: ol.format.filter.Filter);
-            }
+            constructor(condition: Filter);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<BBOX>` operator to test whether a geometry-valued property
+         * intersects a fixed bounding box
+         *
+         * @param geometryName Geometry name to use.
+         * @param extent Extent.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Bbox extends Filter {
             /**
              * @classdesc
              * Represents a `<BBOX>` operator to test whether a geometry-valued property
@@ -3125,22 +3140,18 @@ declare namespace ol {
              *    set on geometries when this is not provided.
              * @api
              */
-            class Bbox extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Represents a `<BBOX>` operator to test whether a geometry-valued property
-                 * intersects a fixed bounding box
-                 *
-                 * @param geometryName Geometry name to use.
-                 * @param extent Extent.
-                 * @param opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @api
-                 */
-                constructor(geometryName: string, extent: ol.Extent, opt_srsName?: string);
-            }
+            constructor(geometryName: string, extent: ol.Extent, opt_srsName?: string);
         }
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading data in the
+     * [OSMXML format](http://wiki.openstreetmap.org/wiki/OSM_XML).
+     *
+     * @api stable
+     */
+    class OSMXML extends XMLFeature {
         /**
          * @classdesc
          * Feature format for reading data in the
@@ -3148,36 +3159,38 @@ declare namespace ol {
          *
          * @api stable
          */
-        class OSMXML extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading data in the
-             * [OSMXML format](http://wiki.openstreetmap.org/wiki/OSM_XML).
-             *
-             * @api stable
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Read all features from an OSM source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from an OSM source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the projection from an OSM source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from an OSM source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the Encoded
+     * Polyline Algorithm Format.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api stable
+     */
+    class Polyline extends TextFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the Encoded
@@ -3187,123 +3200,121 @@ declare namespace ol {
          *     Optional configuration object.
          * @api stable
          */
-        class Polyline extends ol.format.TextFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the Encoded
-             * Polyline Algorithm Format.
-             *
-             * @param opt_options
-             *     Optional configuration object.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.PolylineOptions);
+        constructor(opt_options?: olx.format.PolylineOptions);
 
-            /**
-             * Encode a list of n-dimensional points and return an encoded string
-             *
-             * Attention: This function will modify the passed array!
-             *
-             * @param numbers A list of n-dimensional points.
-             * @param stride The number of dimension of the points in the list.
-             * @param opt_factor The factor by which the numbers will be
-             *     multiplied. The remaining decimal places will get rounded away.
-             *     Default is `1e5`.
-             * @return The encoded string.
-             * @api
-             */
-            static encodeDeltas(numbers: number[], stride: number, opt_factor?: number): string;
+        /**
+         * Encode a list of n-dimensional points and return an encoded string
+         *
+         * Attention: This function will modify the passed array!
+         *
+         * @param numbers A list of n-dimensional points.
+         * @param stride The number of dimension of the points in the list.
+         * @param opt_factor The factor by which the numbers will be
+         *     multiplied. The remaining decimal places will get rounded away.
+         *     Default is `1e5`.
+         * @return The encoded string.
+         * @api
+         */
+        static encodeDeltas(numbers: number[], stride: number, opt_factor?: number): string;
 
-            /**
-             * Decode a list of n-dimensional points from an encoded string
-             *
-             * @param encoded An encoded string.
-             * @param stride The number of dimension of the points in the
-             *     encoded string.
-             * @param opt_factor The factor by which the resulting numbers will
-             *     be divided. Default is `1e5`.
-             * @return A list of n-dimensional points.
-             * @api
-             */
-            static decodeDeltas(encoded: string, stride: number, opt_factor?: number): number[];
+        /**
+         * Decode a list of n-dimensional points from an encoded string
+         *
+         * @param encoded An encoded string.
+         * @param stride The number of dimension of the points in the
+         *     encoded string.
+         * @param opt_factor The factor by which the resulting numbers will
+         *     be divided. Default is `1e5`.
+         * @return A list of n-dimensional points.
+         * @api
+         */
+        static decodeDeltas(encoded: string, stride: number, opt_factor?: number): number[];
 
-            /**
-             * Encode a list of floating point numbers and return an encoded string
-             *
-             * Attention: This function will modify the passed array!
-             *
-             * @param numbers A list of floating point numbers.
-             * @param opt_factor The factor by which the numbers will be
-             *     multiplied. The remaining decimal places will get rounded away.
-             *     Default is `1e5`.
-             * @return The encoded string.
-             * @api
-             */
-            static encodeFloats(numbers: number[], opt_factor?: number): string;
+        /**
+         * Encode a list of floating point numbers and return an encoded string
+         *
+         * Attention: This function will modify the passed array!
+         *
+         * @param numbers A list of floating point numbers.
+         * @param opt_factor The factor by which the numbers will be
+         *     multiplied. The remaining decimal places will get rounded away.
+         *     Default is `1e5`.
+         * @return The encoded string.
+         * @api
+         */
+        static encodeFloats(numbers: number[], opt_factor?: number): string;
 
-            /**
-             * Decode a list of floating point numbers from an encoded string
-             *
-             * @param encoded An encoded string.
-             * @param opt_factor The factor by which the result will be divided.
-             *     Default is `1e5`.
-             * @return A list of floating point numbers.
-             * @api
-             */
-            static decodeFloats(encoded: string, opt_factor?: number): number[];
+        /**
+         * Decode a list of floating point numbers from an encoded string
+         *
+         * @param encoded An encoded string.
+         * @param opt_factor The factor by which the result will be divided.
+         *     Default is `1e5`.
+         * @return A list of floating point numbers.
+         * @api
+         */
+        static decodeFloats(encoded: string, opt_factor?: number): number[];
 
-            /**
-             * Read the feature from the Polyline source. The coordinates are assumed to be
-             * in two dimensions and in latitude, longitude order.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read the feature from the Polyline source. The coordinates are assumed to be
+         * in two dimensions and in latitude, longitude order.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read the feature from the source. As Polyline sources contain a single
-             * feature, this will return the feature in an array.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read the feature from the source. As Polyline sources contain a single
+         * feature, this will return the feature in an array.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the geometry from the source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Geometry.
-             * @api stable
-             */
-            readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read the geometry from the source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api stable
+         */
+        readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Read the projection from a Polyline source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a Polyline source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Write a single geometry in Polyline format.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Write options.
-             * @return Geometry.
-             * @api stable
-             */
-            writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
-        }
+        /**
+         * Write a single geometry in Polyline format.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return Geometry.
+         * @api stable
+         */
+        writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for text feature formats.
+     *
+     */
+    class TextFeature extends Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -3311,17 +3322,17 @@ declare namespace ol {
          * Base class for text feature formats.
          *
          */
-        class TextFeature extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for text feature formats.
-             *
-             */
-            constructor();
-        }
+        constructor();
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading data in the TopoJSON format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class TopoJSON extends JSONFeature {
         /**
          * @classdesc
          * Feature format for reading data in the TopoJSON format.
@@ -3329,35 +3340,39 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class TopoJSON extends ol.format.JSONFeature {
-            /**
-             * @classdesc
-             * Feature format for reading data in the TopoJSON format.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.TopoJSONOptions);
+        constructor(opt_options?: olx.format.TopoJSONOptions);
 
-            /**
-             * Read all features from a TopoJSON source.
-             *
-             * @param source Source.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string)): ol.Feature[];
+        /**
+         * Read all features from a TopoJSON source.
+         *
+         * @param source Source.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string)): ol.Feature[];
 
-            /**
-             * Read the projection from a TopoJSON source.
-             *
-             * @param object Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(object: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from a TopoJSON source.
+         *
+         * @param object Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(object: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the WFS format.
+     * By default, supports WFS version 1.1.0. You can pass a GML format
+     * as option if you want to read a WFS that contains GML2 (WFS 1.0.0).
+     * Also see {@link ol.format.GMLBase} which is used by this format.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api stable
+     */
+    class WFS extends XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the WFS format.
@@ -3369,79 +3384,76 @@ declare namespace ol {
          *     Optional configuration object.
          * @api stable
          */
-        class WFS extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the WFS format.
-             * By default, supports WFS version 1.1.0. You can pass a GML format
-             * as option if you want to read a WFS that contains GML2 (WFS 1.0.0).
-             * Also see {@link ol.format.GMLBase} which is used by this format.
-             *
-             * @param opt_options
-             *     Optional configuration object.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.WFSOptions);
+        constructor(opt_options?: olx.format.WFSOptions);
 
-            /**
-             * Read all features from a WFS FeatureCollection.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a WFS FeatureCollection.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read transaction response of the source.
-             *
-             * @param source Source.
-             * @return Transaction response.
-             * @api stable
-             */
-            readTransactionResponse(source: (Document | Node | GlobalObject | string)): (ol.WFSTransactionResponse);
+        /**
+         * Read transaction response of the source.
+         *
+         * @param source Source.
+         * @return Transaction response.
+         * @api stable
+         */
+        readTransactionResponse(source: (Document | Node | GlobalObject | string)): (ol.WFSTransactionResponse);
 
-            /**
-             * Read feature collection metadata of the source.
-             *
-             * @param source Source.
-             * @return FeatureCollection metadata.
-             * @api stable
-             */
-            readFeatureCollectionMetadata(source: (Document | Node | GlobalObject | string)): (ol.WFSFeatureCollectionMetadata);
+        /**
+         * Read feature collection metadata of the source.
+         *
+         * @param source Source.
+         * @return FeatureCollection metadata.
+         * @api stable
+         */
+        readFeatureCollectionMetadata(source: (Document | Node | GlobalObject | string)): (ol.WFSFeatureCollectionMetadata);
 
-            /**
-             * Encode format as WFS `GetFeature` and return the Node.
-             *
-             * @param options Options.
-             * @return Result.
-             * @api stable
-             */
-            writeGetFeature(options: olx.format.WFSWriteGetFeatureOptions): Node;
+        /**
+         * Encode format as WFS `GetFeature` and return the Node.
+         *
+         * @param options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeGetFeature(options: olx.format.WFSWriteGetFeatureOptions): Node;
 
-            /**
-             * Encode format as WFS `Transaction` and return the Node.
-             *
-             * @param inserts The features to insert.
-             * @param updates The features to update.
-             * @param deletes The features to delete.
-             * @param options Write options.
-             * @return Result.
-             * @api stable
-             */
-            writeTransaction(inserts: ol.Feature[], updates: ol.Feature[], deletes: ol.Feature[], options: olx.format.WFSWriteTransactionOptions): Node;
+        /**
+         * Encode format as WFS `Transaction` and return the Node.
+         *
+         * @param inserts The features to insert.
+         * @param updates The features to update.
+         * @param deletes The features to delete.
+         * @param options Write options.
+         * @return Result.
+         * @api stable
+         */
+        writeTransaction(inserts: ol.Feature[], updates: ol.Feature[], deletes: ol.Feature[], options: olx.format.WFSWriteTransactionOptions): Node;
 
-            /**
-             * Read the projection from a WFS source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from a WFS source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Geometry format for reading and writing data in the `WellKnownText` (WKT)
+     * format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class WKT extends TextFeature {
         /**
          * @classdesc
          * Geometry format for reading and writing data in the `WellKnownText` (WKT)
@@ -3450,102 +3462,102 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class WKT extends ol.format.TextFeature {
-            /**
-             * @classdesc
-             * Geometry format for reading and writing data in the `WellKnownText` (WKT)
-             * format.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.WKTOptions);
+        constructor(opt_options?: olx.format.WKTOptions);
 
-            /**
-             * Read a feature from a WKT source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read a feature from a WKT source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a WKT source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a WKT source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read a single geometry from a WKT source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Geometry.
-             * @api stable
-             */
-            readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read a single geometry from a WKT source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api stable
+         */
+        readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Encode a feature as a WKT string.
-             *
-             * @param feature Feature.
-             * @param opt_options Write options.
-             * @return WKT string.
-             * @api stable
-             */
-            writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a feature as a WKT string.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return WKT string.
+         * @api stable
+         */
+        writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features as a WKT string.
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return WKT string.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features as a WKT string.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return WKT string.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Write a single geometry as a WKT string.
-             *
-             * @param geometry Geometry.
-             * @return WKT string.
-             * @api stable
-             */
-            writeGeometry(geometry: ol.geom.Geometry): string;
-        }
+        /**
+         * Write a single geometry as a WKT string.
+         *
+         * @param geometry Geometry.
+         * @return WKT string.
+         * @api stable
+         */
+        writeGeometry(geometry: ol.geom.Geometry): string;
+    }
 
+    /**
+     * @classdesc
+     * Format for reading WMS capabilities data
+     *
+     * @api
+     */
+    class WMSCapabilities extends XML {
         /**
          * @classdesc
          * Format for reading WMS capabilities data
          *
          * @api
          */
-        class WMSCapabilities extends ol.format.XML {
-            /**
-             * @classdesc
-             * Format for reading WMS capabilities data
-             *
-             * @api
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Read a WMS capabilities document.
-             *
-             * @param source The XML source.
-             * @return An object representing the WMS capabilities.
-             * @api
-             */
-            read(source: (Document | Node | string)): GlobalObject;
-        }
+        /**
+         * Read a WMS capabilities document.
+         *
+         * @param source The XML source.
+         * @return An object representing the WMS capabilities.
+         * @api
+         */
+        read(source: (Document | Node | string)): GlobalObject;
+    }
 
+    /**
+     * @classdesc
+     * Format for reading WMSGetFeatureInfo format. It uses
+     * {@link ol.format.GML2} to read features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class WMSGetFeatureInfo extends XMLFeature {
         /**
          * @classdesc
          * Format for reading WMSGetFeatureInfo format. It uses
@@ -3554,69 +3566,69 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class WMSGetFeatureInfo extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Format for reading WMSGetFeatureInfo format. It uses
-             * {@link ol.format.GML2} to read features.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.WMSGetFeatureInfoOptions);
+        constructor(opt_options?: olx.format.WMSGetFeatureInfoOptions);
 
-            /**
-             * Read all features from a WMSGetFeatureInfo response.
-             *
-             * @param source Source.
-             * @param opt_options Options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
-        }
+        /**
+         * Read all features from a WMSGetFeatureInfo response.
+         *
+         * @param source Source.
+         * @param opt_options Options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+    }
 
+    /**
+     * @classdesc
+     * Format for reading WMTS capabilities data.
+     *
+     * @api
+     */
+    class WMTSCapabilities extends XML {
         /**
          * @classdesc
          * Format for reading WMTS capabilities data.
          *
          * @api
          */
-        class WMTSCapabilities extends ol.format.XML {
-            /**
-             * @classdesc
-             * Format for reading WMTS capabilities data.
-             *
-             * @api
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Read a WMTS capabilities document.
-             *
-             * @param source The XML source.
-             * @return An object representing the WMTS capabilities.
-             * @api
-             */
-            read(source: (Document | Node | string)): GlobalObject;
-        }
+        /**
+         * Read a WMTS capabilities document.
+         *
+         * @param source The XML source.
+         * @return An object representing the WMTS capabilities.
+         * @api
+         */
+        read(source: (Document | Node | string)): GlobalObject;
+    }
 
+    /**
+     * @classdesc
+     * Generic format for reading non-feature XML data
+     *
+     * @struct
+     */
+    /* tslint:disable-next-line:no-unnecessary-class */
+    class XML {
         /**
          * @classdesc
          * Generic format for reading non-feature XML data
          *
          * @struct
          */
-        class XML {
-            /**
-             * @classdesc
-             * Generic format for reading non-feature XML data
-             *
-             * @struct
-             */
-            constructor();
-        }
+        constructor();
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for XML feature formats.
+     *
+     */
+    class XMLFeature extends Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -3624,18 +3636,35 @@ declare namespace ol {
          * Base class for XML feature formats.
          *
          */
-        class XMLFeature extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for XML feature formats.
-             *
-             */
-            constructor();
-        }
+        constructor();
     }
+}
 
+/**
+ * @classdesc
+ * Helper class for providing HTML5 Geolocation capabilities.
+ * The [Geolocation API](http://www.w3.org/TR/geolocation-API/)
+ * is used to locate a user's position.
+ *
+ * To get notified of position changes, register a listener for the generic
+ * `change` event on your instance of `ol.Geolocation`.
+ *
+ * Example:
+ *
+ *     var geolocation = new ol.Geolocation({
+ *       // take the projection to use from the map's view
+ *       projection: view.getProjection()
+ *     });
+ *     // listen to changes in position
+ *     geolocation.on('change', function(evt) {
+ *       window.console.log(geolocation.getPosition());
+ *     });
+ *
+ * @fires error
+ * @param opt_options Options.
+ * @api stable
+ */
+export class Geolocation extends Object {
     /**
      * @classdesc
      * Helper class for providing HTML5 Geolocation capabilities.
@@ -3660,152 +3689,137 @@ declare namespace ol {
      * @param opt_options Options.
      * @api stable
      */
-    class Geolocation extends ol.Object {
-        /**
-         * @classdesc
-         * Helper class for providing HTML5 Geolocation capabilities.
-         * The [Geolocation API](http://www.w3.org/TR/geolocation-API/)
-         * is used to locate a user's position.
-         *
-         * To get notified of position changes, register a listener for the generic
-         * `change` event on your instance of `ol.Geolocation`.
-         *
-         * Example:
-         *
-         *     var geolocation = new ol.Geolocation({
-         *       // take the projection to use from the map's view
-         *       projection: view.getProjection()
-         *     });
-         *     // listen to changes in position
-         *     geolocation.on('change', function(evt) {
-         *       window.console.log(geolocation.getPosition());
-         *     });
-         *
-         * @fires error
-         * @param opt_options Options.
-         * @api stable
-         */
-        constructor(opt_options?: olx.GeolocationOptions);
+    constructor(opt_options?: olx.GeolocationOptions);
 
-        /**
-         * Get the accuracy of the position in meters.
-         * @return The accuracy of the position measurement in
-         *     meters.
-         * @observable
-         * @api stable
-         */
-        getAccuracy(): (number);
+    /**
+     * Get the accuracy of the position in meters.
+     * @return The accuracy of the position measurement in
+     *     meters.
+     * @observable
+     * @api stable
+     */
+    getAccuracy(): (number);
 
-        /**
-         * Get a geometry of the position accuracy.
-         * @return A geometry of the position accuracy.
-         * @observable
-         * @api stable
-         */
-        getAccuracyGeometry(): ol.geom.Geometry;
+    /**
+     * Get a geometry of the position accuracy.
+     * @return A geometry of the position accuracy.
+     * @observable
+     * @api stable
+     */
+    getAccuracyGeometry(): ol.geom.Geometry;
 
-        /**
-         * Get the altitude associated with the position.
-         * @return The altitude of the position in meters above mean
-         *     sea level.
-         * @observable
-         * @api stable
-         */
-        getAltitude(): (number);
+    /**
+     * Get the altitude associated with the position.
+     * @return The altitude of the position in meters above mean
+     *     sea level.
+     * @observable
+     * @api stable
+     */
+    getAltitude(): (number);
 
-        /**
-         * Get the altitude accuracy of the position.
-         * @return The accuracy of the altitude measurement in
-         *     meters.
-         * @observable
-         * @api stable
-         */
-        getAltitudeAccuracy(): (number);
+    /**
+     * Get the altitude accuracy of the position.
+     * @return The accuracy of the altitude measurement in
+     *     meters.
+     * @observable
+     * @api stable
+     */
+    getAltitudeAccuracy(): (number);
 
-        /**
-         * Get the heading as radians clockwise from North.
-         * @return The heading of the device in radians from north.
-         * @observable
-         * @api stable
-         */
-        getHeading(): (number);
+    /**
+     * Get the heading as radians clockwise from North.
+     * @return The heading of the device in radians from north.
+     * @observable
+     * @api stable
+     */
+    getHeading(): (number);
 
-        /**
-         * Get the position of the device.
-         * @return The current position of the device reported
-         *     in the current projection.
-         * @observable
-         * @api stable
-         */
-        getPosition(): (ol.Coordinate);
+    /**
+     * Get the position of the device.
+     * @return The current position of the device reported
+     *     in the current projection.
+     * @observable
+     * @api stable
+     */
+    getPosition(): (ol.Coordinate);
 
-        /**
-         * Get the projection associated with the position.
-         * @return The projection the position is
-         *     reported in.
-         * @observable
-         * @api stable
-         */
-        getProjection(): (ol.proj.Projection);
+    /**
+     * Get the projection associated with the position.
+     * @return The projection the position is
+     *     reported in.
+     * @observable
+     * @api stable
+     */
+    getProjection(): (ol.proj.Projection);
 
-        /**
-         * Get the speed in meters per second.
-         * @return The instantaneous speed of the device in meters
-         *     per second.
-         * @observable
-         * @api stable
-         */
-        getSpeed(): (number);
+    /**
+     * Get the speed in meters per second.
+     * @return The instantaneous speed of the device in meters
+     *     per second.
+     * @observable
+     * @api stable
+     */
+    getSpeed(): (number);
 
-        /**
-         * Determine if the device location is being tracked.
-         * @return The device location is being tracked.
-         * @observable
-         * @api stable
-         */
-        getTracking(): boolean;
+    /**
+     * Determine if the device location is being tracked.
+     * @return The device location is being tracked.
+     * @observable
+     * @api stable
+     */
+    getTracking(): boolean;
 
-        /**
-         * Get the tracking options.
-         * @see http://www.w3.org/TR/geolocation-API/#position-options
-         * @return PositionOptions as defined by
-         *     the [HTML5 Geolocation spec
-         *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
-         * @observable
-         * @api stable
-         */
-        getTrackingOptions(): (PositionOptions);
+    /**
+     * Get the tracking options.
+     * @see http://www.w3.org/TR/geolocation-API/#position-options
+     * @return PositionOptions as defined by
+     *     the [HTML5 Geolocation spec
+     *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
+     * @observable
+     * @api stable
+     */
+    getTrackingOptions(): (PositionOptions);
 
-        /**
-         * Set the projection to use for transforming the coordinates.
-         * @param projection The projection the position is
-         *     reported in.
-         * @observable
-         * @api stable
-         */
-        setProjection(projection: ol.proj.Projection): void;
+    /**
+     * Set the projection to use for transforming the coordinates.
+     * @param projection The projection the position is
+     *     reported in.
+     * @observable
+     * @api stable
+     */
+    setProjection(projection: ol.proj.Projection): void;
 
-        /**
-         * Enable or disable tracking.
-         * @param tracking Enable tracking.
-         * @observable
-         * @api stable
-         */
-        setTracking(tracking: boolean): void;
+    /**
+     * Enable or disable tracking.
+     * @param tracking Enable tracking.
+     * @observable
+     * @api stable
+     */
+    setTracking(tracking: boolean): void;
 
-        /**
-         * Set the tracking options.
-         * @see http://www.w3.org/TR/geolocation-API/#position-options
-         * @param options PositionOptions as defined by the
-         *     [HTML5 Geolocation spec
-         *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
-         * @observable
-         * @api stable
-         */
-        setTrackingOptions(options: PositionOptions): void;
-    }
+    /**
+     * Set the tracking options.
+     * @see http://www.w3.org/TR/geolocation-API/#position-options
+     * @param options PositionOptions as defined by the
+     *     [HTML5 Geolocation spec
+     *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
+     * @observable
+     * @api stable
+     */
+    setTrackingOptions(options: PositionOptions): void;
+}
 
-    namespace geom {
+export namespace geom {
+    /**
+     * @classdesc
+     * Circle geometry.
+     *
+     * @param center Center.
+     * @param opt_radius Radius.
+     * @param opt_layout Layout.
+     * @api
+     */
+    class Circle extends SimpleGeometry {
         /**
          * @classdesc
          * Circle geometry.
@@ -3815,90 +3829,92 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api
          */
-        class Circle extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Circle geometry.
-             *
-             * @param center Center.
-             * @param opt_radius Radius.
-             * @param opt_layout Layout.
-             * @api
-             */
-            constructor(center: ol.Coordinate, opt_radius?: number, opt_layout?: ol.geom.GeometryLayout);
-
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api
-             */
-            clone(): ol.geom.Circle;
-
-            /**
-             * Return the center of the circle as {@link ol.Coordinate coordinate}.
-             * @return Center.
-             * @api
-             */
-            getCenter(): ol.Coordinate;
-
-            /**
-             * Return the radius of the circle.
-             * @return Radius.
-             * @api
-             */
-            getRadius(): number;
-
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getType(): ol.geom.GeometryType;
-
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
-
-            /**
-             * Set the center of the circle as {@link ol.Coordinate coordinate}.
-             * @param center Center.
-             * @api
-             */
-            setCenter(center: ol.Coordinate): void;
-
-            /**
-             * Set the center (as {@link ol.Coordinate coordinate}) and the radius (as
-             * number) of the circle.
-             * @param center Center.
-             * @param radius Radius.
-             * @param opt_layout Layout.
-             * @api
-             */
-            setCenterAndRadius(center: ol.Coordinate, radius: number, opt_layout?: ol.geom.GeometryLayout): void;
-
-            /**
-             * Set the radius of the circle. The radius is in the units of the projection.
-             * @param radius Radius.
-             * @api
-             */
-            setRadius(radius: number): void;
-        }
+        constructor(center: ol.Coordinate, opt_radius?: number, opt_layout?: GeometryLayout);
 
         /**
-         * The geometry type. One of `'Point'`, `'LineString'`, `'LinearRing'`,
-         * `'Polygon'`, `'MultiPoint'`, `'MultiLineString'`, `'MultiPolygon'`,
-         * `'GeometryCollection'`, `'Circle'`.
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api
          */
-        type GeometryType = "Point" | "LineString" | "LinearRing" | "Polygon" | "MultiPoint" | "MultiLineString" | "MultiPolygon" | "GeometryCollection" | "Circle";
+        clone(): Circle;
 
         /**
-         * The coordinate layout for geometries, indicating whether a 3rd or 4th z ('Z')
-         * or measure ('M') coordinate is available. Supported values are `'XY'`,
-         * `'XYZ'`, `'XYM'`, `'XYZM'`.
+         * Return the center of the circle as {@link ol.Coordinate coordinate}.
+         * @return Center.
+         * @api
          */
-        type GeometryLayout = "XY" | "XYZ" | "XYM" | "XYZM";
+        getCenter(): ol.Coordinate;
 
+        /**
+         * Return the radius of the circle.
+         * @return Radius.
+         * @api
+         */
+        getRadius(): number;
+
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getType(): GeometryType;
+
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
+
+        /**
+         * Set the center of the circle as {@link ol.Coordinate coordinate}.
+         * @param center Center.
+         * @api
+         */
+        setCenter(center: ol.Coordinate): void;
+
+        /**
+         * Set the center (as {@link ol.Coordinate coordinate}) and the radius (as
+         * number) of the circle.
+         * @param center Center.
+         * @param radius Radius.
+         * @param opt_layout Layout.
+         * @api
+         */
+        setCenterAndRadius(center: ol.Coordinate, radius: number, opt_layout?: GeometryLayout): void;
+
+        /**
+         * Set the radius of the circle. The radius is in the units of the projection.
+         * @param radius Radius.
+         * @api
+         */
+        setRadius(radius: number): void;
+    }
+
+    /**
+     * The geometry type. One of `'Point'`, `'LineString'`, `'LinearRing'`,
+     * `'Polygon'`, `'MultiPoint'`, `'MultiLineString'`, `'MultiPolygon'`,
+     * `'GeometryCollection'`, `'Circle'`.
+     */
+    type GeometryType = "Point" | "LineString" | "LinearRing" | "Polygon" | "MultiPoint" | "MultiLineString" | "MultiPolygon" | "GeometryCollection" | "Circle";
+
+    /**
+     * The coordinate layout for geometries, indicating whether a 3rd or 4th z ('Z')
+     * or measure ('M') coordinate is available. Supported values are `'XY'`,
+     * `'XYZ'`, `'XYM'`, `'XYZM'`.
+     */
+    type GeometryLayout = "XY" | "XYZ" | "XYM" | "XYZM";
+
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for vector geometries.
+     *
+     * To get notified of changes to the geometry, register a listener for the
+     * generic `change` event on your geometry instance.
+     *
+     * @api stable
+     */
+    class Geometry extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -3910,105 +3926,101 @@ declare namespace ol {
          *
          * @api stable
          */
-        class Geometry extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for vector geometries.
-             *
-             * To get notified of changes to the geometry, register a listener for the
-             * generic `change` event on your geometry instance.
-             *
-             * @api stable
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Return the closest point of the geometry to the passed point as
-             * {@link ol.Coordinate coordinate}.
-             * @param point Point.
-             * @param opt_closestPoint Closest point.
-             * @return Closest point.
-             * @api stable
-             */
-            getClosestPoint(point: ol.Coordinate, opt_closestPoint?: ol.Coordinate): ol.Coordinate;
+        /**
+         * Return the closest point of the geometry to the passed point as
+         * {@link ol.Coordinate coordinate}.
+         * @param point Point.
+         * @param opt_closestPoint Closest point.
+         * @return Closest point.
+         * @api stable
+         */
+        getClosestPoint(point: ol.Coordinate, opt_closestPoint?: ol.Coordinate): ol.Coordinate;
 
-            /**
-             * Returns true if this geometry includes the specified coordinate. If the
-             * coordinate is on the boundary of the geometry, returns false.
-             * @param coordinate Coordinate.
-             * @return Contains coordinate.
-             * @api
-             */
-            intersectsCoordinate(coordinate: ol.Coordinate): boolean;
+        /**
+         * Returns true if this geometry includes the specified coordinate. If the
+         * coordinate is on the boundary of the geometry, returns false.
+         * @param coordinate Coordinate.
+         * @return Contains coordinate.
+         * @api
+         */
+        intersectsCoordinate(coordinate: ol.Coordinate): boolean;
 
-            /**
-             * Get the extent of the geometry.
-             * @param opt_extent Extent.
-             * @return extent Extent.
-             * @api stable
-             */
-            getExtent(opt_extent?: ol.Extent): ol.Extent;
+        /**
+         * Get the extent of the geometry.
+         * @param opt_extent Extent.
+         * @return extent Extent.
+         * @api stable
+         */
+        getExtent(opt_extent?: ol.Extent): ol.Extent;
 
-            /**
-             * Rotate the geometry around a given coordinate. This modifies the geometry
-             * coordinates in place.
-             * @param angle Rotation angle in radians.
-             * @param anchor The rotation center.
-             * @api
-             */
-            rotate(angle: number, anchor: ol.Coordinate): void;
+        /**
+         * Rotate the geometry around a given coordinate. This modifies the geometry
+         * coordinates in place.
+         * @param angle Rotation angle in radians.
+         * @param anchor The rotation center.
+         * @api
+         */
+        rotate(angle: number, anchor: ol.Coordinate): void;
 
-            /**
-             * Scale the geometry (with an optional origin).  This modifies the geometry
-             * coordinates in place.
-             * @param sx The scaling factor in the x-direction.
-             * @param opt_sy The scaling factor in the y-direction (defaults to
-             *     sx).
-             * @param opt_anchor The scale origin (defaults to the center
-             *     of the geometry extent).
-             * @api
-             */
-            scale(sx: number, opt_sy?: number, opt_anchor?: ol.Coordinate): void;
+        /**
+         * Scale the geometry (with an optional origin).  This modifies the geometry
+         * coordinates in place.
+         * @param sx The scaling factor in the x-direction.
+         * @param opt_sy The scaling factor in the y-direction (defaults to
+         *     sx).
+         * @param opt_anchor The scale origin (defaults to the center
+         *     of the geometry extent).
+         * @api
+         */
+        scale(sx: number, opt_sy?: number, opt_anchor?: ol.Coordinate): void;
 
-            /**
-             * Create a simplified version of this geometry.  For linestrings, this uses
-             * the the {@link
-             * https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
-             * Douglas Peucker} algorithm.  For polygons, a quantization-based
-             * simplification is used to preserve topology.
-             * @param tolerance The tolerance distance for simplification.
-             * @return A new, simplified version of the original
-             *     geometry.
-             * @api
-             */
-            simplify(tolerance: number): ol.geom.Geometry;
+        /**
+         * Create a simplified version of this geometry.  For linestrings, this uses
+         * the the {@link
+         * https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
+         * Douglas Peucker} algorithm.  For polygons, a quantization-based
+         * simplification is used to preserve topology.
+         * @param tolerance The tolerance distance for simplification.
+         * @return A new, simplified version of the original
+         *     geometry.
+         * @api
+         */
+        simplify(tolerance: number): Geometry;
 
-            /**
-             * Transform each coordinate of the geometry from one coordinate reference
-             * system to another. The geometry is modified in place.
-             * For example, a line will be transformed to a line and a circle to a circle.
-             * If you do not want the geometry modified in place, first `clone()` it and
-             * then use this function on the clone.
-             *
-             * @param source The current projection.  Can be a
-             *     string identifier or a {@link ol.proj.Projection} object.
-             * @param destination The desired projection.  Can be a
-             *     string identifier or a {@link ol.proj.Projection} object.
-             * @return This geometry.  Note that original geometry is
-             *     modified in place.
-             * @api stable
-             */
-            transform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.geom.Geometry;
+        /**
+         * Transform each coordinate of the geometry from one coordinate reference
+         * system to another. The geometry is modified in place.
+         * For example, a line will be transformed to a line and a circle to a circle.
+         * If you do not want the geometry modified in place, first `clone()` it and
+         * then use this function on the clone.
+         *
+         * @param source The current projection.  Can be a
+         *     string identifier or a {@link ol.proj.Projection} object.
+         * @param destination The desired projection.  Can be a
+         *     string identifier or a {@link ol.proj.Projection} object.
+         * @return This geometry.  Note that original geometry is
+         *     modified in place.
+         * @api stable
+         */
+        transform(source: ol.ProjectionLike, destination: ol.ProjectionLike): Geometry;
 
-            /**
-             * Get the type of this geometry.
-             * @return Geometry type.
-             */
-            getType(): ol.geom.GeometryType;
-        }
+        /**
+         * Get the type of this geometry.
+         * @return Geometry type.
+         */
+        getType(): GeometryType;
+    }
 
+    /**
+     * @classdesc
+     * An array of {@link ol.geom.Geometry} objects.
+     *
+     * @param opt_geometries Geometries.
+     * @api stable
+     */
+    class GeometryCollection extends Geometry {
         /**
          * @classdesc
          * An array of {@link ol.geom.Geometry} objects.
@@ -4016,64 +4028,66 @@ declare namespace ol {
          * @param opt_geometries Geometries.
          * @api stable
          */
-        class GeometryCollection extends ol.geom.Geometry {
-            /**
-             * @classdesc
-             * An array of {@link ol.geom.Geometry} objects.
-             *
-             * @param opt_geometries Geometries.
-             * @api stable
-             */
-            constructor(opt_geometries?: ol.geom.Geometry[]);
+        constructor(opt_geometries?: Geometry[]);
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.GeometryCollection;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): GeometryCollection;
 
-            /**
-             * Return the geometries that make up this geometry collection.
-             * @return Geometries.
-             * @api stable
-             */
-            getGeometries(): ol.geom.Geometry[];
+        /**
+         * Return the geometries that make up this geometry collection.
+         * @return Geometries.
+         * @api stable
+         */
+        getGeometries(): Geometry[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the geometries that make up this geometry collection.
-             * @param geometries Geometries.
-             * @api stable
-             */
-            setGeometries(geometries: ol.geom.Geometry[]): void;
+        /**
+         * Set the geometries that make up this geometry collection.
+         * @param geometries Geometries.
+         * @api stable
+         */
+        setGeometries(geometries: Geometry[]): void;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            applyTransform(transformFn: ol.TransformFunction): void;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        applyTransform(transformFn: ol.TransformFunction): void;
 
-            /**
-             * Translate the geometry.
-             * @param deltaX Delta X.
-             * @param deltaY Delta Y.
-             * @api
-             */
-            translate(deltaX: number, deltaY: number): void;
-        }
+        /**
+         * Translate the geometry.
+         * @param deltaX Delta X.
+         * @param deltaY Delta Y.
+         * @api
+         */
+        translate(deltaX: number, deltaY: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Linear ring geometry. Only used as part of polygon; cannot be rendered
+     * on its own.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class LinearRing extends SimpleGeometry {
         /**
          * @classdesc
          * Linear ring geometry. Only used as part of polygon; cannot be rendered
@@ -4083,54 +4097,53 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class LinearRing extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Linear ring geometry. Only used as part of polygon; cannot be rendered
-             * on its own.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout);
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.LinearRing;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): LinearRing;
 
-            /**
-             * Return the area of the linear ring on projected plane.
-             * @return Area (on projected plane).
-             * @api stable
-             */
-            getArea(): number;
+        /**
+         * Return the area of the linear ring on projected plane.
+         * @return Area (on projected plane).
+         * @api stable
+         */
+        getArea(): number;
 
-            /**
-             * Return the coordinates of the linear ring.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[];
+        /**
+         * Return the coordinates of the linear ring.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): GeometryType;
 
-            /**
-             * Set the coordinates of the linear ring.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the linear ring.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Linestring geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class LineString extends SimpleGeometry {
         /**
          * @classdesc
          * Linestring geometry.
@@ -4139,109 +4152,109 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class LineString extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Linestring geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout);
 
-            /**
-             * Append the passed coordinate to the coordinates of the linestring.
-             * @param coordinate Coordinate.
-             * @api stable
-             */
-            appendCoordinate(coordinate: ol.Coordinate): void;
+        /**
+         * Append the passed coordinate to the coordinates of the linestring.
+         * @param coordinate Coordinate.
+         * @api stable
+         */
+        appendCoordinate(coordinate: ol.Coordinate): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.LineString;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): LineString;
 
-            /**
-             * Iterate over each segment, calling the provided callback.
-             * If the callback returns a truthy value the function returns that
-             * value immediately. Otherwise the function returns `false`.
-             *
-             * @param callback Function
-             *     called for each segment.
-             * @param opt_this The object to be used as the value of 'this'
-             *     within callback.
-             * @return Value.
-             * @template T,S
-             * @api
-             */
-            forEachSegment<T, S>(callback: ((this: S, start: ol.Coordinate, end: ol.Coordinate) => T), opt_this?: S): (T | boolean);
+        /**
+         * Iterate over each segment, calling the provided callback.
+         * If the callback returns a truthy value the function returns that
+         * value immediately. Otherwise the function returns `false`.
+         *
+         * @param callback Function
+         *     called for each segment.
+         * @param opt_this The object to be used as the value of 'this'
+         *     within callback.
+         * @return Value.
+         * @template T,S
+         * @api
+         */
+        forEachSegment<T, S>(callback: ((this: S, start: ol.Coordinate, end: ol.Coordinate) => T), opt_this?: S): (T | boolean);
 
-            /**
-             * Returns the coordinate at `m` using linear interpolation, or `null` if no
-             * such coordinate exists.
-             *
-             * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
-             * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
-             * M will return the first coordinate and Ms greater than the last M will
-             * return the last coordinate.
-             *
-             * @param m M.
-             * @param opt_extrapolate Extrapolate. Default is `false`.
-             * @return Coordinate.
-             * @api stable
-             */
-            getCoordinateAtM(m: number, opt_extrapolate?: boolean): ol.Coordinate;
+        /**
+         * Returns the coordinate at `m` using linear interpolation, or `null` if no
+         * such coordinate exists.
+         *
+         * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
+         * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
+         * M will return the first coordinate and Ms greater than the last M will
+         * return the last coordinate.
+         *
+         * @param m M.
+         * @param opt_extrapolate Extrapolate. Default is `false`.
+         * @return Coordinate.
+         * @api stable
+         */
+        getCoordinateAtM(m: number, opt_extrapolate?: boolean): ol.Coordinate;
 
-            /**
-             * Return the coordinates of the linestring.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[];
+        /**
+         * Return the coordinates of the linestring.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[];
 
-            /**
-             * Return the coordinate at the provided fraction along the linestring.
-             * The `fraction` is a number between 0 and 1, where 0 is the start of the
-             * linestring and 1 is the end.
-             * @param fraction Fraction.
-             * @param opt_dest Optional coordinate whose values will
-             *     be modified. If not provided, a new coordinate will be returned.
-             * @return Coordinate of the interpolated point.
-             * @api
-             */
-            getCoordinateAt(fraction: number, opt_dest?: ol.Coordinate): ol.Coordinate;
+        /**
+         * Return the coordinate at the provided fraction along the linestring.
+         * The `fraction` is a number between 0 and 1, where 0 is the start of the
+         * linestring and 1 is the end.
+         * @param fraction Fraction.
+         * @param opt_dest Optional coordinate whose values will
+         *     be modified. If not provided, a new coordinate will be returned.
+         * @return Coordinate of the interpolated point.
+         * @api
+         */
+        getCoordinateAt(fraction: number, opt_dest?: ol.Coordinate): ol.Coordinate;
 
-            /**
-             * Return the length of the linestring on projected plane.
-             * @return Length (on projected plane).
-             * @api stable
-             */
-            getLength(): number;
+        /**
+         * Return the length of the linestring on projected plane.
+         * @return Length (on projected plane).
+         * @api stable
+         */
+        getLength(): number;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the linestring.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the linestring.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Multi-linestring geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class MultiLineString extends SimpleGeometry {
         /**
          * @classdesc
          * Multi-linestring geometry.
@@ -4250,98 +4263,98 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class MultiLineString extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Multi-linestring geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][], opt_layout?: GeometryLayout);
 
-            /**
-             * Append the passed linestring to the multilinestring.
-             * @param lineString LineString.
-             * @api stable
-             */
-            appendLineString(lineString: ol.geom.LineString): void;
+        /**
+         * Append the passed linestring to the multilinestring.
+         * @param lineString LineString.
+         * @api stable
+         */
+        appendLineString(lineString: LineString): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.MultiLineString;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): MultiLineString;
 
-            /**
-             * Returns the coordinate at `m` using linear interpolation, or `null` if no
-             * such coordinate exists.
-             *
-             * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
-             * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
-             * M will return the first coordinate and Ms greater than the last M will
-             * return the last coordinate.
-             *
-             * `opt_interpolate` controls interpolation between consecutive LineStrings
-             * within the MultiLineString. If `opt_interpolate` is `true` the coordinates
-             * will be linearly interpolated between the last coordinate of one LineString
-             * and the first coordinate of the next LineString.  If `opt_interpolate` is
-             * `false` then the function will return `null` for Ms falling between
-             * LineStrings.
-             *
-             * @param m M.
-             * @param opt_extrapolate Extrapolate. Default is `false`.
-             * @param opt_interpolate Interpolate. Default is `false`.
-             * @return Coordinate.
-             * @api stable
-             */
-            getCoordinateAtM(m: number, opt_extrapolate?: boolean, opt_interpolate?: boolean): ol.Coordinate;
+        /**
+         * Returns the coordinate at `m` using linear interpolation, or `null` if no
+         * such coordinate exists.
+         *
+         * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
+         * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
+         * M will return the first coordinate and Ms greater than the last M will
+         * return the last coordinate.
+         *
+         * `opt_interpolate` controls interpolation between consecutive LineStrings
+         * within the MultiLineString. If `opt_interpolate` is `true` the coordinates
+         * will be linearly interpolated between the last coordinate of one LineString
+         * and the first coordinate of the next LineString.  If `opt_interpolate` is
+         * `false` then the function will return `null` for Ms falling between
+         * LineStrings.
+         *
+         * @param m M.
+         * @param opt_extrapolate Extrapolate. Default is `false`.
+         * @param opt_interpolate Interpolate. Default is `false`.
+         * @return Coordinate.
+         * @api stable
+         */
+        getCoordinateAtM(m: number, opt_extrapolate?: boolean, opt_interpolate?: boolean): ol.Coordinate;
 
-            /**
-             * Return the coordinates of the multilinestring.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[][];
+        /**
+         * Return the coordinates of the multilinestring.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[][];
 
-            /**
-             * Return the linestring at the specified index.
-             * @param index Index.
-             * @return LineString.
-             * @api stable
-             */
-            getLineString(index: number): ol.geom.LineString;
+        /**
+         * Return the linestring at the specified index.
+         * @param index Index.
+         * @return LineString.
+         * @api stable
+         */
+        getLineString(index: number): LineString;
 
-            /**
-             * Return the linestrings of this multilinestring.
-             * @return LineStrings.
-             * @api stable
-             */
-            getLineStrings(): ol.geom.LineString[];
+        /**
+         * Return the linestrings of this multilinestring.
+         * @return LineStrings.
+         * @api stable
+         */
+        getLineStrings(): LineString[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the multilinestring.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the multilinestring.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Multi-point geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class MultiPoint extends SimpleGeometry {
         /**
          * @classdesc
          * Multi-point geometry.
@@ -4350,74 +4363,74 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class MultiPoint extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Multi-point geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout);
 
-            /**
-             * Append the passed point to this multipoint.
-             * @param point Point.
-             * @api stable
-             */
-            appendPoint(point: ol.geom.Point): void;
+        /**
+         * Append the passed point to this multipoint.
+         * @param point Point.
+         * @api stable
+         */
+        appendPoint(point: Point): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.MultiPoint;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): MultiPoint;
 
-            /**
-             * Return the coordinates of the multipoint.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[];
+        /**
+         * Return the coordinates of the multipoint.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[];
 
-            /**
-             * Return the point at the specified index.
-             * @param index Index.
-             * @return Point.
-             * @api stable
-             */
-            getPoint(index: number): ol.geom.Point;
+        /**
+         * Return the point at the specified index.
+         * @param index Index.
+         * @return Point.
+         * @api stable
+         */
+        getPoint(index: number): Point;
 
-            /**
-             * Return the points of this multipoint.
-             * @return Points.
-             * @api stable
-             */
-            getPoints(): ol.geom.Point[];
+        /**
+         * Return the points of this multipoint.
+         * @return Points.
+         * @api stable
+         */
+        getPoints(): Point[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the multipoint.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the multipoint.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Multi-polygon geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class MultiPolygon extends SimpleGeometry {
         /**
          * @classdesc
          * Multi-polygon geometry.
@@ -4426,96 +4439,96 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class MultiPolygon extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Multi-polygon geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][][], opt_layout?: GeometryLayout);
 
-            /**
-             * Append the passed polygon to this multipolygon.
-             * @param polygon Polygon.
-             * @api stable
-             */
-            appendPolygon(polygon: ol.geom.Polygon): void;
+        /**
+         * Append the passed polygon to this multipolygon.
+         * @param polygon Polygon.
+         * @api stable
+         */
+        appendPolygon(polygon: Polygon): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.MultiPolygon;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): MultiPolygon;
 
-            /**
-             * Return the area of the multipolygon on projected plane.
-             * @return Area (on projected plane).
-             * @api stable
-             */
-            getArea(): number;
+        /**
+         * Return the area of the multipolygon on projected plane.
+         * @return Area (on projected plane).
+         * @api stable
+         */
+        getArea(): number;
 
-            /**
-             * Get the coordinate array for this geometry.  This array has the structure
-             * of a GeoJSON coordinate array for multi-polygons.
-             *
-             * @param opt_right Orient coordinates according to the right-hand
-             *     rule (counter-clockwise for exterior and clockwise for interior rings).
-             *     If `false`, coordinates will be oriented according to the left-hand rule
-             *     (clockwise for exterior and counter-clockwise for interior rings).
-             *     By default, coordinate orientation will depend on how the geometry was
-             *     constructed.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(opt_right?: boolean): ol.Coordinate[][][];
+        /**
+         * Get the coordinate array for this geometry.  This array has the structure
+         * of a GeoJSON coordinate array for multi-polygons.
+         *
+         * @param opt_right Orient coordinates according to the right-hand
+         *     rule (counter-clockwise for exterior and clockwise for interior rings).
+         *     If `false`, coordinates will be oriented according to the left-hand rule
+         *     (clockwise for exterior and counter-clockwise for interior rings).
+         *     By default, coordinate orientation will depend on how the geometry was
+         *     constructed.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(opt_right?: boolean): ol.Coordinate[][][];
 
-            /**
-             * Return the interior points as {@link ol.geom.MultiPoint multipoint}.
-             * @return Interior points.
-             * @api stable
-             */
-            getInteriorPoints(): ol.geom.MultiPoint;
+        /**
+         * Return the interior points as {@link MultiPoint multipoint}.
+         * @return Interior points.
+         * @api stable
+         */
+        getInteriorPoints(): MultiPoint;
 
-            /**
-             * Return the polygon at the specified index.
-             * @param index Index.
-             * @return Polygon.
-             * @api stable
-             */
-            getPolygon(index: number): ol.geom.Polygon;
+        /**
+         * Return the polygon at the specified index.
+         * @param index Index.
+         * @return Polygon.
+         * @api stable
+         */
+        getPolygon(index: number): Polygon;
 
-            /**
-             * Return the polygons of this multipolygon.
-             * @return Polygons.
-             * @api stable
-             */
-            getPolygons(): ol.geom.Polygon[];
+        /**
+         * Return the polygons of this multipolygon.
+         * @return Polygons.
+         * @api stable
+         */
+        getPolygons(): Polygon[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the multipolygon.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the multipolygon.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[][][], opt_layout?: GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Point geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class Point extends SimpleGeometry {
         /**
          * @classdesc
          * Point geometry.
@@ -4524,52 +4537,52 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class Point extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Point geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate, opt_layout?: GeometryLayout);
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.Point;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): Point;
 
-            /**
-             * Return the coordinate of the point.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate;
+        /**
+         * Return the coordinate of the point.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinate of the point.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinate of the point.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate, opt_layout?: GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Polygon geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class Polygon extends SimpleGeometry {
         /**
          * @classdesc
          * Polygon geometry.
@@ -4578,141 +4591,140 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class Polygon extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Polygon geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][], opt_layout?: GeometryLayout);
 
-            /**
-             * Append the passed linear ring to this polygon.
-             * @param linearRing Linear ring.
-             * @api stable
-             */
-            appendLinearRing(linearRing: ol.geom.LinearRing): void;
+        /**
+         * Append the passed linear ring to this polygon.
+         * @param linearRing Linear ring.
+         * @api stable
+         */
+        appendLinearRing(linearRing: LinearRing): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.Polygon;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): Polygon;
 
-            /**
-             * Return the area of the polygon on projected plane.
-             * @return Area (on projected plane).
-             * @api stable
-             */
-            getArea(): number;
+        /**
+         * Return the area of the polygon on projected plane.
+         * @return Area (on projected plane).
+         * @api stable
+         */
+        getArea(): number;
 
-            /**
-             * Get the coordinate array for this geometry.  This array has the structure
-             * of a GeoJSON coordinate array for polygons.
-             *
-             * @param opt_right Orient coordinates according to the right-hand
-             *     rule (counter-clockwise for exterior and clockwise for interior rings).
-             *     If `false`, coordinates will be oriented according to the left-hand rule
-             *     (clockwise for exterior and counter-clockwise for interior rings).
-             *     By default, coordinate orientation will depend on how the geometry was
-             *     constructed.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(opt_right?: boolean): ol.Coordinate[][];
+        /**
+         * Get the coordinate array for this geometry.  This array has the structure
+         * of a GeoJSON coordinate array for polygons.
+         *
+         * @param opt_right Orient coordinates according to the right-hand
+         *     rule (counter-clockwise for exterior and clockwise for interior rings).
+         *     If `false`, coordinates will be oriented according to the left-hand rule
+         *     (clockwise for exterior and counter-clockwise for interior rings).
+         *     By default, coordinate orientation will depend on how the geometry was
+         *     constructed.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(opt_right?: boolean): ol.Coordinate[][];
 
-            /**
-             * Return an interior point of the polygon.
-             * @return Interior point.
-             * @api stable
-             */
-            getInteriorPoint(): ol.geom.Point;
+        /**
+         * Return an interior point of the polygon.
+         * @return Interior point.
+         * @api stable
+         */
+        getInteriorPoint(): Point;
 
-            /**
-             * Return the number of rings of the polygon,  this includes the exterior
-             * ring and any interior rings.
-             *
-             * @return Number of rings.
-             * @api
-             */
-            getLinearRingCount(): number;
+        /**
+         * Return the number of rings of the polygon,  this includes the exterior
+         * ring and any interior rings.
+         *
+         * @return Number of rings.
+         * @api
+         */
+        getLinearRingCount(): number;
 
-            /**
-             * Return the Nth linear ring of the polygon geometry. Return `null` if the
-             * given index is out of range.
-             * The exterior linear ring is available at index `0` and the interior rings
-             * at index `1` and beyond.
-             *
-             * @param index Index.
-             * @return Linear ring.
-             * @api stable
-             */
-            getLinearRing(index: number): ol.geom.LinearRing;
+        /**
+         * Return the Nth linear ring of the polygon geometry. Return `null` if the
+         * given index is out of range.
+         * The exterior linear ring is available at index `0` and the interior rings
+         * at index `1` and beyond.
+         *
+         * @param index Index.
+         * @return Linear ring.
+         * @api stable
+         */
+        getLinearRing(index: number): LinearRing;
 
-            /**
-             * Return the linear rings of the polygon.
-             * @return Linear rings.
-             * @api stable
-             */
-            getLinearRings(): ol.geom.LinearRing[];
+        /**
+         * Return the linear rings of the polygon.
+         * @return Linear rings.
+         * @api stable
+         */
+        getLinearRings(): LinearRing[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the polygon.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
+        /**
+         * Set the coordinates of the polygon.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: GeometryLayout): void;
 
-            /**
-             * Create an approximation of a circle on the surface of a sphere.
-             * @param sphere The sphere.
-             * @param center Center (`[lon, lat]` in degrees).
-             * @param radius The great-circle distance from the center to
-             *     the polygon vertices.
-             * @param opt_n Optional number of vertices for the resulting
-             *     polygon. Default is `32`.
-             * @return The "circular" polygon.
-             * @api stable
-             */
-            static circular(sphere: ol.Sphere, center: ol.Coordinate, radius: number, opt_n?: number): ol.geom.Polygon;
+        /**
+         * Create an approximation of a circle on the surface of a sphere.
+         * @param sphere The sphere.
+         * @param center Center (`[lon, lat]` in degrees).
+         * @param radius The great-circle distance from the center to
+         *     the polygon vertices.
+         * @param opt_n Optional number of vertices for the resulting
+         *     polygon. Default is `32`.
+         * @return The "circular" polygon.
+         * @api stable
+         */
+        static circular(sphere: ol.Sphere, center: ol.Coordinate, radius: number, opt_n?: number): Polygon;
 
-            /**
-             * Create a polygon from an extent. The layout used is `XY`.
-             * @param extent The extent.
-             * @return The polygon.
-             * @api
-             */
-            static fromExtent(extent: ol.Extent): ol.geom.Polygon;
+        /**
+         * Create a polygon from an extent. The layout used is `XY`.
+         * @param extent The extent.
+         * @return The polygon.
+         * @api
+         */
+        static fromExtent(extent: ol.Extent): Polygon;
 
-            /**
-             * Create a regular polygon from a circle.
-             * @param circle Circle geometry.
-             * @param opt_sides Number of sides of the polygon. Default is 32.
-             * @param opt_angle Start angle for the first vertex of the polygon in
-             *     radians. Default is 0.
-             * @return Polygon geometry.
-             * @api
-             */
-            static fromCircle(circle: ol.geom.Circle, opt_sides?: number, opt_angle?: number): ol.geom.Polygon;
-        }
+        /**
+         * Create a regular polygon from a circle.
+         * @param circle Circle geometry.
+         * @param opt_sides Number of sides of the polygon. Default is 32.
+         * @param opt_angle Start angle for the first vertex of the polygon in
+         *     radians. Default is 0.
+         * @return Polygon geometry.
+         * @api
+         */
+        static fromCircle(circle: Circle, opt_sides?: number, opt_angle?: number): Polygon;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; only used for creating subclasses; do not instantiate
+     * in apps, as cannot be rendered.
+     *
+     * @api stable
+     */
+    class SimpleGeometry extends Geometry {
         /**
          * @classdesc
          * Abstract base class; only used for creating subclasses; do not instantiate
@@ -4720,141 +4732,143 @@ declare namespace ol {
          *
          * @api stable
          */
-        class SimpleGeometry extends ol.geom.Geometry {
-            /**
-             * @classdesc
-             * Abstract base class; only used for creating subclasses; do not instantiate
-             * in apps, as cannot be rendered.
-             *
-             * @api stable
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Return the first coordinate of the geometry.
-             * @return First coordinate.
-             * @api stable
-             */
-            getFirstCoordinate(): ol.Coordinate;
+        /**
+         * Return the first coordinate of the geometry.
+         * @return First coordinate.
+         * @api stable
+         */
+        getFirstCoordinate(): ol.Coordinate;
 
-            /**
-             * Return the last coordinate of the geometry.
-             * @return Last point.
-             * @api stable
-             */
-            getLastCoordinate(): ol.Coordinate;
+        /**
+         * Return the last coordinate of the geometry.
+         * @return Last point.
+         * @api stable
+         */
+        getLastCoordinate(): ol.Coordinate;
 
-            /**
-             * Return the {@link ol.geom.GeometryLayout layout} of the geometry.
-             * @return Layout.
-             * @api stable
-             */
-            getLayout(): ol.geom.GeometryLayout;
+        /**
+         * Return the {@link GeometryLayout layout} of the geometry.
+         * @return Layout.
+         * @api stable
+         */
+        getLayout(): GeometryLayout;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            applyTransform(transformFn: ol.TransformFunction): void;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        applyTransform(transformFn: ol.TransformFunction): void;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            translate(deltaX: number, deltaY: number): void;
-        }
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        translate(deltaX: number, deltaY: number): void;
     }
+}
 
+/**
+ * Render a grid for a coordinate system on a map.
+ * @param opt_options Options.
+ * @api
+ */
+export class Graticule {
     /**
      * Render a grid for a coordinate system on a map.
      * @param opt_options Options.
      * @api
      */
-    class Graticule {
-        /**
-         * Render a grid for a coordinate system on a map.
-         * @param opt_options Options.
-         * @api
-         */
-        constructor(opt_options?: olx.GraticuleOptions);
+    constructor(opt_options?: olx.GraticuleOptions);
 
-        /**
-         * Get the map associated with this graticule.
-         * @return The map.
-         * @api
-         */
-        getMap(): ol.Map;
+    /**
+     * Get the map associated with this graticule.
+     * @return The map.
+     * @api
+     */
+    getMap(): ol.Map;
 
-        /**
-         * Get the list of meridians.  Meridians are lines of equal longitude.
-         * @return The meridians.
-         * @api
-         */
-        getMeridians(): ol.geom.LineString[];
+    /**
+     * Get the list of meridians.  Meridians are lines of equal longitude.
+     * @return The meridians.
+     * @api
+     */
+    getMeridians(): ol.geom.LineString[];
 
-        /**
-         * Get the list of parallels.  Pallels are lines of equal latitude.
-         * @return The parallels.
-         * @api
-         */
-        getParallels(): ol.geom.LineString[];
+    /**
+     * Get the list of parallels.  Pallels are lines of equal latitude.
+     * @return The parallels.
+     * @api
+     */
+    getParallels(): ol.geom.LineString[];
 
-        /**
-         * Set the map for this graticule.  The graticule will be rendered on the
-         * provided map.
-         * @param map Map.
-         * @api
-         */
-        setMap(map: ol.Map): void;
-    }
+    /**
+     * Set the map for this graticule.  The graticule will be rendered on the
+     * provided map.
+     * @param map Map.
+     * @api
+     */
+    setMap(map: ol.Map): void;
+}
 
-    namespace has {
-        /**
-         * The ratio between physical pixels and device-independent pixels
-         * (dips) on the device (`window.devicePixelRatio`).
-         * @const
-         * @api stable
-         */
-        const DEVICE_PIXEL_RATIO: number;
+export namespace has {
+    /**
+     * The ratio between physical pixels and device-independent pixels
+     * (dips) on the device (`window.devicePixelRatio`).
+     * @const
+     * @api stable
+     */
+    const DEVICE_PIXEL_RATIO: number;
 
-        /**
-         * True if both the library and browser support Canvas.  Always `false`
-         * if `ol.ENABLE_CANVAS` is set to `false` at compile time.
-         * @const
-         * @api stable
-         */
-        const CANVAS: boolean;
+    /**
+     * True if both the library and browser support Canvas.  Always `false`
+     * if `ol.ENABLE_CANVAS` is set to `false` at compile time.
+     * @const
+     * @api stable
+     */
+    const CANVAS: boolean;
 
-        /**
-         * Indicates if DeviceOrientation is supported in the user's browser.
-         * @const
-         * @api stable
-         */
-        const DEVICE_ORIENTATION: boolean;
+    /**
+     * Indicates if DeviceOrientation is supported in the user's browser.
+     * @const
+     * @api stable
+     */
+    const DEVICE_ORIENTATION: boolean;
 
-        /**
-         * Is HTML5 geolocation supported in the current browser?
-         * @const
-         * @api stable
-         */
-        const GEOLOCATION: boolean;
+    /**
+     * Is HTML5 geolocation supported in the current browser?
+     * @const
+     * @api stable
+     */
+    const GEOLOCATION: boolean;
 
-        /**
-         * True if browser supports touch events.
-         * @const
-         * @api stable
-         */
-        const TOUCH: boolean;
+    /**
+     * True if browser supports touch events.
+     * @const
+     * @api stable
+     */
+    const TOUCH: boolean;
 
-        /**
-         * True if both OpenLayers and browser support WebGL.  Always `false`
-         * if `ol.ENABLE_WEBGL` is set to `false` at compile time.
-         * @const
-         * @api stable
-         */
-        const WEBGL: boolean;
-    }
+    /**
+     * True if both OpenLayers and browser support WebGL.  Always `false`
+     * if `ol.ENABLE_WEBGL` is set to `false` at compile time.
+     * @const
+     * @api stable
+     */
+    const WEBGL: boolean;
+}
 
+/**
+ * @param extent Extent.
+ * @param resolution Resolution.
+ * @param pixelRatio Pixel ratio.
+ * @param attributions Attributions.
+ * @param src Image source URI.
+ * @param crossOrigin Cross origin.
+ * @param imageLoadFunction Image load function.
+ */
+export class Image extends ImageBase {
     /**
      * @param extent Extent.
      * @param resolution Resolution.
@@ -4864,35 +4878,33 @@ declare namespace ol {
      * @param crossOrigin Cross origin.
      * @param imageLoadFunction Image load function.
      */
-    class Image extends ol.ImageBase {
-        /**
-         * @param extent Extent.
-         * @param resolution Resolution.
-         * @param pixelRatio Pixel ratio.
-         * @param attributions Attributions.
-         * @param src Image source URI.
-         * @param crossOrigin Cross origin.
-         * @param imageLoadFunction Image load function.
-         */
-        constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, attributions: ol.Attribution[], src: string, crossOrigin?: string, imageLoadFunction?: ol.ImageLoadFunctionType);
+    constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, attributions: ol.Attribution[], src: string, crossOrigin?: string, imageLoadFunction?: ol.ImageLoadFunctionType);
 
-        /**
-         * Get the HTML image element (may be a Canvas, Image, or Video).
-         * @param opt_context Object.
-         * @return Image.
-         * @api
-         */
-        getImage(opt_context?: GlobalObject): (HTMLCanvasElement | Image | HTMLVideoElement);
+    /**
+     * Get the HTML image element (may be a Canvas, Image, or Video).
+     * @param opt_context Object.
+     * @return Image.
+     * @api
+     */
+    getImage(opt_context?: GlobalObject): (HTMLCanvasElement | Image | HTMLVideoElement);
 
-        /**
-         * Load the image or retry if loading previously failed.
-         * Loading is taken care of by the tile queue, and calling this method is
-         * only needed for preloading or for reloading in case of an error.
-         * @api
-         */
-        load(): void;
-    }
+    /**
+     * Load the image or retry if loading previously failed.
+     * Loading is taken care of by the tile queue, and calling this method is
+     * only needed for preloading or for reloading in case of an error.
+     * @api
+     */
+    load(): void;
+}
 
+/**
+ * @param extent Extent.
+ * @param resolution Resolution.
+ * @param pixelRatio Pixel ratio.
+ * @param state State.
+ * @param attributions Attributions.
+ */
+export class ImageBase extends events.EventTarget {
     /**
      * @param extent Extent.
      * @param resolution Resolution.
@@ -4900,19 +4912,19 @@ declare namespace ol {
      * @param state State.
      * @param attributions Attributions.
      */
-    class ImageBase extends ol.events.EventTarget {
-        /**
-         * @param extent Extent.
-         * @param resolution Resolution.
-         * @param pixelRatio Pixel ratio.
-         * @param state State.
-         * @param attributions Attributions.
-         */
-        constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, state: ol.ImageState, attributions: ol.Attribution[]);
-    }
+    constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, state: ol.ImageState, attributions: ol.Attribution[]);
+}
 
-    type ImageState = number;
+export type ImageState = number;
 
+/**
+ * @param tileCoord Tile coordinate.
+ * @param state State.
+ * @param src Image source URI.
+ * @param crossOrigin Cross origin.
+ * @param tileLoadFunction Tile load function.
+ */
+export class ImageTile extends Tile {
     /**
      * @param tileCoord Tile coordinate.
      * @param state State.
@@ -4920,48 +4932,48 @@ declare namespace ol {
      * @param crossOrigin Cross origin.
      * @param tileLoadFunction Tile load function.
      */
-    class ImageTile extends ol.Tile {
-        /**
-         * @param tileCoord Tile coordinate.
-         * @param state State.
-         * @param src Image source URI.
-         * @param crossOrigin Cross origin.
-         * @param tileLoadFunction Tile load function.
-         */
-        constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, crossOrigin?: string, tileLoadFunction?: ol.TileLoadFunctionType);
-
-        /**
-         * Get the image element for this tile.
-         * @inheritDoc
-         * @api
-         */
-        getImage(opt_context?: GlobalObject): (HTMLCanvasElement | HTMLImageElement | HTMLVideoElement);
-    }
+    constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, crossOrigin?: string, tileLoadFunction?: ol.TileLoadFunctionType);
 
     /**
-     * Inherit the prototype methods from one constructor into another.
-     *
-     * Usage:
-     *
-     *     function ParentClass(a, b) { }
-     *     ParentClass.prototype.foo = function(a) { }
-     *
-     *     function ChildClass(a, b, c) {
-     *       // Call parent constructor
-     *       ParentClass.call(this, a, b);
-     *     }
-     *     ol.inherits(ChildClass, ParentClass);
-     *
-     *     var child = new ChildClass('a', 'b', 'see');
-     *     child.foo(); // This works.
-     *
-     * @param childCtor Child constructor.
-     * @param parentCtor Parent constructor.
+     * Get the image element for this tile.
+     * @inheritDoc
      * @api
      */
-    function inherits(childCtor: (() => any), parentCtor: (() => any)): void;
+    getImage(opt_context?: GlobalObject): (HTMLCanvasElement | HTMLImageElement | HTMLVideoElement);
+}
 
-    namespace interaction {
+/**
+ * Inherit the prototype methods from one constructor into another.
+ *
+ * Usage:
+ *
+ *     function ParentClass(a, b) { }
+ *     ParentClass.prototype.foo = function(a) { }
+ *
+ *     function ChildClass(a, b, c) {
+ *       // Call parent constructor
+ *       ParentClass.call(this, a, b);
+ *     }
+ *     ol.inherits(ChildClass, ParentClass);
+ *
+ *     var child = new ChildClass('a', 'b', 'see');
+ *     child.foo(); // This works.
+ *
+ * @param childCtor Child constructor.
+ * @param parentCtor Parent constructor.
+ * @api
+ */
+export function inherits(childCtor: (() => any), parentCtor: (() => any)): void;
+
+export namespace interaction {
+    /**
+     * @classdesc
+     * Allows the user to zoom by double-clicking on the map.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DoubleClickZoom extends Interaction {
         /**
          * @classdesc
          * Allows the user to zoom by double-clicking on the map.
@@ -4969,26 +4981,27 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DoubleClickZoom extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to zoom by double-clicking on the map.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DoubleClickZoomOptions);
+        constructor(opt_options?: olx.interaction.DoubleClickZoomOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
-             * doubleclick) and eventually zooms the map.
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
+         * doubleclick) and eventually zooms the map.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
 
+    /**
+     * @classdesc
+     * Handles input of vector data by drag and drop.
+     *
+     * @fires ol.interaction.DragAndDropEvent
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragAndDrop extends Interaction {
         /**
          * @classdesc
          * Handles input of vector data by drag and drop.
@@ -4997,28 +5010,30 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragAndDrop extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Handles input of vector data by drag and drop.
-             *
-             * @fires ol.interaction.DragAndDropEvent
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragAndDropOptions);
+        constructor(opt_options?: olx.interaction.DragAndDropOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} unconditionally and
-             * neither prevents the browser default nor stops event propagation.
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent: any;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} unconditionally and
+         * neither prevents the browser default nor stops event propagation.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent: any;
+    }
 
-        namespace DragAndDrop {
+    namespace DragAndDrop {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
+         * of this type.
+         *
+         * @param type Type.
+         * @param file File.
+         * @param opt_features Features.
+         * @param opt_projection Projection.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
@@ -5029,41 +5044,46 @@ declare namespace ol {
              * @param opt_features Features.
              * @param opt_projection Projection.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
-                 * of this type.
-                 *
-                 * @param type Type.
-                 * @param file File.
-                 * @param opt_features Features.
-                 * @param opt_projection Projection.
-                 */
-                constructor(type: ol.interaction.DragAndDropEventType, file: File, opt_features?: ol.Feature[], opt_projection?: ol.proj.Projection);
+            constructor(type: DragAndDropEventType, file: File, opt_features?: ol.Feature[], opt_projection?: ol.proj.Projection);
 
-                /**
-                 * The features parsed from dropped data.
-                 * @api stable
-                 */
-                features: ol.Feature[];
+            /**
+             * The features parsed from dropped data.
+             * @api stable
+             */
+            features: ol.Feature[];
 
-                /**
-                 * The dropped file.
-                 * @api stable
-                 */
-                file: File;
+            /**
+             * The dropped file.
+             * @api stable
+             */
+            file: File;
 
-                /**
-                 * The feature projection.
-                 * @api
-                 */
-                projection: ol.proj.Projection;
-            }
+            /**
+             * The feature projection.
+             * @api
+             */
+            projection: ol.proj.Projection;
         }
+    }
 
-        type DragAndDropEventType = string;
+    type DragAndDropEventType = string;
 
+    /**
+     * @classdesc
+     * Allows the user to draw a vector box by clicking and dragging on the map,
+     * normally combined with an {@link ol.events.condition} that limits
+     * it to when the shift or other key is held down. This is used, for example,
+     * for zooming to a specific area of the map
+     * (see {@link ol.interaction.DragZoom} and
+     * {@link ol.interaction.DragRotateAndZoom}).
+     *
+     * This interaction is only supported for mouse devices.
+     *
+     * @fires ol.DragBoxEvent
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragBox extends Pointer {
         /**
          * @classdesc
          * Allows the user to draw a vector box by clicking and dragging on the map,
@@ -5079,33 +5099,27 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragBox extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to draw a vector box by clicking and dragging on the map,
-             * normally combined with an {@link ol.events.condition} that limits
-             * it to when the shift or other key is held down. This is used, for example,
-             * for zooming to a specific area of the map
-             * (see {@link ol.interaction.DragZoom} and
-             * {@link ol.interaction.DragRotateAndZoom}).
-             *
-             * This interaction is only supported for mouse devices.
-             *
-             * @fires ol.DragBoxEvent
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragBoxOptions);
+        constructor(opt_options?: olx.interaction.DragBoxOptions);
 
-            /**
-             * Returns geometry of last drawn box.
-             * @return Geometry.
-             * @api stable
-             */
-            getGeometry(): ol.geom.Polygon;
-        }
+        /**
+         * Returns geometry of last drawn box.
+         * @return Geometry.
+         * @api stable
+         */
+        getGeometry(): ol.geom.Polygon;
+    }
 
-        namespace DragBox {
+    namespace DragBox {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.DragBox} instances are instances of
+         * this type.
+         *
+         * @param type The event type.
+         * @param coordinate The event coordinate.
+         * @param mapBrowserEvent Originating event.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.DragBox} instances are instances of
@@ -5115,35 +5129,33 @@ declare namespace ol {
              * @param coordinate The event coordinate.
              * @param mapBrowserEvent Originating event.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.DragBox} instances are instances of
-                 * this type.
-                 *
-                 * @param type The event type.
-                 * @param coordinate The event coordinate.
-                 * @param mapBrowserEvent Originating event.
-                 */
-                constructor(type: string, coordinate: ol.Coordinate, mapBrowserEvent: ol.MapBrowserEvent);
+            constructor(type: string, coordinate: ol.Coordinate, mapBrowserEvent: ol.MapBrowserEvent);
 
-                /**
-                 * The coordinate of the drag event.
-                 * @const
-                 * @api stable
-                 */
-                coordinate: ol.Coordinate;
+            /**
+             * The coordinate of the drag event.
+             * @const
+             * @api stable
+             */
+            coordinate: ol.Coordinate;
 
-                /**
-                 * @const
-                 * @api
-                 */
-                mapBrowserEvent: ol.MapBrowserEvent;
-            }
+            /**
+             * @const
+             * @api
+             */
+            mapBrowserEvent: ol.MapBrowserEvent;
         }
+    }
 
-        type DragBoxEventType = string;
+    type DragBoxEventType = string;
 
+    /**
+     * @classdesc
+     * Allows the user to pan the map by dragging the map.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragPan extends Pointer {
         /**
          * @classdesc
          * Allows the user to pan the map by dragging the map.
@@ -5151,17 +5163,21 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragPan extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to pan the map by dragging the map.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragPanOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragPanOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to rotate the map by clicking and dragging on the map,
+     * normally combined with an {@link ol.events.condition} that limits
+     * it to when the alt and shift keys are held down.
+     *
+     * This interaction is only supported for mouse devices.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragRotate extends Pointer {
         /**
          * @classdesc
          * Allows the user to rotate the map by clicking and dragging on the map,
@@ -5173,21 +5189,23 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragRotate extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to rotate the map by clicking and dragging on the map,
-             * normally combined with an {@link ol.events.condition} that limits
-             * it to when the alt and shift keys are held down.
-             *
-             * This interaction is only supported for mouse devices.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragRotateOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragRotateOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom and rotate the map by clicking and dragging
+     * on the map.  By default, this interaction is limited to when the shift
+     * key is held down.
+     *
+     * This interaction is only supported for mouse devices.
+     *
+     * And this interaction is not included in the default interactions.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragRotateAndZoom extends Pointer {
         /**
          * @classdesc
          * Allows the user to zoom and rotate the map by clicking and dragging
@@ -5201,23 +5219,22 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragRotateAndZoom extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to zoom and rotate the map by clicking and dragging
-             * on the map.  By default, this interaction is limited to when the shift
-             * key is held down.
-             *
-             * This interaction is only supported for mouse devices.
-             *
-             * And this interaction is not included in the default interactions.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragRotateAndZoomOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragRotateAndZoomOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map by clicking and dragging on the map,
+     * normally combined with an {@link ol.events.condition} that limits
+     * it to when a key, shift by default, is held down.
+     *
+     * To change the style of the box, use CSS and the `.ol-dragzoom` selector, or
+     * your custom one configured with `className`.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragZoom extends DragBox {
         /**
          * @classdesc
          * Allows the user to zoom the map by clicking and dragging on the map,
@@ -5230,23 +5247,19 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragZoom extends ol.interaction.DragBox {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map by clicking and dragging on the map,
-             * normally combined with an {@link ol.events.condition} that limits
-             * it to when a key, shift by default, is held down.
-             *
-             * To change the style of the box, use CSS and the `.ol-dragzoom` selector, or
-             * your custom one configured with `className`.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragZoomOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragZoomOptions);
+    }
 
-        namespace Draw {
+    namespace Draw {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Draw} instances are instances of
+         * this type.
+         *
+         * @param type Type.
+         * @param feature The feature drawn.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Draw} instances are instances of
@@ -5255,27 +5268,27 @@ declare namespace ol {
              * @param type Type.
              * @param feature The feature drawn.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Draw} instances are instances of
-                 * this type.
-                 *
-                 * @param type Type.
-                 * @param feature The feature drawn.
-                 */
-                constructor(type: ol.interaction.DrawEventType, feature: ol.Feature);
+            constructor(type: DrawEventType, feature: ol.Feature);
 
-                /**
-                 * The feature being drawn.
-                 * @api stable
-                 */
-                feature: ol.Feature;
-            }
+            /**
+             * The feature being drawn.
+             * @api stable
+             */
+            feature: ol.Feature;
         }
+    }
 
-        type DrawEventType = string;
+    type DrawEventType = string;
 
+    /**
+     * @classdesc
+     * Interaction for drawing feature geometries.
+     *
+     * @fires ol.interaction.DrawEvent
+     * @param options Options.
+     * @api stable
+     */
+    class Draw extends Pointer {
         /**
          * @classdesc
          * Interaction for drawing feature geometries.
@@ -5284,90 +5297,97 @@ declare namespace ol {
          * @param options Options.
          * @api stable
          */
-        class Draw extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Interaction for drawing feature geometries.
-             *
-             * @fires ol.interaction.DrawEvent
-             * @param options Options.
-             * @api stable
-             */
-            constructor(options: olx.interaction.DrawOptions);
-
-            /**
-             * Remove last point of the feature currently being drawn.
-             * @api
-             */
-            removeLastPoint(): void;
-
-            /**
-             * Stop drawing and add the sketch feature to the target layer.
-             * The {@link ol.interaction.DrawEventType.DRAWEND} event is dispatched before
-             * inserting the feature.
-             * @api
-             */
-            finishDrawing(): void;
-
-            /**
-             * Extend an existing geometry by adding additional points. This only works
-             * on features with `LineString` geometries, where the interaction will
-             * extend lines by adding points to the end of the coordinates array.
-             * @param feature Feature to be extended.
-             * @api
-             */
-            extend(feature: ol.Feature): void;
-
-            /**
-             * Create a `geometryFunction` that will create a box-shaped polygon (aligned
-             * with the coordinate system axes).  Use this with the draw interaction and
-             * `type: 'Circle'` to return a box instead of a circle geometry.
-             * @return Function that draws a box-shaped polygon.
-             * @api
-             */
-            static createBox(): ol.DrawGeometryFunctionType;
-
-            /**
-             * Create a `geometryFunction` for `mode: 'Circle'` that will create a regular
-             * polygon with a user specified number of sides and start angle instead of an
-             * `ol.geom.Circle` geometry.
-             * @param opt_sides Number of sides of the regular polygon. Default is
-             *     32.
-             * @param opt_angle Angle of the first point in radians. 0 means East.
-             *     Default is the angle defined by the heading from the center of the
-             *     regular polygon to the current pointer position.
-             * @return Function that draws a
-             *     polygon.
-             * @api
-             */
-            static createRegularPolygon(opt_sides?: number, opt_angle?: number): ol.DrawGeometryFunctionType;
-        }
+        constructor(options: olx.interaction.DrawOptions);
 
         /**
-         * Set of interactions included in maps by default. Specific interactions can be
-         * excluded by setting the appropriate option to false in the constructor
-         * options, but the order of the interactions is fixed.  If you want to specify
-         * a different order for interactions, you will need to create your own
-         * {@link ol.interaction.Interaction} instances and insert them into a
-         * {@link ol.Collection} in the order you want before creating your
-         * {@link ol.Map} instance. The default set of interactions, in sequence, is:
-         * * {@link ol.interaction.DragRotate}
-         * * {@link ol.interaction.DoubleClickZoom}
-         * * {@link ol.interaction.DragPan}
-         * * {@link ol.interaction.PinchRotate}
-         * * {@link ol.interaction.PinchZoom}
-         * * {@link ol.interaction.KeyboardPan}
-         * * {@link ol.interaction.KeyboardZoom}
-         * * {@link ol.interaction.MouseWheelZoom}
-         * * {@link ol.interaction.DragZoom}
-         *
-         * @param opt_options Defaults options.
-         * @return A collection of
-         * interactions to be used with the ol.Map constructor's interactions option.
-         * @api stable
+         * Remove last point of the feature currently being drawn.
+         * @api
          */
-        function defaults(opt_options?: olx.interaction.DefaultsOptions): ol.Collection<ol.interaction.Interaction>;
+        removeLastPoint(): void;
 
+        /**
+         * Stop drawing and add the sketch feature to the target layer.
+         * The {@link ol.interaction.DrawEventType.DRAWEND} event is dispatched before
+         * inserting the feature.
+         * @api
+         */
+        finishDrawing(): void;
+
+        /**
+         * Extend an existing geometry by adding additional points. This only works
+         * on features with `LineString` geometries, where the interaction will
+         * extend lines by adding points to the end of the coordinates array.
+         * @param feature Feature to be extended.
+         * @api
+         */
+        extend(feature: ol.Feature): void;
+
+        /**
+         * Create a `geometryFunction` that will create a box-shaped polygon (aligned
+         * with the coordinate system axes).  Use this with the draw interaction and
+         * `type: 'Circle'` to return a box instead of a circle geometry.
+         * @return Function that draws a box-shaped polygon.
+         * @api
+         */
+        static createBox(): ol.DrawGeometryFunctionType;
+
+        /**
+         * Create a `geometryFunction` for `mode: 'Circle'` that will create a regular
+         * polygon with a user specified number of sides and start angle instead of an
+         * `ol.geom.Circle` geometry.
+         * @param opt_sides Number of sides of the regular polygon. Default is
+         *     32.
+         * @param opt_angle Angle of the first point in radians. 0 means East.
+         *     Default is the angle defined by the heading from the center of the
+         *     regular polygon to the current pointer position.
+         * @return Function that draws a
+         *     polygon.
+         * @api
+         */
+        static createRegularPolygon(opt_sides?: number, opt_angle?: number): ol.DrawGeometryFunctionType;
+    }
+
+    /**
+     * Set of interactions included in maps by default. Specific interactions can be
+     * excluded by setting the appropriate option to false in the constructor
+     * options, but the order of the interactions is fixed.  If you want to specify
+     * a different order for interactions, you will need to create your own
+     * {@link ol.interaction.Interaction} instances and insert them into a
+     * {@link ol.Collection} in the order you want before creating your
+     * {@link ol.Map} instance. The default set of interactions, in sequence, is:
+     * * {@link ol.interaction.DragRotate}
+     * * {@link ol.interaction.DoubleClickZoom}
+     * * {@link ol.interaction.DragPan}
+     * * {@link ol.interaction.PinchRotate}
+     * * {@link ol.interaction.PinchZoom}
+     * * {@link ol.interaction.KeyboardPan}
+     * * {@link ol.interaction.KeyboardZoom}
+     * * {@link ol.interaction.MouseWheelZoom}
+     * * {@link ol.interaction.DragZoom}
+     *
+     * @param opt_options Defaults options.
+     * @return A collection of
+     * interactions to be used with the ol.Map constructor's interactions option.
+     * @api stable
+     */
+    function defaults(opt_options?: olx.interaction.DefaultsOptions): ol.Collection<Interaction>;
+
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * User actions that change the state of the map. Some are similar to controls,
+     * but are not associated with a DOM element.
+     * For example, {@link ol.interaction.KeyboardZoom} is functionally the same as
+     * {@link ol.control.Zoom}, but triggered by a keyboard event not a button
+     * element event.
+     * Although interactions do not have a DOM element, some of them do render
+     * vectors and so are visible on the screen.
+     *
+     * @param options Options.
+     * @api
+     */
+    class Interaction extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -5383,48 +5403,48 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class Interaction extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * User actions that change the state of the map. Some are similar to controls,
-             * but are not associated with a DOM element.
-             * For example, {@link ol.interaction.KeyboardZoom} is functionally the same as
-             * {@link ol.control.Zoom}, but triggered by a keyboard event not a button
-             * element event.
-             * Although interactions do not have a DOM element, some of them do render
-             * vectors and so are visible on the screen.
-             *
-             * @param options Options.
-             * @api
-             */
-            constructor(options: olx.interaction.InteractionOptions);
+        constructor(options: olx.interaction.InteractionOptions);
 
-            /**
-             * Return whether the interaction is currently active.
-             * @return `true` if the interaction is active, `false` otherwise.
-             * @observable
-             * @api
-             */
-            getActive(): boolean;
+        /**
+         * Return whether the interaction is currently active.
+         * @return `true` if the interaction is active, `false` otherwise.
+         * @observable
+         * @api
+         */
+        getActive(): boolean;
 
-            /**
-             * Get the map associated with this interaction.
-             * @return Map.
-             * @api
-             */
-            getMap(): ol.Map;
+        /**
+         * Get the map associated with this interaction.
+         * @return Map.
+         * @api
+         */
+        getMap(): ol.Map;
 
-            /**
-             * Activate or deactivate the interaction.
-             * @param active Active.
-             * @observable
-             * @api
-             */
-            setActive(active: boolean): void;
-        }
+        /**
+         * Activate or deactivate the interaction.
+         * @param active Active.
+         * @observable
+         * @api
+         */
+        setActive(active: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to pan the map using keyboard arrows.
+     * Note that, although this interaction is by default included in maps,
+     * the keys can only be used when browser focus is on the element to which
+     * the keyboard events are attached. By default, this is the map div,
+     * though you can change this with the `keyboardEventTarget` in
+     * {@link ol.Map}. `document` never loses focus but, for any other element,
+     * focus will have to be on, and returned to, this element if the keys are to
+     * function.
+     * See also {@link ol.interaction.KeyboardZoom}.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class KeyboardPan extends Interaction {
         /**
          * @classdesc
          * Allows the user to pan the map using keyboard arrows.
@@ -5440,35 +5460,35 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class KeyboardPan extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to pan the map using keyboard arrows.
-             * Note that, although this interaction is by default included in maps,
-             * the keys can only be used when browser focus is on the element to which
-             * the keyboard events are attached. By default, this is the map div,
-             * though you can change this with the `keyboardEventTarget` in
-             * {@link ol.Map}. `document` never loses focus but, for any other element,
-             * focus will have to be on, and returned to, this element if the keys are to
-             * function.
-             * See also {@link ol.interaction.KeyboardZoom}.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.KeyboardPanOptions);
+        constructor(opt_options?: olx.interaction.KeyboardPanOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
-             * `KeyEvent`, and decides the direction to pan to (if an arrow key was
-             * pressed).
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
+         * `KeyEvent`, and decides the direction to pan to (if an arrow key was
+         * pressed).
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map using keyboard + and -.
+     * Note that, although this interaction is by default included in maps,
+     * the keys can only be used when browser focus is on the element to which
+     * the keyboard events are attached. By default, this is the map div,
+     * though you can change this with the `keyboardEventTarget` in
+     * {@link ol.Map}. `document` never loses focus but, for any other element,
+     * focus will have to be on, and returned to, this element if the keys are to
+     * function.
+     * See also {@link ol.interaction.KeyboardPan}.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class KeyboardZoom extends Interaction {
         /**
          * @classdesc
          * Allows the user to zoom the map using keyboard + and -.
@@ -5484,36 +5504,31 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class KeyboardZoom extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map using keyboard + and -.
-             * Note that, although this interaction is by default included in maps,
-             * the keys can only be used when browser focus is on the element to which
-             * the keyboard events are attached. By default, this is the map div,
-             * though you can change this with the `keyboardEventTarget` in
-             * {@link ol.Map}. `document` never loses focus but, for any other element,
-             * focus will have to be on, and returned to, this element if the keys are to
-             * function.
-             * See also {@link ol.interaction.KeyboardPan}.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.KeyboardZoomOptions);
+        constructor(opt_options?: olx.interaction.KeyboardZoomOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
-             * `KeyEvent`, and decides whether to zoom in or out (depending on whether the
-             * key pressed was '+' or '-').
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
+         * `KeyEvent`, and decides whether to zoom in or out (depending on whether the
+         * key pressed was '+' or '-').
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
 
-        namespace Modify {
+    namespace Modify {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Modify} instances are instances of
+         * this type.
+         *
+         * @param type Type.
+         * @param features The features modified.
+         * @param mapBrowserPointerEvent Associated
+         *     {@link ol.MapBrowserPointerEvent}.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Modify} instances are instances of
@@ -5524,33 +5539,31 @@ declare namespace ol {
              * @param mapBrowserPointerEvent Associated
              *     {@link ol.MapBrowserPointerEvent}.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Modify} instances are instances of
-                 * this type.
-                 *
-                 * @param type Type.
-                 * @param features The features modified.
-                 * @param mapBrowserPointerEvent Associated
-                 *     {@link ol.MapBrowserPointerEvent}.
-                 */
-                constructor(type: ol.ModifyEventType, features: ol.Collection<ol.Feature>, mapBrowserPointerEvent: ol.MapBrowserPointerEvent);
+            constructor(type: ol.ModifyEventType, features: ol.Collection<ol.Feature>, mapBrowserPointerEvent: ol.MapBrowserPointerEvent);
 
-                /**
-                 * The features being modified.
-                 * @api
-                 */
-                features: ol.Collection<ol.Feature>;
+            /**
+             * The features being modified.
+             * @api
+             */
+            features: ol.Collection<ol.Feature>;
 
-                /**
-                 * Associated {@link ol.MapBrowserEvent}.
-                 * @api
-                 */
-                mapBrowserEvent: ol.MapBrowserEvent;
-            }
+            /**
+             * Associated {@link ol.MapBrowserEvent}.
+             * @api
+             */
+            mapBrowserEvent: ol.MapBrowserEvent;
         }
+    }
 
+    /**
+     * @classdesc
+     * Interaction for modifying feature geometries.
+     *
+     * @param options Options.
+     * @fires ol.interaction.ModifyEvent
+     * @api
+     */
+    class Modify extends Pointer {
         /**
          * @classdesc
          * Interaction for modifying feature geometries.
@@ -5559,25 +5572,24 @@ declare namespace ol {
          * @fires ol.interaction.ModifyEvent
          * @api
          */
-        class Modify extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Interaction for modifying feature geometries.
-             *
-             * @param options Options.
-             * @fires ol.interaction.ModifyEvent
-             * @api
-             */
-            constructor(options: olx.interaction.ModifyOptions);
+        constructor(options: olx.interaction.ModifyOptions);
 
-            /**
-             * Removes the vertex currently being pointed.
-             * @return True when a vertex was removed.
-             * @api
-             */
-            removePoint(): boolean;
-        }
+        /**
+         * Removes the vertex currently being pointed.
+         * @return True when a vertex was removed.
+         * @api
+         */
+        removePoint(): boolean;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map by scrolling the mouse wheel.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class MouseWheelZoom extends Interaction {
         /**
          * @classdesc
          * Allows the user to zoom the map by scrolling the mouse wheel.
@@ -5585,34 +5597,35 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class MouseWheelZoom extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map by scrolling the mouse wheel.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.MouseWheelZoomOptions);
+        constructor(opt_options?: olx.interaction.MouseWheelZoomOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
-             * mousewheel-event) and eventually zooms the map.
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
+         * mousewheel-event) and eventually zooms the map.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
-            /**
-             * Enable or disable using the mouse's location as an anchor when zooming
-             * @param useAnchor true to zoom to the mouse's location, false
-             * to zoom to the center of the map
-             * @api
-             */
-            setMouseAnchor(useAnchor: boolean): void;
-        }
+        /**
+         * Enable or disable using the mouse's location as an anchor when zooming
+         * @param useAnchor true to zoom to the mouse's location, false
+         * to zoom to the center of the map
+         * @api
+         */
+        setMouseAnchor(useAnchor: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to rotate the map by twisting with two fingers
+     * on a touch screen.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class PinchRotate extends Pointer {
         /**
          * @classdesc
          * Allows the user to rotate the map by twisting with two fingers
@@ -5621,18 +5634,18 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class PinchRotate extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to rotate the map by twisting with two fingers
-             * on a touch screen.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.PinchRotateOptions);
-        }
+        constructor(opt_options?: olx.interaction.PinchRotateOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map by pinching with two fingers
+     * on a touch screen.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class PinchZoom extends Pointer {
         /**
          * @classdesc
          * Allows the user to zoom the map by pinching with two fingers
@@ -5641,18 +5654,23 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class PinchZoom extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map by pinching with two fingers
-             * on a touch screen.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.PinchZoomOptions);
-        }
+        constructor(opt_options?: olx.interaction.PinchZoomOptions);
+    }
 
+    /**
+     * @classdesc
+     * Base class that calls user-defined functions on `down`, `move` and `up`
+     * events. This class also manages "drag sequences".
+     *
+     * When the `handleDownEvent` user function returns `true` a drag sequence is
+     * started. During a drag sequence the `handleDragEvent` user function is
+     * called on `move` events. The drag sequence ends when the `handleUpEvent`
+     * user function is called and returns `false`.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Pointer extends Interaction {
         /**
          * @classdesc
          * Base class that calls user-defined functions on `down`, `move` and `up`
@@ -5666,34 +5684,32 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Pointer extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Base class that calls user-defined functions on `down`, `move` and `up`
-             * events. This class also manages "drag sequences".
-             *
-             * When the `handleDownEvent` user function returns `true` a drag sequence is
-             * started. During a drag sequence the `handleDragEvent` user function is
-             * called on `move` events. The drag sequence ends when the `handleUpEvent`
-             * user function is called and returns `false`.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.interaction.PointerOptions);
+        constructor(opt_options?: olx.interaction.PointerOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} and may call into
-             * other functions, if event sequences like e.g. 'drag' or 'down-up' etc. are
-             * detected.
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} and may call into
+         * other functions, if event sequences like e.g. 'drag' or 'down-up' etc. are
+         * detected.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
 
-        namespace Select {
+    namespace Select {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Select} instances are instances of
+         * this type.
+         *
+         * @param type The event type.
+         * @param selected Selected features.
+         * @param deselected Deselected features.
+         * @param mapBrowserEvent Associated
+         *     {@link ol.MapBrowserEvent}.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Select} instances are instances of
@@ -5705,40 +5721,45 @@ declare namespace ol {
              * @param mapBrowserEvent Associated
              *     {@link ol.MapBrowserEvent}.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Select} instances are instances of
-                 * this type.
-                 *
-                 * @param type The event type.
-                 * @param selected Selected features.
-                 * @param deselected Deselected features.
-                 * @param mapBrowserEvent Associated
-                 *     {@link ol.MapBrowserEvent}.
-                 */
-                constructor(type: string, selected: ol.Feature[], deselected: ol.Feature[], mapBrowserEvent: ol.MapBrowserEvent);
+            constructor(type: string, selected: ol.Feature[], deselected: ol.Feature[], mapBrowserEvent: ol.MapBrowserEvent);
 
-                /**
-                 * Selected features array.
-                 * @api
-                 */
-                selected: ol.Feature[];
+            /**
+             * Selected features array.
+             * @api
+             */
+            selected: ol.Feature[];
 
-                /**
-                 * Deselected features array.
-                 * @api
-                 */
-                deselected: ol.Feature[];
+            /**
+             * Deselected features array.
+             * @api
+             */
+            deselected: ol.Feature[];
 
-                /**
-                 * Associated {@link ol.MapBrowserEvent}.
-                 * @api
-                 */
-                mapBrowserEvent: ol.MapBrowserEvent;
-            }
+            /**
+             * Associated {@link ol.MapBrowserEvent}.
+             * @api
+             */
+            mapBrowserEvent: ol.MapBrowserEvent;
         }
+    }
 
+    /**
+     * @classdesc
+     * Interaction for selecting vector features. By default, selected features are
+     * styled differently, so this interaction can be used for visual highlighting,
+     * as well as selecting features for other actions, such as modification or
+     * output. There are three ways of controlling which features are selected:
+     * using the browser event as defined by the `condition` and optionally the
+     * `toggle`, `add`/`remove`, and `multi` options; a `layers` filter; and a
+     * further feature filter using the `filter` option.
+     *
+     * Selected features are added to an internal unmanaged layer.
+     *
+     * @param opt_options Options.
+     * @fires ol.interaction.SelectEvent
+     * @api stable
+     */
+    class Select extends Interaction {
         /**
          * @classdesc
          * Interaction for selecting vector features. By default, selected features are
@@ -5755,61 +5776,65 @@ declare namespace ol {
          * @fires ol.interaction.SelectEvent
          * @api stable
          */
-        class Select extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Interaction for selecting vector features. By default, selected features are
-             * styled differently, so this interaction can be used for visual highlighting,
-             * as well as selecting features for other actions, such as modification or
-             * output. There are three ways of controlling which features are selected:
-             * using the browser event as defined by the `condition` and optionally the
-             * `toggle`, `add`/`remove`, and `multi` options; a `layers` filter; and a
-             * further feature filter using the `filter` option.
-             *
-             * Selected features are added to an internal unmanaged layer.
-             *
-             * @param opt_options Options.
-             * @fires ol.interaction.SelectEvent
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.SelectOptions);
+        constructor(opt_options?: olx.interaction.SelectOptions);
 
-            /**
-             * Get the selected features.
-             * @return Features collection.
-             * @api stable
-             */
-            getFeatures(): ol.Collection<ol.Feature>;
+        /**
+         * Get the selected features.
+         * @return Features collection.
+         * @api stable
+         */
+        getFeatures(): ol.Collection<ol.Feature>;
 
-            /**
-             * Returns the associated {@link ol.layer.Vector vectorlayer} of
-             * the (last) selected feature. Note that this will not work with any
-             * programmatic method like pushing features to
-             * {@link ol.interaction.Select#getFeatures collection}.
-             * @param feature Feature
-             * @return Layer.
-             * @api
-             */
-            getLayer(feature: (ol.Feature | ol.render.Feature)): ol.layer.Vector;
+        /**
+         * Returns the associated {@link ol.layer.Vector vectorlayer} of
+         * the (last) selected feature. Note that this will not work with any
+         * programmatic method like pushing features to
+         * {@link ol.interaction.Select#getFeatures collection}.
+         * @param feature Feature
+         * @return Layer.
+         * @api
+         */
+        getLayer(feature: (ol.Feature | ol.render.Feature)): ol.layer.Vector;
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} and may change the
-             * selected state of features.
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} and may change the
+         * selected state of features.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
-            /**
-             * Remove the interaction from its current map, if any,  and attach it to a new
-             * map, if any. Pass `null` to just remove the interaction from the current map.
-             * @param map Map.
-             * @api stable
-             */
-            setMap(map: ol.Map): void;
-        }
+        /**
+         * Remove the interaction from its current map, if any,  and attach it to a new
+         * map, if any. Pass `null` to just remove the interaction from the current map.
+         * @param map Map.
+         * @api stable
+         */
+        setMap(map: ol.Map): void;
+    }
 
+    /**
+     * @classdesc
+     * Handles snapping of vector features while modifying or drawing them.  The
+     * features can come from a {@link ol.source.Vector} or {@link ol.Collection}
+     * Any interaction object that allows the user to interact
+     * with the features using the mouse can benefit from the snapping, as long
+     * as it is added before.
+     *
+     * The snap interaction modifies map browser event `coordinate` and `pixel`
+     * properties to force the snap to occur to any interaction that them.
+     *
+     * Example:
+     *
+     *     var snap = new ol.interaction.Snap({
+     *       source: source
+     *     });
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Snap extends Pointer {
         /**
          * @classdesc
          * Handles snapping of vector features while modifying or drawing them.  The
@@ -5830,49 +5855,38 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Snap extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Handles snapping of vector features while modifying or drawing them.  The
-             * features can come from a {@link ol.source.Vector} or {@link ol.Collection}
-             * Any interaction object that allows the user to interact
-             * with the features using the mouse can benefit from the snapping, as long
-             * as it is added before.
-             *
-             * The snap interaction modifies map browser event `coordinate` and `pixel`
-             * properties to force the snap to occur to any interaction that them.
-             *
-             * Example:
-             *
-             *     var snap = new ol.interaction.Snap({
-             *       source: source
-             *     });
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.interaction.SnapOptions);
+        constructor(opt_options?: olx.interaction.SnapOptions);
 
-            /**
-             * Add a feature to the collection of features that we may snap to.
-             * @param feature Feature.
-             * @param opt_listen Whether to listen to the geometry change or not
-             *     Defaults to `true`.
-             * @api
-             */
-            addFeature(feature: ol.Feature, opt_listen?: boolean): void;
+        /**
+         * Add a feature to the collection of features that we may snap to.
+         * @param feature Feature.
+         * @param opt_listen Whether to listen to the geometry change or not
+         *     Defaults to `true`.
+         * @api
+         */
+        addFeature(feature: ol.Feature, opt_listen?: boolean): void;
 
-            /**
-             * Remove a feature from the collection of features that we may snap to.
-             * @param feature Feature
-             * @param opt_unlisten Whether to unlisten to the geometry change
-             *     or not. Defaults to `true`.
-             * @api
-             */
-            removeFeature(feature: ol.Feature, opt_unlisten?: boolean): void;
-        }
+        /**
+         * Remove a feature from the collection of features that we may snap to.
+         * @param feature Feature
+         * @param opt_unlisten Whether to unlisten to the geometry change
+         *     or not. Defaults to `true`.
+         * @api
+         */
+        removeFeature(feature: ol.Feature, opt_unlisten?: boolean): void;
+    }
 
-        namespace Translate {
+    namespace Translate {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Translate} instances are instances of
+         * this type.
+         *
+         * @param type Type.
+         * @param features The features translated.
+         * @param coordinate The event coordinate.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Translate} instances are instances of
@@ -5882,35 +5896,34 @@ declare namespace ol {
              * @param features The features translated.
              * @param coordinate The event coordinate.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Translate} instances are instances of
-                 * this type.
-                 *
-                 * @param type Type.
-                 * @param features The features translated.
-                 * @param coordinate The event coordinate.
-                 */
-                constructor(type: ol.interaction.TranslateEventType, features: ol.Collection<ol.Feature>, coordinate: ol.Coordinate);
+            constructor(type: TranslateEventType, features: ol.Collection<ol.Feature>, coordinate: ol.Coordinate);
 
-                /**
-                 * The features being translated.
-                 * @api
-                 */
-                features: ol.Collection<ol.Feature>;
+            /**
+             * The features being translated.
+             * @api
+             */
+            features: ol.Collection<ol.Feature>;
 
-                /**
-                 * The coordinate of the drag event.
-                 * @const
-                 * @api
-                 */
-                coordinate: ol.Coordinate;
-            }
+            /**
+             * The coordinate of the drag event.
+             * @const
+             * @api
+             */
+            coordinate: ol.Coordinate;
         }
+    }
 
-        type TranslateEventType = string;
+    type TranslateEventType = string;
 
+    /**
+     * @classdesc
+     * Interaction for translating (moving) features.
+     *
+     * @fires ol.interaction.TranslateEvent
+     * @param options Options.
+     * @api
+     */
+    class Translate extends Pointer {
         /**
          * @classdesc
          * Interaction for translating (moving) features.
@@ -5919,19 +5932,23 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class Translate extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Interaction for translating (moving) features.
-             *
-             * @fires ol.interaction.TranslateEvent
-             * @param options Options.
-             * @api
-             */
-            constructor(options: olx.interaction.TranslateOptions);
-        }
+        constructor(options: olx.interaction.TranslateOptions);
     }
+}
 
+/**
+ * @classdesc
+ * Implementation of inertial deceleration for map movement.
+ *
+ * @param decay Rate of decay (must be negative).
+ * @param minVelocity Minimum velocity (pixels/millisecond).
+ * @param delay Delay to consider to calculate the kinetic
+ *     initial values (milliseconds).
+ * @struct
+ * @api
+ */
+/* tslint:disable-next-line:no-unnecessary-class */
+export class Kinetic {
     /**
      * @classdesc
      * Implementation of inertial deceleration for map movement.
@@ -5943,22 +5960,22 @@ declare namespace ol {
      * @struct
      * @api
      */
-    class Kinetic {
-        /**
-         * @classdesc
-         * Implementation of inertial deceleration for map movement.
-         *
-         * @param decay Rate of decay (must be negative).
-         * @param minVelocity Minimum velocity (pixels/millisecond).
-         * @param delay Delay to consider to calculate the kinetic
-         *     initial values (milliseconds).
-         * @struct
-         * @api
-         */
-        constructor(decay: number, minVelocity: number, delay: number);
-    }
+    constructor(decay: number, minVelocity: number, delay: number);
+}
 
-    namespace layer {
+export namespace layer {
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Note that with `ol.layer.Base` and all its subclasses, any property set in
+     * the options is set as a {@link ol.Object} property on the layer object, so
+     * is observable, and has get/set accessors.
+     *
+     * @param options Layer options.
+     * @api stable
+     */
+    class Base extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -5970,121 +5987,119 @@ declare namespace ol {
          * @param options Layer options.
          * @api stable
          */
-        class Base extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Note that with `ol.layer.Base` and all its subclasses, any property set in
-             * the options is set as a {@link ol.Object} property on the layer object, so
-             * is observable, and has get/set accessors.
-             *
-             * @param options Layer options.
-             * @api stable
-             */
-            constructor(options: olx.layer.BaseOptions);
+        constructor(options: olx.layer.BaseOptions);
 
-            /**
-             * Return the {@link ol.Extent extent} of the layer or `undefined` if it
-             * will be visible regardless of extent.
-             * @return The layer extent.
-             * @observable
-             * @api stable
-             */
-            getExtent(): (ol.Extent);
+        /**
+         * Return the {@link ol.Extent extent} of the layer or `undefined` if it
+         * will be visible regardless of extent.
+         * @return The layer extent.
+         * @observable
+         * @api stable
+         */
+        getExtent(): (ol.Extent);
 
-            /**
-             * Return the maximum resolution of the layer.
-             * @return The maximum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            getMaxResolution(): number;
+        /**
+         * Return the maximum resolution of the layer.
+         * @return The maximum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        getMaxResolution(): number;
 
-            /**
-             * Return the minimum resolution of the layer.
-             * @return The minimum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            getMinResolution(): number;
+        /**
+         * Return the minimum resolution of the layer.
+         * @return The minimum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        getMinResolution(): number;
 
-            /**
-             * Return the opacity of the layer (between 0 and 1).
-             * @return The opacity of the layer.
-             * @observable
-             * @api stable
-             */
-            getOpacity(): number;
+        /**
+         * Return the opacity of the layer (between 0 and 1).
+         * @return The opacity of the layer.
+         * @observable
+         * @api stable
+         */
+        getOpacity(): number;
 
-            /**
-             * Return the visibility of the layer (`true` or `false`).
-             * @return The visibility of the layer.
-             * @observable
-             * @api stable
-             */
-            getVisible(): boolean;
+        /**
+         * Return the visibility of the layer (`true` or `false`).
+         * @return The visibility of the layer.
+         * @observable
+         * @api stable
+         */
+        getVisible(): boolean;
 
-            /**
-             * Return the Z-index of the layer, which is used to order layers before
-             * rendering. The default Z-index is 0.
-             * @return The Z-index of the layer.
-             * @observable
-             * @api
-             */
-            getZIndex(): number;
+        /**
+         * Return the Z-index of the layer, which is used to order layers before
+         * rendering. The default Z-index is 0.
+         * @return The Z-index of the layer.
+         * @observable
+         * @api
+         */
+        getZIndex(): number;
 
-            /**
-             * Set the extent at which the layer is visible.  If `undefined`, the layer
-             * will be visible at all extents.
-             * @param extent The extent of the layer.
-             * @observable
-             * @api stable
-             */
-            setExtent(extent: (ol.Extent)): void;
+        /**
+         * Set the extent at which the layer is visible.  If `undefined`, the layer
+         * will be visible at all extents.
+         * @param extent The extent of the layer.
+         * @observable
+         * @api stable
+         */
+        setExtent(extent: (ol.Extent)): void;
 
-            /**
-             * Set the maximum resolution at which the layer is visible.
-             * @param maxResolution The maximum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            setMaxResolution(maxResolution: number): void;
+        /**
+         * Set the maximum resolution at which the layer is visible.
+         * @param maxResolution The maximum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        setMaxResolution(maxResolution: number): void;
 
-            /**
-             * Set the minimum resolution at which the layer is visible.
-             * @param minResolution The minimum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            setMinResolution(minResolution: number): void;
+        /**
+         * Set the minimum resolution at which the layer is visible.
+         * @param minResolution The minimum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        setMinResolution(minResolution: number): void;
 
-            /**
-             * Set the opacity of the layer, allowed values range from 0 to 1.
-             * @param opacity The opacity of the layer.
-             * @observable
-             * @api stable
-             */
-            setOpacity(opacity: number): void;
+        /**
+         * Set the opacity of the layer, allowed values range from 0 to 1.
+         * @param opacity The opacity of the layer.
+         * @observable
+         * @api stable
+         */
+        setOpacity(opacity: number): void;
 
-            /**
-             * Set the visibility of the layer (`true` or `false`).
-             * @param visible The visibility of the layer.
-             * @observable
-             * @api stable
-             */
-            setVisible(visible: boolean): void;
+        /**
+         * Set the visibility of the layer (`true` or `false`).
+         * @param visible The visibility of the layer.
+         * @observable
+         * @api stable
+         */
+        setVisible(visible: boolean): void;
 
-            /**
-             * Set Z-index of the layer, which is used to order layers before rendering.
-             * The default Z-index is 0.
-             * @param zindex The z-index of the layer.
-             * @observable
-             * @api
-             */
-            setZIndex(zindex: number): void;
-        }
+        /**
+         * Set Z-index of the layer, which is used to order layers before rendering.
+         * The default Z-index is 0.
+         * @param zindex The z-index of the layer.
+         * @observable
+         * @api
+         */
+        setZIndex(zindex: number): void;
+    }
 
+    /**
+     * @classdesc
+     * A {@link ol.Collection} of layers that are handled together.
+     *
+     * A generic `change` event is triggered when the group/Collection changes.
+     *
+     * @param opt_options Layer options.
+     * @api stable
+     */
+    class Group extends Base {
         /**
          * @classdesc
          * A {@link ol.Collection} of layers that are handled together.
@@ -6094,39 +6109,41 @@ declare namespace ol {
          * @param opt_options Layer options.
          * @api stable
          */
-        class Group extends ol.layer.Base {
-            /**
-             * @classdesc
-             * A {@link ol.Collection} of layers that are handled together.
-             *
-             * A generic `change` event is triggered when the group/Collection changes.
-             *
-             * @param opt_options Layer options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.GroupOptions);
+        constructor(opt_options?: olx.layer.GroupOptions);
 
-            /**
-             * Returns the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
-             * in this group.
-             * @return Collection of
-             *   {@link ol.layer.Base layers} that are part of this group.
-             * @observable
-             * @api stable
-             */
-            getLayers(): ol.Collection<ol.layer.Base>;
+        /**
+         * Returns the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
+         * in this group.
+         * @return Collection of
+         *   {@link ol.layer.Base layers} that are part of this group.
+         * @observable
+         * @api stable
+         */
+        getLayers(): ol.Collection<Base>;
 
-            /**
-             * Set the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
-             * in this group.
-             * @param layers Collection of
-             *   {@link ol.layer.Base layers} that are part of this group.
-             * @observable
-             * @api stable
-             */
-            setLayers(layers: ol.Collection<ol.layer.Base>): void;
-        }
+        /**
+         * Set the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
+         * in this group.
+         * @param layers Collection of
+         *   {@link ol.layer.Base layers} that are part of this group.
+         * @observable
+         * @api stable
+         */
+        setLayers(layers: ol.Collection<Base>): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer for rendering vector data as a heatmap.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Options.
+     * @api
+     */
+    class Heatmap extends Vector {
         /**
          * @classdesc
          * Layer for rendering vector data as a heatmap.
@@ -6138,69 +6155,70 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Heatmap extends ol.layer.Vector {
-            /**
-             * @classdesc
-             * Layer for rendering vector data as a heatmap.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @fires ol.render.Event
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.layer.HeatmapOptions);
+        constructor(opt_options?: olx.layer.HeatmapOptions);
 
-            /**
-             * Return the blur size in pixels.
-             * @return Blur size in pixels.
-             * @api
-             * @observable
-             */
-            getBlur(): number;
+        /**
+         * Return the blur size in pixels.
+         * @return Blur size in pixels.
+         * @api
+         * @observable
+         */
+        getBlur(): number;
 
-            /**
-             * Return the gradient colors as array of strings.
-             * @return Colors.
-             * @api
-             * @observable
-             */
-            getGradient(): string[];
+        /**
+         * Return the gradient colors as array of strings.
+         * @return Colors.
+         * @api
+         * @observable
+         */
+        getGradient(): string[];
 
-            /**
-             * Return the size of the radius in pixels.
-             * @return Radius size in pixel.
-             * @api
-             * @observable
-             */
-            getRadius(): number;
+        /**
+         * Return the size of the radius in pixels.
+         * @return Radius size in pixel.
+         * @api
+         * @observable
+         */
+        getRadius(): number;
 
-            /**
-             * Set the blur size in pixels.
-             * @param blur Blur size in pixels.
-             * @api
-             * @observable
-             */
-            setBlur(blur: number): void;
+        /**
+         * Set the blur size in pixels.
+         * @param blur Blur size in pixels.
+         * @api
+         * @observable
+         */
+        setBlur(blur: number): void;
 
-            /**
-             * Set the gradient colors as array of strings.
-             * @param colors Gradient.
-             * @api
-             * @observable
-             */
-            setGradient(colors: string[]): void;
+        /**
+         * Set the gradient colors as array of strings.
+         * @param colors Gradient.
+         * @api
+         * @observable
+         */
+        setGradient(colors: string[]): void;
 
-            /**
-             * Set the size of the radius in pixels.
-             * @param radius Radius size in pixel.
-             * @api
-             * @observable
-             */
-            setRadius(radius: number): void;
-        }
+        /**
+         * Set the size of the radius in pixels.
+         * @param radius Radius size in pixel.
+         * @api
+         * @observable
+         */
+        setRadius(radius: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Server-rendered images that are available for arbitrary extents and
+     * resolutions.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Layer options.
+     * @api stable
+     */
+    class Image extends Layer {
         /**
          * @classdesc
          * Server-rendered images that are available for arbitrary extents and
@@ -6213,22 +6231,29 @@ declare namespace ol {
          * @param opt_options Layer options.
          * @api stable
          */
-        class Image extends ol.layer.Layer {
-            /**
-             * @classdesc
-             * Server-rendered images that are available for arbitrary extents and
-             * resolutions.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @fires ol.render.Event
-             * @param opt_options Layer options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.ImageOptions);
-        }
+        constructor(opt_options?: olx.layer.ImageOptions);
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * A visual representation of raster or vector map data.
+     * Layers group together those properties that pertain to how the data is to be
+     * displayed, irrespective of the source of that data.
+     *
+     * Layers are usually added to a map with {@link ol.Map#addLayer}. Components
+     * like {@link ol.interaction.Select} use unmanaged layers internally. These
+     * unmanaged layers are associated with the map using
+     * {@link ol.layer.Layer#setMap} instead.
+     *
+     * A generic `change` event is fired when the state of the source changes.
+     *
+     * @fires ol.render.Event
+     * @param options Layer options.
+     * @api stable
+     */
+    class Layer extends Base {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -6248,59 +6273,52 @@ declare namespace ol {
          * @param options Layer options.
          * @api stable
          */
-        class Layer extends ol.layer.Base {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * A visual representation of raster or vector map data.
-             * Layers group together those properties that pertain to how the data is to be
-             * displayed, irrespective of the source of that data.
-             *
-             * Layers are usually added to a map with {@link ol.Map#addLayer}. Components
-             * like {@link ol.interaction.Select} use unmanaged layers internally. These
-             * unmanaged layers are associated with the map using
-             * {@link ol.layer.Layer#setMap} instead.
-             *
-             * A generic `change` event is fired when the state of the source changes.
-             *
-             * @fires ol.render.Event
-             * @param options Layer options.
-             * @api stable
-             */
-            constructor(options: olx.layer.LayerOptions);
+        constructor(options: olx.layer.LayerOptions);
 
-            /**
-             * Get the layer source.
-             * @return The layer source (or `null` if not yet set).
-             * @observable
-             * @api stable
-             */
-            getSource(): ol.source.Source;
+        /**
+         * Get the layer source.
+         * @return The layer source (or `null` if not yet set).
+         * @observable
+         * @api stable
+         */
+        getSource(): ol.source.Source;
 
-            /**
-             * Sets the layer to be rendered on top of other layers on a map. The map will
-             * not manage this layer in its layers collection, and the callback in
-             * {@link ol.Map#forEachLayerAtPixel} will receive `null` as layer. This
-             * is useful for temporary layers. To remove an unmanaged layer from the map,
-             * use `#setMap(null)`.
-             *
-             * To add the layer to a map and have it managed by the map, use
-             * {@link ol.Map#addLayer} instead.
-             * @param map Map.
-             * @api
-             */
-            setMap(map: ol.Map): void;
+        /**
+         * Sets the layer to be rendered on top of other layers on a map. The map will
+         * not manage this layer in its layers collection, and the callback in
+         * {@link ol.Map#forEachLayerAtPixel} will receive `null` as layer. This
+         * is useful for temporary layers. To remove an unmanaged layer from the map,
+         * use `#setMap(null)`.
+         *
+         * To add the layer to a map and have it managed by the map, use
+         * {@link ol.Map#addLayer} instead.
+         * @param map Map.
+         * @api
+         */
+        setMap(map: ol.Map): void;
 
-            /**
-             * Set the layer source.
-             * @param source The layer source.
-             * @observable
-             * @api stable
-             */
-            setSource(source: ol.source.Source): void;
-        }
+        /**
+         * Set the layer source.
+         * @param source The layer source.
+         * @observable
+         * @api stable
+         */
+        setSource(source: ol.source.Source): void;
+    }
 
+    /**
+     * @classdesc
+     * For layer sources that provide pre-rendered, tiled images in grids that are
+     * organized by zoom levels for specific resolutions.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Tile layer options.
+     * @api stable
+     */
+    class Tile extends Layer {
         /**
          * @classdesc
          * For layer sources that provide pre-rendered, tiled images in grids that are
@@ -6313,54 +6331,53 @@ declare namespace ol {
          * @param opt_options Tile layer options.
          * @api stable
          */
-        class Tile extends ol.layer.Layer {
-            /**
-             * @classdesc
-             * For layer sources that provide pre-rendered, tiled images in grids that are
-             * organized by zoom levels for specific resolutions.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @fires ol.render.Event
-             * @param opt_options Tile layer options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.TileOptions);
+        constructor(opt_options?: olx.layer.TileOptions);
 
-            /**
-             * Return the level as number to which we will preload tiles up to.
-             * @return The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            getPreload(): number;
+        /**
+         * Return the level as number to which we will preload tiles up to.
+         * @return The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        getPreload(): number;
 
-            /**
-             * Set the level as number to which we will preload tiles up to.
-             * @param preload The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            setPreload(preload: number): void;
+        /**
+         * Set the level as number to which we will preload tiles up to.
+         * @param preload The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        setPreload(preload: number): void;
 
-            /**
-             * Whether we use interim tiles on error.
-             * @return Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            getUseInterimTilesOnError(): boolean;
+        /**
+         * Whether we use interim tiles on error.
+         * @return Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        getUseInterimTilesOnError(): boolean;
 
-            /**
-             * Set whether we use interim tiles on error.
-             * @param useInterimTilesOnError Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
-        }
+        /**
+         * Set whether we use interim tiles on error.
+         * @param useInterimTilesOnError Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Vector data that is rendered client-side.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Options.
+     * @api stable
+     */
+    class Vector extends Layer {
         /**
          * @classdesc
          * Vector data that is rendered client-side.
@@ -6372,69 +6389,68 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class Vector extends ol.layer.Layer {
-            /**
-             * @classdesc
-             * Vector data that is rendered client-side.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @fires ol.render.Event
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.VectorOptions);
-
-            /**
-             * Return the associated {@link ol.source.Vector vectorsource} of the layer.
-             * @return Source.
-             * @api stable
-             */
-            getSource(): ol.source.Vector;
-
-            /**
-             * Get the style for features.  This returns whatever was passed to the `style`
-             * option at construction or to the `setStyle` method.
-             * @return Layer style.
-             * @api stable
-             */
-            getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
-
-            /**
-             * Get the style function.
-             * @return Layer style function.
-             * @api stable
-             */
-            getStyleFunction(): (ol.StyleFunction);
-
-            /**
-             * Set the style for features.  This can be a single style object, an array
-             * of styles, or a function that takes a feature and resolution and returns
-             * an array of styles. If it is `undefined` the default style is used. If
-             * it is `null` the layer has no style (a `null` style), so only features
-             * that have their own styles will be rendered in the layer. See
-             * {@link ol.style} for information on the default style.
-             * @param style Layer style.
-             * @api stable
-             */
-            setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
-        }
+        constructor(opt_options?: olx.layer.VectorOptions);
 
         /**
-         * Render mode for vector tiles:
-         *  * `'image'`: Vector tiles are rendered as images. Great performance, but
-         *    point symbols and texts are always rotated with the view and pixels are
-         *    scaled during zoom animations.
-         *  * `'hybrid'`: Polygon and line elements are rendered as images, so pixels
-         *    are scaled during zoom animations. Point symbols and texts are accurately
-         *    rendered as vectors and can stay upright on rotated views.
-         *  * `'vector'`: Vector tiles are rendered as vectors. Most accurate rendering
-         *    even during animations, but slower performance than the other options.
-         * @api
+         * Return the associated {@link ol.source.Vector vectorsource} of the layer.
+         * @return Source.
+         * @api stable
          */
-        type VectorTileRenderType = "image" | "hybrid" | "vector";
+        getSource(): ol.source.Vector;
 
+        /**
+         * Get the style for features.  This returns whatever was passed to the `style`
+         * option at construction or to the `setStyle` method.
+         * @return Layer style.
+         * @api stable
+         */
+        getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
+
+        /**
+         * Get the style function.
+         * @return Layer style function.
+         * @api stable
+         */
+        getStyleFunction(): (ol.StyleFunction);
+
+        /**
+         * Set the style for features.  This can be a single style object, an array
+         * of styles, or a function that takes a feature and resolution and returns
+         * an array of styles. If it is `undefined` the default style is used. If
+         * it is `null` the layer has no style (a `null` style), so only features
+         * that have their own styles will be rendered in the layer. See
+         * {@link ol.style} for information on the default style.
+         * @param style Layer style.
+         * @api stable
+         */
+        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
+    }
+
+    /**
+     * Render mode for vector tiles:
+     *  * `'image'`: Vector tiles are rendered as images. Great performance, but
+     *    point symbols and texts are always rotated with the view and pixels are
+     *    scaled during zoom animations.
+     *  * `'hybrid'`: Polygon and line elements are rendered as images, so pixels
+     *    are scaled during zoom animations. Point symbols and texts are accurately
+     *    rendered as vectors and can stay upright on rotated views.
+     *  * `'vector'`: Vector tiles are rendered as vectors. Most accurate rendering
+     *    even during animations, but slower performance than the other options.
+     * @api
+     */
+    type VectorTileRenderType = "image" | "hybrid" | "vector";
+
+    /**
+     * @classdesc
+     * Layer for vector tile data that is rendered client-side.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class VectorTile extends Vector {
         /**
          * @classdesc
          * Layer for vector tile data that is rendered client-side.
@@ -6445,85 +6461,122 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class VectorTile extends ol.layer.Vector {
-            /**
-             * @classdesc
-             * Layer for vector tile data that is rendered client-side.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.layer.VectorTileOptions);
+        constructor(opt_options?: olx.layer.VectorTileOptions);
 
-            /**
-             * Return the level as number to which we will preload tiles up to.
-             * @return The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            getPreload(): number;
+        /**
+         * Return the level as number to which we will preload tiles up to.
+         * @return The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        getPreload(): number;
 
-            /**
-             * Whether we use interim tiles on error.
-             * @return Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            getUseInterimTilesOnError(): boolean;
+        /**
+         * Whether we use interim tiles on error.
+         * @return Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        getUseInterimTilesOnError(): boolean;
 
-            /**
-             * Set the level as number to which we will preload tiles up to.
-             * @param preload The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            setPreload(preload: number): void;
+        /**
+         * Set the level as number to which we will preload tiles up to.
+         * @param preload The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        setPreload(preload: number): void;
 
-            /**
-             * Set whether we use interim tiles on error.
-             * @param useInterimTilesOnError Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
-        }
+        /**
+         * Set whether we use interim tiles on error.
+         * @param useInterimTilesOnError Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
     }
+}
+
+/**
+ * Strategies for loading vector data.
+ */
+export namespace loadingstrategy {
+    /**
+     * Strategy function for loading all features with a single request.
+     * @param extent Extent.
+     * @param resolution Resolution.
+     * @return Extents.
+     * @api
+     */
+    function all(extent: ol.Extent, resolution: number): ol.Extent[];
 
     /**
-     * Strategies for loading vector data.
+     * Strategy function for loading features based on the view's extent and
+     * resolution.
+     * @param extent Extent.
+     * @param resolution Resolution.
+     * @return Extents.
+     * @api
      */
-    namespace loadingstrategy {
-        /**
-         * Strategy function for loading all features with a single request.
-         * @param extent Extent.
-         * @param resolution Resolution.
-         * @return Extents.
-         * @api
-         */
-        function all(extent: ol.Extent, resolution: number): ol.Extent[];
+    function bbox(extent: ol.Extent, resolution: number): ol.Extent[];
 
-        /**
-         * Strategy function for loading features based on the view's extent and
-         * resolution.
-         * @param extent Extent.
-         * @param resolution Resolution.
-         * @return Extents.
-         * @api
-         */
-        function bbox(extent: ol.Extent, resolution: number): ol.Extent[];
-
-        /**
-         * Creates a strategy function for loading features based on a tile grid.
-         * @param tileGrid Tile grid.
-         * @return Loading strategy.
-         * @api
-         */
-        function tile(tileGrid: ol.tilegrid.TileGrid): ((extent: ol.Extent, i: number) => ol.Extent[]);
-    }
+    /**
+     * Creates a strategy function for loading features based on a tile grid.
+     * @param tileGrid Tile grid.
+     * @return Loading strategy.
+     * @api
+     */
+    function tile(tileGrid: ol.tilegrid.TileGrid): ((extent: ol.Extent, i: number) => ol.Extent[]);
+}
 
+/**
+ * @classdesc
+ * The map is the core component of OpenLayers. For a map to render, a view,
+ * one or more layers, and a target container are needed:
+ *
+ *     var map = new ol.Map({
+ *       view: new ol.View({
+ *         center: [0, 0],
+ *         zoom: 1
+ *       }),
+ *       layers: [
+ *         new ol.layer.Tile({
+ *           source: new ol.source.OSM()
+ *         })
+ *       ],
+ *       target: 'map'
+ *     });
+ *
+ * The above snippet creates a map using a {@link ol.layer.Tile} to display
+ * {@link ol.source.OSM} OSM data and render it to a DOM element with the
+ * id `map`.
+ *
+ * The constructor places a viewport container (with CSS class name
+ * `ol-viewport`) in the target element (see `getViewport()`), and then two
+ * further elements within the viewport: one with CSS class name
+ * `ol-overlaycontainer-stopevent` for controls and some overlays, and one with
+ * CSS class name `ol-overlaycontainer` for other overlays (see the `stopEvent`
+ * option of {@link ol.Overlay} for the difference). The map itself is placed in
+ * a further element within the viewport, either DOM or Canvas, depending on the
+ * renderer.
+ *
+ * Layers are stored as a `ol.Collection` in layerGroups. A top-level group is
+ * provided by the library. This is what is accessed by `getLayerGroup` and
+ * `setLayerGroup`. Layers entered in the options are added to this group, and
+ * `addLayer` and `removeLayer` change the layer collection in the group.
+ * `getLayers` is a convenience function for `getLayerGroup().getLayers()`.
+ * Note that `ol.layer.Group` is a subclass of `ol.layer.Base`, so layers
+ * entered in the options or added with `addLayer` can be groups, which can
+ * contain further groups, and so on.
+ *
+ * @param options Map options.
+ * @fires ol.MapBrowserEvent
+ * @fires ol.MapEvent
+ * @fires ol.render.Event#postcompose
+ * @fires ol.render.Event#precompose
+ * @api stable
+ */
+export class Map extends Object {
     /**
      * @classdesc
      * The map is the core component of OpenLayers. For a map to render, a view,
@@ -6571,383 +6624,347 @@ declare namespace ol {
      * @fires ol.render.Event#precompose
      * @api stable
      */
-    class Map extends ol.Object {
-        /**
-         * @classdesc
-         * The map is the core component of OpenLayers. For a map to render, a view,
-         * one or more layers, and a target container are needed:
-         *
-         *     var map = new ol.Map({
-         *       view: new ol.View({
-         *         center: [0, 0],
-         *         zoom: 1
-         *       }),
-         *       layers: [
-         *         new ol.layer.Tile({
-         *           source: new ol.source.OSM()
-         *         })
-         *       ],
-         *       target: 'map'
-         *     });
-         *
-         * The above snippet creates a map using a {@link ol.layer.Tile} to display
-         * {@link ol.source.OSM} OSM data and render it to a DOM element with the
-         * id `map`.
-         *
-         * The constructor places a viewport container (with CSS class name
-         * `ol-viewport`) in the target element (see `getViewport()`), and then two
-         * further elements within the viewport: one with CSS class name
-         * `ol-overlaycontainer-stopevent` for controls and some overlays, and one with
-         * CSS class name `ol-overlaycontainer` for other overlays (see the `stopEvent`
-         * option of {@link ol.Overlay} for the difference). The map itself is placed in
-         * a further element within the viewport, either DOM or Canvas, depending on the
-         * renderer.
-         *
-         * Layers are stored as a `ol.Collection` in layerGroups. A top-level group is
-         * provided by the library. This is what is accessed by `getLayerGroup` and
-         * `setLayerGroup`. Layers entered in the options are added to this group, and
-         * `addLayer` and `removeLayer` change the layer collection in the group.
-         * `getLayers` is a convenience function for `getLayerGroup().getLayers()`.
-         * Note that `ol.layer.Group` is a subclass of `ol.layer.Base`, so layers
-         * entered in the options or added with `addLayer` can be groups, which can
-         * contain further groups, and so on.
-         *
-         * @param options Map options.
-         * @fires ol.MapBrowserEvent
-         * @fires ol.MapEvent
-         * @fires ol.render.Event#postcompose
-         * @fires ol.render.Event#precompose
-         * @api stable
-         */
-        constructor(options: olx.MapOptions);
+    constructor(options: olx.MapOptions);
 
-        /**
-         * Add the given control to the map.
-         * @param control Control.
-         * @api stable
-         */
-        addControl(control: ol.control.Control): void;
+    /**
+     * Add the given control to the map.
+     * @param control Control.
+     * @api stable
+     */
+    addControl(control: ol.control.Control): void;
 
-        /**
-         * Add the given interaction to the map.
-         * @param interaction Interaction to add.
-         * @api stable
-         */
-        addInteraction(interaction: ol.interaction.Interaction): void;
+    /**
+     * Add the given interaction to the map.
+     * @param interaction Interaction to add.
+     * @api stable
+     */
+    addInteraction(interaction: ol.interaction.Interaction): void;
 
-        /**
-         * Adds the given layer to the top of this map. If you want to add a layer
-         * elsewhere in the stack, use `getLayers()` and the methods available on
-         * {@link ol.Collection}.
-         * @param layer Layer.
-         * @api stable
-         */
-        addLayer(layer: ol.layer.Base): void;
+    /**
+     * Adds the given layer to the top of this map. If you want to add a layer
+     * elsewhere in the stack, use `getLayers()` and the methods available on
+     * {@link ol.Collection}.
+     * @param layer Layer.
+     * @api stable
+     */
+    addLayer(layer: ol.layer.Base): void;
 
-        /**
-         * Add the given overlay to the map.
-         * @param overlay Overlay.
-         * @api stable
-         */
-        addOverlay(overlay: ol.Overlay): void;
+    /**
+     * Add the given overlay to the map.
+     * @param overlay Overlay.
+     * @api stable
+     */
+    addOverlay(overlay: ol.Overlay): void;
 
-        /**
-         * Detect features that intersect a pixel on the viewport, and execute a
-         * callback with each intersecting feature. Layers included in the detection can
-         * be configured through `opt_layerFilter`.
-         * @param pixel Pixel.
-         * @param callback Feature callback. The callback will be
-         *     called with two arguments. The first argument is one
-         *     {@link ol.Feature feature} or
-         *     {@link ol.render.Feature render feature} at the pixel, the second is
-         *     the {@link ol.layer.Layer layer} of the feature and will be null for
-         *     unmanaged layers. To stop detection, callback functions can return a
-         *     truthy value.
-         * @param opt_options Optional options.
-         * @return Callback result, i.e. the return value of last
-         * callback execution, or the first truthy callback return value.
-         * @template T
-         * @api stable
-         */
-        forEachFeatureAtPixel<T>(
-            pixel: ol.Pixel,
-            callback: ((feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => T),
-            opt_options?: olx.AtPixelOptions
-        ): (T);
+    /**
+     * Detect features that intersect a pixel on the viewport, and execute a
+     * callback with each intersecting feature. Layers included in the detection can
+     * be configured through `opt_layerFilter`.
+     * @param pixel Pixel.
+     * @param callback Feature callback. The callback will be
+     *     called with two arguments. The first argument is one
+     *     {@link ol.Feature feature} or
+     *     {@link ol.render.Feature render feature} at the pixel, the second is
+     *     the {@link ol.layer.Layer layer} of the feature and will be null for
+     *     unmanaged layers. To stop detection, callback functions can return a
+     *     truthy value.
+     * @param opt_options Optional options.
+     * @return Callback result, i.e. the return value of last
+     * callback execution, or the first truthy callback return value.
+     * @template T
+     * @api stable
+     */
+    forEachFeatureAtPixel<T>(
+        pixel: ol.Pixel,
+        callback: ((feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => T),
+        opt_options?: olx.AtPixelOptions
+    ): (T);
 
-        /**
-         * Get all features that intersect a pixel on the viewport.
-         * @param pixel Pixel.
-         * @param opt_options Optional options.
-         * @return The detected features or null if none were found.
-         * @api stable
-         */
-        getFeaturesAtPixel(
-            pixel: ol.Pixel,
-            opt_options?: olx.AtPixelOptions
-        ): (Array<ol.Feature | ol.render.Feature> | null);
+    /**
+     * Get all features that intersect a pixel on the viewport.
+     * @param pixel Pixel.
+     * @param opt_options Optional options.
+     * @return The detected features or null if none were found.
+     * @api stable
+     */
+    getFeaturesAtPixel(
+        pixel: ol.Pixel,
+        opt_options?: olx.AtPixelOptions
+    ): (Array<ol.Feature | ol.render.Feature> | null);
 
-        /**
-         * Detect layers that have a color value at a pixel on the viewport, and
-         * execute a callback with each matching layer. Layers included in the
-         * detection can be configured through `opt_layerFilter`.
-         * @param pixel Pixel.
-         * @param callback Layer
-         *     callback. This callback will recieve two arguments: first is the
-         *     {@link ol.layer.Layer layer}, second argument is {@link ol.Color}
-         *     and will be null for layer types that do not currently support this
-         *     argument. To stop detection callback functions can return a truthy value.
-         * @param opt_this Value to use as `this` when executing `callback`.
-         * @param opt_layerFilter Layer
-         *     filter function. The filter function will receive one argument, the
-         *     {@link ol.layer.Layer layer-candidate} and it should return a boolean
-         *     value. Only layers which are visible and for which this function returns
-         *     `true` will be tested for features. By default, all visible layers will
-         *     be tested.
-         * @param opt_this2 Value to use as `this` when executing `layerFilter`.
-         * @return Callback result, i.e. the return value of last
-         * callback execution, or the first truthy callback return value.
-         * @template S,T,U
-         * @api stable
-         */
-        forEachLayerAtPixel<S, T, U>(pixel: ol.Pixel,
-                                     callback: ((layer: ol.layer.Layer, color: ol.Color) => T),
-                                     opt_this?: S,
-                                     opt_layerFilter?: ((layer: ol.layer.Layer) => boolean),
-                                     opt_this2?: U): (T);
+    /**
+     * Detect layers that have a color value at a pixel on the viewport, and
+     * execute a callback with each matching layer. Layers included in the
+     * detection can be configured through `opt_layerFilter`.
+     * @param pixel Pixel.
+     * @param callback Layer
+     *     callback. This callback will recieve two arguments: first is the
+     *     {@link ol.layer.Layer layer}, second argument is {@link ol.Color}
+     *     and will be null for layer types that do not currently support this
+     *     argument. To stop detection callback functions can return a truthy value.
+     * @param opt_this Value to use as `this` when executing `callback`.
+     * @param opt_layerFilter Layer
+     *     filter function. The filter function will receive one argument, the
+     *     {@link ol.layer.Layer layer-candidate} and it should return a boolean
+     *     value. Only layers which are visible and for which this function returns
+     *     `true` will be tested for features. By default, all visible layers will
+     *     be tested.
+     * @param opt_this2 Value to use as `this` when executing `layerFilter`.
+     * @return Callback result, i.e. the return value of last
+     * callback execution, or the first truthy callback return value.
+     * @template S,T,U
+     * @api stable
+     */
+    forEachLayerAtPixel<T>(pixel: ol.Pixel,
+                           callback: (layer: ol.layer.Layer, color: ol.Color) => T,
+                           opt_this?: any,
+                           opt_layerFilter?: (layer: ol.layer.Layer) => boolean,
+                           opt_this2?: any): (T);
 
-        /**
-         * Detect if features intersect a pixel on the viewport. Layers included in the
-         * detection can be configured through `opt_layerFilter`.
-         * @param pixel Pixel.
-         * @param opt_options Optional options.
-         * @return Is there a feature at the given pixel?
-         * @api
-         */
-        hasFeatureAtPixel(
-            pixel: ol.Pixel,
-            opt_options?: olx.AtPixelOptions
-        ): boolean;
+    /**
+     * Detect if features intersect a pixel on the viewport. Layers included in the
+     * detection can be configured through `opt_layerFilter`.
+     * @param pixel Pixel.
+     * @param opt_options Optional options.
+     * @return Is there a feature at the given pixel?
+     * @api
+     */
+    hasFeatureAtPixel(
+        pixel: ol.Pixel,
+        opt_options?: olx.AtPixelOptions
+    ): boolean;
 
-        /**
-         * Returns the geographical coordinate for a browser event.
-         * @param event Event.
-         * @return Coordinate.
-         * @api stable
-         */
-        getEventCoordinate(event: Event): ol.Coordinate;
+    /**
+     * Returns the geographical coordinate for a browser event.
+     * @param event Event.
+     * @return Coordinate.
+     * @api stable
+     */
+    getEventCoordinate(event: Event): ol.Coordinate;
 
-        /**
-         * Returns the map pixel position for a browser event relative to the viewport.
-         * @param event Event.
-         * @return Pixel.
-         * @api stable
-         */
-        getEventPixel(event: Event): ol.Pixel;
+    /**
+     * Returns the map pixel position for a browser event relative to the viewport.
+     * @param event Event.
+     * @return Pixel.
+     * @api stable
+     */
+    getEventPixel(event: Event): ol.Pixel;
 
-        /**
-         * Get the target in which this map is rendered.
-         * Note that this returns what is entered as an option or in setTarget:
-         * if that was an element, it returns an element; if a string, it returns that.
-         * @return The Element or id of the Element that the
-         *     map is rendered in.
-         * @observable
-         * @api stable
-         */
-        getTarget(): (Element | string);
+    /**
+     * Get the target in which this map is rendered.
+     * Note that this returns what is entered as an option or in setTarget:
+     * if that was an element, it returns an element; if a string, it returns that.
+     * @return The Element or id of the Element that the
+     *     map is rendered in.
+     * @observable
+     * @api stable
+     */
+    getTarget(): (Element | string);
 
-        /**
-         * Get the DOM element into which this map is rendered. In contrast to
-         * `getTarget` this method always return an `Element`, or `null` if the
-         * map has no target.
-         * @return The element that the map is rendered in.
-         * @api
-         */
-        getTargetElement(): Element;
+    /**
+     * Get the DOM element into which this map is rendered. In contrast to
+     * `getTarget` this method always return an `Element`, or `null` if the
+     * map has no target.
+     * @return The element that the map is rendered in.
+     * @api
+     */
+    getTargetElement(): Element;
 
-        /**
-         * Get the coordinate for a given pixel.  This returns a coordinate in the
-         * map view projection.
-         * @param pixel Pixel position in the map viewport.
-         * @return The coordinate for the pixel position.
-         * @api stable
-         */
-        getCoordinateFromPixel(pixel: ol.Pixel): ol.Coordinate;
+    /**
+     * Get the coordinate for a given pixel.  This returns a coordinate in the
+     * map view projection.
+     * @param pixel Pixel position in the map viewport.
+     * @return The coordinate for the pixel position.
+     * @api stable
+     */
+    getCoordinateFromPixel(pixel: ol.Pixel): ol.Coordinate;
 
-        /**
-         * Get the map controls. Modifying this collection changes the controls
-         * associated with the map.
-         * @return Controls.
-         * @api stable
-         */
-        getControls(): ol.Collection<ol.control.Control>;
+    /**
+     * Get the map controls. Modifying this collection changes the controls
+     * associated with the map.
+     * @return Controls.
+     * @api stable
+     */
+    getControls(): ol.Collection<ol.control.Control>;
 
-        /**
-         * Get the map overlays. Modifying this collection changes the overlays
-         * associated with the map.
-         * @return Overlays.
-         * @api stable
-         */
-        getOverlays(): ol.Collection<ol.Overlay>;
+    /**
+     * Get the map overlays. Modifying this collection changes the overlays
+     * associated with the map.
+     * @return Overlays.
+     * @api stable
+     */
+    getOverlays(): ol.Collection<ol.Overlay>;
 
-        /**
-         * Get an overlay by its identifier (the value returned by overlay.getId()).
-         * Note that the index treats string and numeric identifiers as the same. So
-         * `map.getOverlayById(2)` will return an overlay with id `'2'` or `2`.
-         * @param id Overlay identifier.
-         * @return Overlay.
-         * @api
-         */
-        getOverlayById(id: (string | number)): ol.Overlay;
+    /**
+     * Get an overlay by its identifier (the value returned by overlay.getId()).
+     * Note that the index treats string and numeric identifiers as the same. So
+     * `map.getOverlayById(2)` will return an overlay with id `'2'` or `2`.
+     * @param id Overlay identifier.
+     * @return Overlay.
+     * @api
+     */
+    getOverlayById(id: (string | number)): ol.Overlay;
 
-        /**
-         * Get the map interactions. Modifying this collection changes the interactions
-         * associated with the map.
-         *
-         * Interactions are used for e.g. pan, zoom and rotate.
-         * @return Interactions.
-         * @api stable
-         */
-        getInteractions(): ol.Collection<ol.interaction.Interaction>;
+    /**
+     * Get the map interactions. Modifying this collection changes the interactions
+     * associated with the map.
+     *
+     * Interactions are used for e.g. pan, zoom and rotate.
+     * @return Interactions.
+     * @api stable
+     */
+    getInteractions(): ol.Collection<ol.interaction.Interaction>;
 
-        /**
-         * Get the layergroup associated with this map.
-         * @return A layer group containing the layers in this map.
-         * @observable
-         * @api stable
-         */
-        getLayerGroup(): ol.layer.Group;
+    /**
+     * Get the layergroup associated with this map.
+     * @return A layer group containing the layers in this map.
+     * @observable
+     * @api stable
+     */
+    getLayerGroup(): ol.layer.Group;
 
-        /**
-         * Get the collection of layers associated with this map.
-         * @return Layers.
-         * @api stable
-         */
-        getLayers(): ol.Collection<ol.layer.Base>;
+    /**
+     * Get the collection of layers associated with this map.
+     * @return Layers.
+     * @api stable
+     */
+    getLayers(): ol.Collection<ol.layer.Base>;
 
-        /**
-         * Get the pixel for a coordinate.  This takes a coordinate in the map view
-         * projection and returns the corresponding pixel.
-         * @param coordinate A map coordinate.
-         * @return A pixel position in the map viewport.
-         * @api stable
-         */
-        getPixelFromCoordinate(coordinate: ol.Coordinate): ol.Pixel;
+    /**
+     * Get the pixel for a coordinate.  This takes a coordinate in the map view
+     * projection and returns the corresponding pixel.
+     * @param coordinate A map coordinate.
+     * @return A pixel position in the map viewport.
+     * @api stable
+     */
+    getPixelFromCoordinate(coordinate: ol.Coordinate): ol.Pixel;
 
-        /**
-         * Get the size of this map.
-         * @return The size in pixels of the map in the DOM.
-         * @observable
-         * @api stable
-         */
-        getSize(): (ol.Size);
+    /**
+     * Get the size of this map.
+     * @return The size in pixels of the map in the DOM.
+     * @observable
+     * @api stable
+     */
+    getSize(): (ol.Size);
 
-        /**
-         * Get the view associated with this map. A view manages properties such as
-         * center and resolution.
-         * @return The view that controls this map.
-         * @observable
-         * @api stable
-         */
-        getView(): ol.View;
+    /**
+     * Get the view associated with this map. A view manages properties such as
+     * center and resolution.
+     * @return The view that controls this map.
+     * @observable
+     * @api stable
+     */
+    getView(): ol.View;
 
-        /**
-         * Get the element that serves as the map viewport.
-         * @return Viewport.
-         * @api stable
-         */
-        getViewport(): Element;
+    /**
+     * Get the element that serves as the map viewport.
+     * @return Viewport.
+     * @api stable
+     */
+    getViewport(): Element;
 
-        /**
-         * Requests an immediate render in a synchronous manner.
-         * @api stable
-         */
-        renderSync(): void;
+    /**
+     * Requests an immediate render in a synchronous manner.
+     * @api stable
+     */
+    renderSync(): void;
 
-        /**
-         * Request a map rendering (at the next animation frame).
-         * @api stable
-         */
-        render(): void;
+    /**
+     * Request a map rendering (at the next animation frame).
+     * @api stable
+     */
+    render(): void;
 
-        /**
-         * Remove the given control from the map.
-         * @param control Control.
-         * @return The removed control (or undefined
-         *     if the control was not found).
-         * @api stable
-         */
-        removeControl(control: ol.control.Control): (ol.control.Control);
+    /**
+     * Remove the given control from the map.
+     * @param control Control.
+     * @return The removed control (or undefined
+     *     if the control was not found).
+     * @api stable
+     */
+    removeControl(control: ol.control.Control): (ol.control.Control);
 
-        /**
-         * Remove the given interaction from the map.
-         * @param interaction Interaction to remove.
-         * @return The removed interaction (or
-         *     undefined if the interaction was not found).
-         * @api stable
-         */
-        removeInteraction(interaction: ol.interaction.Interaction): (ol.interaction.Interaction);
+    /**
+     * Remove the given interaction from the map.
+     * @param interaction Interaction to remove.
+     * @return The removed interaction (or
+     *     undefined if the interaction was not found).
+     * @api stable
+     */
+    removeInteraction(interaction: ol.interaction.Interaction): (ol.interaction.Interaction);
 
-        /**
-         * Removes the given layer from the map.
-         * @param layer Layer.
-         * @return The removed layer (or undefined if the
-         *     layer was not found).
-         * @api stable
-         */
-        removeLayer(layer: ol.layer.Base): (ol.layer.Base);
+    /**
+     * Removes the given layer from the map.
+     * @param layer Layer.
+     * @return The removed layer (or undefined if the
+     *     layer was not found).
+     * @api stable
+     */
+    removeLayer(layer: ol.layer.Base): (ol.layer.Base);
 
-        /**
-         * Remove the given overlay from the map.
-         * @param overlay Overlay.
-         * @return The removed overlay (or undefined
-         *     if the overlay was not found).
-         * @api stable
-         */
-        removeOverlay(overlay: ol.Overlay): (ol.Overlay);
+    /**
+     * Remove the given overlay from the map.
+     * @param overlay Overlay.
+     * @return The removed overlay (or undefined
+     *     if the overlay was not found).
+     * @api stable
+     */
+    removeOverlay(overlay: ol.Overlay): (ol.Overlay);
 
-        /**
-         * Sets the layergroup of this map.
-         * @param layerGroup A layer group containing the layers in
-         *     this map.
-         * @observable
-         * @api stable
-         */
-        setLayerGroup(layerGroup: ol.layer.Group): void;
+    /**
+     * Sets the layergroup of this map.
+     * @param layerGroup A layer group containing the layers in
+     *     this map.
+     * @observable
+     * @api stable
+     */
+    setLayerGroup(layerGroup: ol.layer.Group): void;
 
-        /**
-         * Set the size of this map.
-         * @param size The size in pixels of the map in the DOM.
-         * @observable
-         * @api
-         */
-        setSize(size: (ol.Size)): void;
+    /**
+     * Set the size of this map.
+     * @param size The size in pixels of the map in the DOM.
+     * @observable
+     * @api
+     */
+    setSize(size: (ol.Size)): void;
 
-        /**
-         * Set the target element to render this map into.
-         * @param target The Element or id of the Element
-         *     that the map is rendered in.
-         * @observable
-         * @api stable
-         */
-        setTarget(target: (Element | string)): void;
+    /**
+     * Set the target element to render this map into.
+     * @param target The Element or id of the Element
+     *     that the map is rendered in.
+     * @observable
+     * @api stable
+     */
+    setTarget(target: (Element | string)): void;
 
-        /**
-         * Set the view for this map.
-         * @param view The view that controls this map.
-         * @observable
-         * @api stable
-         */
-        setView(view: ol.View): void;
+    /**
+     * Set the view for this map.
+     * @param view The view that controls this map.
+     * @observable
+     * @api stable
+     */
+    setView(view: ol.View): void;
 
-        /**
-         * Force a recalculation of the map viewport size.  This should be called when
-         * third-party code changes the size of the map viewport.
-         * @api stable
-         */
-        updateSize(): void;
-    }
+    /**
+     * Force a recalculation of the map viewport size.  This should be called when
+     * third-party code changes the size of the map viewport.
+     * @api stable
+     */
+    updateSize(): void;
+}
 
+/**
+ * @classdesc
+ * Events emitted as map browser events are instances of this type.
+ * See {@link ol.Map} for which events trigger a map browser event.
+ *
+ * @param type Event type.
+ * @param map Map.
+ * @param browserEvent Browser event.
+ * @param opt_dragging Is the map currently being dragged?
+ * @param opt_frameState Frame state.
+ */
+export class MapBrowserEvent extends MapEvent {
     /**
      * @classdesc
      * Events emitted as map browser events are instances of this type.
@@ -6959,72 +6976,70 @@ declare namespace ol {
      * @param opt_dragging Is the map currently being dragged?
      * @param opt_frameState Frame state.
      */
-    class MapBrowserEvent extends ol.MapEvent {
-        /**
-         * @classdesc
-         * Events emitted as map browser events are instances of this type.
-         * See {@link ol.Map} for which events trigger a map browser event.
-         *
-         * @param type Event type.
-         * @param map Map.
-         * @param browserEvent Browser event.
-         * @param opt_dragging Is the map currently being dragged?
-         * @param opt_frameState Frame state.
-         */
-        constructor(type: string, map: ol.Map, browserEvent: Event, opt_dragging?: boolean, opt_frameState?: olx.FrameState);
-
-        /**
-         * The original browser event.
-         * @const
-         * @api stable
-         */
-        originalEvent: Event;
-
-        /**
-         * The pixel of the original browser event.
-         * @api stable
-         */
-        pixel: ol.Pixel;
-
-        /**
-         * The coordinate of the original browser event.
-         * @api stable
-         */
-        coordinate: ol.Coordinate;
-
-        /**
-         * Indicates if the map is currently being dragged. Only set for
-         * `POINTERDRAG` and `POINTERMOVE` events. Default is `false`.
-         *
-         * @api stable
-         */
-        dragging: boolean;
-    }
+    constructor(type: string, map: ol.Map, browserEvent: Event, opt_dragging?: boolean, opt_frameState?: olx.FrameState);
 
     /**
-     * @param type Event type.
-     * @param map Map.
-     * @param pointerEvent Pointer event.
-     * @param opt_dragging Is the map currently being dragged?
-     * @param opt_frameState Frame state.
+     * The original browser event.
+     * @const
+     * @api stable
      */
-    class MapBrowserPointerEvent extends ol.MapBrowserEvent {
-        // /**
-        //  * @param type Event type.
-        //  * @param map Map.
-        //  * @param pointerEvent Pointer event.
-        //  * @param opt_dragging Is the map currently being dragged?
-        //  * @param opt_frameState Frame state.
-        //  */
-        // constructor (type: string,
-        //           map: ol.Map,
-        //           pointerEvent: ol.pointer.PointerEvent,
-        //           opt_dragging?: boolean,
-        //           opt_frameState?: olx.FrameState)
+    originalEvent: Event;
 
-        pointerEvent: ol.pointer.PointerEvent;
-    }
+    /**
+     * The pixel of the original browser event.
+     * @api stable
+     */
+    pixel: ol.Pixel;
 
+    /**
+     * The coordinate of the original browser event.
+     * @api stable
+     */
+    coordinate: ol.Coordinate;
+
+    /**
+     * Indicates if the map is currently being dragged. Only set for
+     * `POINTERDRAG` and `POINTERMOVE` events. Default is `false`.
+     *
+     * @api stable
+     */
+    dragging: boolean;
+}
+
+/**
+ * @param type Event type.
+ * @param map Map.
+ * @param pointerEvent Pointer event.
+ * @param opt_dragging Is the map currently being dragged?
+ * @param opt_frameState Frame state.
+ */
+export class MapBrowserPointerEvent extends MapBrowserEvent {
+    // /**
+    //  * @param type Event type.
+    //  * @param map Map.
+    //  * @param pointerEvent Pointer event.
+    //  * @param opt_dragging Is the map currently being dragged?
+    //  * @param opt_frameState Frame state.
+    //  */
+    // constructor (type: string,
+    //           map: ol.Map,
+    //           pointerEvent: ol.pointer.PointerEvent,
+    //           opt_dragging?: boolean,
+    //           opt_frameState?: olx.FrameState)
+
+    pointerEvent: ol.pointer.PointerEvent;
+}
+
+/**
+ * @classdesc
+ * Events emitted as map events are instances of this type.
+ * See {@link ol.Map} for which events trigger a map event.
+ *
+ * @param type Event type.
+ * @param map Map.
+ * @param opt_frameState Frame state.
+ */
+export class MapEvent extends events.Event {
     /**
      * @classdesc
      * Events emitted as map events are instances of this type.
@@ -7034,31 +7049,30 @@ declare namespace ol {
      * @param map Map.
      * @param opt_frameState Frame state.
      */
-    class MapEvent extends ol.events.Event {
-        /**
-         * @classdesc
-         * Events emitted as map events are instances of this type.
-         * See {@link ol.Map} for which events trigger a map event.
-         *
-         * @param type Event type.
-         * @param map Map.
-         * @param opt_frameState Frame state.
-         */
-        constructor(type: string, map: ol.Map, opt_frameState?: olx.FrameState);
+    constructor(type: string, map: ol.Map, opt_frameState?: olx.FrameState);
 
-        /**
-         * The map where the event occurred.
-         * @api stable
-         */
-        map: ol.Map;
+    /**
+     * The map where the event occurred.
+     * @api stable
+     */
+    map: ol.Map;
 
-        /**
-         * The frame state at the time of the event.
-         * @api
-         */
-        frameState: olx.FrameState;
-    }
+    /**
+     * The frame state at the time of the event.
+     * @api
+     */
+    frameState: olx.FrameState;
+}
 
+/**
+ * @classdesc
+ * Events emitted by {@link ol.Object} instances are instances of this type.
+ *
+ * @param type The event type.
+ * @param key The property name.
+ * @param oldValue The old value for `key`.
+ */
+export class ObjectEvent extends events.Event {
     /**
      * @classdesc
      * Events emitted by {@link ol.Object} instances are instances of this type.
@@ -7067,31 +7081,66 @@ declare namespace ol {
      * @param key The property name.
      * @param oldValue The old value for `key`.
      */
-    class ObjectEvent extends ol.events.Event {
-        /**
-         * @classdesc
-         * Events emitted by {@link ol.Object} instances are instances of this type.
-         *
-         * @param type The event type.
-         * @param key The property name.
-         * @param oldValue The old value for `key`.
-         */
-        constructor(type: string, key: string, oldValue: any);
+    constructor(type: string, key: string, oldValue: any);
 
-        /**
-         * The name of the property whose value is changing.
-         * @api stable
-         */
-        key: string;
+    /**
+     * The name of the property whose value is changing.
+     * @api stable
+     */
+    key: string;
 
-        /**
-         * The old value. To get the new value use `e.target.get(e.key)` where
-         * `e` is the event object.
-         * @api stable
-         */
-        oldValue: any;
-    }
+    /**
+     * The old value. To get the new value use `e.target.get(e.key)` where
+     * `e` is the event object.
+     * @api stable
+     */
+    oldValue: any;
+}
 
+/**
+ * @classdesc
+ * Abstract base class; normally only used for creating subclasses and not
+ * instantiated in apps.
+ * Most non-trivial classes inherit from this.
+ *
+ * This extends {@link ol.Observable} with observable properties, where each
+ * property is observable as well as the object as a whole.
+ *
+ * Classes that inherit from this have pre-defined properties, to which you can
+ * add your owns. The pre-defined properties are listed in this documentation as
+ * 'Observable Properties', and have their own accessors; for example,
+ * {@link ol.Map} has a `target` property, accessed with `getTarget()`  and
+ * changed with `setTarget()`. Not all properties are however settable. There
+ * are also general-purpose accessors `get()` and `set()`. For example,
+ * `get('target')` is equivalent to `getTarget()`.
+ *
+ * The `set` accessors trigger a change event, and you can monitor this by
+ * registering a listener. For example, {@link ol.View} has a `center`
+ * property, so `view.on('change:center', function(evt) {...});` would call the
+ * function whenever the value of the center property changes. Within the
+ * function, `evt.target` would be the view, so `evt.target.getCenter()` would
+ * return the new center.
+ *
+ * You can add your own observable properties with
+ * `object.set('prop', 'value')`, and retrieve that with `object.get('prop')`.
+ * You can listen for changes on that property value with
+ * `object.on('change:prop', listener)`. You can get a list of all
+ * properties with {@link ol.Object#getProperties object.getProperties()}.
+ *
+ * Note that the observable properties are separate from standard JS properties.
+ * You can, for example, give your map object a title with
+ * `map.title='New title'` and with `map.set('title', 'Another title')`. The
+ * first will be a `hasOwnProperty`; the second will appear in
+ * `getProperties()`. Only the second is observable.
+ *
+ * Properties can be deleted by using the unset method. E.g.
+ * object.unset('foo').
+ *
+ * @param opt_values An object with key-value pairs.
+ * @fires ol.ObjectEvent
+ * @api
+ */
+export class Object extends Observable {
     /**
      * @classdesc
      * Abstract base class; normally only used for creating subclasses and not
@@ -7135,101 +7184,70 @@ declare namespace ol {
      * @fires ol.ObjectEvent
      * @api
      */
-    class Object extends ol.Observable {
-        /**
-         * @classdesc
-         * Abstract base class; normally only used for creating subclasses and not
-         * instantiated in apps.
-         * Most non-trivial classes inherit from this.
-         *
-         * This extends {@link ol.Observable} with observable properties, where each
-         * property is observable as well as the object as a whole.
-         *
-         * Classes that inherit from this have pre-defined properties, to which you can
-         * add your owns. The pre-defined properties are listed in this documentation as
-         * 'Observable Properties', and have their own accessors; for example,
-         * {@link ol.Map} has a `target` property, accessed with `getTarget()`  and
-         * changed with `setTarget()`. Not all properties are however settable. There
-         * are also general-purpose accessors `get()` and `set()`. For example,
-         * `get('target')` is equivalent to `getTarget()`.
-         *
-         * The `set` accessors trigger a change event, and you can monitor this by
-         * registering a listener. For example, {@link ol.View} has a `center`
-         * property, so `view.on('change:center', function(evt) {...});` would call the
-         * function whenever the value of the center property changes. Within the
-         * function, `evt.target` would be the view, so `evt.target.getCenter()` would
-         * return the new center.
-         *
-         * You can add your own observable properties with
-         * `object.set('prop', 'value')`, and retrieve that with `object.get('prop')`.
-         * You can listen for changes on that property value with
-         * `object.on('change:prop', listener)`. You can get a list of all
-         * properties with {@link ol.Object#getProperties object.getProperties()}.
-         *
-         * Note that the observable properties are separate from standard JS properties.
-         * You can, for example, give your map object a title with
-         * `map.title='New title'` and with `map.set('title', 'Another title')`. The
-         * first will be a `hasOwnProperty`; the second will appear in
-         * `getProperties()`. Only the second is observable.
-         *
-         * Properties can be deleted by using the unset method. E.g.
-         * object.unset('foo').
-         *
-         * @param opt_values An object with key-value pairs.
-         * @fires ol.ObjectEvent
-         * @api
-         */
-        constructor(opt_values?: { [k: string]: any });
+    constructor(opt_values?: { [k: string]: any });
 
-        /**
-         * Gets a value.
-         * @param key Key name.
-         * @return Value.
-         * @api stable
-         */
-        get(key: string): any;
+    /**
+     * Gets a value.
+     * @param key Key name.
+     * @return Value.
+     * @api stable
+     */
+    get(key: string): any;
 
-        /**
-         * Get a list of object property names.
-         * @return List of property names.
-         * @api stable
-         */
-        getKeys(): string[];
+    /**
+     * Get a list of object property names.
+     * @return List of property names.
+     * @api stable
+     */
+    getKeys(): string[];
 
-        /**
-         * Get an object of all property names and values.
-         * @return Object.
-         * @api stable
-         */
-        getProperties(): { [k: string]: any };
+    /**
+     * Get an object of all property names and values.
+     * @return Object.
+     * @api stable
+     */
+    getProperties(): { [k: string]: any };
 
-        /**
-         * Sets a value.
-         * @param key Key name.
-         * @param value Value.
-         * @param opt_silent Update without triggering an event.
-         * @api stable
-         */
-        set(key: string, value: any, opt_silent?: boolean): void;
+    /**
+     * Sets a value.
+     * @param key Key name.
+     * @param value Value.
+     * @param opt_silent Update without triggering an event.
+     * @api stable
+     */
+    set(key: string, value: any, opt_silent?: boolean): void;
 
-        /**
-         * Sets a collection of key-value pairs.  Note that this changes any existing
-         * properties and adds new ones (it does not remove any existing properties).
-         * @param values Values.
-         * @param opt_silent Update without triggering an event.
-         * @api stable
-         */
-        setProperties(values: { [k: string]: any }, opt_silent?: boolean): void;
+    /**
+     * Sets a collection of key-value pairs.  Note that this changes any existing
+     * properties and adds new ones (it does not remove any existing properties).
+     * @param values Values.
+     * @param opt_silent Update without triggering an event.
+     * @api stable
+     */
+    setProperties(values: { [k: string]: any }, opt_silent?: boolean): void;
 
-        /**
-         * Unsets a property.
-         * @param key Key name.
-         * @param opt_silent Unset without triggering an event.
-         * @api stable
-         */
-        unset(key: string, opt_silent?: boolean): void;
-    }
+    /**
+     * Unsets a property.
+     * @param key Key name.
+     * @param opt_silent Unset without triggering an event.
+     * @api stable
+     */
+    unset(key: string, opt_silent?: boolean): void;
+}
 
+/**
+ * @classdesc
+ * Abstract base class; normally only used for creating subclasses and not
+ * instantiated in apps.
+ * An event target providing convenient methods for listener registration
+ * and unregistration. A generic `change` event is always available through
+ * {@link ol.Observable#changed}.
+ *
+ * @fires ol.events.Event
+ * @struct
+ * @api stable
+ */
+export class Observable extends events.EventTarget {
     /**
      * @classdesc
      * Abstract base class; normally only used for creating subclasses and not
@@ -7242,95 +7260,102 @@ declare namespace ol {
      * @struct
      * @api stable
      */
-    class Observable extends ol.events.EventTarget {
-        /**
-         * @classdesc
-         * Abstract base class; normally only used for creating subclasses and not
-         * instantiated in apps.
-         * An event target providing convenient methods for listener registration
-         * and unregistration. A generic `change` event is always available through
-         * {@link ol.Observable#changed}.
-         *
-         * @fires ol.events.Event
-         * @struct
-         * @api stable
-         */
-        constructor();
-
-        /**
-         * Removes an event listener using the key returned by `on()` or `once()`.
-         * @param key The key returned by `on()`
-         *     or `once()` (or an array of keys).
-         * @api stable
-         */
-        static unByKey(key: (ol.EventsKey | ol.EventsKey[])): void;
-
-        /**
-         * Increases the revision counter and dispatches a 'change' event.
-         * @api
-         */
-        changed(): void;
-
-        /**
-         * Dispatches an event and calls all listeners listening for events
-         * of this type. The event parameter can either be a string or an
-         * Object with a `type` property.
-         *
-         * @param event Event object.
-         * @api
-         */
-        dispatchEvent(event: (GlobalObject | ol.events.Event | string)): void;
-
-        /**
-         * Get the version number for this object.  Each time the object is modified,
-         * its version number will be incremented.
-         * @return Revision.
-         * @api
-         */
-        getRevision(): number;
-
-        /**
-         * Listen for a certain type of event.
-         * @param type The event type or array of event types.
-         * @param listener The listener function.
-         * @param opt_this The object to use as `this` in `listener`.
-         * @return Unique key for the listener. If
-         *     called with an array of event types as the first argument, the return
-         *     will be an array of keys.
-         * @api stable
-         */
-        on(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
-
-        /**
-         * Listen once for a certain type of event.
-         * @param type The event type or array of event types.
-         * @param listener The listener function.
-         * @param opt_this The object to use as `this` in `listener`.
-         * @return Unique key for the listener. If
-         *     called with an array of event types as the first argument, the return
-         *     will be an array of keys.
-         * @api stable
-         */
-        once(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
-
-        /**
-         * Unlisten for a certain type of event.
-         * @param type The event type or array of event types.
-         * @param listener The listener function.
-         * @param opt_this The object which was used as `this` by the
-         * `listener`.
-         * @api stable
-         */
-        un(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): void;
-    }
+    constructor();
 
     /**
-     * Overlay position: `'bottom-left'`, `'bottom-center'`,  `'bottom-right'`,
-     * `'center-left'`, `'center-center'`, `'center-right'`, `'top-left'`,
-     * `'top-center'`, `'top-right'`
+     * Removes an event listener using the key returned by `on()` or `once()`.
+     * @param key The key returned by `on()`
+     *     or `once()` (or an array of keys).
+     * @api stable
      */
-    type OverlayPositioning = "bottom-left" | "bottom-center" | "bottom-right" | "center-left" | "center-center" | "center-right" | "top-left" | "top-center" | "top-right";
+    static unByKey(key: (ol.EventsKey | ol.EventsKey[])): void;
 
+    /**
+     * Increases the revision counter and dispatches a 'change' event.
+     * @api
+     */
+    changed(): void;
+
+    /**
+     * Dispatches an event and calls all listeners listening for events
+     * of this type. The event parameter can either be a string or an
+     * Object with a `type` property.
+     *
+     * @param event Event object.
+     * @api
+     */
+    dispatchEvent(event: (GlobalObject| ol.events.Event | string)): void;
+
+    /**
+     * Get the version number for this object.  Each time the object is modified,
+     * its version number will be incremented.
+     * @return Revision.
+     * @api
+     */
+    getRevision(): number;
+
+    /**
+     * Listen for a certain type of event.
+     * @param type The event type or array of event types.
+     * @param listener The listener function.
+     * @param opt_this The object to use as `this` in `listener`.
+     * @return Unique key for the listener. If
+     *     called with an array of event types as the first argument, the return
+     *     will be an array of keys.
+     * @api stable
+     */
+    on(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
+
+    /**
+     * Listen once for a certain type of event.
+     * @param type The event type or array of event types.
+     * @param listener The listener function.
+     * @param opt_this The object to use as `this` in `listener`.
+     * @return Unique key for the listener. If
+     *     called with an array of event types as the first argument, the return
+     *     will be an array of keys.
+     * @api stable
+     */
+    once(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
+
+    /**
+     * Unlisten for a certain type of event.
+     * @param type The event type or array of event types.
+     * @param listener The listener function.
+     * @param opt_this The object which was used as `this` by the
+     * `listener`.
+     * @api stable
+     */
+    un(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): void;
+}
+
+/**
+ * Overlay position: `'bottom-left'`, `'bottom-center'`,  `'bottom-right'`,
+ * `'center-left'`, `'center-center'`, `'center-right'`, `'top-left'`,
+ * `'top-center'`, `'top-right'`
+ */
+export type OverlayPositioning = "bottom-left" | "bottom-center" | "bottom-right" | "center-left" | "center-center" | "center-right" | "top-left" | "top-center" | "top-right";
+
+/**
+ * @classdesc
+ * An element to be displayed over the map and attached to a single map
+ * location.  Like {@link ol.control.Control}, Overlays are visible widgets.
+ * Unlike Controls, they are not in a fixed position on the screen, but are tied
+ * to a geographical coordinate, so panning the map will move an Overlay but not
+ * a Control.
+ *
+ * Example:
+ *
+ *     var popup = new ol.Overlay({
+ *       element: document.getElementById('popup')
+ *     });
+ *     popup.setPosition(coordinate);
+ *     map.addOverlay(popup);
+ *
+ * @param options Overlay options.
+ * @api stable
+ */
+export class Overlay extends Object {
     /**
      * @classdesc
      * An element to be displayed over the map and attached to a single map
@@ -7350,205 +7375,215 @@ declare namespace ol {
      * @param options Overlay options.
      * @api stable
      */
-    class Overlay extends ol.Object {
-        /**
-         * @classdesc
-         * An element to be displayed over the map and attached to a single map
-         * location.  Like {@link ol.control.Control}, Overlays are visible widgets.
-         * Unlike Controls, they are not in a fixed position on the screen, but are tied
-         * to a geographical coordinate, so panning the map will move an Overlay but not
-         * a Control.
-         *
-         * Example:
-         *
-         *     var popup = new ol.Overlay({
-         *       element: document.getElementById('popup')
-         *     });
-         *     popup.setPosition(coordinate);
-         *     map.addOverlay(popup);
-         *
-         * @param options Overlay options.
-         * @api stable
-         */
-        constructor(options: olx.OverlayOptions);
-
-        /**
-         * Get the DOM element of this overlay.
-         * @return The Element containing the overlay.
-         * @observable
-         * @api stable
-         */
-        getElement(): (Element);
-
-        /**
-         * Get the overlay identifier which is set on constructor.
-         * @return Id.
-         * @api
-         */
-        getId(): (number | string);
-
-        /**
-         * Get the map associated with this overlay.
-         * @return The map that the overlay is part of.
-         * @observable
-         * @api stable
-         */
-        getMap(): (ol.Map);
-
-        /**
-         * Get the offset of this overlay.
-         * @return The offset.
-         * @observable
-         * @api stable
-         */
-        getOffset(): number[];
-
-        /**
-         * Get the current position of this overlay.
-         * @return The spatial point that the overlay is
-         *     anchored at.
-         * @observable
-         * @api stable
-         */
-        getPosition(): (ol.Coordinate);
-
-        /**
-         * Get the current positioning of this overlay.
-         * @return How the overlay is positioned
-         *     relative to its point on the map.
-         * @observable
-         * @api stable
-         */
-        getPositioning(): ol.OverlayPositioning;
-
-        /**
-         * Set the DOM element to be associated with this overlay.
-         * @param element The Element containing the overlay.
-         * @observable
-         * @api stable
-         */
-        setElement(element: (Element)): void;
-
-        /**
-         * Set the map to be associated with this overlay.
-         * @param map The map that the overlay is part of.
-         * @observable
-         * @api stable
-         */
-        setMap(map: (ol.Map)): void;
-
-        /**
-         * Set the offset for this overlay.
-         * @param offset Offset.
-         * @observable
-         * @api stable
-         */
-        setOffset(offset: number[]): void;
-
-        /**
-         * Set the position for this overlay. If the position is `undefined` the
-         * overlay is hidden.
-         * @param position The spatial point that the overlay
-         *     is anchored at.
-         * @observable
-         * @api stable
-         */
-        setPosition(position: (ol.Coordinate | undefined)): void;
-
-        /**
-         * Set the positioning for this overlay.
-         * @param positioning how the overlay is
-         *     positioned relative to its point on the map.
-         * @observable
-         * @api stable
-         */
-        setPositioning(positioning: ol.OverlayPositioning): void;
-    }
-
-    namespace pointer {
-        /**
-         * @classdesc
-         * A class for pointer events.
-         *
-         * This class is used as an abstraction for mouse events,
-         * touch events and even native pointer events.
-         *
-         * @param type The type of the event to create.
-         * @param originalEvent The event.
-         * @param opt_eventDict An optional dictionary of
-         *    initial event properties.
-         */
-        class PointerEvent {
-        }
-    }
+    constructor(options: olx.OverlayOptions);
 
     /**
-     * The ol.proj namespace stores:
-     * * a list of {@link ol.proj.Projection}
-     * objects, one for each projection supported by the application
-     * * a list of transform functions needed to convert coordinates in one projection
-     * into another.
-     *
-     * The static functions are the methods used to maintain these.
-     * Each transform function can handle not only simple coordinate pairs, but also
-     * large arrays of coordinates such as vector geometries.
-     *
-     * When loaded, the library adds projection objects for EPSG:4326 (WGS84
-     * geographic coordinates) and EPSG:3857 (Web or Spherical Mercator, as used
-     * for example by Bing Maps or OpenStreetMap), together with the relevant
-     * transform functions.
-     *
-     * Additional transforms may be added by using the {@link http://proj4js.org/}
-     * library (version 2.2 or later). You can use the full build supplied by
-     * Proj4js, or create a custom build to support those projections you need; see
-     * the Proj4js website for how to do this. You also need the Proj4js definitions
-     * for the required projections. These definitions can be obtained from
-     * {@link http://epsg.io/}, and are a JS function, so can be loaded in a script
-     * tag (as in the examples) or pasted into your application.
-     * The first time there is a request for a projection, either with a
-     * {@link ol.proj.projectionLike} or directly with {@link ol.proj.get}, the
-     * code will check if the Proj4js library and the necessary definition are
-     * loaded; if so, it will register the appropriate {@link ol.proj.Projection}
-     * object and add transform functions between the new projection and all the
-     * existing ones. See examples/wms-image-custom-proj for an example of this.
-     * Because the check for presence of the Proj4js library and the definition only
-     * takes place on the first request for them, this means they can be loaded
-     * dynamically as needed; for example, with user-supplied data where you don't
-     * know in advance what projections are needed, you can initially load minimal
-     * support and then load whichever are requested.
-     *
-     * Note that Proj4js does not support projection extents. If you want to add
-     * one for creating default tile grids, you can add it after the Projection
-     * object has been created with `setExtent`, for example,
-     * `ol.proj.get('EPSG:1234').setExtent(extent)`.
-     *
-     * In addition to Proj4js support, any transform functions can be added with
-     * {@link ol.proj.addCoordinateTransforms}. To use this, you must first create
-     * a {@link ol.proj.Projection} object for the new projection and add it with
-     * {@link ol.proj.addProjection}. You can then add the forward and inverse
-     * functions with {@link ol.proj.addCoordinateTransforms}. See
-     * examples/wms-custom-proj for an example of this.
-     *
-     * Note that if no transforms are needed and you only need to define the
-     * projection, just add a {@link ol.proj.Projection} with
-     * {@link ol.proj.addProjection}. See examples/wms-no-proj for an example of
-     * this.
-     *
+     * Get the DOM element of this overlay.
+     * @return The Element containing the overlay.
+     * @observable
+     * @api stable
      */
-    namespace proj {
-        /**
-         * Projection units: `'degrees'`, `'ft'`, `'m'`, `'pixels'`, `'tile-pixels'` or
-         * `'us-ft'`.
-         */
-        type Units = "degress" | "ft" | "m" | "pixels" | "tile-pixels" | "us-ft";
+    getElement(): (Element);
 
-        /**
-         * Meters per unit lookup table.
-         * @const
-         * @api stable
-         */
-        const METERS_PER_UNIT: { [k: string]: number };
+    /**
+     * Get the overlay identifier which is set on constructor.
+     * @return Id.
+     * @api
+     */
+    getId(): (number | string);
 
+    /**
+     * Get the map associated with this overlay.
+     * @return The map that the overlay is part of.
+     * @observable
+     * @api stable
+     */
+    getMap(): (ol.Map);
+
+    /**
+     * Get the offset of this overlay.
+     * @return The offset.
+     * @observable
+     * @api stable
+     */
+    getOffset(): number[];
+
+    /**
+     * Get the current position of this overlay.
+     * @return The spatial point that the overlay is
+     *     anchored at.
+     * @observable
+     * @api stable
+     */
+    getPosition(): (ol.Coordinate);
+
+    /**
+     * Get the current positioning of this overlay.
+     * @return How the overlay is positioned
+     *     relative to its point on the map.
+     * @observable
+     * @api stable
+     */
+    getPositioning(): ol.OverlayPositioning;
+
+    /**
+     * Set the DOM element to be associated with this overlay.
+     * @param element The Element containing the overlay.
+     * @observable
+     * @api stable
+     */
+    setElement(element: (Element)): void;
+
+    /**
+     * Set the map to be associated with this overlay.
+     * @param map The map that the overlay is part of.
+     * @observable
+     * @api stable
+     */
+    setMap(map: (ol.Map)): void;
+
+    /**
+     * Set the offset for this overlay.
+     * @param offset Offset.
+     * @observable
+     * @api stable
+     */
+    setOffset(offset: number[]): void;
+
+    /**
+     * Set the position for this overlay. If the position is `undefined` the
+     * overlay is hidden.
+     * @param position The spatial point that the overlay
+     *     is anchored at.
+     * @observable
+     * @api stable
+     */
+    setPosition(position: (ol.Coordinate | undefined)): void;
+
+    /**
+     * Set the positioning for this overlay.
+     * @param positioning how the overlay is
+     *     positioned relative to its point on the map.
+     * @observable
+     * @api stable
+     */
+    setPositioning(positioning: ol.OverlayPositioning): void;
+}
+
+export namespace pointer {
+    /**
+     * @classdesc
+     * A class for pointer events.
+     *
+     * This class is used as an abstraction for mouse events,
+     * touch events and even native pointer events.
+     *
+     * @param type The type of the event to create.
+     * @param originalEvent The event.
+     * @param opt_eventDict An optional dictionary of
+     *    initial event properties.
+     */
+    class PointerEvent {
+    }
+}
+
+/**
+ * The ol.proj namespace stores:
+ * * a list of {@link ol.proj.Projection}
+ * objects, one for each projection supported by the application
+ * * a list of transform functions needed to convert coordinates in one projection
+ * into another.
+ *
+ * The static functions are the methods used to maintain these.
+ * Each transform function can handle not only simple coordinate pairs, but also
+ * large arrays of coordinates such as vector geometries.
+ *
+ * When loaded, the library adds projection objects for EPSG:4326 (WGS84
+ * geographic coordinates) and EPSG:3857 (Web or Spherical Mercator, as used
+ * for example by Bing Maps or OpenStreetMap), together with the relevant
+ * transform functions.
+ *
+ * Additional transforms may be added by using the {@link http://proj4js.org/}
+ * library (version 2.2 or later). You can use the full build supplied by
+ * Proj4js, or create a custom build to support those projections you need; see
+ * the Proj4js website for how to do this. You also need the Proj4js definitions
+ * for the required projections. These definitions can be obtained from
+ * {@link http://epsg.io/}, and are a JS function, so can be loaded in a script
+ * tag (as in the examples) or pasted into your application.
+ * The first time there is a request for a projection, either with a
+ * {@link ol.proj.projectionLike} or directly with {@link ol.proj.get}, the
+ * code will check if the Proj4js library and the necessary definition are
+ * loaded; if so, it will register the appropriate {@link ol.proj.Projection}
+ * object and add transform functions between the new projection and all the
+ * existing ones. See examples/wms-image-custom-proj for an example of this.
+ * Because the check for presence of the Proj4js library and the definition only
+ * takes place on the first request for them, this means they can be loaded
+ * dynamically as needed; for example, with user-supplied data where you don't
+ * know in advance what projections are needed, you can initially load minimal
+ * support and then load whichever are requested.
+ *
+ * Note that Proj4js does not support projection extents. If you want to add
+ * one for creating default tile grids, you can add it after the Projection
+ * object has been created with `setExtent`, for example,
+ * `ol.proj.get('EPSG:1234').setExtent(extent)`.
+ *
+ * In addition to Proj4js support, any transform functions can be added with
+ * {@link ol.proj.addCoordinateTransforms}. To use this, you must first create
+ * a {@link ol.proj.Projection} object for the new projection and add it with
+ * {@link ol.proj.addProjection}. You can then add the forward and inverse
+ * functions with {@link ol.proj.addCoordinateTransforms}. See
+ * examples/wms-custom-proj for an example of this.
+ *
+ * Note that if no transforms are needed and you only need to define the
+ * projection, just add a {@link ol.proj.Projection} with
+ * {@link ol.proj.addProjection}. See examples/wms-no-proj for an example of
+ * this.
+ *
+ */
+export namespace proj {
+    /**
+     * Projection units: `'degrees'`, `'ft'`, `'m'`, `'pixels'`, `'tile-pixels'` or
+     * `'us-ft'`.
+     */
+    type Units = "degrees" | "ft" | "m" | "pixels" | "tile-pixels" | "us-ft";
+
+    /**
+     * Meters per unit lookup table.
+     * @const
+     * @api stable
+     */
+    const METERS_PER_UNIT: { [k: string]: number };
+
+    /**
+     * @classdesc
+     * Projection definition class. One of these is created for each projection
+     * supported in the application and stored in the {@link ol.proj} namespace.
+     * You can use these in applications, but this is not required, as API params
+     * and options use {@link ol.ProjectionLike} which means the simple string
+     * code will suffice.
+     *
+     * You can use {@link ol.proj.get} to retrieve the object for a particular
+     * projection.
+     *
+     * The library includes definitions for `EPSG:4326` and `EPSG:3857`, together
+     * with the following aliases:
+     * * `EPSG:4326`: CRS:84, urn:ogc:def:crs:EPSG:6.6:4326,
+     *     urn:ogc:def:crs:OGC:1.3:CRS84, urn:ogc:def:crs:OGC:2:84,
+     *     http://www.opengis.net/gml/srs/epsg.xml#4326,
+     *     urn:x-ogc:def:crs:EPSG:4326
+     * * `EPSG:3857`: EPSG:102100, EPSG:102113, EPSG:900913,
+     *     urn:ogc:def:crs:EPSG:6.18:3:3857,
+     *     http://www.opengis.net/gml/srs/epsg.xml#3857
+     *
+     * If you use proj4js, aliases can be added using `proj4.defs()`; see
+     * [documentation](https://github.com/proj4js/proj4js). To set an alternative
+     * namespace for proj4, use {@link ol.proj.setProj4}.
+     *
+     * @param options Projection options.
+     * @struct
+     * @api stable
+     */
+    class Projection {
         /**
          * @classdesc
          * Projection definition class. One of these is created for each projection
@@ -7578,289 +7613,276 @@ declare namespace ol {
          * @struct
          * @api stable
          */
-        class Projection {
-            /**
-             * @classdesc
-             * Projection definition class. One of these is created for each projection
-             * supported in the application and stored in the {@link ol.proj} namespace.
-             * You can use these in applications, but this is not required, as API params
-             * and options use {@link ol.ProjectionLike} which means the simple string
-             * code will suffice.
-             *
-             * You can use {@link ol.proj.get} to retrieve the object for a particular
-             * projection.
-             *
-             * The library includes definitions for `EPSG:4326` and `EPSG:3857`, together
-             * with the following aliases:
-             * * `EPSG:4326`: CRS:84, urn:ogc:def:crs:EPSG:6.6:4326,
-             *     urn:ogc:def:crs:OGC:1.3:CRS84, urn:ogc:def:crs:OGC:2:84,
-             *     http://www.opengis.net/gml/srs/epsg.xml#4326,
-             *     urn:x-ogc:def:crs:EPSG:4326
-             * * `EPSG:3857`: EPSG:102100, EPSG:102113, EPSG:900913,
-             *     urn:ogc:def:crs:EPSG:6.18:3:3857,
-             *     http://www.opengis.net/gml/srs/epsg.xml#3857
-             *
-             * If you use proj4js, aliases can be added using `proj4.defs()`; see
-             * [documentation](https://github.com/proj4js/proj4js). To set an alternative
-             * namespace for proj4, use {@link ol.proj.setProj4}.
-             *
-             * @param options Projection options.
-             * @struct
-             * @api stable
-             */
-            constructor(options: olx.ProjectionOptions);
-
-            /**
-             * Get the code for this projection, e.g. 'EPSG:4326'.
-             * @return Code.
-             * @api stable
-             */
-            getCode(): string;
-
-            /**
-             * Get the validity extent for this projection.
-             * @return Extent.
-             * @api stable
-             */
-            getExtent(): ol.Extent;
-
-            /**
-             * Get the units of this projection.
-             * @return Units.
-             * @api stable
-             */
-            getUnits(): ol.proj.Units;
-
-            /**
-             * Get the amount of meters per unit of this projection.  If the projection is
-             * not configured with `metersPerUnit` or a units identifier, the return is
-             * `undefined`.
-             * @return Meters.
-             * @api stable
-             */
-            getMetersPerUnit(): (number);
-
-            /**
-             * Get the world extent for this projection.
-             * @return Extent.
-             * @api
-             */
-            getWorldExtent(): ol.Extent;
-
-            /**
-             * Is this projection a global projection which spans the whole world?
-             * @return Whether the projection is global.
-             * @api stable
-             */
-            isGlobal(): boolean;
-
-            /**
-             * Set if the projection is a global projection which spans the whole world
-             * @param global Whether the projection is global.
-             * @api stable
-             */
-            setGlobal(global: boolean): void;
-
-            /**
-             * Set the validity extent for this projection.
-             * @param extent Extent.
-             * @api stable
-             */
-            setExtent(extent: ol.Extent): void;
-
-            /**
-             * Set the world extent for this projection.
-             * @param worldExtent World extent
-             *     [minlon, minlat, maxlon, maxlat].
-             * @api
-             */
-            setWorldExtent(worldExtent: ol.Extent): void;
-
-            /**
-             * Set the getPointResolution function for this projection.
-             * @param func Function
-             * @api
-             */
-            setGetPointResolution(func: ((resolution: number, coords: ol.Coordinate) => number)): void;
-
-            /**
-             * Get the resolution of the point in degrees or distance units.
-             * For projections with degrees as the unit this will simply return the
-             * provided resolution. The default for other projections is to estimate
-             * the point resolution by transforming the 'point' pixel to EPSG:4326,
-             * measuring its width and height on the normal sphere,
-             * and taking the average of the width and height.
-             * An alternative implementation may be given when constructing a
-             * projection. For many local projections,
-             * such a custom function will return the resolution unchanged.
-             * @param resolution Resolution in projection units.
-             * @param point Point.
-             * @return Point resolution in projection units.
-             * @api
-             */
-            getPointResolution(resolution: number, point: ol.Coordinate): number;
-        }
+        constructor(options: olx.ProjectionOptions);
 
         /**
-         * Register proj4. If not explicitly registered, it will be assumed that
-         * proj4js will be loaded in the global namespace. For example in a
-         * browserify ES6 environment you could use:
-         *
-         *     import ol from 'openlayers';
-         *     import proj4 from 'proj4';
-         *     ol.proj.setProj4(proj4);
-         *
-         * @param proj4 Proj4.
+         * Get the code for this projection, e.g. 'EPSG:4326'.
+         * @return Code.
+         * @api stable
+         */
+        getCode(): string;
+
+        /**
+         * Get the validity extent for this projection.
+         * @return Extent.
+         * @api stable
+         */
+        getExtent(): ol.Extent;
+
+        /**
+         * Get the units of this projection.
+         * @return Units.
+         * @api stable
+         */
+        getUnits(): Units;
+
+        /**
+         * Get the amount of meters per unit of this projection.  If the projection is
+         * not configured with `metersPerUnit` or a units identifier, the return is
+         * `undefined`.
+         * @return Meters.
+         * @api stable
+         */
+        getMetersPerUnit(): (number);
+
+        /**
+         * Get the world extent for this projection.
+         * @return Extent.
          * @api
          */
-        function setProj4(proj4: any): void;
+        getWorldExtent(): ol.Extent;
 
         /**
-         * Registers transformation functions that don't alter coordinates. Those allow
-         * to transform between projections with equal meaning.
-         *
-         * @param projections Projections.
+         * Is this projection a global projection which spans the whole world?
+         * @return Whether the projection is global.
+         * @api stable
+         */
+        isGlobal(): boolean;
+
+        /**
+         * Set if the projection is a global projection which spans the whole world
+         * @param global Whether the projection is global.
+         * @api stable
+         */
+        setGlobal(global: boolean): void;
+
+        /**
+         * Set the validity extent for this projection.
+         * @param extent Extent.
+         * @api stable
+         */
+        setExtent(extent: ol.Extent): void;
+
+        /**
+         * Set the world extent for this projection.
+         * @param worldExtent World extent
+         *     [minlon, minlat, maxlon, maxlat].
          * @api
          */
-        function addEquivalentProjections(projections: ol.proj.Projection[]): void;
+        setWorldExtent(worldExtent: ol.Extent): void;
 
         /**
-         * Add a Projection object to the list of supported projections that can be
-         * looked up by their code.
-         *
-         * @param projection Projection instance.
-         * @api stable
-         */
-        function addProjection(projection: ol.proj.Projection): void;
-
-        /**
-         * Registers coordinate transform functions to convert coordinates between the
-         * source projection and the destination projection.
-         * The forward and inverse functions convert coordinate pairs; this function
-         * converts these into the functions used internally which also handle
-         * extents and coordinate arrays.
-         *
-         * @param source Source projection.
-         * @param destination Destination projection.
-         * @param forward The forward transform
-         *     function (that is, from the source projection to the destination
-         *     projection) that takes a {@link ol.Coordinate} as argument and returns
-         *     the transformed {@link ol.Coordinate}.
-         * @param inverse The inverse transform
-         *     function (that is, from the destination projection to the source
-         *     projection) that takes a {@link ol.Coordinate} as argument and returns
-         *     the transformed {@link ol.Coordinate}.
-         * @api stable
-         */
-        function addCoordinateTransforms(source: ol.ProjectionLike,
-                                         destination: ol.ProjectionLike,
-                                         forward: ((coords: ol.Coordinate) => ol.Coordinate),
-                                         inverse: ((coords: ol.Coordinate) => ol.Coordinate)): void;
-
-        /**
-         * Transforms a coordinate from longitude/latitude to a different projection.
-         * @param coordinate Coordinate as longitude and latitude, i.e.
-         *     an array with longitude as 1st and latitude as 2nd element.
-         * @param opt_projection Target projection. The
-         *     default is Web Mercator, i.e. 'EPSG:3857'.
-         * @return Coordinate projected to the target projection.
-         * @api stable
-         */
-        function fromLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
-
-        /**
-         * Transforms a coordinate to longitude/latitude.
-         * @param coordinate Projected coordinate.
-         * @param opt_projection Projection of the coordinate.
-         *     The default is Web Mercator, i.e. 'EPSG:3857'.
-         * @return Coordinate as longitude and latitude, i.e. an array
-         *     with longitude as 1st and latitude as 2nd element.
-         * @api stable
-         */
-        function toLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
-
-        /**
-         * Fetches a Projection object for the code specified.
-         *
-         * @param projectionLike Either a code string which is
-         *     a combination of authority and identifier such as "EPSG:4326", or an
-         *     existing projection object, or undefined.
-         * @return Projection object, or null if not in list.
-         * @api stable
-         */
-        function get(projectionLike: ol.ProjectionLike): ol.proj.Projection;
-
-        /**
-         * Checks if two projections are the same, that is every coordinate in one
-         * projection does represent the same geographic point as the same coordinate in
-         * the other projection.
-         *
-         * @param projection1 Projection 1.
-         * @param projection2 Projection 2.
-         * @return Equivalent.
+         * Set the getPointResolution function for this projection.
+         * @param func Function
          * @api
          */
-        function equivalent(projection1: ol.proj.Projection, projection2: ol.proj.Projection): boolean;
+        setGetPointResolution(func: ((resolution: number, coords: ol.Coordinate) => number)): void;
 
         /**
-         * Given the projection-like objects, searches for a transformation
-         * function to convert a coordinates array from the source projection to the
-         * destination projection.
-         *
-         * @param source Source.
-         * @param destination Destination.
-         * @return Transform function.
-         * @api stable
+         * Get the resolution of the point in degrees or distance units.
+         * For projections with degrees as the unit this will simply return the
+         * provided resolution. The default for other projections is to estimate
+         * the point resolution by transforming the 'point' pixel to EPSG:4326,
+         * measuring its width and height on the normal sphere,
+         * and taking the average of the width and height.
+         * An alternative implementation may be given when constructing a
+         * projection. For many local projections,
+         * such a custom function will return the resolution unchanged.
+         * @param resolution Resolution in projection units.
+         * @param point Point.
+         * @return Point resolution in projection units.
+         * @api
          */
-        function getTransform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.TransformFunction;
-
-        /**
-         * Transforms a coordinate from source projection to destination projection.
-         * This returns a new coordinate (and does not modify the original).
-         *
-         * See {@link ol.proj.transformExtent} for extent transformation.
-         * See the transform method of {@link ol.geom.Geometry} and its subclasses for
-         * geometry transforms.
-         *
-         * @param coordinate Coordinate.
-         * @param source Source projection-like.
-         * @param destination Destination projection-like.
-         */
-        function transform(coordinate: ol.Coordinate, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Coordinate;
-
-        /**
-         * Transforms an extent from source projection to destination projection.  This
-         * returns a new extent (and does not modify the original).
-         *
-         * @param extent The extent to transform.
-         * @param source Source projection-like.
-         * @param destination Destination projection-like.
-         * @return The transformed extent.
-         * @api stable
-         */
-        function transformExtent(extent: ol.Extent, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Extent;
-
-        /**
-         * Get the resolution of the point in degrees or distance units. For
-         * projections with degrees as the unit this will simply return the
-         * provided resolution. For other projections the point resolution is
-         * estimated by transforming the 'point' pixel to EPSG:4326, measuring
-         * its width and height on the normal sphere, and taking the average of
-         * the width and height.
-         * @param projection The projection.
-         * @param resolution Nominal resolution in projection units.
-         * @param point Point to find adjusted resolution at.
-         * @return Point to find adjusted resolution at.
-         */
-        function getPointResolution(
-            projection: ol.proj.Projection,
-            resolution: number,
-            point: ol.Coordinate
-        ): number;
+        getPointResolution(resolution: number, point: ol.Coordinate): number;
     }
 
-    namespace render {
-        namespace canvas {
+    /**
+     * Register proj4. If not explicitly registered, it will be assumed that
+     * proj4js will be loaded in the global namespace. For example in a
+     * browserify ES6 environment you could use:
+     *
+     *     import ol from 'openlayers';
+     *     import proj4 from 'proj4';
+     *     ol.proj.setProj4(proj4);
+     *
+     * @param proj4 Proj4.
+     * @api
+     */
+    function setProj4(proj4: any): void;
+
+    /**
+     * Registers transformation functions that don't alter coordinates. Those allow
+     * to transform between projections with equal meaning.
+     *
+     * @param projections Projections.
+     * @api
+     */
+    function addEquivalentProjections(projections: Projection[]): void;
+
+    /**
+     * Add a Projection object to the list of supported projections that can be
+     * looked up by their code.
+     *
+     * @param projection Projection instance.
+     * @api stable
+     */
+    function addProjection(projection: Projection): void;
+
+    /**
+     * Registers coordinate transform functions to convert coordinates between the
+     * source projection and the destination projection.
+     * The forward and inverse functions convert coordinate pairs; this function
+     * converts these into the functions used internally which also handle
+     * extents and coordinate arrays.
+     *
+     * @param source Source projection.
+     * @param destination Destination projection.
+     * @param forward The forward transform
+     *     function (that is, from the source projection to the destination
+     *     projection) that takes a {@link ol.Coordinate} as argument and returns
+     *     the transformed {@link ol.Coordinate}.
+     * @param inverse The inverse transform
+     *     function (that is, from the destination projection to the source
+     *     projection) that takes a {@link ol.Coordinate} as argument and returns
+     *     the transformed {@link ol.Coordinate}.
+     * @api stable
+     */
+    function addCoordinateTransforms(source: ol.ProjectionLike,
+                                        destination: ol.ProjectionLike,
+                                        forward: ((coords: ol.Coordinate) => ol.Coordinate),
+                                        inverse: ((coords: ol.Coordinate) => ol.Coordinate)): void;
+
+    /**
+     * Transforms a coordinate from longitude/latitude to a different projection.
+     * @param coordinate Coordinate as longitude and latitude, i.e.
+     *     an array with longitude as 1st and latitude as 2nd element.
+     * @param opt_projection Target projection. The
+     *     default is Web Mercator, i.e. 'EPSG:3857'.
+     * @return Coordinate projected to the target projection.
+     * @api stable
+     */
+    function fromLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
+
+    /**
+     * Transforms a coordinate to longitude/latitude.
+     * @param coordinate Projected coordinate.
+     * @param opt_projection Projection of the coordinate.
+     *     The default is Web Mercator, i.e. 'EPSG:3857'.
+     * @return Coordinate as longitude and latitude, i.e. an array
+     *     with longitude as 1st and latitude as 2nd element.
+     * @api stable
+     */
+    function toLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
+
+    /**
+     * Fetches a Projection object for the code specified.
+     *
+     * @param projectionLike Either a code string which is
+     *     a combination of authority and identifier such as "EPSG:4326", or an
+     *     existing projection object, or undefined.
+     * @return Projection object, or null if not in list.
+     * @api stable
+     */
+    function get(projectionLike: ol.ProjectionLike): Projection;
+
+    /**
+     * Checks if two projections are the same, that is every coordinate in one
+     * projection does represent the same geographic point as the same coordinate in
+     * the other projection.
+     *
+     * @param projection1 Projection 1.
+     * @param projection2 Projection 2.
+     * @return Equivalent.
+     * @api
+     */
+    function equivalent(projection1: Projection, projection2: Projection): boolean;
+
+    /**
+     * Given the projection-like objects, searches for a transformation
+     * function to convert a coordinates array from the source projection to the
+     * destination projection.
+     *
+     * @param source Source.
+     * @param destination Destination.
+     * @return Transform function.
+     * @api stable
+     */
+    function getTransform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.TransformFunction;
+
+    /**
+     * Transforms a coordinate from source projection to destination projection.
+     * This returns a new coordinate (and does not modify the original).
+     *
+     * See {@link ol.proj.transformExtent} for extent transformation.
+     * See the transform method of {@link ol.geom.Geometry} and its subclasses for
+     * geometry transforms.
+     *
+     * @param coordinate Coordinate.
+     * @param source Source projection-like.
+     * @param destination Destination projection-like.
+     */
+    function transform(coordinate: ol.Coordinate, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Coordinate;
+
+    /**
+     * Transforms an extent from source projection to destination projection.  This
+     * returns a new extent (and does not modify the original).
+     *
+     * @param extent The extent to transform.
+     * @param source Source projection-like.
+     * @param destination Destination projection-like.
+     * @return The transformed extent.
+     * @api stable
+     */
+    function transformExtent(extent: ol.Extent, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Extent;
+
+    /**
+     * Get the resolution of the point in degrees or distance units. For
+     * projections with degrees as the unit this will simply return the
+     * provided resolution. For other projections the point resolution is
+     * estimated by transforming the 'point' pixel to EPSG:4326, measuring
+     * its width and height on the normal sphere, and taking the average of
+     * the width and height.
+     * @param projection The projection.
+     * @param resolution Nominal resolution in projection units.
+     * @param point Point to find adjusted resolution at.
+     * @return Point to find adjusted resolution at.
+     */
+    function getPointResolution(
+        projection: Projection,
+        resolution: number,
+        point: ol.Coordinate
+    ): number;
+}
+
+export namespace render {
+    namespace canvas {
+        /**
+         * @classdesc
+         * A concrete subclass of {@link ol.render.VectorContext} that implements
+         * direct rendering of features and geometries to an HTML5 Canvas context.
+         * Instances of this class are created internally by the library and
+         * provided to application code as vectorContext member of the
+         * {@link ol.render.Event} object associated with postcompose, precompose and
+         * render events emitted by layers and maps.
+         *
+         * @param context Context.
+         * @param pixelRatio Pixel ratio.
+         * @param extent Extent.
+         * @param transform Transform.
+         * @param viewRotation View rotation.
+         * @struct
+         */
+        class Immediate extends VectorContext {
             /**
              * @classdesc
              * A concrete subclass of {@link ol.render.VectorContext} that implements
@@ -7877,66 +7899,57 @@ declare namespace ol {
              * @param viewRotation View rotation.
              * @struct
              */
-            class Immediate extends ol.render.VectorContext {
-                /**
-                 * @classdesc
-                 * A concrete subclass of {@link ol.render.VectorContext} that implements
-                 * direct rendering of features and geometries to an HTML5 Canvas context.
-                 * Instances of this class are created internally by the library and
-                 * provided to application code as vectorContext member of the
-                 * {@link ol.render.Event} object associated with postcompose, precompose and
-                 * render events emitted by layers and maps.
-                 *
-                 * @param context Context.
-                 * @param pixelRatio Pixel ratio.
-                 * @param extent Extent.
-                 * @param transform Transform.
-                 * @param viewRotation View rotation.
-                 * @struct
-                 */
-                constructor(context: CanvasRenderingContext2D, pixelRatio: number, extent: ol.Extent, transform: any, viewRotation: number);
+            constructor(context: CanvasRenderingContext2D, pixelRatio: number, extent: ol.Extent, transform: any, viewRotation: number);
 
-                /**
-                 * Render a circle geometry into the canvas.  Rendering is immediate and uses
-                 * the current fill and stroke styles.
-                 *
-                 * @param geometry Circle geometry.
-                 * @api
-                 */
-                drawCircle(geometry: ol.geom.Circle): void;
+            /**
+             * Render a circle geometry into the canvas.  Rendering is immediate and uses
+             * the current fill and stroke styles.
+             *
+             * @param geometry Circle geometry.
+             * @api
+             */
+            drawCircle(geometry: ol.geom.Circle): void;
 
-                /**
-                 * Set the rendering style.  Note that since this is an immediate rendering API,
-                 * any `zIndex` on the provided style will be ignored.
-                 *
-                 * @param style The rendering style.
-                 * @api
-                 */
-                setStyle(style: ol.style.Style): void;
+            /**
+             * Set the rendering style.  Note that since this is an immediate rendering API,
+             * any `zIndex` on the provided style will be ignored.
+             *
+             * @param style The rendering style.
+             * @api
+             */
+            setStyle(style: ol.style.Style): void;
 
-                /**
-                 * Render a geometry into the canvas.  Call
-                 * {@link ol.render.canvas.Immediate#setStyle} first to set the rendering style.
-                 *
-                 * @param geometry The geometry to render.
-                 * @api
-                 */
-                drawGeometry(geometry: (ol.geom.Geometry | ol.render.Feature)): void;
+            /**
+             * Render a geometry into the canvas.  Call
+             * {@link ol.render.canvas.Immediate#setStyle} first to set the rendering style.
+             *
+             * @param geometry The geometry to render.
+             * @api
+             */
+            drawGeometry(geometry: (ol.geom.Geometry | Feature)): void;
 
-                /**
-                 * Render a feature into the canvas.  Note that any `zIndex` on the provided
-                 * style will be ignored - features are rendered immediately in the order that
-                 * this method is called.  If you need `zIndex` support, you should be using an
-                 * {@link ol.layer.Vector} instead.
-                 *
-                 * @param feature Feature.
-                 * @param style Style.
-                 * @api
-                 */
-                drawFeature(feature: ol.Feature, style: ol.style.Style): void;
-            }
+            /**
+             * Render a feature into the canvas.  Note that any `zIndex` on the provided
+             * style will be ignored - features are rendered immediately in the order that
+             * this method is called.  If you need `zIndex` support, you should be using an
+             * {@link ol.layer.Vector} instead.
+             *
+             * @param feature Feature.
+             * @param style Style.
+             * @api
+             */
+            drawFeature(feature: ol.Feature, style: ol.style.Style): void;
         }
+    }
 
+    /**
+     * @param type Type.
+     * @param opt_vectorContext Vector context.
+     * @param opt_frameState Frame state.
+     * @param opt_context Context.
+     * @param opt_glContext WebGL Context.
+     */
+    class Event extends events.Event {
         /**
          * @param type Type.
          * @param opt_vectorContext Vector context.
@@ -7944,45 +7957,49 @@ declare namespace ol {
          * @param opt_context Context.
          * @param opt_glContext WebGL Context.
          */
-        class Event extends ol.events.Event {
-            /**
-             * @param type Type.
-             * @param opt_vectorContext Vector context.
-             * @param opt_frameState Frame state.
-             * @param opt_context Context.
-             * @param opt_glContext WebGL Context.
-             */
-            constructor(type: ol.render.EventType, opt_vectorContext?: ol.render.VectorContext, opt_frameState?: olx.FrameState, opt_context?: CanvasRenderingContext2D, opt_glContext?: any);
+        constructor(type: EventType, opt_vectorContext?: VectorContext, opt_frameState?: olx.FrameState, opt_context?: CanvasRenderingContext2D, opt_glContext?: any);
 
-            /**
-             * For canvas, this is an instance of {@link ol.render.canvas.Immediate}.
-             * @api
-             */
-            vectorContext: ol.render.VectorContext;
+        /**
+         * For canvas, this is an instance of {@link ol.render.canvas.Immediate}.
+         * @api
+         */
+        vectorContext: VectorContext;
 
-            /**
-             * An object representing the current render frame state.
-             * @api
-             */
-            frameState: olx.FrameState;
+        /**
+         * An object representing the current render frame state.
+         * @api
+         */
+        frameState: olx.FrameState;
 
-            /**
-             * Canvas context. Only available when a Canvas renderer is used, null
-             * otherwise.
-             * @api
-             */
-            context: CanvasRenderingContext2D;
+        /**
+         * Canvas context. Only available when a Canvas renderer is used, null
+         * otherwise.
+         * @api
+         */
+        context: CanvasRenderingContext2D;
 
-            /**
-             * WebGL context. Only available when a WebGL renderer is used, null
-             * otherwise.
-             * @api
-             */
-            glContext: any;
-        }
+        /**
+         * WebGL context. Only available when a WebGL renderer is used, null
+         * otherwise.
+         * @api
+         */
+        glContext: any;
+    }
 
-        type EventType = string;
+    type EventType = string;
 
+    /**
+     * Lightweight, read-only, {@link ol.Feature} and {@link ol.geom.Geometry} like
+     * structure, optimized for rendering and styling. Geometry access through the
+     * API is limited to getting the type and extent of the geometry.
+     *
+     * @param type Geometry type.
+     * @param flatCoordinates Flat coordinates. These always need
+     *     to be right-handed for polygons.
+     * @param ends Ends or Endss.
+     * @param properties Properties.
+     */
+    class Feature {
         /**
          * Lightweight, read-only, {@link ol.Feature} and {@link ol.geom.Geometry} like
          * structure, optimized for rendering and styling. Geometry access through the
@@ -7994,107 +8011,104 @@ declare namespace ol {
          * @param ends Ends or Endss.
          * @param properties Properties.
          */
-        class Feature {
-            /**
-             * Lightweight, read-only, {@link ol.Feature} and {@link ol.geom.Geometry} like
-             * structure, optimized for rendering and styling. Geometry access through the
-             * API is limited to getting the type and extent of the geometry.
-             *
-             * @param type Geometry type.
-             * @param flatCoordinates Flat coordinates. These always need
-             *     to be right-handed for polygons.
-             * @param ends Ends or Endss.
-             * @param properties Properties.
-             */
-            constructor(type: ol.geom.GeometryType, flatCoordinates: number[], ends: (number[] | number[][]), properties: { [k: string]: any });
+        constructor(type: ol.geom.GeometryType, flatCoordinates: number[], ends: (number[] | number[][]), properties: { [k: string]: any });
 
-            /**
-             * Get a feature property by its key.
-             * @param key Key
-             * @return Value for the requested key.
-             * @api
-             */
-            get(key: string): any;
+        /**
+         * Get a feature property by its key.
+         * @param key Key
+         * @return Value for the requested key.
+         * @api
+         */
+        get(key: string): any;
 
-            /**
-             * Get the extent of this feature's geometry.
-             * @return Extent.
-             * @api
-             */
-            getExtent(): ol.Extent;
+        /**
+         * Get the extent of this feature's geometry.
+         * @return Extent.
+         * @api
+         */
+        getExtent(): ol.Extent;
 
-            /**
-             * Get the feature for working with its geometry.
-             * @return Feature.
-             * @api
-             */
-            getGeometry(): ol.render.Feature;
+        /**
+         * Get the feature for working with its geometry.
+         * @return Feature.
+         * @api
+         */
+        getGeometry(): Feature;
 
-            /**
-             * Get the feature properties.
-             * @return Feature properties.
-             * @api
-             */
-            getProperties(): { [k: string]: any };
+        /**
+         * Get the feature properties.
+         * @return Feature properties.
+         * @api
+         */
+        getProperties(): { [k: string]: any };
 
-            /**
-             * Get the type of this feature's geometry.
-             * @return Geometry type.
-             * @api
-             */
-            getType(): ol.geom.GeometryType;
-        }
+        /**
+         * Get the type of this feature's geometry.
+         * @return Geometry type.
+         * @api
+         */
+        getType(): ol.geom.GeometryType;
+    }
 
+    /**
+     * Context for drawing geometries.  A vector context is available on render
+     * events and does not need to be constructed directly.
+     * @struct
+     * @api
+     */
+    /* tslint:disable-next-line:no-unnecessary-class */
+    class VectorContext {
         /**
          * Context for drawing geometries.  A vector context is available on render
          * events and does not need to be constructed directly.
          * @struct
          * @api
          */
-        class VectorContext {
-            /**
-             * Context for drawing geometries.  A vector context is available on render
-             * events and does not need to be constructed directly.
-             * @struct
-             * @api
-             */
-            constructor();
-        }
-
-        /**
-         * Binds a Canvas Immediate API to a canvas context, to allow drawing geometries
-         * to the context's canvas.
-         *
-         * The units for geometry coordinates are css pixels relative to the top left
-         * corner of the canvas element.
-         * ```js
-         * var canvas = document.createElement('canvas');
-         * var render = ol.render.toContext(canvas.getContext('2d'),
-         *     { size: [100, 100] });
-         * render.setFillStrokeStyle(new ol.style.Fill({ color: blue }));
-         * render.drawPolygon(
-         *     new ol.geom.Polygon([[[0, 0], [100, 100], [100, 0], [0, 0]]]));
-         * ```
-         *
-         * @param context Canvas context.
-         * @param opt_options Options.
-         * @return Canvas Immediate.
-         * @api
-         */
-        function toContext(context: CanvasRenderingContext2D, opt_options?: olx.render.ToContextOptions): ol.render.canvas.Immediate;
+        constructor();
     }
 
     /**
-     * Available renderers: `'canvas'`, `'dom'` or `'webgl'`.
+     * Binds a Canvas Immediate API to a canvas context, to allow drawing geometries
+     * to the context's canvas.
+     *
+     * The units for geometry coordinates are css pixels relative to the top left
+     * corner of the canvas element.
+     * ```js
+     * var canvas = document.createElement('canvas');
+     * var render = ol.render.toContext(canvas.getContext('2d'),
+     *     { size: [100, 100] });
+     * render.setFillStrokeStyle(new ol.style.Fill({ color: blue }));
+     * render.drawPolygon(
+     *     new ol.geom.Polygon([[[0, 0], [100, 100], [100, 0], [0, 0]]]));
+     * ```
+     *
+     * @param context Canvas context.
+     * @param opt_options Options.
+     * @return Canvas Immediate.
+     * @api
      */
-    type RendererType = "canvas" | "dom" | "webgl";
+    function toContext(context: CanvasRenderingContext2D, opt_options?: olx.render.ToContextOptions): canvas.Immediate;
+}
 
+/**
+ * Available renderers: `'canvas'`, `'dom'` or `'webgl'`.
+ */
+export type RendererType = "canvas" | "dom" | "webgl";
+
+/**
+ * Raster operation type. Supported values are `'pixel'` and `'image'`.
+ */
+export type RasterOperationType = "pixel" | "image";
+
+export namespace source {
     /**
-     * Raster operation type. Supported values are `'pixel'` and `'image'`.
+     * @classdesc
+     * Layer source for Bing Maps tile data.
+     *
+     * @param options Bing Maps options.
+     * @api stable
      */
-    type RasterOperationType = "pixel" | "image";
-
-    namespace source {
+    class BingMaps extends TileImage {
         /**
          * @classdesc
          * Layer source for Bing Maps tile data.
@@ -8102,25 +8116,25 @@ declare namespace ol {
          * @param options Bing Maps options.
          * @api stable
          */
-        class BingMaps extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for Bing Maps tile data.
-             *
-             * @param options Bing Maps options.
-             * @api stable
-             */
-            constructor(options: olx.source.BingMapsOptions);
+        constructor(options: olx.source.BingMapsOptions);
 
-            /**
-             * The attribution containing a link to the Microsoft® Bing™ Maps Platform APIs’
-             * Terms Of Use.
-             * @const
-             * @api
-             */
-            static TOS_ATTRIBUTION: ol.Attribution;
-        }
+        /**
+         * The attribution containing a link to the Microsoft® Bing™ Maps Platform APIs’
+         * Terms Of Use.
+         * @const
+         * @api
+         */
+        static TOS_ATTRIBUTION: ol.Attribution;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for the CartoDB tiles.
+     *
+     * @param options CartoDB options.
+     * @api
+     */
+    class CartoDB extends XYZ {
         /**
          * @classdesc
          * Layer source for the CartoDB tiles.
@@ -8128,41 +8142,43 @@ declare namespace ol {
          * @param options CartoDB options.
          * @api
          */
-        class CartoDB extends ol.source.XYZ {
-            /**
-             * @classdesc
-             * Layer source for the CartoDB tiles.
-             *
-             * @param options CartoDB options.
-             * @api
-             */
-            constructor(options: olx.source.CartoDBOptions);
+        constructor(options: olx.source.CartoDBOptions);
 
-            /**
-             * Returns the current config.
-             * @return The current configuration.
-             * @api
-             */
-            getConfig(): GlobalObject;
+        /**
+         * Returns the current config.
+         * @return The current configuration.
+         * @api
+         */
+        getConfig(): GlobalObject;
 
-            /**
-             * Updates the carto db config.
-             * @param config a key-value lookup. Values will replace current values
-             *     in the config.
-             * @api
-             */
-            updateConfig(config: GlobalObject): void;
+        /**
+         * Updates the carto db config.
+         * @param config a key-value lookup. Values will replace current values
+         *     in the config.
+         * @api
+         */
+        updateConfig(config: GlobalObject): void;
 
-            /**
-             * Sets the CartoDB config
-             * @param config In the case of anonymous maps, a CartoDB configuration
-             *     object.
-             * If using named maps, a key-value lookup with the template parameters.
-             * @api
-             */
-            setConfig(config: GlobalObject): void;
-        }
+        /**
+         * Sets the CartoDB config
+         * @param config In the case of anonymous maps, a CartoDB configuration
+         *     object.
+         * If using named maps, a key-value lookup with the template parameters.
+         * @api
+         */
+        setConfig(config: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source to cluster vector data. Works out of the box with point
+     * geometries. For other geometry types, or if not all geometries should be
+     * considered for clustering, a custom `geometryFunction` can be defined.
+     *
+     * @param options Constructor options.
+     * @api
+     */
+    class Cluster extends Vector {
         /**
          * @classdesc
          * Layer source to cluster vector data. Works out of the box with point
@@ -8172,40 +8188,40 @@ declare namespace ol {
          * @param options Constructor options.
          * @api
          */
-        class Cluster extends ol.source.Vector {
-            /**
-             * @classdesc
-             * Layer source to cluster vector data. Works out of the box with point
-             * geometries. For other geometry types, or if not all geometries should be
-             * considered for clustering, a custom `geometryFunction` can be defined.
-             *
-             * @param options Constructor options.
-             * @api
-             */
-            constructor(options: olx.source.ClusterOptions);
+        constructor(options: olx.source.ClusterOptions);
 
-            /**
-             * Get a reference to the wrapped source.
-             * @return Source.
-             * @api
-             */
-            getSource(): ol.source.Vector;
+        /**
+         * Get a reference to the wrapped source.
+         * @return Source.
+         * @api
+         */
+        getSource(): Vector;
 
-            /**
-             * Get the distance in pixels between clusters.
-             * @return The distance in pixels.
-             * @api
-             */
-            getDistance(): number;
+        /**
+         * Get the distance in pixels between clusters.
+         * @return The distance in pixels.
+         * @api
+         */
+        getDistance(): number;
 
-            /**
-             * Set the distance in pixels between clusters.
-             * @param distance The distance in pixels.
-             * @api
-             */
-            setDistance(distance: number): void;
-        }
+        /**
+         * Set the distance in pixels between clusters.
+         * @param distance The distance in pixels.
+         * @api
+         */
+        setDistance(distance: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for sources providing a single image.
+     *
+     * @param options Single image source options.
+     * @api
+     */
+    class Image extends Source {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -8215,19 +8231,18 @@ declare namespace ol {
          * @param options Single image source options.
          * @api
          */
-        class Image extends ol.source.Source {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for sources providing a single image.
-             *
-             * @param options Single image source options.
-             * @api
-             */
-            constructor(options: ol.SourceImageOptions);
-        }
+        constructor(options: ol.SourceImageOptions);
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Image} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param image The image.
+     */
+    class ImageEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Image} instances are instances of this
@@ -8236,24 +8251,29 @@ declare namespace ol {
          * @param type Type.
          * @param image The image.
          */
-        class ImageEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Image} instances are instances of this
-             * type.
-             *
-             * @param type Type.
-             * @param image The image.
-             */
-            constructor(type: string, image: ol.Image);
+        constructor(type: string, image: ol.Image);
 
-            /**
-             * The image related to the event.
-             * @api
-             */
-            image: ol.Image;
-        }
+        /**
+         * The image related to the event.
+         * @api
+         */
+        image: ol.Image;
+    }
 
+    /**
+     * @classdesc
+     * Source for data from ArcGIS Rest services providing single, untiled images.
+     * Useful when underlying map service has labels.
+     *
+     * If underlying map service is not using labels,
+     * take advantage of ol image caching and use
+     * {@link ol.source.TileArcGISRest} data source.
+     *
+     * @fires ol.source.ImageEvent
+     * @param opt_options Image ArcGIS Rest Options.
+     * @api
+     */
+    class ImageArcGISRest extends Image {
         /**
          * @classdesc
          * Source for data from ArcGIS Rest services providing single, untiled images.
@@ -8267,66 +8287,60 @@ declare namespace ol {
          * @param opt_options Image ArcGIS Rest Options.
          * @api
          */
-        class ImageArcGISRest extends ol.source.Image {
-            /**
-             * @classdesc
-             * Source for data from ArcGIS Rest services providing single, untiled images.
-             * Useful when underlying map service has labels.
-             *
-             * If underlying map service is not using labels,
-             * take advantage of ol image caching and use
-             * {@link ol.source.TileArcGISRest} data source.
-             *
-             * @fires ol.source.ImageEvent
-             * @param opt_options Image ArcGIS Rest Options.
-             * @api
-             */
-            constructor(opt_options?: olx.source.ImageArcGISRestOptions);
+        constructor(opt_options?: olx.source.ImageArcGISRestOptions);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Return the image load function of the source.
-             * @return The image load function.
-             * @api
-             */
-            getImageLoadFunction(): ol.ImageLoadFunctionType;
+        /**
+         * Return the image load function of the source.
+         * @return The image load function.
+         * @api
+         */
+        getImageLoadFunction(): ol.ImageLoadFunctionType;
 
-            /**
-             * Return the URL used for this ArcGIS source.
-             * @return URL.
-             * @api stable
-             */
-            getUrl(): (string);
+        /**
+         * Return the URL used for this ArcGIS source.
+         * @return URL.
+         * @api stable
+         */
+        getUrl(): (string);
 
-            /**
-             * Set the image load function of the source.
-             * @param imageLoadFunction Image load function.
-             * @api
-             */
-            setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
+        /**
+         * Set the image load function of the source.
+         * @param imageLoadFunction Image load function.
+         * @api
+         */
+        setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
 
-            /**
-             * Set the URL to use for requests.
-             * @param url URL.
-             * @api stable
-             */
-            setUrl(url: (string)): void;
+        /**
+         * Set the URL to use for requests.
+         * @param url URL.
+         * @api stable
+         */
+        setUrl(url: (string)): void;
 
-            /**
-             * Update the user-provided params.
-             * @param params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Base class for image sources where a canvas element is the image.
+     *
+     * @param options Constructor options.
+     * @api
+     */
+    class ImageCanvas extends Image {
         /**
          * @classdesc
          * Base class for image sources where a canvas element is the image.
@@ -8334,17 +8348,18 @@ declare namespace ol {
          * @param options Constructor options.
          * @api
          */
-        class ImageCanvas extends ol.source.Image {
-            /**
-             * @classdesc
-             * Base class for image sources where a canvas element is the image.
-             *
-             * @param options Constructor options.
-             * @api
-             */
-            constructor(options: olx.source.ImageCanvasOptions);
-        }
+        constructor(options: olx.source.ImageCanvasOptions);
+    }
 
+    /**
+     * @classdesc
+     * Source for images from Mapguide servers
+     *
+     * @fires ol.source.ImageEvent
+     * @param options Options.
+     * @api stable
+     */
+    class ImageMapGuide extends Image {
         /**
          * @classdesc
          * Source for images from Mapguide servers
@@ -8353,47 +8368,46 @@ declare namespace ol {
          * @param options Options.
          * @api stable
          */
-        class ImageMapGuide extends ol.source.Image {
-            /**
-             * @classdesc
-             * Source for images from Mapguide servers
-             *
-             * @fires ol.source.ImageEvent
-             * @param options Options.
-             * @api stable
-             */
-            constructor(options: olx.source.ImageMapGuideOptions);
+        constructor(options: olx.source.ImageMapGuideOptions);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Return the image load function of the source.
-             * @return The image load function.
-             * @api
-             */
-            getImageLoadFunction(): ol.ImageLoadFunctionType;
+        /**
+         * Return the image load function of the source.
+         * @return The image load function.
+         * @api
+         */
+        getImageLoadFunction(): ol.ImageLoadFunctionType;
 
-            /**
-             * Update the user-provided params.
-             * @param params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
 
-            /**
-             * Set the image load function of the MapGuide source.
-             * @param imageLoadFunction Image load function.
-             * @api
-             */
-            setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
-        }
+        /**
+         * Set the image load function of the MapGuide source.
+         * @param imageLoadFunction Image load function.
+         * @api
+         */
+        setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
+    }
 
+    /**
+     * @classdesc
+     * A layer source for displaying a single, static image.
+     *
+     * @param options Options.
+     * @api stable
+     */
+    class ImageStatic extends Image {
         /**
          * @classdesc
          * A layer source for displaying a single, static image.
@@ -8401,17 +8415,25 @@ declare namespace ol {
          * @param options Options.
          * @api stable
          */
-        class ImageStatic extends ol.source.Image {
-            /**
-             * @classdesc
-             * A layer source for displaying a single, static image.
-             *
-             * @param options Options.
-             * @api stable
-             */
-            constructor(options: olx.source.ImageStaticOptions);
-        }
+        constructor(options: olx.source.ImageStaticOptions);
+    }
 
+    /**
+     * @classdesc
+     * An image source whose images are canvas elements into which vector features
+     * read from a vector source (`ol.source.Vector`) are drawn. An
+     * `ol.source.ImageVector` object is to be used as the `source` of an image
+     * layer (`ol.layer.Image`). Image layers are rotated, scaled, and translated,
+     * as opposed to being re-rendered, during animations and interactions. So, like
+     * any other image layer, an image layer configured with an
+     * `ol.source.ImageVector` will exhibit this behaviour. This is in contrast to a
+     * vector layer, where vector features are re-drawn during animations and
+     * interactions.
+     *
+     * @param options Options.
+     * @api
+     */
+    class ImageVector extends ImageCanvas {
         /**
          * @classdesc
          * An image source whose images are canvas elements into which vector features
@@ -8427,59 +8449,52 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class ImageVector extends ol.source.ImageCanvas {
-            /**
-             * @classdesc
-             * An image source whose images are canvas elements into which vector features
-             * read from a vector source (`ol.source.Vector`) are drawn. An
-             * `ol.source.ImageVector` object is to be used as the `source` of an image
-             * layer (`ol.layer.Image`). Image layers are rotated, scaled, and translated,
-             * as opposed to being re-rendered, during animations and interactions. So, like
-             * any other image layer, an image layer configured with an
-             * `ol.source.ImageVector` will exhibit this behaviour. This is in contrast to a
-             * vector layer, where vector features are re-drawn during animations and
-             * interactions.
-             *
-             * @param options Options.
-             * @api
-             */
-            constructor(options: olx.source.ImageVectorOptions);
+        constructor(options: olx.source.ImageVectorOptions);
 
-            /**
-             * Get a reference to the wrapped source.
-             * @return Source.
-             * @api
-             */
-            getSource(): ol.source.Vector;
+        /**
+         * Get a reference to the wrapped source.
+         * @return Source.
+         * @api
+         */
+        getSource(): Vector;
 
-            /**
-             * Get the style for features.  This returns whatever was passed to the `style`
-             * option at construction or to the `setStyle` method.
-             * @return Layer style.
-             * @api stable
-             */
-            getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
+        /**
+         * Get the style for features.  This returns whatever was passed to the `style`
+         * option at construction or to the `setStyle` method.
+         * @return Layer style.
+         * @api stable
+         */
+        getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
 
-            /**
-             * Get the style function.
-             * @return Layer style function.
-             * @api stable
-             */
-            getStyleFunction(): (ol.StyleFunction);
+        /**
+         * Get the style function.
+         * @return Layer style function.
+         * @api stable
+         */
+        getStyleFunction(): (ol.StyleFunction);
 
-            /**
-             * Set the style for features.  This can be a single style object, an array
-             * of styles, or a function that takes a feature and resolution and returns
-             * an array of styles. If it is `undefined` the default style is used. If
-             * it is `null` the layer has no style (a `null` style), so only features
-             * that have their own styles will be rendered in the layer. See
-             * {@link ol.style} for information on the default style.
-             * @param style Layer style.
-             * @api stable
-             */
-            setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
-        }
+        /**
+         * Set the style for features.  This can be a single style object, an array
+         * of styles, or a function that takes a feature and resolution and returns
+         * an array of styles. If it is `undefined` the default style is used. If
+         * it is `null` the layer has no style (a `null` style), so only features
+         * that have their own styles will be rendered in the layer. See
+         * {@link ol.style} for information on the default style.
+         * @param style Layer style.
+         * @api stable
+         */
+        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
+    }
 
+    /**
+     * @classdesc
+     * Source for WMS servers providing single, untiled images.
+     *
+     * @fires ol.source.ImageEvent
+     * @param opt_options Options.
+     * @api stable
+     */
+    class ImageWMS extends Image {
         /**
          * @classdesc
          * Source for WMS servers providing single, untiled images.
@@ -8488,77 +8503,76 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class ImageWMS extends ol.source.Image {
-            /**
-             * @classdesc
-             * Source for WMS servers providing single, untiled images.
-             *
-             * @fires ol.source.ImageEvent
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.ImageWMSOptions);
+        constructor(opt_options?: olx.source.ImageWMSOptions);
 
-            /**
-             * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
-             * projection. Return `undefined` if the GetFeatureInfo URL cannot be
-             * constructed.
-             * @param coordinate Coordinate.
-             * @param resolution Resolution.
-             * @param projection Projection.
-             * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
-             *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
-             *     in the `LAYERS` parameter will be used. `VERSION` should not be
-             *     specified here.
-             * @return GetFeatureInfo URL.
-             * @api stable
-             */
-            getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
+        /**
+         * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
+         * projection. Return `undefined` if the GetFeatureInfo URL cannot be
+         * constructed.
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param projection Projection.
+         * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
+         *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
+         *     in the `LAYERS` parameter will be used. `VERSION` should not be
+         *     specified here.
+         * @return GetFeatureInfo URL.
+         * @api stable
+         */
+        getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Return the image load function of the source.
-             * @return The image load function.
-             * @api
-             */
-            getImageLoadFunction(): ol.ImageLoadFunctionType;
+        /**
+         * Return the image load function of the source.
+         * @return The image load function.
+         * @api
+         */
+        getImageLoadFunction(): ol.ImageLoadFunctionType;
 
-            /**
-             * Return the URL used for this WMS source.
-             * @return URL.
-             * @api stable
-             */
-            getUrl(): (string);
+        /**
+         * Return the URL used for this WMS source.
+         * @return URL.
+         * @api stable
+         */
+        getUrl(): (string);
 
-            /**
-             * Set the image load function of the source.
-             * @param imageLoadFunction Image load function.
-             * @api
-             */
-            setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
+        /**
+         * Set the image load function of the source.
+         * @param imageLoadFunction Image load function.
+         * @api
+         */
+        setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
 
-            /**
-             * Set the URL to use for requests.
-             * @param url URL.
-             * @api stable
-             */
-            setUrl(url: (string)): void;
+        /**
+         * Set the URL to use for requests.
+         * @param url URL.
+         * @api stable
+         */
+        setUrl(url: (string)): void;
 
-            /**
-             * Update the user-provided params.
-             * @param params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for the OpenStreetMap tile server.
+     *
+     * @param opt_options Open Street Map options.
+     * @api stable
+     */
+    class OSM extends XYZ {
         /**
          * @classdesc
          * Layer source for the OpenStreetMap tile server.
@@ -8566,25 +8580,28 @@ declare namespace ol {
          * @param opt_options Open Street Map options.
          * @api stable
          */
-        class OSM extends ol.source.XYZ {
-            /**
-             * @classdesc
-             * Layer source for the OpenStreetMap tile server.
-             *
-             * @param opt_options Open Street Map options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.OSMOptions);
+        constructor(opt_options?: olx.source.OSMOptions);
 
-            /**
-             * The attribution containing a link to the OpenStreetMap Copyright and License
-             * page.
-             * @const
-             * @api
-             */
-            static ATTRIBUTION: ol.Attribution;
-        }
+        /**
+         * The attribution containing a link to the OpenStreetMap Copyright and License
+         * page.
+         * @const
+         * @api
+         */
+        static ATTRIBUTION: ol.Attribution;
+    }
 
+    /**
+     * @classdesc
+     * A source that transforms data from any number of input sources using an array
+     * of {@link ol.RasterOperation} functions to transform input pixel values into
+     * output pixel values.
+     *
+     * @fires ol.source.RasterEvent
+     * @param options Options.
+     * @api
+     */
+    class Raster extends Image {
         /**
          * @classdesc
          * A source that transforms data from any number of input sources using an array
@@ -8595,29 +8612,28 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class Raster extends ol.source.Image {
-            /**
-             * @classdesc
-             * A source that transforms data from any number of input sources using an array
-             * of {@link ol.RasterOperation} functions to transform input pixel values into
-             * output pixel values.
-             *
-             * @fires ol.source.RasterEvent
-             * @param options Options.
-             * @api
-             */
-            constructor(options: olx.source.RasterOptions);
+        constructor(options: olx.source.RasterOptions);
 
-            /**
-             * Set the operation.
-             * @param operation New operation.
-             * @param opt_lib Functions that will be available to operations run
-             *     in a worker.
-             * @api
-             */
-            setOperation(operation: ol.RasterOperation, opt_lib?: GlobalObject): void;
-        }
+        /**
+         * Set the operation.
+         * @param operation New operation.
+         * @param opt_lib Functions that will be available to operations run
+         *     in a worker.
+         * @api
+         */
+        setOperation(operation: ol.RasterOperation, opt_lib?: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Raster} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param frameState The frame state.
+     * @param data An object made available to operations.
+     */
+    class RasterEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Raster} instances are instances of this
@@ -8627,43 +8643,45 @@ declare namespace ol {
          * @param frameState The frame state.
          * @param data An object made available to operations.
          */
-        class RasterEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Raster} instances are instances of this
-             * type.
-             *
-             * @param type Type.
-             * @param frameState The frame state.
-             * @param data An object made available to operations.
-             */
-            constructor(type: string, frameState: olx.FrameState, data: GlobalObject);
-
-            /**
-             * The raster extent.
-             * @api
-             */
-            extent: ol.Extent;
-
-            /**
-             * The pixel resolution (map units per pixel).
-             * @api
-             */
-            resolution: number;
-
-            /**
-             * An object made available to all operations.  This can be used by operations
-             * as a storage object (e.g. for calculating statistics).
-             * @api
-             */
-            data: GlobalObject;
-        }
+        constructor(type: string, frameState: olx.FrameState, data: GlobalObject);
 
         /**
-         * State of the source, one of 'undefined', 'loading', 'ready' or 'error'.
+         * The raster extent.
+         * @api
          */
-        type State = "undefined" | "loading" | "ready" | "error";
+        extent: ol.Extent;
 
+        /**
+         * The pixel resolution (map units per pixel).
+         * @api
+         */
+        resolution: number;
+
+        /**
+         * An object made available to all operations.  This can be used by operations
+         * as a storage object (e.g. for calculating statistics).
+         * @api
+         */
+        data: GlobalObject;
+    }
+
+    /**
+     * State of the source, one of 'undefined', 'loading', 'ready' or 'error'.
+     */
+    type State = "undefined" | "loading" | "ready" | "error";
+
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for {@link ol.layer.Layer} sources.
+     *
+     * A generic `change` event is triggered when the state of the source changes.
+     *
+     * @param options Source options.
+     * @api stable
+     */
+    class Source extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -8675,64 +8693,60 @@ declare namespace ol {
          * @param options Source options.
          * @api stable
          */
-        class Source extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for {@link ol.layer.Layer} sources.
-             *
-             * A generic `change` event is triggered when the state of the source changes.
-             *
-             * @param options Source options.
-             * @api stable
-             */
-            constructor(options: ol.SourceSourceOptions);
+        constructor(options: ol.SourceSourceOptions);
 
-            /**
-             * Get the attributions of the source.
-             * @return Attributions.
-             * @api stable
-             */
-            getAttributions(): ol.Attribution[];
+        /**
+         * Get the attributions of the source.
+         * @return Attributions.
+         * @api stable
+         */
+        getAttributions(): ol.Attribution[];
 
-            /**
-             * Get the logo of the source.
-             * @return Logo.
-             * @api stable
-             */
-            getLogo(): (string | olx.LogoOptions);
+        /**
+         * Get the logo of the source.
+         * @return Logo.
+         * @api stable
+         */
+        getLogo(): (string | olx.LogoOptions);
 
-            /**
-             * Get the projection of the source.
-             * @return Projection.
-             * @api
-             */
-            getProjection(): ol.proj.Projection;
+        /**
+         * Get the projection of the source.
+         * @return Projection.
+         * @api
+         */
+        getProjection(): ol.proj.Projection;
 
-            /**
-             * Get the state of the source, see {@link ol.source.State} for possible states.
-             * @return State.
-             * @api
-             */
-            getState(): ol.source.State;
+        /**
+         * Get the state of the source, see {@link ol.source.State} for possible states.
+         * @return State.
+         * @api
+         */
+        getState(): State;
 
-            /**
-             * Refreshes the source and finally dispatches a 'change' event.
-             * @api
-             */
-            refresh(): void;
+        /**
+         * Refreshes the source and finally dispatches a 'change' event.
+         * @api
+         */
+        refresh(): void;
 
-            /**
-             * Set the attributions of the source.
-             * @param attributions Attributions.
-             *     Can be passed as `string`, `Array<string>`, `{@link ol.Attribution}`,
-             *     `Array<{@link ol.Attribution}>` or `undefined`.
-             * @api
-             */
-            setAttributions(attributions: (ol.AttributionLike)): void;
-        }
+        /**
+         * Set the attributions of the source.
+         * @param attributions Attributions.
+         *     Can be passed as `string`, `Array<string>`, `{@link ol.Attribution}`,
+         *     `Array<{@link ol.Attribution}>` or `undefined`.
+         * @api
+         */
+        setAttributions(attributions: (ol.AttributionLike)): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for the Stamen tile server.
+     *
+     * @param options Stamen options.
+     * @api stable
+     */
+    class Stamen extends XYZ {
         /**
          * @classdesc
          * Layer source for the Stamen tile server.
@@ -8740,17 +8754,19 @@ declare namespace ol {
          * @param options Stamen options.
          * @api stable
          */
-        class Stamen extends ol.source.XYZ {
-            /**
-             * @classdesc
-             * Layer source for the Stamen tile server.
-             *
-             * @param options Stamen options.
-             * @api stable
-             */
-            constructor(options: olx.source.StamenOptions);
-        }
+        constructor(options: olx.source.StamenOptions);
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for sources providing images divided into a tile grid.
+     *
+     * @param options Tile source options.
+     * @api
+     */
+    class Tile extends Source {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -8760,26 +8776,25 @@ declare namespace ol {
          * @param options Tile source options.
          * @api
          */
-        class Tile extends ol.source.Source {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for sources providing images divided into a tile grid.
-             *
-             * @param options Tile source options.
-             * @api
-             */
-            constructor(options: ol.SourceTileOptions);
+        constructor(options: ol.SourceTileOptions);
 
-            /**
-             * Return the tile grid of the tile source.
-             * @return Tile grid.
-             * @api stable
-             */
-            getTileGrid(): ol.tilegrid.TileGrid;
-        }
+        /**
+         * Return the tile grid of the tile source.
+         * @return Tile grid.
+         * @api stable
+         */
+        getTileGrid(): ol.tilegrid.TileGrid;
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Tile} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param tile The tile.
+     */
+    class TileEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Tile} instances are instances of this
@@ -8788,24 +8803,28 @@ declare namespace ol {
          * @param type Type.
          * @param tile The tile.
          */
-        class TileEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Tile} instances are instances of this
-             * type.
-             *
-             * @param type Type.
-             * @param tile The tile.
-             */
-            constructor(type: string, tile: ol.Tile);
+        constructor(type: string, tile: ol.Tile);
 
-            /**
-             * The tile related to the event.
-             * @api
-             */
-            tile: ol.Tile;
-        }
+        /**
+         * The tile related to the event.
+         * @api
+         */
+        tile: ol.Tile;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data from ArcGIS Rest services. Map and Image
+     * Services are supported.
+     *
+     * For cached ArcGIS services, better performance is available using the
+     * {@link ol.source.XYZ} data source.
+     *
+     * @param opt_options Tile ArcGIS Rest
+     *     options.
+     * @api
+     */
+    class TileArcGISRest extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data from ArcGIS Rest services. Map and Image
@@ -8818,37 +8837,36 @@ declare namespace ol {
          *     options.
          * @api
          */
-        class TileArcGISRest extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data from ArcGIS Rest services. Map and Image
-             * Services are supported.
-             *
-             * For cached ArcGIS services, better performance is available using the
-             * {@link ol.source.XYZ} data source.
-             *
-             * @param opt_options Tile ArcGIS Rest
-             *     options.
-             * @api
-             */
-            constructor(opt_options?: olx.source.TileArcGISRestOptions);
+        constructor(opt_options?: olx.source.TileArcGISRestOptions);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return Params.
-             * @api
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Update the user-provided params.
-             * @param params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * A pseudo tile source, which does not fetch tiles from a server, but renders
+     * a grid outline for the tile grid/projection along with the coordinates for
+     * each tile. See examples/canvas-tiles for an example.
+     *
+     * Uses Canvas context2d, so requires Canvas support.
+     *
+     * @param options Debug tile options.
+     * @api
+     */
+    class TileDebug extends Tile {
         /**
          * @classdesc
          * A pseudo tile source, which does not fetch tiles from a server, but renders
@@ -8860,21 +8878,18 @@ declare namespace ol {
          * @param options Debug tile options.
          * @api
          */
-        class TileDebug extends ol.source.Tile {
-            /**
-             * @classdesc
-             * A pseudo tile source, which does not fetch tiles from a server, but renders
-             * a grid outline for the tile grid/projection along with the coordinates for
-             * each tile. See examples/canvas-tiles for an example.
-             *
-             * Uses Canvas context2d, so requires Canvas support.
-             *
-             * @param options Debug tile options.
-             * @api
-             */
-            constructor(options: olx.source.TileDebugOptions);
-        }
+        constructor(options: olx.source.TileDebugOptions);
+    }
 
+    /**
+     * @classdesc
+     * Base class for sources providing images divided into a tile grid.
+     *
+     * @fires ol.source.TileEvent
+     * @param options Image tile options.
+     * @api
+     */
+    class TileImage extends UrlTile {
         /**
          * @classdesc
          * Base class for sources providing images divided into a tile grid.
@@ -8883,39 +8898,38 @@ declare namespace ol {
          * @param options Image tile options.
          * @api
          */
-        class TileImage extends ol.source.UrlTile {
-            /**
-             * @classdesc
-             * Base class for sources providing images divided into a tile grid.
-             *
-             * @fires ol.source.TileEvent
-             * @param options Image tile options.
-             * @api
-             */
-            constructor(options: olx.source.TileImageOptions);
+        constructor(options: olx.source.TileImageOptions);
 
-            /**
-             * Sets whether to render reprojection edges or not (usually for debugging).
-             * @param render Render the edges.
-             * @api
-             */
-            setRenderReprojectionEdges(render: boolean): void;
+        /**
+         * Sets whether to render reprojection edges or not (usually for debugging).
+         * @param render Render the edges.
+         * @api
+         */
+        setRenderReprojectionEdges(render: boolean): void;
 
-            /**
-             * Sets the tile grid to use when reprojecting the tiles to the given
-             * projection instead of the default tile grid for the projection.
-             *
-             * This can be useful when the default tile grid cannot be created
-             * (e.g. projection has no extent defined) or
-             * for optimization reasons (custom tile size, resolutions, ...).
-             *
-             * @param projection Projection.
-             * @param tilegrid Tile grid to use for the projection.
-             * @api
-             */
-            setTileGridForProjection(projection: ol.ProjectionLike, tilegrid: ol.tilegrid.TileGrid): void;
-        }
+        /**
+         * Sets the tile grid to use when reprojecting the tiles to the given
+         * projection instead of the default tile grid for the projection.
+         *
+         * This can be useful when the default tile grid cannot be created
+         * (e.g. projection has no extent defined) or
+         * for optimization reasons (custom tile size, resolutions, ...).
+         *
+         * @param projection Projection.
+         * @param tilegrid Tile grid to use for the projection.
+         * @api
+         */
+        setTileGridForProjection(projection: ol.ProjectionLike, tilegrid: ol.tilegrid.TileGrid): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data in TileJSON format.
+     *
+     * @param options TileJSON options.
+     * @api stable
+     */
+    class TileJSON extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data in TileJSON format.
@@ -8923,23 +8937,23 @@ declare namespace ol {
          * @param options TileJSON options.
          * @api stable
          */
-        class TileJSON extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data in TileJSON format.
-             *
-             * @param options TileJSON options.
-             * @api stable
-             */
-            constructor(options: olx.source.TileJSONOptions);
+        constructor(options: olx.source.TileJSONOptions);
 
-            /**
-             * @return The tilejson object.
-             * @api
-             */
-            getTileJSON(): TileJSON;
-        }
+        /**
+         * @return The tilejson object.
+         * @api
+         */
+        getTileJSON(): TileJSON;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for UTFGrid interaction data loaded from TileJSON format.
+     *
+     * @param options Source options.
+     * @api
+     */
+    class TileUTFGrid extends Tile {
         /**
          * @classdesc
          * Layer source for UTFGrid interaction data loaded from TileJSON format.
@@ -8947,39 +8961,39 @@ declare namespace ol {
          * @param options Source options.
          * @api
          */
-        class TileUTFGrid extends ol.source.Tile {
-            /**
-             * @classdesc
-             * Layer source for UTFGrid interaction data loaded from TileJSON format.
-             *
-             * @param options Source options.
-             * @api
-             */
-            constructor(options: olx.source.TileUTFGridOptions);
+        constructor(options: olx.source.TileUTFGridOptions);
 
-            /**
-             * Return the template from TileJSON.
-             * @return The template from TileJSON.
-             * @api
-             */
-            getTemplate(): (string);
+        /**
+         * Return the template from TileJSON.
+         * @return The template from TileJSON.
+         * @api
+         */
+        getTemplate(): (string);
 
-            /**
-             * Calls the callback (synchronously by default) with the available data
-             * for given coordinate and resolution (or `null` if not yet loaded or
-             * in case of an error).
-             * @param coordinate Coordinate.
-             * @param resolution Resolution.
-             * @param callback Callback.
-             * @param opt_this The object to use as `this` in the callback.
-             * @param opt_request If `true` the callback is always async.
-             *                               The tile data is requested if not yet loaded.
-             * @template T
-             * @api
-             */
-            forDataAtCoordinateAndResolution<T>(coordinate: ol.Coordinate, resolution: number, callback: ((d: any) => any), opt_this?: T, opt_request?: boolean): void;
-        }
+        /**
+         * Calls the callback (synchronously by default) with the available data
+         * for given coordinate and resolution (or `null` if not yet loaded or
+         * in case of an error).
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param callback Callback.
+         * @param opt_this The object to use as `this` in the callback.
+         * @param opt_request If `true` the callback is always async.
+         *                               The tile data is requested if not yet loaded.
+         * @template T
+         * @api
+         */
+        forDataAtCoordinateAndResolution(coordinate: ol.Coordinate, resolution: number, callback: ((d: any) => any), opt_this?: any, opt_request?: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data from WMS servers.
+     *
+     * @param opt_options Tile WMS options.
+     * @api stable
+     */
+    class TileWMS extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data from WMS servers.
@@ -8987,48 +9001,48 @@ declare namespace ol {
          * @param opt_options Tile WMS options.
          * @api stable
          */
-        class TileWMS extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data from WMS servers.
-             *
-             * @param opt_options Tile WMS options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.TileWMSOptions);
+        constructor(opt_options?: olx.source.TileWMSOptions);
 
-            /**
-             * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
-             * projection. Return `undefined` if the GetFeatureInfo URL cannot be
-             * constructed.
-             * @param coordinate Coordinate.
-             * @param resolution Resolution.
-             * @param projection Projection.
-             * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
-             *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
-             *     in the `LAYERS` parameter will be used. `VERSION` should not be
-             *     specified here.
-             * @return GetFeatureInfo URL.
-             * @api stable
-             */
-            getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
+        /**
+         * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
+         * projection. Return `undefined` if the GetFeatureInfo URL cannot be
+         * constructed.
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param projection Projection.
+         * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
+         *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
+         *     in the `LAYERS` parameter will be used. `VERSION` should not be
+         *     specified here.
+         * @return GetFeatureInfo URL.
+         * @api stable
+         */
+        getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Update the user-provided params.
-             * @param params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Base class for sources providing tiles divided into a tile grid over http.
+     *
+     * @fires ol.source.TileEvent
+     * @param options Image tile options.
+     */
+    class UrlTile extends Tile {
         /**
          * @classdesc
          * Base class for sources providing tiles divided into a tile grid over http.
@@ -9036,69 +9050,72 @@ declare namespace ol {
          * @fires ol.source.TileEvent
          * @param options Image tile options.
          */
-        class UrlTile extends ol.source.Tile {
-            /**
-             * @classdesc
-             * Base class for sources providing tiles divided into a tile grid over http.
-             *
-             * @fires ol.source.TileEvent
-             * @param options Image tile options.
-             */
-            constructor(options: ol.SourceUrlTileOptions);
+        constructor(options: ol.SourceUrlTileOptions);
 
-            /**
-             * Return the tile load function of the source.
-             * @return TileLoadFunction
-             * @api
-             */
-            getTileLoadFunction(): ol.TileLoadFunctionType;
+        /**
+         * Return the tile load function of the source.
+         * @return TileLoadFunction
+         * @api
+         */
+        getTileLoadFunction(): ol.TileLoadFunctionType;
 
-            /**
-             * Return the tile URL function of the source.
-             * @return TileUrlFunction
-             * @api
-             */
-            getTileUrlFunction(): ol.TileUrlFunctionType;
+        /**
+         * Return the tile URL function of the source.
+         * @return TileUrlFunction
+         * @api
+         */
+        getTileUrlFunction(): ol.TileUrlFunctionType;
 
-            /**
-             * Return the URLs used for this source.
-             * When a tileUrlFunction is used instead of url or urls,
-             * null will be returned.
-             * @return URLs.
-             * @api
-             */
-            getUrls(): (string[]);
+        /**
+         * Return the URLs used for this source.
+         * When a tileUrlFunction is used instead of url or urls,
+         * null will be returned.
+         * @return URLs.
+         * @api
+         */
+        getUrls(): (string[]);
 
-            /**
-             * Set the tile load function of the source.
-             * @param tileLoadFunction Tile load function.
-             * @api
-             */
-            setTileLoadFunction(tileLoadFunction: ol.TileLoadFunctionType): void;
+        /**
+         * Set the tile load function of the source.
+         * @param tileLoadFunction Tile load function.
+         * @api
+         */
+        setTileLoadFunction(tileLoadFunction: ol.TileLoadFunctionType): void;
 
-            /**
-             * Set the tile URL function of the source.
-             * @param tileUrlFunction Tile URL function.
-             * @param opt_key Optional new tile key for the source.
-             * @api
-             */
-            setTileUrlFunction(tileUrlFunction: ol.TileUrlFunctionType, opt_key?: string): void;
+        /**
+         * Set the tile URL function of the source.
+         * @param tileUrlFunction Tile URL function.
+         * @param opt_key Optional new tile key for the source.
+         * @api
+         */
+        setTileUrlFunction(tileUrlFunction: ol.TileUrlFunctionType, opt_key?: string): void;
 
-            /**
-             * Set the URL to use for requests.
-             * @param url URL.
-             * @api stable
-             */
-            setUrl(url: string): void;
+        /**
+         * Set the URL to use for requests.
+         * @param url URL.
+         * @api stable
+         */
+        setUrl(url: string): void;
 
-            /**
-             * Set the URLs to use for requests.
-             * @param urls URLs.
-             * @api stable
-             */
-            setUrls(urls: string[]): void;
-        }
+        /**
+         * Set the URLs to use for requests.
+         * @param urls URLs.
+         * @api stable
+         */
+        setUrls(urls: string[]): void;
+    }
 
+    /**
+     * @classdesc
+     * Provides a source of features for vector layers. Vector features provided
+     * by this source are suitable for editing. See {@link ol.source.VectorTile} for
+     * vector data that is optimized for rendering.
+     *
+     * @fires ol.source.VectorEvent
+     * @param opt_options Vector source options.
+     * @api stable
+     */
+    class Vector extends Source {
         /**
          * @classdesc
          * Provides a source of features for vector layers. Vector features provided
@@ -9109,196 +9126,194 @@ declare namespace ol {
          * @param opt_options Vector source options.
          * @api stable
          */
-        class Vector extends ol.source.Source {
-            /**
-             * @classdesc
-             * Provides a source of features for vector layers. Vector features provided
-             * by this source are suitable for editing. See {@link ol.source.VectorTile} for
-             * vector data that is optimized for rendering.
-             *
-             * @fires ol.source.VectorEvent
-             * @param opt_options Vector source options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.VectorOptions);
+        constructor(opt_options?: olx.source.VectorOptions);
 
-            /**
-             * Add a single feature to the source.  If you want to add a batch of features
-             * at once, call {@link ol.source.Vector#addFeatures source.addFeatures()}
-             * instead.
-             * @param feature Feature to add.
-             * @api stable
-             */
-            addFeature(feature: ol.Feature): void;
+        /**
+         * Add a single feature to the source.  If you want to add a batch of features
+         * at once, call {@link ol.source.Vector#addFeatures source.addFeatures()}
+         * instead.
+         * @param feature Feature to add.
+         * @api stable
+         */
+        addFeature(feature: ol.Feature): void;
 
-            /**
-             * Add a batch of features to the source.
-             * @param features Features to add.
-             * @api stable
-             */
-            addFeatures(features: ol.Feature[]): void;
+        /**
+         * Add a batch of features to the source.
+         * @param features Features to add.
+         * @api stable
+         */
+        addFeatures(features: ol.Feature[]): void;
 
-            /**
-             * Remove all features from the source.
-             * @param events.
-             * @api stable
-             */
-            clear(opt_fast?: boolean): void;
+        /**
+         * Remove all features from the source.
+         * @param events.
+         * @api stable
+         */
+        clear(opt_fast?: boolean): void;
 
-            /**
-             * Iterate through all features on the source, calling the provided callback
-             * with each one.  If the callback returns any "truthy" value, iteration will
-             * stop and the function will return the same value.
-             *
-             * @param callback Called with each feature
-             *     on the source.  Return a truthy value to stop iteration.
-             * @param opt_this The object to use as `this` in the callback.
-             * @return The return value from the last call to the callback.
-             * @template T,S
-             * @api stable
-             */
-            forEachFeature<T, S>(callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        /**
+         * Iterate through all features on the source, calling the provided callback
+         * with each one.  If the callback returns any "truthy" value, iteration will
+         * stop and the function will return the same value.
+         *
+         * @param callback Called with each feature
+         *     on the source.  Return a truthy value to stop iteration.
+         * @param opt_this The object to use as `this` in the callback.
+         * @return The return value from the last call to the callback.
+         * @template T,S
+         * @api stable
+         */
+        forEachFeature<S>(callback: ((feature: ol.Feature) => S), opt_this?: any): (S);
 
-            /**
-             * Iterate through all features whose bounding box intersects the provided
-             * extent (note that the feature's geometry may not intersect the extent),
-             * calling the callback with each feature.  If the callback returns a "truthy"
-             * value, iteration will stop and the function will return the same value.
-             *
-             * If you are interested in features whose geometry intersects an extent, call
-             * the {@link ol.source.Vector#forEachFeatureIntersectingExtent
-             * source.forEachFeatureIntersectingExtent()} method instead.
-             *
-             * When `useSpatialIndex` is set to false, this method will loop through all
-             * features, equivalent to {@link ol.source.Vector#forEachFeature}.
-             *
-             * @param extent Extent.
-             * @param callback Called with each feature
-             *     whose bounding box intersects the provided extent.
-             * @param opt_this The object to use as `this` in the callback.
-             * @return The return value from the last call to the callback.
-             * @template T,S
-             * @api
-             */
-            forEachFeatureInExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        /**
+         * Iterate through all features whose bounding box intersects the provided
+         * extent (note that the feature's geometry may not intersect the extent),
+         * calling the callback with each feature.  If the callback returns a "truthy"
+         * value, iteration will stop and the function will return the same value.
+         *
+         * If you are interested in features whose geometry intersects an extent, call
+         * the {@link ol.source.Vector#forEachFeatureIntersectingExtent
+         * source.forEachFeatureIntersectingExtent()} method instead.
+         *
+         * When `useSpatialIndex` is set to false, this method will loop through all
+         * features, equivalent to {@link ol.source.Vector#forEachFeature}.
+         *
+         * @param extent Extent.
+         * @param callback Called with each feature
+         *     whose bounding box intersects the provided extent.
+         * @param opt_this The object to use as `this` in the callback.
+         * @return The return value from the last call to the callback.
+         * @template T,S
+         * @api
+         */
+        forEachFeatureInExtent<S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: any): (S);
 
-            /**
-             * Iterate through all features whose geometry intersects the provided extent,
-             * calling the callback with each feature.  If the callback returns a "truthy"
-             * value, iteration will stop and the function will return the same value.
-             *
-             * If you only want to test for bounding box intersection, call the
-             * {@link ol.source.Vector#forEachFeatureInExtent
-             * source.forEachFeatureInExtent()} method instead.
-             *
-             * @param extent Extent.
-             * @param callback Called with each feature
-             *     whose geometry intersects the provided extent.
-             * @param opt_this The object to use as `this` in the callback.
-             * @return The return value from the last call to the callback.
-             * @template T,S
-             * @api
-             */
-            forEachFeatureIntersectingExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        /**
+         * Iterate through all features whose geometry intersects the provided extent,
+         * calling the callback with each feature.  If the callback returns a "truthy"
+         * value, iteration will stop and the function will return the same value.
+         *
+         * If you only want to test for bounding box intersection, call the
+         * {@link ol.source.Vector#forEachFeatureInExtent
+         * source.forEachFeatureInExtent()} method instead.
+         *
+         * @param extent Extent.
+         * @param callback Called with each feature
+         *     whose geometry intersects the provided extent.
+         * @param opt_this The object to use as `this` in the callback.
+         * @return The return value from the last call to the callback.
+         * @template T,S
+         * @api
+         */
+        forEachFeatureIntersectingExtent<S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: any): (S);
 
-            /**
-             * Get the features collection associated with this source. Will be `null`
-             * unless the source was configured with `useSpatialIndex` set to `false`, or
-             * with an {@link ol.Collection} as `features`.
-             * @return The collection of features.
-             * @api
-             */
-            getFeaturesCollection(): ol.Collection<ol.Feature>;
+        /**
+         * Get the features collection associated with this source. Will be `null`
+         * unless the source was configured with `useSpatialIndex` set to `false`, or
+         * with an {@link ol.Collection} as `features`.
+         * @return The collection of features.
+         * @api
+         */
+        getFeaturesCollection(): ol.Collection<ol.Feature>;
 
-            /**
-             * Get all features on the source.
-             * @return Features.
-             * @api stable
-             */
-            getFeatures(): ol.Feature[];
+        /**
+         * Get all features on the source.
+         * @return Features.
+         * @api stable
+         */
+        getFeatures(): ol.Feature[];
 
-            /**
-             * Get all features whose geometry intersects the provided coordinate.
-             * @param coordinate Coordinate.
-             * @return Features.
-             * @api stable
-             */
-            getFeaturesAtCoordinate(coordinate: ol.Coordinate): ol.Feature[];
+        /**
+         * Get all features whose geometry intersects the provided coordinate.
+         * @param coordinate Coordinate.
+         * @return Features.
+         * @api stable
+         */
+        getFeaturesAtCoordinate(coordinate: ol.Coordinate): ol.Feature[];
 
-            /**
-             * Get all features in the provided extent.  Note that this returns all features
-             * whose bounding boxes intersect the given extent (so it may include features
-             * whose geometries do not intersect the extent).
-             *
-             * This method is not available when the source is configured with
-             * `useSpatialIndex` set to `false`.
-             * @param extent Extent.
-             * @return Features.
-             * @api
-             */
-            getFeaturesInExtent(extent: ol.Extent): ol.Feature[];
+        /**
+         * Get all features in the provided extent.  Note that this returns all features
+         * whose bounding boxes intersect the given extent (so it may include features
+         * whose geometries do not intersect the extent).
+         *
+         * This method is not available when the source is configured with
+         * `useSpatialIndex` set to `false`.
+         * @param extent Extent.
+         * @return Features.
+         * @api
+         */
+        getFeaturesInExtent(extent: ol.Extent): ol.Feature[];
 
-            /**
-             * Get the closest feature to the provided coordinate.
-             *
-             * This method is not available when the source is configured with
-             * `useSpatialIndex` set to `false`.
-             * @param coordinate Coordinate.
-             * @param opt_filter Feature filter function.
-             *     The filter function will receive one argument, the {@link ol.Feature feature}
-             *     and it should return a boolean value. By default, no filtering is made.
-             * @return Closest feature.
-             * @api stable
-             */
-            getClosestFeatureToCoordinate(coordinate: ol.Coordinate, opt_filter?: ((feature: ol.Feature) => boolean)): ol.Feature;
+        /**
+         * Get the closest feature to the provided coordinate.
+         *
+         * This method is not available when the source is configured with
+         * `useSpatialIndex` set to `false`.
+         * @param coordinate Coordinate.
+         * @param opt_filter Feature filter function.
+         *     The filter function will receive one argument, the {@link ol.Feature feature}
+         *     and it should return a boolean value. By default, no filtering is made.
+         * @return Closest feature.
+         * @api stable
+         */
+        getClosestFeatureToCoordinate(coordinate: ol.Coordinate, opt_filter?: ((feature: ol.Feature) => boolean)): ol.Feature;
 
-            /**
-             * Get the extent of the features currently in the source.
-             *
-             * This method is not available when the source is configured with
-             * `useSpatialIndex` set to `false`.
-             * @return Extent.
-             * @api stable
-             */
-            getExtent(): ol.Extent;
+        /**
+         * Get the extent of the features currently in the source.
+         *
+         * This method is not available when the source is configured with
+         * `useSpatialIndex` set to `false`.
+         * @return Extent.
+         * @api stable
+         */
+        getExtent(): ol.Extent;
 
-            /**
-             * Get a feature by its identifier (the value returned by feature.getId()).
-             * Note that the index treats string and numeric identifiers as the same.  So
-             * `source.getFeatureById(2)` will return a feature with id `'2'` or `2`.
-             *
-             * @param id Feature identifier.
-             * @return The feature (or `null` if not found).
-             * @api stable
-             */
-            getFeatureById(id: (string | number)): ol.Feature;
+        /**
+         * Get a feature by its identifier (the value returned by feature.getId()).
+         * Note that the index treats string and numeric identifiers as the same.  So
+         * `source.getFeatureById(2)` will return a feature with id `'2'` or `2`.
+         *
+         * @param id Feature identifier.
+         * @return The feature (or `null` if not found).
+         * @api stable
+         */
+        getFeatureById(id: (string | number)): ol.Feature;
 
-            /**
-             * Get the format associated with this source.
-             *
-             * @return The feature format.
-             * @api
-             */
-            getFormat(): (ol.format.Feature);
+        /**
+         * Get the format associated with this source.
+         *
+         * @return The feature format.
+         * @api
+         */
+        getFormat(): (ol.format.Feature);
 
-            /**
-             * Get the url associated with this source.
-             *
-             * @return The url.
-             * @api
-             */
-            getUrl(): (string | ol.FeatureUrlFunction);
+        /**
+         * Get the url associated with this source.
+         *
+         * @return The url.
+         * @api
+         */
+        getUrl(): (string | ol.FeatureUrlFunction);
 
-            /**
-             * Remove a single feature from the source.  If you want to remove all features
-             * at once, use the {@link ol.source.Vector#clear source.clear()} method
-             * instead.
-             * @param feature Feature to remove.
-             * @api stable
-             */
-            removeFeature(feature: ol.Feature): void;
-        }
+        /**
+         * Remove a single feature from the source.  If you want to remove all features
+         * at once, use the {@link ol.source.Vector#clear source.clear()} method
+         * instead.
+         * @param feature Feature to remove.
+         * @api stable
+         */
+        removeFeature(feature: ol.Feature): void;
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Vector} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param opt_feature Feature.
+     */
+    class VectorEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Vector} instances are instances of this
@@ -9307,24 +9322,30 @@ declare namespace ol {
          * @param type Type.
          * @param opt_feature Feature.
          */
-        class VectorEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Vector} instances are instances of this
-             * type.
-             *
-             * @param type Type.
-             * @param opt_feature Feature.
-             */
-            constructor(type: string, opt_feature?: ol.Feature);
+        constructor(type: string, opt_feature?: ol.Feature);
 
-            /**
-             * The feature being added or removed.
-             * @api stable
-             */
-            feature: ol.Feature;
-        }
+        /**
+         * The feature being added or removed.
+         * @api stable
+         */
+        feature: ol.Feature;
+    }
 
+    /**
+     * @classdesc
+     * Class for layer sources providing vector data divided into a tile grid, to be
+     * used with {@link ol.layer.VectorTile}. Although this source receives tiles
+     * with vector features from the server, it is not meant for feature editing.
+     * Features are optimized for rendering, their geometries are clipped at or near
+     * tile boundaries and simplified for a view resolution. See
+     * {@link ol.source.Vector} for vector sources that are suitable for feature
+     * editing.
+     *
+     * @fires ol.source.TileEvent
+     * @param options Vector tile options.
+     * @api
+     */
+    class VectorTile extends UrlTile {
         /**
          * @classdesc
          * Class for layer sources providing vector data divided into a tile grid, to be
@@ -9339,38 +9360,31 @@ declare namespace ol {
          * @param options Vector tile options.
          * @api
          */
-        class VectorTile extends ol.source.UrlTile {
-            /**
-             * @classdesc
-             * Class for layer sources providing vector data divided into a tile grid, to be
-             * used with {@link ol.layer.VectorTile}. Although this source receives tiles
-             * with vector features from the server, it is not meant for feature editing.
-             * Features are optimized for rendering, their geometries are clipped at or near
-             * tile boundaries and simplified for a view resolution. See
-             * {@link ol.source.Vector} for vector sources that are suitable for feature
-             * editing.
-             *
-             * @fires ol.source.TileEvent
-             * @param options Vector tile options.
-             * @api
-             */
-            constructor(options: olx.source.VectorTileOptions);
-        }
-
-        namespace wms {
-            /**
-             * Available server types: `'carmentaserver'`, `'geoserver'`, `'mapserver'`,
-             *     `'qgis'`. These are servers that have vendor parameters beyond the WMS
-             *     specification that OpenLayers can make use of.
-             */
-            type ServerType = "carmentaserver" | "geoserver" | "mapserver" | "qgis";
-        }
+        constructor(options: olx.source.VectorTileOptions);
+    }
 
+    namespace wms {
         /**
-         * Request encoding. One of 'KVP', 'REST'.
+         * Available server types: `'carmentaserver'`, `'geoserver'`, `'mapserver'`,
+         *     `'qgis'`. These are servers that have vendor parameters beyond the WMS
+         *     specification that OpenLayers can make use of.
          */
-        type WMTSRequestEncoding = "KVP" | "REST";
+        type ServerType = "carmentaserver" | "geoserver" | "mapserver" | "qgis";
+    }
 
+    /**
+     * Request encoding. One of 'KVP', 'REST'.
+     */
+    type WMTSRequestEncoding = "KVP" | "REST";
+
+    /**
+     * @classdesc
+     * Layer source for tile data from WMTS servers.
+     *
+     * @param options WMTS options.
+     * @api stable
+     */
+    class WMTS extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data from WMTS servers.
@@ -9378,100 +9392,113 @@ declare namespace ol {
          * @param options WMTS options.
          * @api stable
          */
-        class WMTS extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data from WMTS servers.
-             *
-             * @param options WMTS options.
-             * @api stable
-             */
-            constructor(options: olx.source.WMTSOptions);
+        constructor(options: olx.source.WMTSOptions);
 
-            /**
-             * Get the dimensions, i.e. those passed to the constructor through the
-             * "dimensions" option, and possibly updated using the updateDimensions
-             * method.
-             * @return Dimensions.
-             * @api
-             */
-            getDimensions(): GlobalObject;
+        /**
+         * Get the dimensions, i.e. those passed to the constructor through the
+         * "dimensions" option, and possibly updated using the updateDimensions
+         * method.
+         * @return Dimensions.
+         * @api
+         */
+        getDimensions(): GlobalObject;
 
-            /**
-             * Return the image format of the WMTS source.
-             * @return Format.
-             * @api
-             */
-            getFormat(): string;
+        /**
+         * Return the image format of the WMTS source.
+         * @return Format.
+         * @api
+         */
+        getFormat(): string;
 
-            /**
-             * Return the layer of the WMTS source.
-             * @return Layer.
-             * @api
-             */
-            getLayer(): string;
+        /**
+         * Return the layer of the WMTS source.
+         * @return Layer.
+         * @api
+         */
+        getLayer(): string;
 
-            /**
-             * Return the matrix set of the WMTS source.
-             * @return MatrixSet.
-             * @api
-             */
-            getMatrixSet(): string;
+        /**
+         * Return the matrix set of the WMTS source.
+         * @return MatrixSet.
+         * @api
+         */
+        getMatrixSet(): string;
 
-            /**
-             * Return the request encoding, either "KVP" or "REST".
-             * @return Request encoding.
-             * @api
-             */
-            getRequestEncoding(): ol.source.WMTSRequestEncoding;
+        /**
+         * Return the request encoding, either "KVP" or "REST".
+         * @return Request encoding.
+         * @api
+         */
+        getRequestEncoding(): WMTSRequestEncoding;
 
-            /**
-             * Return the style of the WMTS source.
-             * @return Style.
-             * @api
-             */
-            getStyle(): string;
+        /**
+         * Return the style of the WMTS source.
+         * @return Style.
+         * @api
+         */
+        getStyle(): string;
 
-            /**
-             * Return the version of the WMTS source.
-             * @return Version.
-             * @api
-             */
-            getVersion(): string;
+        /**
+         * Return the version of the WMTS source.
+         * @return Version.
+         * @api
+         */
+        getVersion(): string;
 
-            /**
-             * Update the dimensions.
-             * @param dimensions Dimensions.
-             * @api
-             */
-            updateDimensions(dimensions: GlobalObject): void;
+        /**
+         * Update the dimensions.
+         * @param dimensions Dimensions.
+         * @api
+         */
+        updateDimensions(dimensions: GlobalObject): void;
 
-            /**
-             * Generate source options from a capabilities object.
-             * @param wmtsCap An object representing the capabilities document.
-             * @param config Configuration properties for the layer.  Defaults for
-             *                  the layer will apply if not provided.
-             *
-             * Required config properties:
-             *  - layer - {string} The layer identifier.
-             *
-             * Optional config properties:
-             *  - matrixSet - {string} The matrix set identifier, required if there is
-             *       more than one matrix set in the layer capabilities.
-             *  - projection - {string} The desired CRS when no matrixSet is specified.
-             *       eg: "EPSG:3857". If the desired projection is not available,
-             *       an error is thrown.
-             *  - requestEncoding - {string} url encoding format for the layer. Default is
-             *       the first tile url format found in the GetCapabilities response.
-             *  - style - {string} The name of the style
-             *  - format - {string} Image format for the layer. Default is the first
-             *       format returned in the GetCapabilities response.
-             * @return WMTS source options object.
-             * @api
-             */
-            static optionsFromCapabilities(wmtsCap: GlobalObject, config: GlobalObject): olx.source.WMTSOptions;
-        }
+        /**
+         * Generate source options from a capabilities object.
+         * @param wmtsCap An object representing the capabilities document.
+         * @param config Configuration properties for the layer.  Defaults for
+         *                  the layer will apply if not provided.
+         *
+         * Required config properties:
+         *  - layer - {string} The layer identifier.
+         *
+         * Optional config properties:
+         *  - matrixSet - {string} The matrix set identifier, required if there is
+         *       more than one matrix set in the layer capabilities.
+         *  - projection - {string} The desired CRS when no matrixSet is specified.
+         *       eg: "EPSG:3857". If the desired projection is not available,
+         *       an error is thrown.
+         *  - requestEncoding - {string} url encoding format for the layer. Default is
+         *       the first tile url format found in the GetCapabilities response.
+         *  - style - {string} The name of the style
+         *  - format - {string} Image format for the layer. Default is the first
+         *       format returned in the GetCapabilities response.
+         * @return WMTS source options object.
+         * @api
+         */
+        static optionsFromCapabilities(wmtsCap: GlobalObject, config: GlobalObject): olx.source.WMTSOptions;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data with URLs in a set XYZ format that are
+     * defined in a URL template. By default, this follows the widely-used
+     * Google grid where `x` 0 and `y` 0 are in the top left. Grids like
+     * TMS where `x` 0 and `y` 0 are in the bottom left can be used by
+     * using the `{-y}` placeholder in the URL template, so long as the
+     * source does not have a custom tile grid. In this case,
+     * {@link ol.source.TileImage} can be used with a `tileUrlFunction`
+     * such as:
+     *
+     *  tileUrlFunction: function(coordinate) {
+     *    return 'http://mapserver.com/' + coordinate[0] + '/' +
+     *        coordinate[1] + '/' + coordinate[2] + '.png';
+     *    }
+     *
+     *
+     * @param opt_options XYZ options.
+     * @api stable
+     */
+    class XYZ extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data with URLs in a set XYZ format that are
@@ -9492,30 +9519,17 @@ declare namespace ol {
          * @param opt_options XYZ options.
          * @api stable
          */
-        class XYZ extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data with URLs in a set XYZ format that are
-             * defined in a URL template. By default, this follows the widely-used
-             * Google grid where `x` 0 and `y` 0 are in the top left. Grids like
-             * TMS where `x` 0 and `y` 0 are in the bottom left can be used by
-             * using the `{-y}` placeholder in the URL template, so long as the
-             * source does not have a custom tile grid. In this case,
-             * {@link ol.source.TileImage} can be used with a `tileUrlFunction`
-             * such as:
-             *
-             *  tileUrlFunction: function(coordinate) {
-             *    return 'http://mapserver.com/' + coordinate[0] + '/' +
-             *        coordinate[1] + '/' + coordinate[2] + '.png';
-             *    }
-             *
-             *
-             * @param opt_options XYZ options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.XYZOptions);
-        }
+        constructor(opt_options?: olx.source.XYZOptions);
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data in Zoomify format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class Zoomify extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data in Zoomify format.
@@ -9523,37 +9537,45 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class Zoomify extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data in Zoomify format.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.ZoomifyOptions);
-        }
+        constructor(opt_options?: olx.source.ZoomifyOptions);
     }
+}
+
+/**
+ * Object literal with options for the {@link ol.Sphere.getLength} or
+ * {@link ol.Sphere.getArea} functions.
+ */
+export interface SphereMetricOptions {
+    /**
+     * Projection of the geometry.  By default, the geometry is assumed to be in
+     * EPSG:3857 (Web Mercator).
+     */
+    projection?: ol.proj.Projection;
 
     /**
-     * Object literal with options for the {@link ol.Sphere.getLength} or
-     * {@link ol.Sphere.getArea} functions.
+     * Sphere radius.  By default, the radius of the earth is used (Clarke 1866
+     * Authalic Sphere).
+     * @api
      */
-    interface SphereMetricOptions {
-        /**
-         * Projection of the geometry.  By default, the geometry is assumed to be in
-         * EPSG:3857 (Web Mercator).
-         */
-        projection?: ol.proj.Projection;
-
-        /**
-         * Sphere radius.  By default, the radius of the earth is used (Clarke 1866
-         * Authalic Sphere).
-         * @api
-         */
-        radius?: number;
-    }
+    radius?: number;
+}
 
+/**
+ * @classdesc
+ * Class to create objects that can be used with {@link
+ * ol.geom.Polygon.circular}.
+ *
+ * For example to create a sphere whose radius is equal to the semi-major
+ * axis of the WGS84 ellipsoid:
+ *
+ * ```js
+ * var wgs84Sphere= new ol.Sphere(6378137);
+ * ```
+ *
+ * @param radius Radius.
+ * @api
+ */
+export class Sphere {
     /**
      * @classdesc
      * Class to create objects that can be used with {@link
@@ -9569,157 +9591,159 @@ declare namespace ol {
      * @param radius Radius.
      * @api
      */
-    class Sphere {
-        /**
-         * @classdesc
-         * Class to create objects that can be used with {@link
-         * ol.geom.Polygon.circular}.
-         *
-         * For example to create a sphere whose radius is equal to the semi-major
-         * axis of the WGS84 ellipsoid:
-         *
-         * ```js
-         * var wgs84Sphere= new ol.Sphere(6378137);
-         * ```
-         *
-         * @param radius Radius.
-         * @api
-         */
-        constructor(radius: number);
-
-        /**
-         * Returns the geodesic area for a list of coordinates.
-         *
-         * [Reference](http://trs-new.jpl.nasa.gov/dspace/handle/2014/40409)
-         * Robert. G. Chamberlain and William H. Duquette, "Some Algorithms for
-         * Polygons on a Sphere", JPL Publication 07-03, Jet Propulsion
-         * Laboratory, Pasadena, CA, June 2007
-         *
-         * @param coordinates List of coordinates of a linear
-         * ring. If the ring is oriented clockwise, the area will be positive,
-         * otherwise it will be negative.
-         * @return Area.
-         * @api
-         */
-        geodesicArea(coordinates: ol.Coordinate[]): number;
-
-        /**
-         * Returns the distance from c1 to c2 using the haversine formula.
-         *
-         * @param c1 Coordinate 1.
-         * @param c2 Coordinate 2.
-         * @return Haversine distance.
-         * @api
-         */
-        haversineDistance(c1: ol.Coordinate, c2: ol.Coordinate): number;
-
-        /**
-         * Get the spherical area of a geometry.  This is the area (in meters) assuming
-         * that polygon edges are segments of great circles on a sphere.
-         * @param geometry A geometry.
-         * @param opt_options Options for the area
-         *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
-         *     You can change this by providing a `projection` option.
-         * @return The spherical area (in square meters).
-         * @api
-         */
-        static getArea(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
-
-        /**
-         * Get the spherical length of a geometry.  This length is the sum of the
-         * great circle distances between coordinates.  For polygons, the length is
-         * the sum of all rings.  For points, the length is zero.  For multi-part
-         * geometries, the length is the sum of the length of each part.
-         * @param geometry A geometry.
-         * @param opt_options Options for the length
-         *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
-         *     You can change this by providing a `projection` option.
-         * @return The spherical length (in meters).
-         * @api
-         */
-        static getLength(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
-    }
+    constructor(radius: number);
 
     /**
-     * Feature styles.
+     * Returns the geodesic area for a list of coordinates.
      *
-     * If no style is defined, the following default style is used:
-     * ```js
-     *  var fill = new ol.style.Fill({
-     *    color: 'rgba(255,255,255,0.4)'
-     *  });
-     *  var stroke = new ol.style.Stroke({
-     *    color: '#3399CC',
-     *    width: 1.25
-     *  });
-     *  var styles = [
-     *    new ol.style.Style({
-     *      image: new ol.style.Circle({
-     *        fill: fill,
-     *        stroke: stroke,
-     *        radius: 5
-     *      }),
-     *      fill: fill,
-     *      stroke: stroke
-     *    })
-     *  ];
-     * ```
-     *
-     * A separate editing style has the following defaults:
-     * ```js
-     *  var white = [255, 255, 255, 1];
-     *  var blue = [0, 153, 255, 1];
-     *  var width = 3;
-     *  styles[ol.geom.GeometryType.POLYGON] = [
-     *    new ol.style.Style({
-     *      fill: new ol.style.Fill({
-     *        color: [255, 255, 255, 0.5]
-     *      })
-     *    })
-     *  ];
-     *  styles[ol.geom.GeometryType.MULTI_POLYGON] =
-     *      styles[ol.geom.GeometryType.POLYGON];
-     *  styles[ol.geom.GeometryType.LINE_STRING] = [
-     *    new ol.style.Style({
-     *      stroke: new ol.style.Stroke({
-     *        color: white,
-     *        width: width + 2
-     *      })
-     *    }),
-     *    new ol.style.Style({
-     *      stroke: new ol.style.Stroke({
-     *        color: blue,
-     *        width: width
-     *      })
-     *    })
-     *  ];
-     *  styles[ol.geom.GeometryType.MULTI_LINE_STRING] =
-     *      styles[ol.geom.GeometryType.LINE_STRING];
-     *  styles[ol.geom.GeometryType.POINT] = [
-     *    new ol.style.Style({
-     *      image: new ol.style.Circle({
-     *        radius: width * 2,
-     *        fill: new ol.style.Fill({
-     *          color: blue
-     *        }),
-     *        stroke: new ol.style.Stroke({
-     *          color: white,
-     *          width: width / 2
-     *        })
-     *      }),
-     *      zIndex: Infinity
-     *    })
-     *  ];
-     *  styles[ol.geom.GeometryType.MULTI_POINT] =
-     *      styles[ol.geom.GeometryType.POINT];
-     *  styles[ol.geom.GeometryType.GEOMETRY_COLLECTION] =
-     *      styles[ol.geom.GeometryType.POLYGON].concat(
-     *          styles[ol.geom.GeometryType.POINT]
-     *      );
-     * ```
+     * [Reference](http://trs-new.jpl.nasa.gov/dspace/handle/2014/40409)
+     * Robert. G. Chamberlain and William H. Duquette, "Some Algorithms for
+     * Polygons on a Sphere", JPL Publication 07-03, Jet Propulsion
+     * Laboratory, Pasadena, CA, June 2007
      *
+     * @param coordinates List of coordinates of a linear
+     * ring. If the ring is oriented clockwise, the area will be positive,
+     * otherwise it will be negative.
+     * @return Area.
+     * @api
      */
-    namespace style {
+    geodesicArea(coordinates: ol.Coordinate[]): number;
+
+    /**
+     * Returns the distance from c1 to c2 using the haversine formula.
+     *
+     * @param c1 Coordinate 1.
+     * @param c2 Coordinate 2.
+     * @return Haversine distance.
+     * @api
+     */
+    haversineDistance(c1: ol.Coordinate, c2: ol.Coordinate): number;
+
+    /**
+     * Get the spherical area of a geometry.  This is the area (in meters) assuming
+     * that polygon edges are segments of great circles on a sphere.
+     * @param geometry A geometry.
+     * @param opt_options Options for the area
+     *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
+     *     You can change this by providing a `projection` option.
+     * @return The spherical area (in square meters).
+     * @api
+     */
+    static getArea(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
+
+    /**
+     * Get the spherical length of a geometry.  This length is the sum of the
+     * great circle distances between coordinates.  For polygons, the length is
+     * the sum of all rings.  For points, the length is zero.  For multi-part
+     * geometries, the length is the sum of the length of each part.
+     * @param geometry A geometry.
+     * @param opt_options Options for the length
+     *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
+     *     You can change this by providing a `projection` option.
+     * @return The spherical length (in meters).
+     * @api
+     */
+    static getLength(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
+}
+
+/**
+ * Feature styles.
+ *
+ * If no style is defined, the following default style is used:
+ * ```js
+ *  var fill = new ol.style.Fill({
+ *    color: 'rgba(255,255,255,0.4)'
+ *  });
+ *  var stroke = new ol.style.Stroke({
+ *    color: '#3399CC',
+ *    width: 1.25
+ *  });
+ *  var styles = [
+ *    new ol.style.Style({
+ *      image: new ol.style.Circle({
+ *        fill: fill,
+ *        stroke: stroke,
+ *        radius: 5
+ *      }),
+ *      fill: fill,
+ *      stroke: stroke
+ *    })
+ *  ];
+ * ```
+ *
+ * A separate editing style has the following defaults:
+ * ```js
+ *  var white = [255, 255, 255, 1];
+ *  var blue = [0, 153, 255, 1];
+ *  var width = 3;
+ *  styles[ol.geom.GeometryType.POLYGON] = [
+ *    new ol.style.Style({
+ *      fill: new ol.style.Fill({
+ *        color: [255, 255, 255, 0.5]
+ *      })
+ *    })
+ *  ];
+ *  styles[ol.geom.GeometryType.MULTI_POLYGON] =
+ *      styles[ol.geom.GeometryType.POLYGON];
+ *  styles[ol.geom.GeometryType.LINE_STRING] = [
+ *    new ol.style.Style({
+ *      stroke: new ol.style.Stroke({
+ *        color: white,
+ *        width: width + 2
+ *      })
+ *    }),
+ *    new ol.style.Style({
+ *      stroke: new ol.style.Stroke({
+ *        color: blue,
+ *        width: width
+ *      })
+ *    })
+ *  ];
+ *  styles[ol.geom.GeometryType.MULTI_LINE_STRING] =
+ *      styles[ol.geom.GeometryType.LINE_STRING];
+ *  styles[ol.geom.GeometryType.POINT] = [
+ *    new ol.style.Style({
+ *      image: new ol.style.Circle({
+ *        radius: width * 2,
+ *        fill: new ol.style.Fill({
+ *          color: blue
+ *        }),
+ *        stroke: new ol.style.Stroke({
+ *          color: white,
+ *          width: width / 2
+ *        })
+ *      }),
+ *      zIndex: Infinity
+ *    })
+ *  ];
+ *  styles[ol.geom.GeometryType.MULTI_POINT] =
+ *      styles[ol.geom.GeometryType.POINT];
+ *  styles[ol.geom.GeometryType.GEOMETRY_COLLECTION] =
+ *      styles[ol.geom.GeometryType.POLYGON].concat(
+ *          styles[ol.geom.GeometryType.POINT]
+ *      );
+ * ```
+ *
+ */
+export namespace style {
+    /**
+     * Manages the creation of image atlases.
+     *
+     * Images added to this manager will be inserted into an atlas, which
+     * will be used for rendering.
+     * The `size` given in the constructor is the size for the first
+     * atlas. After that, when new atlases are created, they will have
+     * twice the size as the latest atlas (until `maxSize` is reached).
+     *
+     * If an application uses many images or very large images, it is recommended
+     * to set a higher `size` value to avoid the creation of too many atlases.
+     *
+     * @struct
+     * @api
+     * @param opt_options Options.
+     */
+    /* tslint:disable-next-line:no-unnecessary-class */
+    class AtlasManager {
         /**
          * Manages the creation of image atlases.
          *
@@ -9736,26 +9760,17 @@ declare namespace ol {
          * @api
          * @param opt_options Options.
          */
-        class AtlasManager {
-            /**
-             * Manages the creation of image atlases.
-             *
-             * Images added to this manager will be inserted into an atlas, which
-             * will be used for rendering.
-             * The `size` given in the constructor is the size for the first
-             * atlas. After that, when new atlases are created, they will have
-             * twice the size as the latest atlas (until `maxSize` is reached).
-             *
-             * If an application uses many images or very large images, it is recommended
-             * to set a higher `size` value to avoid the creation of too many atlases.
-             *
-             * @struct
-             * @api
-             * @param opt_options Options.
-             */
-            constructor(opt_options?: olx.style.AtlasManagerOptions);
-        }
+        constructor(opt_options?: olx.style.AtlasManagerOptions);
+    }
 
+    /**
+     * @classdesc
+     * Set circle style for vector features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Circle extends Image {
         /**
          * @classdesc
          * Set circle style for vector features.
@@ -9763,54 +9778,54 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Circle extends ol.style.Image {
-            /**
-             * @classdesc
-             * Set circle style for vector features.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.CircleOptions);
+        constructor(opt_options?: olx.style.CircleOptions);
 
-            /**
-             * Get the fill style for the circle.
-             * @return Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
+        /**
+         * Get the fill style for the circle.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): Fill;
 
-            /**
-             * Get the image used to render the circle.
-             * @param pixelRatio Pixel ratio.
-             * @return Canvas element.
-             * @api
-             */
-            getImage(pixelRatio: number): HTMLCanvasElement;
+        /**
+         * Get the image used to render the circle.
+         * @param pixelRatio Pixel ratio.
+         * @return Canvas element.
+         * @api
+         */
+        getImage(pixelRatio: number): HTMLCanvasElement;
 
-            /**
-             * Get the circle radius.
-             * @return Radius.
-             * @api
-             */
-            getRadius(): number;
+        /**
+         * Get the circle radius.
+         * @return Radius.
+         * @api
+         */
+        getRadius(): number;
 
-            /**
-             * Get the stroke style for the circle.
-             * @return Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
+        /**
+         * Get the stroke style for the circle.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): Stroke;
 
-            /**
-             * Set the circle radius.
-             *
-             * @param radius Circle radius.
-             * @api
-             */
-            setRadius(radius: number): void;
-        }
+        /**
+         * Set the circle radius.
+         *
+         * @param radius Circle radius.
+         * @api
+         */
+        setRadius(radius: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Set fill style for vector features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Fill {
         /**
          * @classdesc
          * Set fill style for vector features.
@@ -9818,42 +9833,42 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Fill {
-            /**
-             * @classdesc
-             * Set fill style for vector features.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.FillOptions);
-
-            /**
-             * Get the fill color.
-             * @return Color.
-             * @api
-             */
-            getColor(): (ol.Color | ol.ColorLike);
-
-            /**
-             * Set the color.
-             *
-             * @param color Color.
-             * @api
-             */
-            setColor(color: (ol.Color | ol.ColorLike)): void;
-        }
+        constructor(opt_options?: olx.style.FillOptions);
 
         /**
-         * Icon anchor units. One of 'fraction', 'pixels'.
+         * Get the fill color.
+         * @return Color.
+         * @api
          */
-        type IconAnchorUnits = "fraction" | "pixels";
+        getColor(): (ol.Color | ol.ColorLike);
 
         /**
-         * Icon origin. One of 'bottom-left', 'bottom-right', 'top-left', 'top-right'.
+         * Set the color.
+         *
+         * @param color Color.
+         * @api
          */
-        type IconOrigin = "bottom-left" | "bottom-right" | "top-left" | "top-right";
+        setColor(color: (ol.Color | ol.ColorLike)): void;
+    }
 
+    /**
+     * Icon anchor units. One of 'fraction', 'pixels'.
+     */
+    type IconAnchorUnits = "fraction" | "pixels";
+
+    /**
+     * Icon origin. One of 'bottom-left', 'bottom-right', 'top-left', 'top-right'.
+     */
+    type IconOrigin = "bottom-left" | "bottom-right" | "top-left" | "top-right";
+
+    /**
+     * @classdesc
+     * Set icon style for vector features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Icon extends Image {
         /**
          * @classdesc
          * Set icon style for vector features.
@@ -9861,59 +9876,61 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Icon extends ol.style.Image {
-            /**
-             * @classdesc
-             * Set icon style for vector features.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.IconOptions);
+        constructor(opt_options?: olx.style.IconOptions);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getAnchor(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getAnchor(): number[];
 
-            /**
-             * Get the image icon.
-             * @param pixelRatio Pixel ratio.
-             * @return Image or Canvas element.
-             * @api
-             */
-            getImage(pixelRatio: number): (Image | HTMLCanvasElement);
+        /**
+         * Get the image icon.
+         * @param pixelRatio Pixel ratio.
+         * @return Image or Canvas element.
+         * @api
+         */
+        getImage(pixelRatio: number): (Image | HTMLCanvasElement);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getOrigin(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getOrigin(): number[];
 
-            /**
-             * Get the image URL.
-             * @return Image src.
-             * @api
-             */
-            getSrc(): (string);
+        /**
+         * Get the image URL.
+         * @return Image src.
+         * @api
+         */
+        getSrc(): (string);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getSize(): ol.Size;
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getSize(): ol.Size;
 
-            /**
-             * Load not yet loaded URI.
-             * When rendering a feature with an icon style, the vector renderer will
-             * automatically call this method. However, you might want to call this
-             * method yourself for preloading or other purposes.
-             * @api
-             */
-            load(): void;
-        }
+        /**
+         * Load not yet loaded URI.
+         * When rendering a feature with an icon style, the vector renderer will
+         * automatically call this method. However, you might want to call this
+         * method yourself for preloading or other purposes.
+         * @api
+         */
+        load(): void;
+    }
 
+    /**
+     * @classdesc
+     * A base class used for creating subclasses and not instantiated in
+     * apps. Base class for {@link ol.style.Icon}, {@link ol.style.Circle} and
+     * {@link ol.style.RegularShape}.
+     *
+     * @param options Options.
+     * @api
+     */
+    class Image {
         /**
          * @classdesc
          * A base class used for creating subclasses and not instantiated in
@@ -9923,78 +9940,78 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class Image {
-            /**
-             * @classdesc
-             * A base class used for creating subclasses and not instantiated in
-             * apps. Base class for {@link ol.style.Icon}, {@link ol.style.Circle} and
-             * {@link ol.style.RegularShape}.
-             *
-             * @param options Options.
-             * @api
-             */
-            constructor(options: ol.StyleImageOptions);
+        constructor(options: ol.StyleImageOptions);
 
-            /**
-             * Get the symbolizer opacity.
-             * @return Opacity.
-             * @api
-             */
-            getOpacity(): number;
+        /**
+         * Get the symbolizer opacity.
+         * @return Opacity.
+         * @api
+         */
+        getOpacity(): number;
 
-            /**
-             * Determine whether the symbolizer rotates with the map.
-             * @return Rotate with map.
-             * @api
-             */
-            getRotateWithView(): boolean;
+        /**
+         * Determine whether the symbolizer rotates with the map.
+         * @return Rotate with map.
+         * @api
+         */
+        getRotateWithView(): boolean;
 
-            /**
-             * Get the symoblizer rotation.
-             * @return Rotation.
-             * @api
-             */
-            getRotation(): number;
+        /**
+         * Get the symoblizer rotation.
+         * @return Rotation.
+         * @api
+         */
+        getRotation(): number;
 
-            /**
-             * Get the symbolizer scale.
-             * @return Scale.
-             * @api
-             */
-            getScale(): number;
+        /**
+         * Get the symbolizer scale.
+         * @return Scale.
+         * @api
+         */
+        getScale(): number;
 
-            /**
-             * Determine whether the symbolizer should be snapped to a pixel.
-             * @return The symbolizer should snap to a pixel.
-             * @api
-             */
-            getSnapToPixel(): boolean;
+        /**
+         * Determine whether the symbolizer should be snapped to a pixel.
+         * @return The symbolizer should snap to a pixel.
+         * @api
+         */
+        getSnapToPixel(): boolean;
 
-            /**
-             * Set the opacity.
-             *
-             * @param opacity Opacity.
-             * @api
-             */
-            setOpacity(opacity: number): void;
+        /**
+         * Set the opacity.
+         *
+         * @param opacity Opacity.
+         * @api
+         */
+        setOpacity(opacity: number): void;
 
-            /**
-             * Set the rotation.
-             *
-             * @param rotation Rotation.
-             * @api
-             */
-            setRotation(rotation: number): void;
+        /**
+         * Set the rotation.
+         *
+         * @param rotation Rotation.
+         * @api
+         */
+        setRotation(rotation: number): void;
 
-            /**
-             * Set the scale.
-             *
-             * @param scale Scale.
-             * @api
-             */
-            setScale(scale: number): void;
-        }
+        /**
+         * Set the scale.
+         *
+         * @param scale Scale.
+         * @api
+         */
+        setScale(scale: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Set regular shape style for vector features. The resulting shape will be
+     * a regular polygon when `radius` is provided, or a star when `radius1` and
+     * `radius2` are provided.
+     *
+     * @param options Options.
+     * @api
+     */
+    class RegularShape extends Image {
         /**
          * @classdesc
          * Set regular shape style for vector features. The resulting shape will be
@@ -10004,85 +10021,86 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class RegularShape extends ol.style.Image {
-            /**
-             * @classdesc
-             * Set regular shape style for vector features. The resulting shape will be
-             * a regular polygon when `radius` is provided, or a star when `radius1` and
-             * `radius2` are provided.
-             *
-             * @param options Options.
-             * @api
-             */
-            constructor(options: olx.style.RegularShapeOptions);
+        constructor(options: olx.style.RegularShapeOptions);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getAnchor(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getAnchor(): number[];
 
-            /**
-             * Get the angle used in generating the shape.
-             * @return Shape's rotation in radians.
-             * @api
-             */
-            getAngle(): number;
+        /**
+         * Get the angle used in generating the shape.
+         * @return Shape's rotation in radians.
+         * @api
+         */
+        getAngle(): number;
 
-            /**
-             * Get the fill style for the shape.
-             * @return Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
+        /**
+         * Get the fill style for the shape.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): Fill;
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getImage(pixelRatio: number): (HTMLCanvasElement | HTMLVideoElement | Image);
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getImage(pixelRatio: number): (HTMLCanvasElement | HTMLVideoElement | Image);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getOrigin(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getOrigin(): number[];
 
-            /**
-             * Get the number of points for generating the shape.
-             * @return Number of points for stars and regular polygons.
-             * @api
-             */
-            getPoints(): number;
+        /**
+         * Get the number of points for generating the shape.
+         * @return Number of points for stars and regular polygons.
+         * @api
+         */
+        getPoints(): number;
 
-            /**
-             * Get the (primary) radius for the shape.
-             * @return Radius.
-             * @api
-             */
-            getRadius(): number;
+        /**
+         * Get the (primary) radius for the shape.
+         * @return Radius.
+         * @api
+         */
+        getRadius(): number;
 
-            /**
-             * Get the secondary radius for the shape.
-             * @return Radius2.
-             * @api
-             */
-            getRadius2(): number;
+        /**
+         * Get the secondary radius for the shape.
+         * @return Radius2.
+         * @api
+         */
+        getRadius2(): number;
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getSize(): ol.Size;
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getSize(): ol.Size;
 
-            /**
-             * Get the stroke style for the shape.
-             * @return Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
-        }
+        /**
+         * Get the stroke style for the shape.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): Stroke;
+    }
 
+    /**
+     * @classdesc
+     * Set stroke style for vector features.
+     * Note that the defaults given are the Canvas defaults, which will be used if
+     * option is not defined. The `get` functions return whatever was entered in
+     * the options; they will not return the default.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Stroke {
         /**
          * @classdesc
          * Set stroke style for vector features.
@@ -10093,116 +10111,116 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Stroke {
-            /**
-             * @classdesc
-             * Set stroke style for vector features.
-             * Note that the defaults given are the Canvas defaults, which will be used if
-             * option is not defined. The `get` functions return whatever was entered in
-             * the options; they will not return the default.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.StrokeOptions);
+        constructor(opt_options?: olx.style.StrokeOptions);
 
-            /**
-             * Get the stroke color.
-             * @return Color.
-             * @api
-             */
-            getColor(): (ol.Color | string);
+        /**
+         * Get the stroke color.
+         * @return Color.
+         * @api
+         */
+        getColor(): (ol.Color | string);
 
-            /**
-             * Get the line cap type for the stroke.
-             * @return Line cap.
-             * @api
-             */
-            getLineCap(): (string);
+        /**
+         * Get the line cap type for the stroke.
+         * @return Line cap.
+         * @api
+         */
+        getLineCap(): (string);
 
-            /**
-             * Get the line dash style for the stroke.
-             * @return Line dash.
-             * @api
-             */
-            getLineDash(): number[];
+        /**
+         * Get the line dash style for the stroke.
+         * @return Line dash.
+         * @api
+         */
+        getLineDash(): number[];
 
-            /**
-             * Get the line join type for the stroke.
-             * @return Line join.
-             * @api
-             */
-            getLineJoin(): (string);
+        /**
+         * Get the line join type for the stroke.
+         * @return Line join.
+         * @api
+         */
+        getLineJoin(): (string);
 
-            /**
-             * Get the miter limit for the stroke.
-             * @return Miter limit.
-             * @api
-             */
-            getMiterLimit(): (number);
+        /**
+         * Get the miter limit for the stroke.
+         * @return Miter limit.
+         * @api
+         */
+        getMiterLimit(): (number);
 
-            /**
-             * Get the stroke width.
-             * @return Width.
-             * @api
-             */
-            getWidth(): (number);
+        /**
+         * Get the stroke width.
+         * @return Width.
+         * @api
+         */
+        getWidth(): (number);
 
-            /**
-             * Set the color.
-             *
-             * @param color Color.
-             * @api
-             */
-            setColor(color: (ol.Color | string)): void;
+        /**
+         * Set the color.
+         *
+         * @param color Color.
+         * @api
+         */
+        setColor(color: (ol.Color | string)): void;
 
-            /**
-             * Set the line cap.
-             *
-             * @param lineCap Line cap.
-             * @api
-             */
-            setLineCap(lineCap: (string)): void;
+        /**
+         * Set the line cap.
+         *
+         * @param lineCap Line cap.
+         * @api
+         */
+        setLineCap(lineCap: (string)): void;
 
-            /**
-             * Set the line dash.
-             *
-             * Please note that Internet Explorer 10 and lower [do not support][mdn] the
-             * `setLineDash` method on the `CanvasRenderingContext2D` and therefore this
-             * property will have no visual effect in these browsers.
-             *
-             * [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility
-             *
-             * @param lineDash Line dash.
-             * @api
-             */
-            setLineDash(lineDash: number[]): void;
+        /**
+         * Set the line dash.
+         *
+         * Please note that Internet Explorer 10 and lower [do not support][mdn] the
+         * `setLineDash` method on the `CanvasRenderingContext2D` and therefore this
+         * property will have no visual effect in these browsers.
+         *
+         * [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility
+         *
+         * @param lineDash Line dash.
+         * @api
+         */
+        setLineDash(lineDash: number[]): void;
 
-            /**
-             * Set the line join.
-             *
-             * @param lineJoin Line join.
-             * @api
-             */
-            setLineJoin(lineJoin: (string)): void;
+        /**
+         * Set the line join.
+         *
+         * @param lineJoin Line join.
+         * @api
+         */
+        setLineJoin(lineJoin: (string)): void;
 
-            /**
-             * Set the miter limit.
-             *
-             * @param miterLimit Miter limit.
-             * @api
-             */
-            setMiterLimit(miterLimit: (number)): void;
+        /**
+         * Set the miter limit.
+         *
+         * @param miterLimit Miter limit.
+         * @api
+         */
+        setMiterLimit(miterLimit: (number)): void;
 
-            /**
-             * Set the width.
-             *
-             * @param width Width.
-             * @api
-             */
-            setWidth(width: (number)): void;
-        }
+        /**
+         * Set the width.
+         *
+         * @param width Width.
+         * @api
+         */
+        setWidth(width: (number)): void;
+    }
 
+    /**
+     * @classdesc
+     * Container for vector feature rendering styles. Any changes made to the style
+     * or its children through `set*()` methods will not take effect until the
+     * feature or layer that uses the style is re-rendered.
+     *
+     * @struct
+     * @param opt_options Style options.
+     * @api
+     */
+    class Style {
         /**
          * @classdesc
          * Container for vector feature rendering styles. Any changes made to the style
@@ -10213,124 +10231,121 @@ declare namespace ol {
          * @param opt_options Style options.
          * @api
          */
-        class Style {
-            /**
-             * @classdesc
-             * Container for vector feature rendering styles. Any changes made to the style
-             * or its children through `set*()` methods will not take effect until the
-             * feature or layer that uses the style is re-rendered.
-             *
-             * @struct
-             * @param opt_options Style options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.StyleOptions);
+        constructor(opt_options?: olx.style.StyleOptions);
 
-            /**
-             * Clones the style.
-             * @return The cloned style.
-             * @api
-             */
-            clone(): ol.style.Style;
+        /**
+         * Clones the style.
+         * @return The cloned style.
+         * @api
+         */
+        clone(): Style;
 
-            /**
-             * Get the geometry to be rendered.
-             * @return Feature property or geometry or function that returns the geometry that will
-             *     be rendered with this style.
-             * @api
-             */
-            getGeometry(): (string | ol.geom.Geometry | ol.StyleGeometryFunction);
+        /**
+         * Get the geometry to be rendered.
+         * @return Feature property or geometry or function that returns the geometry that will
+         *     be rendered with this style.
+         * @api
+         */
+        getGeometry(): (string | ol.geom.Geometry | ol.StyleGeometryFunction);
 
-            /**
-             * Get the function used to generate a geometry for rendering.
-             * @return Function that is called with a feature
-             * and returns the geometry to render instead of the feature's geometry.
-             * @api
-             */
-            getGeometryFunction(): ol.StyleGeometryFunction;
+        /**
+         * Get the function used to generate a geometry for rendering.
+         * @return Function that is called with a feature
+         * and returns the geometry to render instead of the feature's geometry.
+         * @api
+         */
+        getGeometryFunction(): ol.StyleGeometryFunction;
 
-            /**
-             * Get the fill style.
-             * @return Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
+        /**
+         * Get the fill style.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): Fill;
 
-            /**
-             * Get the image style.
-             * @return Image style.
-             * @api
-             */
-            getImage(): ol.style.Image;
+        /**
+         * Get the image style.
+         * @return Image style.
+         * @api
+         */
+        getImage(): Image;
 
-            /**
-             * Get the stroke style.
-             * @return Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
+        /**
+         * Get the stroke style.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): Stroke;
 
-            /**
-             * Get the text style.
-             * @return Text style.
-             * @api
-             */
-            getText(): ol.style.Text;
+        /**
+         * Get the text style.
+         * @return Text style.
+         * @api
+         */
+        getText(): Text;
 
-            /**
-             * Get the z-index for the style.
-             * @return ZIndex.
-             * @api
-             */
-            getZIndex(): (number);
+        /**
+         * Get the z-index for the style.
+         * @return ZIndex.
+         * @api
+         */
+        getZIndex(): (number);
 
-            /**
-             * Set the fill style.
-             * @param fill Fill style.
-             * @api
-             */
-            setFill(fill: ol.style.Fill): void;
+        /**
+         * Set the fill style.
+         * @param fill Fill style.
+         * @api
+         */
+        setFill(fill: Fill): void;
 
-            /**
-             * Set a geometry that is rendered instead of the feature's geometry.
-             *
-             * @param geometry
-             *     Feature property or geometry or function returning a geometry to render
-             *     for this style.
-             * @api
-             */
-            setGeometry(geometry: (string | ol.geom.Geometry | ol.StyleGeometryFunction)): void;
+        /**
+         * Set a geometry that is rendered instead of the feature's geometry.
+         *
+         * @param geometry
+         *     Feature property or geometry or function returning a geometry to render
+         *     for this style.
+         * @api
+         */
+        setGeometry(geometry: (string | ol.geom.Geometry | ol.StyleGeometryFunction)): void;
 
-            /**
-             * Set the image style.
-             * @param image Image style.
-             * @api
-             */
-            setImage(image: ol.style.Image): void;
+        /**
+         * Set the image style.
+         * @param image Image style.
+         * @api
+         */
+        setImage(image: Image): void;
 
-            /**
-             * Set the stroke style.
-             * @param stroke Stroke style.
-             * @api
-             */
-            setStroke(stroke: ol.style.Stroke): void;
+        /**
+         * Set the stroke style.
+         * @param stroke Stroke style.
+         * @api
+         */
+        setStroke(stroke: Stroke): void;
 
-            /**
-             * Set the text style.
-             * @param text Text style.
-             * @api
-             */
-            setText(text: ol.style.Text): void;
+        /**
+         * Set the text style.
+         * @param text Text style.
+         * @api
+         */
+        setText(text: Text): void;
 
-            /**
-             * Set the z-index.
-             *
-             * @param zIndex ZIndex.
-             * @api
-             */
-            setZIndex(zIndex: (number)): void;
-        }
+        /**
+         * Set the z-index.
+         *
+         * @param zIndex ZIndex.
+         * @api
+         */
+        setZIndex(zIndex: (number)): void;
+    }
 
+    /**
+     * @classdesc
+     * Set text style for vector features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Text {
         /**
          * @classdesc
          * Set text style for vector features.
@@ -10338,175 +10353,175 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Text {
-            /**
-             * @classdesc
-             * Set text style for vector features.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.TextOptions);
+        constructor(opt_options?: olx.style.TextOptions);
 
-            /**
-             * Get the font name.
-             * @return Font.
-             * @api
-             */
-            getFont(): (string);
+        /**
+         * Get the font name.
+         * @return Font.
+         * @api
+         */
+        getFont(): (string);
 
-            /**
-             * Get the x-offset for the text.
-             * @return Horizontal text offset.
-             * @api
-             */
-            getOffsetX(): number;
+        /**
+         * Get the x-offset for the text.
+         * @return Horizontal text offset.
+         * @api
+         */
+        getOffsetX(): number;
 
-            /**
-             * Get the y-offset for the text.
-             * @return Vertical text offset.
-             * @api
-             */
-            getOffsetY(): number;
+        /**
+         * Get the y-offset for the text.
+         * @return Vertical text offset.
+         * @api
+         */
+        getOffsetY(): number;
 
-            /**
-             * Get the fill style for the text.
-             * @return Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
+        /**
+         * Get the fill style for the text.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): Fill;
 
-            /**
-             * Determine whether the text rotates with the map.
-             * @return Rotate with map.
-             * @api
-             */
-            getRotateWithView(): (boolean);
+        /**
+         * Determine whether the text rotates with the map.
+         * @return Rotate with map.
+         * @api
+         */
+        getRotateWithView(): (boolean);
 
-            /**
-             * Get the text rotation.
-             * @return Rotation.
-             * @api
-             */
-            getRotation(): (number);
+        /**
+         * Get the text rotation.
+         * @return Rotation.
+         * @api
+         */
+        getRotation(): (number);
 
-            /**
-             * Get the text scale.
-             * @return Scale.
-             * @api
-             */
-            getScale(): (number);
+        /**
+         * Get the text scale.
+         * @return Scale.
+         * @api
+         */
+        getScale(): (number);
 
-            /**
-             * Get the stroke style for the text.
-             * @return Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
+        /**
+         * Get the stroke style for the text.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): Stroke;
 
-            /**
-             * Get the text to be rendered.
-             * @return Text.
-             * @api
-             */
-            getText(): (string);
+        /**
+         * Get the text to be rendered.
+         * @return Text.
+         * @api
+         */
+        getText(): (string);
 
-            /**
-             * Get the text alignment.
-             * @return Text align.
-             * @api
-             */
-            getTextAlign(): (string);
+        /**
+         * Get the text alignment.
+         * @return Text align.
+         * @api
+         */
+        getTextAlign(): (string);
 
-            /**
-             * Get the text baseline.
-             * @return Text baseline.
-             * @api
-             */
-            getTextBaseline(): (string);
+        /**
+         * Get the text baseline.
+         * @return Text baseline.
+         * @api
+         */
+        getTextBaseline(): (string);
 
-            /**
-             * Set the font.
-             *
-             * @param font Font.
-             * @api
-             */
-            setFont(font: (string)): void;
+        /**
+         * Set the font.
+         *
+         * @param font Font.
+         * @api
+         */
+        setFont(font: (string)): void;
 
-            /**
-             * Set the x offset.
-             *
-             * @param offsetX Horizontal text offset.
-             * @api
-             */
-            setOffsetX(offsetX: number): void;
+        /**
+         * Set the x offset.
+         *
+         * @param offsetX Horizontal text offset.
+         * @api
+         */
+        setOffsetX(offsetX: number): void;
 
-            /**
-             * Set the y offset.
-             *
-             * @param offsetY Vertical text offset.
-             * @api
-             */
-            setOffsetY(offsetY: number): void;
+        /**
+         * Set the y offset.
+         *
+         * @param offsetY Vertical text offset.
+         * @api
+         */
+        setOffsetY(offsetY: number): void;
 
-            /**
-             * Set the fill.
-             *
-             * @param fill Fill style.
-             * @api
-             */
-            setFill(fill: ol.style.Fill): void;
+        /**
+         * Set the fill.
+         *
+         * @param fill Fill style.
+         * @api
+         */
+        setFill(fill: Fill): void;
 
-            /**
-             * Set the rotation.
-             *
-             * @param rotation Rotation.
-             * @api
-             */
-            setRotation(rotation: (number)): void;
+        /**
+         * Set the rotation.
+         *
+         * @param rotation Rotation.
+         * @api
+         */
+        setRotation(rotation: (number)): void;
 
-            /**
-             * Set the scale.
-             *
-             * @param scale Scale.
-             * @api
-             */
-            setScale(scale: (number)): void;
+        /**
+         * Set the scale.
+         *
+         * @param scale Scale.
+         * @api
+         */
+        setScale(scale: (number)): void;
 
-            /**
-             * Set the stroke.
-             *
-             * @param stroke Stroke style.
-             * @api
-             */
-            setStroke(stroke: ol.style.Stroke): void;
+        /**
+         * Set the stroke.
+         *
+         * @param stroke Stroke style.
+         * @api
+         */
+        setStroke(stroke: Stroke): void;
 
-            /**
-             * Set the text.
-             *
-             * @param text Text.
-             * @api
-             */
-            setText(text: (string)): void;
+        /**
+         * Set the text.
+         *
+         * @param text Text.
+         * @api
+         */
+        setText(text: (string)): void;
 
-            /**
-             * Set the text alignment.
-             *
-             * @param textAlign Text align.
-             * @api
-             */
-            setTextAlign(textAlign: (string)): void;
+        /**
+         * Set the text alignment.
+         *
+         * @param textAlign Text align.
+         * @api
+         */
+        setTextAlign(textAlign: (string)): void;
 
-            /**
-             * Set the text baseline.
-             *
-             * @param textBaseline Text baseline.
-             * @api
-             */
-            setTextBaseline(textBaseline: (string)): void;
-        }
+        /**
+         * Set the text baseline.
+         *
+         * @param textBaseline Text baseline.
+         * @api
+         */
+        setTextBaseline(textBaseline: (string)): void;
     }
+}
 
+/**
+ * @classdesc
+ * Base class for tiles.
+ *
+ * @param tileCoord Tile coordinate.
+ * @param state State.
+ */
+export class Tile extends events.EventTarget {
     /**
      * @classdesc
      * Base class for tiles.
@@ -10514,45 +10529,47 @@ declare namespace ol {
      * @param tileCoord Tile coordinate.
      * @param state State.
      */
-    class Tile extends ol.events.EventTarget {
-        /**
-         * @classdesc
-         * Base class for tiles.
-         *
-         * @param tileCoord Tile coordinate.
-         * @param state State.
-         */
-        constructor(tileCoord: ol.TileCoord, state: ol.Tile.State);
+    constructor(tileCoord: ol.TileCoord, state: ol.Tile.State);
 
-        /**
-         * Get the tile coordinate for this tile.
-         * @return The tile coordinate.
-         * @api
-         */
-        getTileCoord(): ol.TileCoord;
+    /**
+     * Get the tile coordinate for this tile.
+     * @return The tile coordinate.
+     * @api
+     */
+    getTileCoord(): ol.TileCoord;
 
-        /**
-         * Load the image or retry if loading previously failed.
-         * Loading is taken care of by the tile queue, and calling this method is
-         * only needed for preloading or for reloading in case of an error.
-         * @api
-         */
-        load(): void;
-    }
+    /**
+     * Load the image or retry if loading previously failed.
+     * Loading is taken care of by the tile queue, and calling this method is
+     * only needed for preloading or for reloading in case of an error.
+     * @api
+     */
+    load(): void;
+}
 
-    namespace Tile {
-        type State = number;
-    }
+export namespace Tile {
+    type State = number;
+}
 
-    namespace tilegrid {
-        /**
-         * Creates a tile grid with a standard XYZ tiling scheme.
-         * @param opt_options Tile grid options.
-         * @return Tile grid instance.
-         * @api
-         */
-        function createXYZ(opt_options?: olx.tilegrid.XYZOptions): ol.tilegrid.TileGrid;
+export namespace tilegrid {
+    /**
+     * Creates a tile grid with a standard XYZ tiling scheme.
+     * @param opt_options Tile grid options.
+     * @return Tile grid instance.
+     * @api
+     */
+    function createXYZ(opt_options?: olx.tilegrid.XYZOptions): TileGrid;
 
+    /**
+     * @classdesc
+     * Base class for setting the grid pattern for sources accessing tiled-image
+     * servers.
+     *
+     * @param options Tile grid options.
+     * @struct
+     * @api stable
+     */
+    class TileGrid {
         /**
          * @classdesc
          * Base class for setting the grid pattern for sources accessing tiled-image
@@ -10562,119 +10579,118 @@ declare namespace ol {
          * @struct
          * @api stable
          */
-        class TileGrid {
-            /**
-             * @classdesc
-             * Base class for setting the grid pattern for sources accessing tiled-image
-             * servers.
-             *
-             * @param options Tile grid options.
-             * @struct
-             * @api stable
-             */
-            constructor(options: olx.tilegrid.TileGridOptions);
+        constructor(options: olx.tilegrid.TileGridOptions);
 
-            /**
-             * Call a function with each tile coordinate for a given extent and zoom level.
-             *
-             * @param extent Extent.
-             * @param zoom Zoom level.
-             * @param callback Function called with each tile coordinate.
-             * @api
-             */
-            forEachTileCoord(extent: ol.Extent, zoom: number, callback: ((coords: ol.TileCoord) => any)): void;
+        /**
+         * Call a function with each tile coordinate for a given extent and zoom level.
+         *
+         * @param extent Extent.
+         * @param zoom Zoom level.
+         * @param callback Function called with each tile coordinate.
+         * @api
+         */
+        forEachTileCoord(extent: ol.Extent, zoom: number, callback: ((coords: ol.TileCoord) => any)): void;
 
-            /**
-             * Get the maximum zoom level for the grid.
-             * @return Max zoom.
-             * @api
-             */
-            getMaxZoom(): number;
+        /**
+         * Get the maximum zoom level for the grid.
+         * @return Max zoom.
+         * @api
+         */
+        getMaxZoom(): number;
 
-            /**
-             * Get the minimum zoom level for the grid.
-             * @return Min zoom.
-             * @api
-             */
-            getMinZoom(): number;
+        /**
+         * Get the minimum zoom level for the grid.
+         * @return Min zoom.
+         * @api
+         */
+        getMinZoom(): number;
 
-            /**
-             * Get the origin for the grid at the given zoom level.
-             * @param z Z.
-             * @return Origin.
-             * @api stable
-             */
-            getOrigin(z: number): ol.Coordinate;
+        /**
+         * Get the origin for the grid at the given zoom level.
+         * @param z Z.
+         * @return Origin.
+         * @api stable
+         */
+        getOrigin(z: number): ol.Coordinate;
 
-            /**
-             * Get the resolution for the given zoom level.
-             * @param z Z.
-             * @return Resolution.
-             * @api stable
-             */
-            getResolution(z: number): number;
+        /**
+         * Get the resolution for the given zoom level.
+         * @param z Z.
+         * @return Resolution.
+         * @api stable
+         */
+        getResolution(z: number): number;
 
-            /**
-             * Get the list of resolutions for the tile grid.
-             * @return Resolutions.
-             * @api stable
-             */
-            getResolutions(): number[];
+        /**
+         * Get the list of resolutions for the tile grid.
+         * @return Resolutions.
+         * @api stable
+         */
+        getResolutions(): number[];
 
-            /**
-             * Get the extent of a tile coordinate.
-             *
-             * @param tileCoord Tile coordinate.
-             * @param opt_extent Temporary extent object.
-             * @return Extent.
-             * @api
-             */
-            getTileCoordExtent(tileCoord: ol.TileCoord, opt_extent?: ol.Extent): ol.Extent;
+        /**
+         * Get the extent of a tile coordinate.
+         *
+         * @param tileCoord Tile coordinate.
+         * @param opt_extent Temporary extent object.
+         * @return Extent.
+         * @api
+         */
+        getTileCoordExtent(tileCoord: ol.TileCoord, opt_extent?: ol.Extent): ol.Extent;
 
-            /**
-             * Get the tile coordinate for the given map coordinate and resolution.  This
-             * method considers that coordinates that intersect tile boundaries should be
-             * assigned the higher tile coordinate.
-             *
-             * @param coordinate Coordinate.
-             * @param resolution Resolution.
-             * @param opt_tileCoord Destination ol.TileCoord object.
-             * @return Tile coordinate.
-             * @api
-             */
-            getTileCoordForCoordAndResolution(coordinate: ol.Coordinate, resolution: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
+        /**
+         * Get the tile coordinate for the given map coordinate and resolution.  This
+         * method considers that coordinates that intersect tile boundaries should be
+         * assigned the higher tile coordinate.
+         *
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param opt_tileCoord Destination ol.TileCoord object.
+         * @return Tile coordinate.
+         * @api
+         */
+        getTileCoordForCoordAndResolution(coordinate: ol.Coordinate, resolution: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
 
-            /**
-             * Get a tile coordinate given a map coordinate and zoom level.
-             * @param coordinate Coordinate.
-             * @param z Zoom level.
-             * @param opt_tileCoord Destination ol.TileCoord object.
-             * @return Tile coordinate.
-             * @api
-             */
-            getTileCoordForCoordAndZ(coordinate: ol.Coordinate, z: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
+        /**
+         * Get a tile coordinate given a map coordinate and zoom level.
+         * @param coordinate Coordinate.
+         * @param z Zoom level.
+         * @param opt_tileCoord Destination ol.TileCoord object.
+         * @return Tile coordinate.
+         * @api
+         */
+        getTileCoordForCoordAndZ(coordinate: ol.Coordinate, z: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
 
-            /**
-             * Get the tile size for a zoom level. The type of the return value matches the
-             * `tileSize` or `tileSizes` that the tile grid was configured with. To always
-             * get an `ol.Size`, run the result through `ol.size.toSize()`.
-             * @param z Z.
-             * @return Tile size.
-             * @api stable
-             */
-            getTileSize(z: number): (number | ol.Size);
+        /**
+         * Get the tile size for a zoom level. The type of the return value matches the
+         * `tileSize` or `tileSizes` that the tile grid was configured with. To always
+         * get an `ol.Size`, run the result through `ol.size.toSize()`.
+         * @param z Z.
+         * @return Tile size.
+         * @api stable
+         */
+        getTileSize(z: number): (number | ol.Size);
 
-            /**
-             * @param resolution Resolution.
-             * @param opt_direction If 0, the nearest resolution will be used.
-             *     If 1, the nearest lower resolution will be used. If -1, the nearest
-             *     higher resolution will be used. Default is 0.
-             * @return Z.
-             * @api
-             */
-            getZForResolution(resolution: number, opt_direction?: number): number;
-        }
+        /**
+         * @param resolution Resolution.
+         * @param opt_direction If 0, the nearest resolution will be used.
+         *     If 1, the nearest lower resolution will be used. If -1, the nearest
+         *     higher resolution will be used. Default is 0.
+         * @return Z.
+         * @api
+         */
+        getZForResolution(resolution: number, opt_direction?: number): number;
+    }
 
+    /**
+     * @classdesc
+     * Set the grid pattern for sources accessing WMTS tiled-image servers.
+     *
+     * @param options WMTS options.
+     * @struct
+     * @api
+     */
+    class WMTS extends TileGrid {
         /**
          * @classdesc
          * Set the grid pattern for sources accessing WMTS tiled-image servers.
@@ -10683,335 +10699,334 @@ declare namespace ol {
          * @struct
          * @api
          */
-        class WMTS extends ol.tilegrid.TileGrid {
-            /**
-             * @classdesc
-             * Set the grid pattern for sources accessing WMTS tiled-image servers.
-             *
-             * @param options WMTS options.
-             * @struct
-             * @api
-             */
-            constructor(options: olx.tilegrid.WMTSOptions);
+        constructor(options: olx.tilegrid.WMTSOptions);
 
-            /**
-             * Get the list of matrix identifiers.
-             * @return MatrixIds.
-             * @api
-             */
-            getMatrixIds(): string[];
+        /**
+         * Get the list of matrix identifiers.
+         * @return MatrixIds.
+         * @api
+         */
+        getMatrixIds(): string[];
 
-            /**
-             * Create a tile grid from a WMTS capabilities matrix set.
-             * @param matrixSet An object representing a matrixSet in the
-             *     capabilities document.
-             * @param opt_extent An optional extent to restrict the tile
-             *     ranges the server provides.
-             * @return WMTS tileGrid instance.
-             * @api
-             */
-            static createFromCapabilitiesMatrixSet(matrixSet: GlobalObject, opt_extent?: ol.Extent): ol.tilegrid.WMTS;
-        }
+        /**
+         * Create a tile grid from a WMTS capabilities matrix set.
+         * @param matrixSet An object representing a matrixSet in the
+         *     capabilities document.
+         * @param opt_extent An optional extent to restrict the tile
+         *     ranges the server provides.
+         * @return WMTS tileGrid instance.
+         * @api
+         */
+        static createFromCapabilitiesMatrixSet(matrixSet: GlobalObject, opt_extent?: ol.Extent): WMTS;
     }
+}
 
-    type AttributionLike = (string | string[] | ol.Attribution | ol.Attribution[]);
+export type AttributionLike = (string | string[] | ol.Attribution | ol.Attribution[]);
 
-    /**
-     * A function returning the canvas element (`{HTMLCanvasElement}`)
-     * used by the source as an image. The arguments passed to the function are:
-     * {@link ol.Extent} the image extent, `{number}` the image resolution,
-     * `{number}` the device pixel ratio, {@link ol.Size} the image size, and
-     * {@link ol.proj.Projection} the image projection. The canvas returned by
-     * this function is cached by the source. The this keyword inside the function
-     * references the {@link ol.source.ImageCanvas}.
-     *
-     */
-    type CanvasFunctionType = (extent: ol.Extent, resolution: number, pixelRatio: number, size: ol.Size, proj: ol.proj.Projection) => HTMLCanvasElement;
+/**
+ * A function returning the canvas element (`{HTMLCanvasElement}`)
+ * used by the source as an image. The arguments passed to the function are:
+ * {@link ol.Extent} the image extent, `{number}` the image resolution,
+ * `{number}` the device pixel ratio, {@link ol.Size} the image size, and
+ * {@link ol.proj.Projection} the image projection. The canvas returned by
+ * this function is cached by the source. The this keyword inside the function
+ * references the {@link ol.source.ImageCanvas}.
+ *
+ */
+export type CanvasFunctionType = (extent: ol.Extent, resolution: number, pixelRatio: number, size: ol.Size, proj: ol.proj.Projection) => HTMLCanvasElement;
 
-    /**
-     * A color represented as a short array [red, green, blue, alpha].
-     * red, green, and blue should be integers in the range 0..255 inclusive.
-     * alpha should be a float in the range 0..1 inclusive. If no alpha value is
-     * given then `1` will be used.
-     */
-    type Color = ([number, number, number, number] | Uint8Array | Uint8ClampedArray);
+/**
+ * A color represented as a short array [red, green, blue, alpha].
+ * red, green, and blue should be integers in the range 0..255 inclusive.
+ * alpha should be a float in the range 0..1 inclusive. If no alpha value is
+ * given then `1` will be used.
+ */
+export type Color = ([number, number, number, number] | Uint8Array | Uint8ClampedArray);
 
-    /**
-     * A type accepted by CanvasRenderingContext2D.fillStyle.
-     * Represents a color, pattern, or gradient.
-     *
-     */
-    type ColorLike = (string | CanvasPattern | CanvasGradient);
+/**
+ * A type accepted by CanvasRenderingContext2D.fillStyle.
+ * Represents a color, pattern, or gradient.
+ *
+ */
+export type ColorLike = (string | CanvasPattern | CanvasGradient);
 
-    /**
-     * An array of numbers representing an xy coordinate. Example: `[16, 48]`.
-     */
-    type Coordinate = [number, number];
+/**
+ * An array of numbers representing an xy coordinate. Example: `[16, 48]`.
+ */
+export type Coordinate = [number, number];
 
-    /**
-     * A function that takes a {@link ol.Coordinate} and transforms it into a
-     * `{string}`.
-     *
-     */
-    type CoordinateFormatType = (coords?: ol.Coordinate) => string;
+/**
+ * A function that takes a {@link ol.Coordinate} and transforms it into a
+ * `{string}`.
+ *
+ */
+export type CoordinateFormatType = (coords?: ol.Coordinate) => string;
 
-    /**
-     * A function that takes a {@link ol.MapBrowserEvent} and two
-     * {@link ol.Pixel}s and returns a `{boolean}`. If the condition is met,
-     * true should be returned.
-     */
-    type DragBoxEndConditionType = (event: ol.MapBrowserEvent, pixel1: ol.Pixel, pixel2: ol.Pixel) => boolean;
+/**
+ * A function that takes a {@link ol.MapBrowserEvent} and two
+ * {@link ol.Pixel}s and returns a `{boolean}`. If the condition is met,
+ * true should be returned.
+ */
+export type DragBoxEndConditionType = (event: ol.MapBrowserEvent, pixel1: ol.Pixel, pixel2: ol.Pixel) => boolean;
 
-    /**
-     * Function that takes coordinates and an optional existing geometry as
-     * arguments, and returns a geometry. The optional existing geometry is the
-     * geometry that is returned when the function is called without a second
-     * argument.
-     */
-    type DrawGeometryFunctionType = (coords: (ol.Coordinate | ol.Coordinate[] | ol.Coordinate[][]), geo?: ol.geom.SimpleGeometry) => ol.geom.SimpleGeometry;
+/**
+ * Function that takes coordinates and an optional existing geometry as
+ * arguments, and returns a geometry. The optional existing geometry is the
+ * geometry that is returned when the function is called without a second
+ * argument.
+ */
+export type DrawGeometryFunctionType = (coords: (ol.Coordinate | ol.Coordinate[] | ol.Coordinate[][]), geo?: ol.geom.SimpleGeometry) => ol.geom.SimpleGeometry;
 
-    /**
-     * A function that takes an {@link ol.MapBrowserEvent} and returns a
-     * `{boolean}`. If the condition is met, true should be returned.
-     *
-     */
-    type EventsConditionType = (event: ol.MapBrowserEvent) => boolean;
+/**
+ * A function that takes an {@link ol.MapBrowserEvent} and returns a
+ * `{boolean}`. If the condition is met, true should be returned.
+ *
+ */
+export type EventsConditionType = (event: ol.MapBrowserEvent) => boolean;
 
-    /**
-     * Key to use with {@link ol.Observable#unByKey}.
-     *
-     */
-    type EventsKey = GlobalObject;
+/**
+ * Key to use with {@link ol.Observable#unByKey}.
+ *
+ */
+export type EventsKey = GlobalObject;
 
-    /**
-     * An array of numbers representing an extent: `[minx, miny, maxx, maxy]`.
-     */
-    type Extent = [number, number, number, number];
+/**
+ * An array of numbers representing an extent: `[minx, miny, maxx, maxy]`.
+ */
+export type Extent = [number, number, number, number];
 
-    /**
-     * {@link ol.source.Vector} sources use a function of this type to load
-     * features.
-     *
-     * This function takes an {@link ol.Extent} representing the area to be loaded,
-     * a `{number}` representing the resolution (map units per pixel) and an
-     * {@link ol.proj.Projection} for the projection  as arguments. `this` within
-     * the function is bound to the {@link ol.source.Vector} it's called from.
-     *
-     * The function is responsible for loading the features and adding them to the
-     * source.
-     */
-    type FeatureLoader = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => void;
+/**
+ * {@link ol.source.Vector} sources use a function of this type to load
+ * features.
+ *
+ * This function takes an {@link ol.Extent} representing the area to be loaded,
+ * a `{number}` representing the resolution (map units per pixel) and an
+ * {@link ol.proj.Projection} for the projection  as arguments. `this` within
+ * the function is bound to the {@link ol.source.Vector} it's called from.
+ *
+ * The function is responsible for loading the features and adding them to the
+ * source.
+ */
+export type FeatureLoader = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => void;
 
-    /**
-     * A function that returns an array of {@link ol.style.Style styles} given a
-     * resolution. The `this` keyword inside the function references the
-     * {@link ol.Feature} to be styled.
-     *
-     */
-    type FeatureStyleFunction = (resolution: number) => (ol.style.Style | ol.style.Style[]);
+/**
+ * A function that returns an array of {@link ol.style.Style styles} given a
+ * resolution. The `this` keyword inside the function references the
+ * {@link ol.Feature} to be styled.
+ *
+ */
+export type FeatureStyleFunction = (resolution: number) => (ol.style.Style | ol.style.Style[]);
 
-    /**
-     * {@link ol.source.Vector} sources use a function of this type to get the url
-     * to load features from.
-     *
-     * This function takes an {@link ol.Extent} representing the area to be loaded,
-     * a `{number}` representing the resolution (map units per pixel) and an
-     * {@link ol.proj.Projection} for the projection  as arguments and returns a
-     * `{string}` representing the URL.
-     */
-    type FeatureUrlFunction = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => string;
+/**
+ * {@link ol.source.Vector} sources use a function of this type to get the url
+ * to load features from.
+ *
+ * This function takes an {@link ol.Extent} representing the area to be loaded,
+ * a `{number}` representing the resolution (map units per pixel) and an
+ * {@link ol.proj.Projection} for the projection  as arguments and returns a
+ * `{string}` representing the URL.
+ */
+export type FeatureUrlFunction = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => string;
 
-    /**
-     * A function that takes an {@link ol.Image} for the image and a `{string}` for
-     * the src as arguments. It is supposed to make it so the underlying image
-     * {@link ol.Image#getImage} is assigned the content specified by the src. If
-     * not specified, the default is
-     *
-     *     function(image, src) {
-     *       image.getImage().src = src;
-     *     }
-     *
-     * Providing a custom `imageLoadFunction` can be useful to load images with
-     * post requests or - in general - through XHR requests, where the src of the
-     * image element would be set to a data URI when the content is loaded.
-     *
-     */
-    type ImageLoadFunctionType = (image: ol.Image, url: string) => void;
+/**
+ * A function that takes an {@link ol.Image} for the image and a `{string}` for
+ * the src as arguments. It is supposed to make it so the underlying image
+ * {@link ol.Image#getImage} is assigned the content specified by the src. If
+ * not specified, the default is
+ *
+ *     function(image, src) {
+ *       image.getImage().src = src;
+ *     }
+ *
+ * Providing a custom `imageLoadFunction` can be useful to load images with
+ * post requests or - in general - through XHR requests, where the src of the
+ * image element would be set to a data URI when the content is loaded.
+ *
+ */
+export type ImageLoadFunctionType = (image: ol.Image, url: string) => void;
 
-    /**
-     * A function that takes an {@link ol.Extent} and a resolution as arguments, and
-     * returns an array of {@link ol.Extent} with the extents to load. Usually this
-     * is one of the standard {@link ol.loadingstrategy} strategies.
-     *
-     */
-    type LoadingStrategy = (extent: ol.Extent, resolution: number) => ol.Extent[];
+/**
+ * A function that takes an {@link ol.Extent} and a resolution as arguments, and
+ * returns an array of {@link ol.Extent} with the extents to load. Usually this
+ * is one of the standard {@link ol.loadingstrategy} strategies.
+ *
+ */
+export type LoadingStrategy = (extent: ol.Extent, resolution: number) => ol.Extent[];
 
-    type ModifyEventType = string;
+export type ModifyEventType = string;
 
-    /**
-     * An array with two elements, representing a pixel. The first element is the
-     * x-coordinate, the second the y-coordinate of the pixel.
-     */
-    type Pixel = [number, number];
+/**
+ * An array with two elements, representing a pixel. The first element is the
+ * x-coordinate, the second the y-coordinate of the pixel.
+ */
+export type Pixel = [number, number];
 
-    /**
-     * Function to perform manipulations before rendering. This function is called
-     * with the {@link ol.Map} as first and an optional {@link olx.FrameState} as
-     * second argument. Return `true` to keep this function for the next frame,
-     * `false` to remove it.
-     */
-    type PreRenderFunction = (map: ol.Map, state?: olx.FrameState) => boolean;
+/**
+ * Function to perform manipulations before rendering. This function is called
+ * with the {@link ol.Map} as first and an optional {@link olx.FrameState} as
+ * second argument. Return `true` to keep this function for the next frame,
+ * `false` to remove it.
+ */
+export type PreRenderFunction = (map: ol.Map, state?: olx.FrameState) => boolean;
 
-    /**
-     * A projection as {@link ol.proj.Projection}, SRS identifier string or
-     * undefined.
-     */
-    type ProjectionLike = (ol.proj.Projection | string | undefined);
+/**
+ * A projection as {@link ol.proj.Projection}, SRS identifier string or
+ * undefined.
+ */
+export type ProjectionLike = (ol.proj.Projection | string | undefined);
 
-    /**
-     * A function that takes an array of input data, performs some operation, and
-     * returns an array of ouput data.
-     * For `pixel` type operations, the function will be called with an array of
-     * pixels, where each pixel is an array of four numbers (`[r, g, b, a]`) in the
-     * range of 0 - 255. It should return a single pixel array.
-     * For `'image'` type operations, functions will be called with an array of
-     * {@link ImageData https://developer.mozilla.org/en-US/docs/Web/API/ImageData}
-     * and should return a single {@link ImageData
-     * https://developer.mozilla.org/en-US/docs/Web/API/ImageData}.  The operations
-     * are called with a second "data" argument, which can be used for storage.  The
-     * data object is accessible from raster events, where it can be initialized in
-     * "beforeoperations" and accessed again in "afteroperations".
-     *
-     */
-    type RasterOperation = (data: (number[][] | ImageData[]), obj: GlobalObject) => (number[] | ImageData);
+/**
+ * A function that takes an array of input data, performs some operation, and
+ * returns an array of ouput data.
+ * For `pixel` type operations, the function will be called with an array of
+ * pixels, where each pixel is an array of four numbers (`[r, g, b, a]`) in the
+ * range of 0 - 255. It should return a single pixel array.
+ * For `'image'` type operations, functions will be called with an array of
+ * {@link ImageData https://developer.mozilla.org/en-US/docs/Web/API/ImageData}
+ * and should return a single {@link ImageData
+ * https://developer.mozilla.org/en-US/docs/Web/API/ImageData}.  The operations
+ * are called with a second "data" argument, which can be used for storage.  The
+ * data object is accessible from raster events, where it can be initialized in
+ * "beforeoperations" and accessed again in "afteroperations".
+ *
+ */
+export type RasterOperation = (data: (number[][] | ImageData[]), obj: GlobalObject) => (number[] | ImageData);
 
-    /**
-     * A function that takes an {@link ol.Feature} or {@link ol.render.Feature} and
-     * an {@link ol.layer.Layer} and returns `true` if the feature may be selected
-     * or `false` otherwise.
-     */
-    type SelectFilterFunction = (feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => boolean;
+/**
+ * A function that takes an {@link ol.Feature} or {@link ol.render.Feature} and
+ * an {@link ol.layer.Layer} and returns `true` if the feature may be selected
+ * or `false` otherwise.
+ */
+export type SelectFilterFunction = (feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => boolean;
 
-    /**
-     * An array of numbers representing a size: `[width, height]`.
-     */
-    type Size = [number, number];
+/**
+ * An array of numbers representing a size: `[width, height]`.
+ */
+export type Size = [number, number];
 
-    interface SourceImageOptions {
-        attributions?: ol.AttributionLike;
-        extent?: (ol.Extent);
-        logo?: (string | olx.LogoOptions);
-        projection: ol.ProjectionLike;
-        resolutions?: number[];
-        state?: ol.source.State;
-    }
+export interface SourceImageOptions {
+    attributions?: ol.AttributionLike;
+    extent?: (ol.Extent);
+    logo?: (string | olx.LogoOptions);
+    projection: ol.ProjectionLike;
+    resolutions?: number[];
+    state?: ol.source.State;
+}
 
-    interface SourceSourceOptions {
-        attributions?: ol.AttributionLike;
-        logo?: (string | olx.LogoOptions);
-        projection: ol.ProjectionLike;
-        state?: ol.source.State;
-        wrapX?: boolean;
-    }
+export interface SourceSourceOptions {
+    attributions?: ol.AttributionLike;
+    logo?: (string | olx.LogoOptions);
+    projection: ol.ProjectionLike;
+    state?: ol.source.State;
+    wrapX?: boolean;
+}
 
-    interface SourceUrlTileOptions {
-        attributions?: ol.AttributionLike;
-        cacheSize?: number;
-        extent?: ol.Extent;
-        logo?: (string | olx.LogoOptions);
-        opaque?: boolean;
-        projection: ol.ProjectionLike;
-        state?: ol.source.State;
-        tileGrid?: ol.tilegrid.TileGrid;
-        tileLoadFunction: ol.TileLoadFunctionType;
-        tilePixelRatio?: number;
-        tileUrlFunction?: ol.TileUrlFunctionType;
-        url?: string;
-        urls?: string[];
-        wrapX?: boolean;
-    }
+export interface SourceUrlTileOptions {
+    attributions?: ol.AttributionLike;
+    cacheSize?: number;
+    extent?: ol.Extent;
+    logo?: (string | olx.LogoOptions);
+    opaque?: boolean;
+    projection: ol.ProjectionLike;
+    state?: ol.source.State;
+    tileGrid?: ol.tilegrid.TileGrid;
+    tileLoadFunction: ol.TileLoadFunctionType;
+    tilePixelRatio?: number;
+    tileUrlFunction?: ol.TileUrlFunctionType;
+    url?: string;
+    urls?: string[];
+    wrapX?: boolean;
+}
 
-    interface SourceTileOptions {
-        attributions?: ol.AttributionLike;
-        cacheSize?: number;
-        extent?: ol.Extent;
-        logo?: (string | olx.LogoOptions);
-        opaque?: boolean;
-        tilePixelRatio?: number;
-        projection: ol.ProjectionLike;
-        state?: ol.source.State;
-        tileGrid?: ol.tilegrid.TileGrid;
-        wrapX?: boolean;
-    }
+export interface SourceTileOptions {
+    attributions?: ol.AttributionLike;
+    cacheSize?: number;
+    extent?: ol.Extent;
+    logo?: (string | olx.LogoOptions);
+    opaque?: boolean;
+    tilePixelRatio?: number;
+    projection: ol.ProjectionLike;
+    state?: ol.source.State;
+    tileGrid?: ol.tilegrid.TileGrid;
+    wrapX?: boolean;
+}
 
-    interface StyleImageOptions {
-        opacity: number;
-        rotateWithView: boolean;
-        rotation: number;
-        scale: number;
-        snapToPixel: boolean;
-    }
+export interface StyleImageOptions {
+    opacity: number;
+    rotateWithView: boolean;
+    rotation: number;
+    scale: number;
+    snapToPixel: boolean;
+}
 
-    /**
-     * A function that takes an {@link ol.Feature} and a `{number}` representing
-     * the view's resolution. The function should return a {@link ol.style.Style}
-     * or an array of them. This way e.g. a vector layer can be styled.
-     *
-     */
-    type StyleFunction = (feature: (ol.Feature | ol.render.Feature), resolution: number) => (ol.style.Style | ol.style.Style[]);
+/**
+ * A function that takes an {@link ol.Feature} and a `{number}` representing
+ * the view's resolution. The function should return a {@link ol.style.Style}
+ * or an array of them. This way e.g. a vector layer can be styled.
+ *
+ */
+export type StyleFunction = (feature: (ol.Feature | ol.render.Feature), resolution: number) => (ol.style.Style | ol.style.Style[]);
 
-    /**
-     * A function that takes an {@link ol.Feature} as argument and returns an
-     * {@link ol.geom.Geometry} that will be rendered and styled for the feature.
-     *
-     */
-    type StyleGeometryFunction = (feature: (ol.Feature | ol.render.Feature)) => (ol.geom.Geometry | ol.render.Feature);
+/**
+ * A function that takes an {@link ol.Feature} as argument and returns an
+ * {@link ol.geom.Geometry} that will be rendered and styled for the feature.
+ *
+ */
+export type StyleGeometryFunction = (feature: (ol.Feature | ol.render.Feature)) => (ol.geom.Geometry | ol.render.Feature);
 
-    /**
-     * An array of three numbers representing the location of a tile in a tile
-     * grid. The order is `z`, `x`, and `y`. `z` is the zoom level.
-     */
-    type TileCoord = [number, number, number];
+/**
+ * An array of three numbers representing the location of a tile in a tile
+ * grid. The order is `z`, `x`, and `y`. `z` is the zoom level.
+ */
+export type TileCoord = [number, number, number];
 
-    /**
-     * A function that takes an {@link ol.Tile} for the tile and a `{string}` for
-     * the url as arguments.
-     *
-     */
-    type TileLoadFunctionType = (tile: ol.Tile, url: string) => void;
+/**
+ * A function that takes an {@link ol.Tile} for the tile and a `{string}` for
+ * the url as arguments.
+ *
+ */
+export type TileLoadFunctionType = (tile: ol.Tile, url: string) => void;
 
-    /**
-     * {@link ol.source.Tile} sources use a function of this type to get the url
-     * that provides a tile for a given tile coordinate.
-     *
-     * This function takes an {@link ol.TileCoord} for the tile coordinate, a
-     * `{number}` representing the pixel ratio and an {@link ol.proj.Projection} for
-     * the projection  as arguments and returns a `{string}` representing the tile
-     * URL, or undefined if no tile should be requested for the passed tile
-     * coordinate.
-     *
-     */
-    type TileUrlFunctionType = (coords: ol.TileCoord, pixelRatio: number, proj: ol.proj.Projection) => string;
+/**
+ * {@link ol.source.Tile} sources use a function of this type to get the url
+ * that provides a tile for a given tile coordinate.
+ *
+ * This function takes an {@link ol.TileCoord} for the tile coordinate, a
+ * `{number}` representing the pixel ratio and an {@link ol.proj.Projection} for
+ * the projection  as arguments and returns a `{string}` representing the tile
+ * URL, or undefined if no tile should be requested for the passed tile
+ * coordinate.
+ *
+ */
+export type TileUrlFunctionType = (coords: ol.TileCoord, pixelRatio: number, proj: ol.proj.Projection) => string;
 
-    /**
-     * A transform function accepts an array of input coordinate values, an optional
-     * output array, and an optional dimension (default should be 2).  The function
-     * transforms the input coordinate values, populates the output array, and
-     * returns the output array.
-     *
-     */
-    type TransformFunction = (array: number[], out?: number[], dimension?: number) => number[];
+/**
+ * A transform function accepts an array of input coordinate values, an optional
+ * output array, and an optional dimension (default should be 2).  The function
+ * transforms the input coordinate values, populates the output array, and
+ * returns the output array.
+ *
+ */
+export type TransformFunction = (array: number[], out?: number[], dimension?: number) => number[];
 
-    /**
-     * Number of features; bounds/extent.
-     */
-    type WFSFeatureCollectionMetadata = GlobalObject;
+/**
+ * Number of features; bounds/extent.
+ */
+export type WFSFeatureCollectionMetadata = GlobalObject;
 
-    /**
-     * Total deleted; total inserted; total updated; array of insert ids.
-     */
-    type WFSTransactionResponse = GlobalObject;
+/**
+ * Total deleted; total inserted; total updated; array of insert ids.
+ */
+export type WFSTransactionResponse = GlobalObject;
 
+/**
+ * @param tileCoord Tile coordinate.
+ * @param state State.
+ * @param src Data source url.
+ * @param format Feature format.
+ * @param tileLoadFunction Tile load function.
+ */
+export class VectorTile extends Tile {
     /**
      * @param tileCoord Tile coordinate.
      * @param state State.
@@ -11019,44 +11034,92 @@ declare namespace ol {
      * @param format Feature format.
      * @param tileLoadFunction Tile load function.
      */
-    class VectorTile extends ol.Tile {
-        /**
-         * @param tileCoord Tile coordinate.
-         * @param state State.
-         * @param src Data source url.
-         * @param format Feature format.
-         * @param tileLoadFunction Tile load function.
-         */
-        constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, format: ol.format.Feature, tileLoadFunction: ol.TileLoadFunctionType);
+    constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, format: ol.format.Feature, tileLoadFunction: ol.TileLoadFunctionType);
 
-        /**
-         * Get the feature format assigned for reading this tile's features.
-         * @return Feature format.
-         * @api
-         */
-        getFormat(): ol.format.Feature;
+    /**
+     * Get the feature format assigned for reading this tile's features.
+     * @return Feature format.
+     * @api
+     */
+    getFormat(): ol.format.Feature;
 
-        /**
-         * @param features Features.
-         * @api
-         */
-        setFeatures(features: ol.Feature[]): void;
+    /**
+     * @param features Features.
+     * @api
+     */
+    setFeatures(features: ol.Feature[]): void;
 
-        /**
-         * Set the projection of the features that were added with {@link #setFeatures}.
-         * @param projection Feature projection.
-         * @api
-         */
-        setProjection(projection: ol.proj.Projection): void;
+    /**
+     * Set the projection of the features that were added with {@link #setFeatures}.
+     * @param projection Feature projection.
+     * @api
+     */
+    setProjection(projection: ol.proj.Projection): void;
 
-        /**
-         * Set the feature loader for reading this tile's features.
-         * @param loader Feature loader.
-         * @api
-         */
-        setLoader(loader: ol.FeatureLoader): void;
-    }
+    /**
+     * Set the feature loader for reading this tile's features.
+     * @param loader Feature loader.
+     * @api
+     */
+    setLoader(loader: ol.FeatureLoader): void;
+}
 
+/**
+ * @classdesc
+ * An ol.View object represents a simple 2D view of the map.
+ *
+ * This is the object to act upon to change the center, resolution,
+ * and rotation of the map.
+ *
+ * ### The view states
+ *
+ * An `ol.View` is determined by three states: `center`, `resolution`,
+ * and `rotation`. Each state has a corresponding getter and setter, e.g.
+ * `getCenter` and `setCenter` for the `center` state.
+ *
+ * An `ol.View` has a `projection`. The projection determines the
+ * coordinate system of the center, and its units determine the units of the
+ * resolution (projection units per pixel). The default projection is
+ * Spherical Mercator (EPSG:3857).
+ *
+ * ### The constraints
+ *
+ * `setCenter`, `setResolution` and `setRotation` can be used to change the
+ * states of the view. Any value can be passed to the setters. And the value
+ * that is passed to a setter will effectively be the value set in the view,
+ * and returned by the corresponding getter.
+ *
+ * But an `ol.View` object also has a *resolution constraint*, a
+ * *rotation constraint* and a *center constraint*.
+ *
+ * As said above, no constraints are applied when the setters are used to set
+ * new states for the view. Applying constraints is done explicitly through
+ * the use of the `constrain*` functions (`constrainResolution` and
+ * `constrainRotation` and `constrainCenter`).
+ *
+ * The main users of the constraints are the interactions and the
+ * controls. For example, double-clicking on the map changes the view to
+ * the "next" resolution. And releasing the fingers after pinch-zooming
+ * snaps to the closest resolution (with an animation).
+ *
+ * The *resolution constraint* snaps to specific resolutions. It is
+ * determined by the following options: `resolutions`, `maxResolution`,
+ * `maxZoom`, and `zoomFactor`. If `resolutions` is set, the other three
+ * options are ignored. See documentation for each option for more
+ * information.
+ *
+ * The *rotation constraint* snaps to specific angles. It is determined
+ * by the following options: `enableRotation` and `constrainRotation`.
+ * By default the rotation value is snapped to zero when approaching the
+ * horizontal.
+ *
+ * The *center constraint* is determined by the `extent` option. By
+ * default the center is not constrained at all.
+ *
+ * @param opt_options View options.
+ * @api stable
+ */
+export class View extends Object {
     /**
      * @classdesc
      * An ol.View object represents a simple 2D view of the map.
@@ -11112,309 +11175,252 @@ declare namespace ol {
      * @param opt_options View options.
      * @api stable
      */
-    class View extends ol.Object {
-        /**
-         * @classdesc
-         * An ol.View object represents a simple 2D view of the map.
-         *
-         * This is the object to act upon to change the center, resolution,
-         * and rotation of the map.
-         *
-         * ### The view states
-         *
-         * An `ol.View` is determined by three states: `center`, `resolution`,
-         * and `rotation`. Each state has a corresponding getter and setter, e.g.
-         * `getCenter` and `setCenter` for the `center` state.
-         *
-         * An `ol.View` has a `projection`. The projection determines the
-         * coordinate system of the center, and its units determine the units of the
-         * resolution (projection units per pixel). The default projection is
-         * Spherical Mercator (EPSG:3857).
-         *
-         * ### The constraints
-         *
-         * `setCenter`, `setResolution` and `setRotation` can be used to change the
-         * states of the view. Any value can be passed to the setters. And the value
-         * that is passed to a setter will effectively be the value set in the view,
-         * and returned by the corresponding getter.
-         *
-         * But an `ol.View` object also has a *resolution constraint*, a
-         * *rotation constraint* and a *center constraint*.
-         *
-         * As said above, no constraints are applied when the setters are used to set
-         * new states for the view. Applying constraints is done explicitly through
-         * the use of the `constrain*` functions (`constrainResolution` and
-         * `constrainRotation` and `constrainCenter`).
-         *
-         * The main users of the constraints are the interactions and the
-         * controls. For example, double-clicking on the map changes the view to
-         * the "next" resolution. And releasing the fingers after pinch-zooming
-         * snaps to the closest resolution (with an animation).
-         *
-         * The *resolution constraint* snaps to specific resolutions. It is
-         * determined by the following options: `resolutions`, `maxResolution`,
-         * `maxZoom`, and `zoomFactor`. If `resolutions` is set, the other three
-         * options are ignored. See documentation for each option for more
-         * information.
-         *
-         * The *rotation constraint* snaps to specific angles. It is determined
-         * by the following options: `enableRotation` and `constrainRotation`.
-         * By default the rotation value is snapped to zero when approaching the
-         * horizontal.
-         *
-         * The *center constraint* is determined by the `extent` option. By
-         * default the center is not constrained at all.
-         *
-         * @param opt_options View options.
-         * @api stable
-         */
-        constructor(opt_options?: olx.ViewOptions);
+    constructor(opt_options?: olx.ViewOptions);
 
-        /**
-         * Animate the view. The view's center, zoom (or resolution), and
-         * rotation can be animated for smooth transitions between view states.
-         * @param var_args Animation options.
-         * @param restArgs
-         * @api experimental
-         */
-        animate(...var_args: Array<olx.animation.AnimateOptions | olx.animation.AnimateCallback>): void;
+    /**
+     * Animate the view. The view's center, zoom (or resolution), and
+     * rotation can be animated for smooth transitions between view states.
+     * @param var_args Animation options.
+     * @param restArgs
+     * @api experimental
+     */
+    animate(...var_args: Array<olx.animation.AnimateOptions | olx.animation.AnimateCallback>): void;
 
-        /**
-         * Determine if the view is being animated.
-         * @return The view is being animated.
-         * @api
-         */
-        getAnimating(): boolean;
+    /**
+     * Determine if the view is being animated.
+     * @return The view is being animated.
+     * @api
+     */
+    getAnimating(): boolean;
 
-        /**
-         * Determine if the user is interacting with the view, such as panning or zooming.
-         * @return The view is being interacted with.
-         * @api
-         */
-        getInteracting(): boolean;
+    /**
+     * Determine if the user is interacting with the view, such as panning or zooming.
+     * @return The view is being interacted with.
+     * @api
+     */
+    getInteracting(): boolean;
 
-        /**
-         * Cancel any ongoing animations.
-         * @api
-         */
-        cancelAnimations(): void;
+    /**
+     * Cancel any ongoing animations.
+     * @api
+     */
+    cancelAnimations(): void;
 
-        /**
-         * Get the constrained center of this view.
-         * @param center Center.
-         * @return Constrained center.
-         * @api
-         */
-        constrainCenter(center?: ol.Coordinate): ol.Coordinate;
+    /**
+     * Get the constrained center of this view.
+     * @param center Center.
+     * @return Constrained center.
+     * @api
+     */
+    constrainCenter(center?: ol.Coordinate): ol.Coordinate;
 
-        /**
-         * Get the constrained resolution of this view.
-         * @param resolution Resolution.
-         * @param opt_delta Delta. Default is `0`.
-         * @param opt_direction Direction. Default is `0`.
-         * @return Constrained resolution.
-         * @api
-         */
-        constrainResolution(resolution?: number, opt_delta?: number, opt_direction?: number): number;
+    /**
+     * Get the constrained resolution of this view.
+     * @param resolution Resolution.
+     * @param opt_delta Delta. Default is `0`.
+     * @param opt_direction Direction. Default is `0`.
+     * @return Constrained resolution.
+     * @api
+     */
+    constrainResolution(resolution?: number, opt_delta?: number, opt_direction?: number): number;
 
-        /**
-         * Get the constrained rotation of this view.
-         * @param rotation Rotation.
-         * @param opt_delta Delta. Default is `0`.
-         * @return Constrained rotation.
-         * @api
-         */
-        constrainRotation(rotation?: number, opt_delta?: number): number;
+    /**
+     * Get the constrained rotation of this view.
+     * @param rotation Rotation.
+     * @param opt_delta Delta. Default is `0`.
+     * @return Constrained rotation.
+     * @api
+     */
+    constrainRotation(rotation?: number, opt_delta?: number): number;
 
-        /**
-         * Get the view center.
-         * @return The center of the view.
-         * @observable
-         * @api stable
-         */
-        getCenter(): ol.Coordinate;
+    /**
+     * Get the view center.
+     * @return The center of the view.
+     * @observable
+     * @api stable
+     */
+    getCenter(): ol.Coordinate;
 
-        /**
-         * Calculate the extent for the current view state and the passed size.
-         * The size is the pixel dimensions of the box into which the calculated extent
-         * should fit. In most cases you want to get the extent of the entire map,
-         * that is `map.getSize()`.
-         * @param size Box pixel size.
-         * @return Extent.
-         * @api stable
-         */
-        calculateExtent(size?: ol.Size): ol.Extent;
+    /**
+     * Calculate the extent for the current view state and the passed size.
+     * The size is the pixel dimensions of the box into which the calculated extent
+     * should fit. In most cases you want to get the extent of the entire map,
+     * that is `map.getSize()`.
+     * @param size Box pixel size.
+     * @return Extent.
+     * @api stable
+     */
+    calculateExtent(size?: ol.Size): ol.Extent;
 
-        /**
-         * Get the maximum resolution of the view.
-         * @return The maximum resolution of the view.
-         * @api
-         */
-        getMaxResolution(): number;
+    /**
+     * Get the maximum resolution of the view.
+     * @return The maximum resolution of the view.
+     * @api
+     */
+    getMaxResolution(): number;
 
-        /**
-         * Get the minimum resolution of the view.
-         * @return The minimum resolution of the view.
-         * @api
-         */
-        getMinResolution(): number;
+    /**
+     * Get the minimum resolution of the view.
+     * @return The minimum resolution of the view.
+     * @api
+     */
+    getMinResolution(): number;
 
-        /**
-         * Get the maximum zoom level for the view.
-         * @return The maximum zoom level.
-         * @api
-         */
-        getMaxZoom(): number;
+    /**
+     * Get the maximum zoom level for the view.
+     * @return The maximum zoom level.
+     * @api
+     */
+    getMaxZoom(): number;
 
-        /**
-         * Set a new maximum zoom level for the view.
-         * @param zoom The maximum zoom level.
-         * @api stable
-         */
-        setMaxZoom(zoom: number): void;
+    /**
+     * Set a new maximum zoom level for the view.
+     * @param zoom The maximum zoom level.
+     * @api stable
+     */
+    setMaxZoom(zoom: number): void;
 
-        /**
-         * Get the minimum zoom level for the view.
-         * @return The minimum zoom level.
-         * @api
-         */
-        getMinZoom(): number;
+    /**
+     * Get the minimum zoom level for the view.
+     * @return The minimum zoom level.
+     * @api
+     */
+    getMinZoom(): number;
 
-        /**
-         * Set a new minimum zoom level for the view.
-         * @param zoom The minimum zoom level.
-         * @api stable
-         */
-        setMinZoom(zoom: number): void;
+    /**
+     * Set a new minimum zoom level for the view.
+     * @param zoom The minimum zoom level.
+     * @api stable
+     */
+    setMinZoom(zoom: number): void;
 
-        /**
-         * Get the view projection.
-         * @return The projection of the view.
-         * @api stable
-         */
-        getProjection(): ol.proj.Projection;
+    /**
+     * Get the view projection.
+     * @return The projection of the view.
+     * @api stable
+     */
+    getProjection(): ol.proj.Projection;
 
-        /**
-         * Get the view resolution.
-         * @return The resolution of the view.
-         * @observable
-         * @api stable
-         */
-        getResolution(): number;
+    /**
+     * Get the view resolution.
+     * @return The resolution of the view.
+     * @observable
+     * @api stable
+     */
+    getResolution(): number;
 
-        /**
-         * Get the resolutions for the view. This returns the array of resolutions
-         * passed to the constructor of the {ol.View}, or undefined if none were given.
-         * @return The resolutions of the view.
-         * @api stable
-         */
-        getResolutions(): number[];
+    /**
+     * Get the resolutions for the view. This returns the array of resolutions
+     * passed to the constructor of the {ol.View}, or undefined if none were given.
+     * @return The resolutions of the view.
+     * @api stable
+     */
+    getResolutions(): number[];
 
-        /**
-         * Get the resolution for a provided extent (in map units) and size (in pixels).
-         * @param extent Extent.
-         * @param opt_size Box pixel size.
-         * @return The resolution at which the provided extent will render at
-         *     the given size.
-         * @api
-         */
-        getResolutionForExtent(extent: ol.Extent, opt_size?: ol.Size): number;
+    /**
+     * Get the resolution for a provided extent (in map units) and size (in pixels).
+     * @param extent Extent.
+     * @param opt_size Box pixel size.
+     * @return The resolution at which the provided extent will render at
+     *     the given size.
+     * @api
+     */
+    getResolutionForExtent(extent: ol.Extent, opt_size?: ol.Size): number;
 
-        /**
-         * Get the view rotation.
-         * @return The rotation of the view in radians.
-         * @observable
-         * @api stable
-         */
-        getRotation(): number;
+    /**
+     * Get the view rotation.
+     * @return The rotation of the view in radians.
+     * @observable
+     * @api stable
+     */
+    getRotation(): number;
 
-        /**
-         * Get the current zoom level.  If you configured your view with a resolutions
-         * array (this is rare), this method may return non-integer zoom levels (so
-         * the zoom level is not safe to use as an index into a resolutions array).
-         * @return Zoom.
-         * @api
-         */
-        getZoom(): number;
+    /**
+     * Get the current zoom level.  If you configured your view with a resolutions
+     * array (this is rare), this method may return non-integer zoom levels (so
+     * the zoom level is not safe to use as an index into a resolutions array).
+     * @return Zoom.
+     * @api
+     */
+    getZoom(): number;
 
-        /**
-         * Get the zoom level for a resolution.
-         * @param resolution The resolution.
-         * @return The zoom level for the provided resolution.
-         * @api
-         */
-        getZoomForResolution(resolution: number): number;
+    /**
+     * Get the zoom level for a resolution.
+     * @param resolution The resolution.
+     * @return The zoom level for the provided resolution.
+     * @api
+     */
+    getZoomForResolution(resolution: number): number;
 
-        /**
-         * Get the resolution for a zoom level.
-         * @param zoom Zoom level.
-         * @return The view resolution for the provided zoom level.
-         * @api
-         */
-        getResolutionForZoom(zoom: number): number;
+    /**
+     * Get the resolution for a zoom level.
+     * @param zoom Zoom level.
+     * @return The view resolution for the provided zoom level.
+     * @api
+     */
+    getResolutionForZoom(zoom: number): number;
 
-        /**
-         * Fit the given geometry or extent based on the given map size and border.
-         * The size is pixel dimensions of the box to fit the extent into.
-         * In most cases you will want to use the map size, that is `map.getSize()`.
-         * Takes care of the map angle.
-         * @param geometry Geometry.
-         * @param opt_options Options.
-         * @api
-         */
-        fit(geometryOrExtent: (ol.geom.SimpleGeometry | ol.Extent), opt_options?: olx.view.FitOptions): void;
+    /**
+     * Fit the given geometry or extent based on the given map size and border.
+     * The size is pixel dimensions of the box to fit the extent into.
+     * In most cases you will want to use the map size, that is `map.getSize()`.
+     * Takes care of the map angle.
+     * @param geometry Geometry.
+     * @param opt_options Options.
+     * @api
+     */
+    fit(geometryOrExtent: (ol.geom.SimpleGeometry | ol.Extent), opt_options?: olx.view.FitOptions): void;
 
-        /**
-         * Center on coordinate and view position.
-         * @param coordinate Coordinate.
-         * @param size Box pixel size.
-         * @param position Position on the view to center on.
-         * @api
-         */
-        centerOn(coordinate: ol.Coordinate, size: ol.Size, position: ol.Pixel): void;
+    /**
+     * Center on coordinate and view position.
+     * @param coordinate Coordinate.
+     * @param size Box pixel size.
+     * @param position Position on the view to center on.
+     * @api
+     */
+    centerOn(coordinate: ol.Coordinate, size: ol.Size, position: ol.Pixel): void;
 
-        /**
-         * Rotate the view around a given coordinate.
-         * @param rotation New rotation value for the view.
-         * @param opt_anchor The rotation center.
-         * @api stable
-         */
-        rotate(rotation: number, opt_anchor?: ol.Coordinate): void;
+    /**
+     * Rotate the view around a given coordinate.
+     * @param rotation New rotation value for the view.
+     * @param opt_anchor The rotation center.
+     * @api stable
+     */
+    rotate(rotation: number, opt_anchor?: ol.Coordinate): void;
 
-        /**
-         * Set the center of the current view.
-         * @param center The center of the view.
-         * @observable
-         * @api stable
-         */
-        setCenter(center: ol.Coordinate): void;
+    /**
+     * Set the center of the current view.
+     * @param center The center of the view.
+     * @observable
+     * @api stable
+     */
+    setCenter(center: ol.Coordinate): void;
 
-        /**
-         * Set the resolution for this view.
-         * @param resolution The resolution of the view.
-         * @observable
-         * @api stable
-         */
-        setResolution(resolution?: number): void;
+    /**
+     * Set the resolution for this view.
+     * @param resolution The resolution of the view.
+     * @observable
+     * @api stable
+     */
+    setResolution(resolution?: number): void;
 
-        /**
-         * Set the rotation for this view.
-         * @param rotation The rotation of the view in radians.
-         * @observable
-         * @api stable
-         */
-        setRotation(rotation: number): void;
+    /**
+     * Set the rotation for this view.
+     * @param rotation The rotation of the view in radians.
+     * @observable
+     * @api stable
+     */
+    setRotation(rotation: number): void;
 
-        /**
-         * Zoom to a specific zoom level.
-         * @param zoom Zoom level.
-         * @api stable
-         */
-        setZoom(zoom: number): void;
-    }
+    /**
+     * Zoom to a specific zoom level.
+     * @param zoom Zoom level.
+     * @api stable
+     */
+    setZoom(zoom: number): void;
 }
 
-declare namespace olx {
+export namespace olx {
     namespace animation {
         interface BounceOptions {
             resolution: number;
@@ -11485,11 +11491,11 @@ declare namespace olx {
 
         interface DefaultsOptions {
             attribution?: boolean;
-            attributionOptions?: olx.control.AttributionOptions;
+            attributionOptions?: AttributionOptions;
             rotate?: boolean;
-            rotateOptions?: olx.control.RotateOptions;
+            rotateOptions?: RotateOptions;
             zoom?: boolean;
-            zoomOptions?: olx.control.ZoomOptions;
+            zoomOptions?: ZoomOptions;
         }
 
         interface FullScreenOptions {
@@ -11595,8 +11601,8 @@ declare namespace olx {
 
         interface MVTOptions {
             featureClass?: (((geom: (ol.geom.Geometry | { [k: string]: any })) => any) | ((geom: ol.geom.GeometryType, arg2: number[],
-                           arg3: (number[] | number[][]),
-                           arg4: { [k: string]: any }) => any));
+                            arg3: (number[] | number[][]),
+                            arg4: { [k: string]: any }) => any));
             geometryName?: string;
             layerName?: string;
             layers?: string[];
@@ -11669,7 +11675,7 @@ declare namespace olx {
             srsName?: string;
             handle?: string;
             nativeElements: GlobalObject[];
-            gmlOptions?: olx.format.GMLOptions;
+            gmlOptions?: GMLOptions;
         }
 
         interface WKTOptions {
@@ -11712,7 +11718,7 @@ declare namespace olx {
         }
 
         interface DragAndDropOptions {
-            formatConstructors?: Array<typeof ol.format.Feature>;
+            formatConstructors?: Array<typeof format.Feature>;
             projection: ol.ProjectionLike;
             target?: Element;
             source?: ol.source.Vector;
@@ -11926,7 +11932,7 @@ declare namespace olx {
         type VectorRenderType = "image" | "vector";
 
         interface VectorOptions {
-            renderMode?: (olx.layer.VectorRenderType | string);
+            renderMode?: (VectorRenderType | string);
             renderOrder?: (feature1: ol.Feature, feature2: ol.Feature) => number;
             map?: ol.Map;
             extent?: ol.Extent;
@@ -12006,7 +12012,7 @@ declare namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             opaque?: boolean;
             projection: ol.ProjectionLike;
             reprojectionErrorThreshold?: number;
@@ -12026,7 +12032,7 @@ declare namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             format?: ol.format.Feature;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             overlaps?: boolean;
             projection: ol.ProjectionLike;
             state?: ol.source.State;
@@ -12081,7 +12087,7 @@ declare namespace olx {
         interface ImageArcGISRestOptions {
             attributions?: ol.Attribution[];
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             imageLoadFunction?: ol.ImageLoadFunctionType;
             params?: { [k: string]: any };
             projection: ol.ProjectionLike;
@@ -12093,7 +12099,7 @@ declare namespace olx {
         interface ImageCanvasOptions {
             attributions?: ol.AttributionLike;
             canvasFunction: ol.CanvasFunctionType;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             projection: ol.ProjectionLike;
             ratio?: number;
             resolutions?: number[];
@@ -12102,7 +12108,7 @@ declare namespace olx {
 
         interface ImageVectorOptions {
             attributions?: ol.AttributionLike;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             projection: ol.ProjectionLike;
             ratio?: number;
             renderBuffer?: number;
@@ -12128,7 +12134,7 @@ declare namespace olx {
             hidpi?: boolean;
             serverType?: (ol.source.wms.ServerType | string);
             imageLoadFunction?: ol.ImageLoadFunctionType;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             params: { [k: string]: any };
             projection: ol.ProjectionLike;
             ratio?: number;
@@ -12152,7 +12158,7 @@ declare namespace olx {
             crossOrigin?: (string);
             imageExtent: ol.Extent;
             imageLoadFunction?: ol.ImageLoadFunctionType;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             projection: ol.ProjectionLike;
             imageSize?: ol.Size;
             url: string;
@@ -12163,7 +12169,7 @@ declare namespace olx {
             cacheSize?: number;
             crossOrigin?: (string);
             params?: { [k: string]: any };
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             tileGrid?: ol.tilegrid.TileGrid;
             projection?: ol.ProjectionLike;
             reprojectionErrorThreshold?: number;
@@ -12193,7 +12199,7 @@ declare namespace olx {
             crossOrigin?: (string);
             gutter?: number;
             hidpi?: boolean;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             tileGrid?: ol.tilegrid.TileGrid;
             projection?: ol.ProjectionLike;
             reprojectionErrorThreshold?: number;
@@ -12210,7 +12216,7 @@ declare namespace olx {
             features?: (ol.Feature[] | ol.Collection<ol.Feature>);
             format?: ol.format.Feature;
             loader?: ol.FeatureLoader;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             overlaps?: boolean;
             strategy?: ol.LoadingStrategy;
             url?: (string | ol.FeatureUrlFunction);
@@ -12222,7 +12228,7 @@ declare namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             tileGrid: ol.tilegrid.WMTS;
             projection: ol.ProjectionLike;
             reprojectionErrorThreshold?: number;
@@ -12245,7 +12251,7 @@ declare namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             opaque?: boolean;
             projection?: ol.ProjectionLike;
             reprojectionErrorThreshold?: number;
@@ -12265,7 +12271,7 @@ declare namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             projection: ol.ProjectionLike;
             maxZoom?: number;
             minZoom?: number;
@@ -12279,7 +12285,7 @@ declare namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             reprojectionErrorThreshold?: number;
             url: string;
             tierSizeCalculation?: string;
@@ -12357,7 +12363,7 @@ declare namespace olx {
             offsetX?: number;
             offsetY?: number;
             overflow?: boolean;
-            placement?: olx.style.TextPlacement;
+            placement?: TextPlacement;
             scale?: number;
             rotateWithView?: boolean;
             rotation?: number;
@@ -12464,7 +12470,7 @@ declare namespace olx {
         layers?: (ol.layer.Base[] | ol.Collection<ol.layer.Base>);
         loadTilesWhileAnimating?: boolean;
         loadTilesWhileInteracting?: boolean;
-        logo?: (boolean | string | olx.LogoOptions | Element);
+        logo?: (boolean | string | LogoOptions | Element);
         overlays?: (ol.Collection<ol.Overlay> | ol.Overlay[]);
         renderer?: (ol.RendererType | Array<(ol.RendererType | string)> | string);
         target?: (Element | string);
@@ -12483,7 +12489,7 @@ declare namespace olx {
         stopEvent?: boolean;
         insertFirst?: boolean;
         autoPan?: boolean;
-        autoPanAnimation?: olx.animation.PanOptions;
+        autoPanAnimation?: animation.PanOptions;
         autoPanMargin?: number;
     }
 
@@ -12511,7 +12517,7 @@ declare namespace olx {
             maxZoom?: number;
             duration?: number;
             easing?: ((t: number) => number);
-            callback?: olx.animation.AnimateCallback;
+            callback?: animation.AnimateCallback;
         }
     }
 
@@ -12547,7 +12553,7 @@ declare namespace olx {
     interface FrameState {
         pixelRatio: number;
         time: number;
-        viewState: olx.ViewState;
+        viewState: ViewState;
     }
 
     interface ViewState {
@@ -12557,7 +12563,3 @@ declare namespace olx {
         rotation: number;
     }
 }
-
-declare module "openlayers" {
-    export = ol;
-}
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index ff37abb4dc..58f9c5e4ad 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -1,13 +1,15 @@
+import * as ol from 'openlayers';
+
 // Basic type variables for test functions
 let anyValue: any;
 let booleanValue: boolean;
-let canvas: HTMLCanvasElement;
-let domEventTarget: EventTarget;
-let fn: () => void;
-let image: HTMLImageElement;
+const canvas: HTMLCanvasElement = new HTMLCanvasElement();
+const domEventTarget: EventTarget = new EventTarget();
+const fn: () => void = () => {};
+const image: HTMLImageElement = new HTMLImageElement();
 let jsonValue: JSON;
-let listener: ol.EventsListenerFunctionType;
-let numberArray: number[];
+const listener: ol.EventsListenerFunctionType = (evt) => {};
+let numberArray: number[] = [];
 let numberValue: number;
 let object: { [key: string]: any };
 let stringArray: string[];
@@ -15,67 +17,72 @@ let stringValue: string;
 
 // Callback predefinitions for OpenLayers
 let coordinateFormatType: ol.CoordinateFormatType;
-let drawGeometryFunction: ol.DrawGeometryFunctionType;
+const drawGeometryFunction: ol.DrawGeometryFunctionType = (coords, geo) => new ol.geom.SimpleGeometry();
 let easingFunction: (t: number) => number;
 let featureLoader: ol.FeatureLoader;
 let featureStyleFunction: ol.FeatureStyleFunction;
-let preRenderFunction: ol.PreRenderFunction;
+const preRenderFunction: ol.PreRenderFunction = (map, state) => false;
 let transformFunction: ol.TransformFunction;
 drawGeometryFunction([0, 0], new ol.geom.Point([0, 0]));
 drawGeometryFunction([0, 0]);
 
 // Type variables for OpenLayers
 let attribution: ol.Attribution;
-let boundingCoordinates: ol.Coordinate[];
+const boundingCoordinates: ol.Coordinate[] = [];
 let circle: ol.geom.Circle;
 let clusterSource: ol.source.Cluster;
 let color: ol.Color;
 let coordinate: ol.Coordinate;
 let coordinatesArray: ol.Coordinate[];
 let coordinatesArrayDim2: ol.Coordinate[][];
-let eventKey: ol.EventsKey;
-let eventKeyArray: ol.EventsKey[];
+const eventKey: ol.EventsKey = {};
+const eventKeyArray: ol.EventsKey[] = [];
 let eventKeyMixed: ol.EventsKey | ol.EventsKey[];
-let eventTarget: ol.events.EventTarget;
+const eventTarget = new ol.events.EventTarget();
 let extent: ol.Extent;
 let feature: ol.Feature;
 let featureArray: ol.Feature[];
 let featureCollection: ol.Collection<ol.Feature>;
-let featureFormat: ol.format.Feature;
-let featureUrlFunction: ol.FeatureUrlFunction;
+const featureFormat = new ol.format.Feature();
+const featureUrlFunction: ol.FeatureUrlFunction = (extent, resolution, proj) => stringValue;
 let geometriesArray: ol.geom.Geometry[];
 let geometry: ol.geom.Geometry;
 let geometryCollection: ol.geom.GeometryCollection;
 let geometryLayout: ol.geom.GeometryLayout;
 let geometryType: ol.geom.GeometryType;
 let graticule: ol.Graticule;
-let iconAnchorUnits: ol.style.IconAnchorUnits;
-let iconOrigin: ol.style.IconOrigin;
+const iconAnchorUnits: ol.style.IconAnchorUnits = 'fraction';
+const iconOrigin: ol.style.IconOrigin = 'bottom-left';
 let linearRing: ol.geom.LinearRing;
 let lineString: ol.geom.LineString;
 let loadingStrategy: ol.LoadingStrategy;
-let logoOptions: olx.LogoOptions;
-let mapBrowserEvent: ol.MapBrowserEvent;
+const logoOptions: ol.olx.LogoOptions = {href: stringValue, src: stringValue};
+let map: ol.Map;
 let multiLineString: ol.geom.MultiLineString;
 let multiPoint: ol.geom.MultiPoint;
 let multiPolygon: ol.geom.MultiPolygon;
-let olEvent: ol.events.Event;
-let pixel: ol.Pixel;
+let numberCollection: ol.Collection<number>;
+const olEvent = new ol.events.Event(stringValue);
+const pixel: ol.Pixel = [numberValue, numberValue];
 let point: ol.geom.Point;
 let polygon: ol.geom.Polygon;
 let projection: ol.proj.Projection;
-let projectionLike: ol.ProjectionLike;
-let simpleGeometry: ol.geom.SimpleGeometry;
+const projectionLike: ol.ProjectionLike = stringValue;
+const simpleGeometry = new ol.geom.SimpleGeometry();
 let size: ol.Size;
-let style: ol.style.Style;
-let styleArray: ol.style.Style[];
-let styleFunction: ol.StyleFunction;
+const style = new ol.style.Style();
+const styleArray: ol.style.Style[] = [];
+const styleFunction: ol.StyleFunction = (feature, resolution) => style;
 let styleRegularShape: ol.style.RegularShape;
-let tilegrid: ol.tilegrid.TileGrid;
-let transformFn: ol.TransformFunction;
+const tilegrid = new ol.tilegrid.TileGrid({resolutions: numberArray});
+const transformFn: ol.TransformFunction = (array, out, dimension) => numberArray;
 let units: ol.proj.Units;
 let vectorSource: ol.source.Vector;
 
+const viewState: ol.olx.ViewState = {center: coordinate, projection, resolution: numberValue, rotation: numberValue};
+const frameState: ol.olx.FrameState = {pixelRatio: numberValue, time: numberValue, viewState};
+const mapBrowserEvent = new ol.MapBrowserEvent(stringValue, map, event, booleanValue, frameState);
+
 //
 // ol.Attribution
 //
@@ -84,6 +91,24 @@ attribution = new ol.Attribution({
     html: stringValue,
 });
 
+//
+// ol.Collection
+//
+let collection = new ol.Collection<number>();
+collection = new ol.Collection<number>([]);
+collection.clear();
+numberCollection = collection.extend(numberArray);
+collection.forEach((item, index, array) => {});
+numberArray = collection.getArray();
+numberValue = collection.item(numberValue);
+numberValue = collection.getLength();
+collection.insertAt(numberValue, numberValue);
+numberValue = collection.pop();
+numberValue = collection.push(numberValue);
+numberValue = collection.remove(numberValue);
+numberValue = collection.removeAt(numberValue);
+collection.setAt(numberValue, numberValue);
+
 //
 // ol.color
 //
@@ -155,7 +180,7 @@ circle = <ol.geom.Circle> circle.transform(projectionLike, projectionLike);
 //
 // ol.geom.Geometry
 //
-let geometryResult: ol.geom.Geometry;
+const geometryResult = new ol.geom.Geometry();
 coordinate = geometryResult.getClosestPoint(coordinate);
 geometryResult.getClosestPoint(coordinate, coordinate);
 extent = geometryResult.getExtent();
@@ -283,7 +308,7 @@ point.setCoordinates(coordinate, geometryLayout);
 //
 // ol.geom.Polygon
 //
-let localSphere: ol.Sphere;
+const localSphere = new ol.Sphere(numberValue);
 let linearRingsArray: ol.geom.LinearRing[];
 
 polygon = new ol.geom.Polygon(coordinatesArrayDim2);
@@ -321,7 +346,7 @@ simpleGeometry.translate(numberValue, numberValue);
 //
 // ol.source
 //
-let featureCallback: (f: ol.Feature) => any;
+const featureCallback = (f: ol.Feature) => anyValue;
 vectorSource = new ol.source.Vector({
     attributions: [attribution],
     features: featureCollection,
@@ -379,8 +404,8 @@ feature = new ol.Feature({
 feature = feature.clone();
 geometry = feature.getGeometry();
 stringValue = feature.getGeometryName();
-let featureGetId: string | number = feature.getId();
-let featureGetStyle: ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction = feature.getStyle();
+const featureGetId: string | number = feature.getId();
+const featureGetStyle: ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction = feature.getStyle();
 featureStyleFunction = feature.getStyleFunction();
 feature.setGeometry(geometry);
 feature.setGeometryName(stringValue);
@@ -491,21 +516,21 @@ view.setZoom(numberValue);
 //
 // ol.layer.Base
 //
-let baseLayer: ol.layer.Base = new ol.layer.Base({
+const baseLayer: ol.layer.Base = new ol.layer.Base({
     zIndex: 1
 });
 
 //
 // ol.layer.Group
 //
-let groupLayer: ol.layer.Group = new ol.layer.Group({
+const groupLayer: ol.layer.Group = new ol.layer.Group({
     zIndex: 2
 });
 
 //
 // ol.layer.Heatmap
 //
-let heatmapLayer: ol.layer.Heatmap = new ol.layer.Heatmap({
+const heatmapLayer: ol.layer.Heatmap = new ol.layer.Heatmap({
     source: new ol.source.Vector(),
     weight: '',
     zIndex: 1
@@ -514,7 +539,7 @@ let heatmapLayer: ol.layer.Heatmap = new ol.layer.Heatmap({
 //
 // ol.layer.Image
 //
-let imageLayer: ol.layer.Image = new ol.layer.Image({
+const imageLayer: ol.layer.Image = new ol.layer.Image({
     source: new ol.source.Image({
         projection: ''
     }),
@@ -524,14 +549,14 @@ let imageLayer: ol.layer.Image = new ol.layer.Image({
 //
 // ol.layer.Layer
 //
-let layerLayer: ol.layer.Layer = new ol.layer.Layer({
+const layerLayer: ol.layer.Layer = new ol.layer.Layer({
     zIndex: 2
 });
 
 //
 // ol.layer.Tile
 //
-let tileLayer: ol.layer.Tile = new ol.layer.Tile({
+const tileLayer: ol.layer.Tile = new ol.layer.Tile({
     source: new ol.source.OSM(),
     zIndex: 0
 });
@@ -539,8 +564,8 @@ let tileLayer: ol.layer.Tile = new ol.layer.Tile({
 //
 // ol.layer.Vector
 //
-let vectorLayerRenderMode: olx.layer.VectorRenderType = 'image';
-let vectorLayer: ol.layer.Vector = new ol.layer.Vector({
+const vectorLayerRenderMode: ol.olx.layer.VectorRenderType = 'image';
+const vectorLayer: ol.layer.Vector = new ol.layer.Vector({
     renderMode: vectorLayerRenderMode,
     source: new ol.source.Vector(),
     zIndex: -1
@@ -549,7 +574,7 @@ let vectorLayer: ol.layer.Vector = new ol.layer.Vector({
 //
 // ol.layer.VectorTile
 //
-let vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
+const vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
     renderOrder: () => 1,
     zIndex: 2
 });
@@ -557,7 +582,7 @@ let vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
 //
 // ol.Object
 //
-let olObject: ol.Object = new ol.Object({
+const olObject: ol.Object = new ol.Object({
     a: numberValue,
     b: stringValue,
     c: booleanValue,
@@ -576,7 +601,7 @@ olObject.unset(stringValue, booleanValue);
 // ol.Observable
 //
 ol.Observable.unByKey(eventKey);
-let observable: ol.Observable = new ol.Observable();
+const observable: ol.Observable = new ol.Observable();
 observable.changed();
 observable.dispatchEvent({ type: stringValue });
 observable.dispatchEvent({ type: stringValue, target: domEventTarget });
@@ -595,7 +620,7 @@ observable.un([stringValue, stringValue], listener, {});
 //
 // ol.proj
 //
-let getPointResolutionFn: (n: number, c: ol.Coordinate) => number;
+const getPointResolutionFn = (n: number, c: ol.Coordinate) => numberValue;
 projection = new ol.proj.Projection({
     code: stringValue,
 });
@@ -611,20 +636,28 @@ projection.setGetPointResolution(getPointResolutionFn);
 projection.setGlobal(booleanValue);
 projection.setWorldExtent(extent);
 
+units = 'degrees';
+units = 'ft';
+units = 'm';
+units = 'pixels';
+units = 'tile-pixels';
+units = 'us-ft';
+
 //
 // ol.Map
 //
 
-let map: ol.Map = new ol.Map({
+map = new ol.Map({
     view,
     layers: [tileLayer],
     target: stringValue
 });
+numberValue = map.forEachLayerAtPixel(coordinate, (layer, color) => numberValue, anyValue, (layer) => booleanValue, anyValue);
 
 //
 // ol.source.ImageWMS
 //
-let imageWMS: ol.source.ImageWMS = new ol.source.ImageWMS({
+const imageWMS: ol.source.ImageWMS = new ol.source.ImageWMS({
     params: {},
     projection,
     serverType: stringValue,
@@ -637,6 +670,19 @@ let imageWMS: ol.source.ImageWMS = new ol.source.ImageWMS({
 const source = imageWMS as ol.source.Source;
 projection = source.getProjection();
 
+//
+// ol.source.TileUTFGrid
+//
+const tileJSONValue = JSON;
+let tileUTFGrid = new ol.source.TileUTFGrid({});
+tileUTFGrid = new ol.source.TileUTFGrid({
+    jsonp: booleanValue,
+    preemptive: booleanValue,
+    tileJSON: tileJSONValue,
+    url: stringValue,
+});
+tileUTFGrid.forDataAtCoordinateAndResolution(coordinate, numberValue, (d) => anyValue, anyValue, booleanValue);
+
 //
 // ol.source.TileWMS
 //
@@ -660,7 +706,7 @@ stringValue = tileWMS.getGetFeatureInfoUrl([0, 0], 1, "EPSG:4326", {});
 //
 // ol.source.WMTS
 //
-let wmts: ol.source.WMTS = new ol.source.WMTS({
+const wmts: ol.source.WMTS = new ol.source.WMTS({
     layer: "",
     projection,
     matrixSet: "",
@@ -700,7 +746,7 @@ easingFunction = ol.easing.upAndDown;
 //
 // ol.Geolocation
 //
-let geolocation: ol.Geolocation = new ol.Geolocation({
+const geolocation: ol.Geolocation = new ol.Geolocation({
     projection
 });
 coordinate = geolocation.getPosition();
@@ -713,16 +759,16 @@ graticule = new ol.Graticule();
 graticule = new ol.Graticule({
     map,
 });
-let graticuleMap: ol.Map = graticule.getMap();
-let graticuleMeridians: ol.geom.LineString[] = graticule.getMeridians();
-let graticuleParallels: ol.geom.LineString[] = graticule.getParallels();
+const graticuleMap: ol.Map = graticule.getMap();
+const graticuleMeridians: ol.geom.LineString[] = graticule.getMeridians();
+const graticuleParallels: ol.geom.LineString[] = graticule.getParallels();
 graticule.setMap(graticuleMap);
 
 //
 // ol.DeviceOrientation
 //
 
-let deviceOrientation: ol.DeviceOrientation = new ol.DeviceOrientation({
+const deviceOrientation: ol.DeviceOrientation = new ol.DeviceOrientation({
     tracking: true,
 });
 numberValue = deviceOrientation.getHeading();
@@ -731,15 +777,15 @@ numberValue = deviceOrientation.getHeading();
 // ol.Overlay
 //
 
-let popup: ol.Overlay = new ol.Overlay({
+const popup: ol.Overlay = new ol.Overlay({
     element: document.getElementById('popup')
 });
 map.addOverlay(popup);
-let popupElement: Element = popup.getElement();
-let popupMap: ol.Map = popup.getMap();
-let popupOffset: number[] = popup.getOffset();
+const popupElement: Element = popup.getElement();
+const popupMap: ol.Map = popup.getMap();
+const popupOffset: number[] = popup.getOffset();
 coordinate = popup.getPosition();
-let popupPositioning: ol.OverlayPositioning = popup.getPositioning();
+const popupPositioning: ol.OverlayPositioning = popup.getPositioning();
 popup.setElement(popupElement);
 popup.setMap(popupMap);
 popup.setOffset(popupOffset);
@@ -751,7 +797,7 @@ popup.setPositioning(popupPositioning);
 // ol.format.GeoJSON
 //
 
-let geojsonOptions: olx.format.GeoJSONOptions;
+const geojsonOptions: ol.olx.format.GeoJSONOptions = {defaultDataProjection: projectionLike, featureProjection: projectionLike, geometryName: stringValue};
 geojsonOptions.defaultDataProjection = "EPSG";
 geojsonOptions.defaultDataProjection = projection;
 geojsonOptions.geometryName = "geom";
@@ -761,13 +807,13 @@ geojsonFormat = new ol.format.GeoJSON();
 geojsonFormat = new ol.format.GeoJSON(geojsonOptions);
 
 // Test options
-let readOptions: olx.format.ReadOptions;
+const readOptions: ol.olx.format.ReadOptions = {dataProjection: projectionLike, featureProjection: projectionLike};
 readOptions.dataProjection = "EPSG";
 readOptions.dataProjection = projection;
 readOptions.featureProjection = "EPSG";
 readOptions.featureProjection = projection;
 
-let writeOptions: olx.format.WriteOptions;
+const writeOptions: ol.olx.format.WriteOptions = {dataProjection: projectionLike, featureProjection: projectionLike, rightHanded: booleanValue, decimals: numberValue};
 writeOptions.dataProjection = "EPSG";
 writeOptions.dataProjection = projection;
 writeOptions.featureProjection = "EPSG";
@@ -891,11 +937,11 @@ withinFilter = ol.format.filter.within("geometry", geometry, "srs");
 //
 // ol.interactions
 //
-let modifyFeature: ol.interaction.Modify = new ol.interaction.Modify({
+const modifyFeature: ol.interaction.Modify = new ol.interaction.Modify({
     insertVertexCondition: ol.events.condition.never,
     features: new ol.Collection<ol.Feature>(featureArray),
 });
-let modifySource: ol.interaction.Modify = new ol.interaction.Modify({
+const modifySource: ol.interaction.Modify = new ol.interaction.Modify({
     insertVertexCondition: ol.events.condition.never,
     source: new ol.source.Vector({
         features: new ol.Collection<ol.Feature>(featureArray),
@@ -935,7 +981,7 @@ draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunction
 });
-let styleFunctionAsStyle = (feature: ol.Feature, resolution: number): ol.style.Style => style;
+const styleFunctionAsStyle = (feature: ol.Feature, resolution: number): ol.style.Style => style;
 draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunctionAsStyle
@@ -949,13 +995,13 @@ ol.interaction.defaults({
     constrainResolution: booleanValue
 });
 
-let styleFunctionAsArray = (feature: ol.Feature, resolution: number): ol.style.Style[] => styleArray;
+const styleFunctionAsArray = (feature: ol.Feature, resolution: number): ol.style.Style[] => styleArray;
 draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunctionAsArray
 });
 
-let dragbox: ol.interaction.DragBox = new ol.interaction.DragBox({
+const dragbox: ol.interaction.DragBox = new ol.interaction.DragBox({
     className: stringValue,
     minArea: 10,
     condition: ol.events.condition.always,
@@ -967,7 +1013,7 @@ let dragbox: ol.interaction.DragBox = new ol.interaction.DragBox({
 });
 polygon = dragbox.getGeometry();
 
-let interaction: ol.interaction.Interaction = new ol.interaction.Interaction({
+const interaction: ol.interaction.Interaction = new ol.interaction.Interaction({
     handleEvent: (e: ol.MapBrowserEvent) => {
         return booleanValue;
     }
@@ -980,12 +1026,12 @@ const select: ol.interaction.Select = new ol.interaction.Select({
     layers: (layer: ol.layer.Layer) => true,
 });
 
-let pinchZoom: ol.interaction.PinchZoom = new ol.interaction.PinchZoom({
+const pinchZoom: ol.interaction.PinchZoom = new ol.interaction.PinchZoom({
     constrainResolution: booleanValue,
     duration: numberValue
 });
 
-let mouseWheelZoom: ol.interaction.MouseWheelZoom = new ol.interaction.MouseWheelZoom({
+const mouseWheelZoom: ol.interaction.MouseWheelZoom = new ol.interaction.MouseWheelZoom({
     constrainResolution: booleanValue,
     duration: numberValue,
     timeout: numberValue,
@@ -996,7 +1042,7 @@ let mouseWheelZoom: ol.interaction.MouseWheelZoom = new ol.interaction.MouseWhee
 // ol.style.Icon
 //
 
-let iconWithUndefined = new ol.style.Icon({});
+const iconWithUndefined = new ol.style.Icon({});
 let icon: ol.style.Icon;
 
 icon = new ol.style.Icon({
@@ -1051,7 +1097,7 @@ styleRegularShape = new ol.style.RegularShape({
 // ol.proj
 //
 
-let value = ol.proj.METERS_PER_UNIT['degrees'];
+const value = ol.proj.METERS_PER_UNIT['degrees'];
 
 numberValue = ol.Sphere.getArea(geometry, {
     projection,
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index bbf9bf242a..f93cf8562a 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -1,12 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // Not sure how to work around this, or if it's necessary to
-        "no-declare-current-package": false,
-        "no-single-declare-module": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "strict-export-declare-modifiers": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/ora/index.d.ts b/types/ora/index.d.ts
index f5dd605073..d43a01c7cf 100644
--- a/types/ora/index.d.ts
+++ b/types/ora/index.d.ts
@@ -119,6 +119,8 @@ declare class Ora {
     text: string;
 
     color: Color;
+
+    frameIndex: number;
 }
 
 interface oraFactory {
diff --git a/types/ora/tsconfig.json b/types/ora/tsconfig.json
index 4092876efe..d283fa111a 100644
--- a/types/ora/tsconfig.json
+++ b/types/ora/tsconfig.json
@@ -14,10 +14,11 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
     },
     "files": [
         "index.d.ts",
         "ora-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 97d439c504..9fbbeaa92f 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for plotly.js 1.28
+// Type definitions for plotly.js 1.35
 // Project: https://plot.ly/javascript/
 // Definitions by: Chris Gervang <https://github.com/chrisgervang>
 // 				Martin Duparc <https://github.com/martinduparc>
@@ -25,9 +25,14 @@ export interface Point {
 }
 
 export interface PlotScatterDataPoint {
-	pointNumber: number;
-	curveNumber: number;
-	data: ScatterData;
+  curveNumber: number;
+  data: ScatterData;
+  pointIndex: number;
+  pointNumber: number;
+  x: number;
+  xaxis: LayoutAxis;
+  y: number;
+  yaxis: LayoutAxis;
 }
 
 export interface PlotMouseEvent {
@@ -106,6 +111,7 @@ export function extendTraces(root: Root, update: Data | Data[], indices: number
 export function prependTraces(root: Root, update: Data | Data[], indices: number | number[]): Promise<PlotlyHTMLElement>;
 export function toImage(root: Root, opts: ToImgopts): Promise<string>;
 export function downloadImage(root: Root, opts: DownloadImgopts): Promise<string>;
+export function react(root: Root, data: Data[], layout?: Partial<Layout>, config?: Partial<Config>): Promise<PlotlyHTMLElement>;
 
 // Layout
 export interface Layout {
@@ -113,7 +119,7 @@ export interface Layout {
 	titlefont: Partial<Font>;
 	autosize: boolean;
 	showlegend: boolean;
-	paper_bgcolor: Color;
+    paper_bgcolor: Color;
     plot_bgcolor: Color;
     separators: string;
     hidesources: boolean;
@@ -132,7 +138,7 @@ export interface Layout {
 	width: number;
 	hovermode: 'closest' | 'x' | 'y' | false;
 	hoverlabel: Partial<Label>;
-	calendar: Calendar;
+    calendar: Calendar;
     'xaxis.range': [Datum, Datum];
 	'xaxis.range[0]': Datum;
 	'xaxis.range[1]': Datum;
@@ -143,17 +149,17 @@ export interface Layout {
 	'xaxis.type': AxisType;
 	'xaxis.autorange': boolean;
 	'yaxis.autorange': boolean;
-	ternary: {}; // TODO
+    ternary: {}; // TODO
     geo: {}; // TODO
     mapbox: {}; // TODO
-	radialaxis: {}; // TODO
+    radialaxis: {}; // TODO
     angularaxis: {}; // TODO
     direction: 'clockwise' | 'counterclockwise';
     dragmode: 'zoom' | 'pan' | 'select' | 'lasso' | 'orbit' | 'turntable';
     orientation: number;
-    annotations: {}; // TODO
-	shapes: Array<Partial<Shape>>;
-    images: {}; // TODO
+    annotations: Array<Partial<Annotations>>;
+    shapes: Array<Partial<Shape>>;
+    images: Array<Partial<Image>>;
     updatemenus: {}; // TODO
     sliders: {}; // TODO
     legend: Partial<Legend>;
@@ -291,34 +297,48 @@ export type ModeBarDefaultButtons = 'lasso2d' | 'select2d' | 'sendDataToCloud' |
 
 export type ButtonClickEvent = (gd: PlotlyHTMLElement, ev: MouseEvent) => void;
 
+export interface Icon {
+	width: number;
+	path: string;
+	ascent: number;
+	descent: number;
+}
+
 export interface ModeBarButton {
 	/** name / id of the buttons (for tracking) */
-	name: string;
+    name: string;
+
 	/**
 	 * text that appears while hovering over the button,
 	 * enter null, false or '' for no hover text
 	 */
-	title: string;
+    title: string;
+
 	/**
 	 * svg icon object associated with the button
 	 * can be linked to Plotly.Icons to use the default plotly icons
 	 */
-	icon: string;
+    icon: string | Icon;
+
 	/** icon positioning */
-	gravity?: string;
+    gravity?: string;
+
 	/**
 	 * click handler associated with the button, a function of
 	 * 'gd' (the main graph object) and
 	 * 'ev' (the event object)
 	 */
-	click: ButtonClickEvent;
+    click: ButtonClickEvent;
+
 	/**
 	 * attribute associated with button,
 	 * use this with 'val' to keep track of the state
 	 */
-	attr?: string;
+    attr?: string;
+
 	/** initial 'attr' value, can be a function of gd */
-	val?: any;
+    val?: any;
+
 	/** is the button a toggle button? */
 	toggle?: boolean;
 }
@@ -378,7 +398,7 @@ export interface ScatterMarker {
 	cmax: boolean;
 	cmin: boolean;
 	autocolorscale: boolean;
-    reversescale: boolean;
+	reversescale: boolean;
 	opacity: number | number[];
 	size: number | number[];
 	maxdisplayed: number;
@@ -388,7 +408,7 @@ export interface ScatterMarker {
 	showscale: boolean;
 	line: Partial<ScatterMarkerLine>;
 	colorbar: {}; // TODO
-    gradient: {}; // TODO
+	gradient: {}; // TODO
 }
 
 export interface ScatterMarkerLine {
@@ -417,89 +437,116 @@ export interface Font {
 	color: string;
 }
 
+export interface Edits {
+	annotationPosition: boolean;
+	annotationTail: boolean;
+	annotationText: boolean;
+	axisTitleText: boolean;
+	colorbarPosition: boolean;
+	colorbarTitleText: boolean;
+	legendPosition: boolean;
+	legendText: boolean;
+	shapePosition: boolean;
+	titleText: boolean;
+}
+
 export interface Config {
-	// no interactivity, for export or image generation
+	/** no interactivity, for export or image generation */
 	staticPlot: boolean;
 
-	// we can edit titles, move annotations, etc
+	/** we can edit titles, move annotations, etc */
 	editable: boolean;
+	edits: Partial<Edits>;
 
-	// DO autosize once regardless of layout.autosize
-	// (use default width or height values otherwise)
+	/** DO autosize once regardless of layout.autosize (use default width or height values otherwise) */
 	autosizable: boolean;
 
-	// set the length of the undo/redo queue
+	/** set the length of the undo/redo queue */
 	queueLength: number;
 
-	// if we DO autosize, do we fill the container or the screen?
+	/** if we DO autosize, do we fill the container or the screen? */
 	fillFrame: boolean;
 
-	// if we DO autosize, set the frame margins in percents of plot size
+	/** if we DO autosize, set the frame margins in percents of plot size */
 	frameMargins: number;
 
-	// mousewheel or two-finger scroll zooms the plot
+	/** mousewheel or two-finger scroll zooms the plot */
 	scrollZoom: boolean;
 
-	// double click interaction (false, 'reset', 'autosize' or 'reset+autosize')
+	/** double click interaction (false, 'reset', 'autosize' or 'reset+autosize') */
 	doubleClick: 'reset+autosize' | 'reset' | 'autosize' | false;
 
-	// new users see some hints about interactivity
+	/** new users see some hints about interactivity */
 	showTips: boolean;
 
-	// link to open this plot in plotly
+	/** enable axis pan/zoom drag handles */
+	showAxisDragHandles: boolean;
+
+	/** enable direct range entry at the pan/zoom drag points (drag handles must be enabled above) */
+	showAxisRangeEntryBoxes: boolean;
+
+	/** link to open this plot in plotly */
 	showLink: boolean;
 
-	// if we show a link, does it contain data or just link to a plotly file?
+	/** if we show a link, does it contain data or just link to a plotly file? */
 	sendData: boolean;
 
-	// text appearing in the sendData link
+	/** text appearing in the sendData link */
 	linkText: string;
 
-	// false or function adding source(s) to linkText <text>
+	/** false or function adding source(s) to linkText <text> */
 	showSources: boolean;
 
-	// display the mode bar (true, false, or 'hover')
+	/** display the mode bar (true, false, or 'hover') */
 	displayModeBar: 'hover' | boolean;
 
-	// remove mode bar button by name
-	// (see ./components/modebar/buttons.js for the list of names)
+	/** remove mode bar button by name (see ./components/modebar/buttons.js for the list of names) */
 	modeBarButtonsToRemove: ModeBarDefaultButtons[];
 
-	// add mode bar button using config objects
-	// (see ./components/modebar/buttons.js for list of arguments)
+	/** add mode bar button using config objects (see ./components/modebar/buttons.js for list of arguments) */
 	modeBarButtonsToAdd: ModeBarDefaultButtons[] | ModeBarButton[];
 
-	// fully custom mode bar buttons as nested array,
-	// where the outer arrays represents button groups, and
-	// the inner arrays have buttons config objects or names of default buttons
-	// (see ./components/modebar/buttons.js for more info)
-	modeBarButtons: ModeBarDefaultButtons[][] | ModeBarButton[][];
+	/**
+	 * fully custom mode bar buttons as nested array, where the outer
+	 * arrays represents button groups, and the inner arrays have
+	 * buttons config objects or names of default buttons
+	 * (see ./components/modebar/buttons.js for more info)
+	 */
+	modeBarButtons: ModeBarDefaultButtons[][] | ModeBarButton[][] | false;
 
-	// add the plotly logo on the end of the mode bar
+	/** add the plotly logo on the end of the mode bar */
 	displaylogo: boolean;
 
-	// increase the pixel ratio for Gl plot images
+	/** increase the pixel ratio for Gl plot images */
 	plotGlPixelRatio: number;
 
-	// function to add the background color to a different container
-	// or 'opaque' to ensure there's white behind it
-	setBackground: string | 'opaque';
+	/**
+	 * function to add the background color to a different container
+	 * or 'opaque' to ensure there's white behind it
+	 */
+	setBackground: string | 'opaque' | 'transparent';
 
-	// URL to topojson files used in geo charts
+	/** URL to topojson files used in geo charts */
 	topojsonURL: string;
 
-	// Mapbox access token (required to plot mapbox trace types)
-	// If using an Mapbox Atlas server, set this option to '',
-	// so that plotly.js won't attempt to authenticate to the public Mapbox server.
+	/**
+	 * Mapbox access token (required to plot mapbox trace types)
+	 * If using an Mapbox Atlas server, set this option to '',
+	 * so that plotly.js won't attempt to authenticate to the public Mapbox server.
+	 */
 	mapboxAccessToken: string;
 
-	// Turn all console logging on or off (errors will be thrown)
-	// This should ONLY be set via Plotly.setPlotConfig
-	logging: boolean;
+	/**
+	 * Turn all console logging on or off (errors will be thrown)
+	 * This should ONLY be set via Plotly.setPlotConfig
+	 */
+	logging: boolean | 0 | 1 | 2;
 
-	// Set global transform to be applied to all traces with no
-	// specification needed
+	/** Set global transform to be applied to all traces with no specification needed */
 	globalTransforms: any[];
+
+	/** Which localization should we use? Should be a string like 'en' or 'en-US' */
+	locale: string;
 }
 
 // Components
@@ -543,34 +590,279 @@ export interface Label {
 	font: Partial<Font>;
 }
 
-export interface Annotations extends Point, Label {
-	visible: boolean;
-	ax: number;
-	ay: number;
-	xanchor: 'auto' | 'left' | 'center' | 'right';
-	xshift: number;
-	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
-	yshift: number;
-	text: string;
-	textangle: string;
-	width: number;
-	height: number;
-	opacity: number;
-	align: 'left' | 'center' | 'right';
-	valign: 'top' | 'middle' | 'bottom';
-	borderpad: number;
-	borderwidth: number;
-	showarrow: boolean;
-	arrowcolor: string;
-	arrowhead: number;
-	arrowsize: number;
-	arrowwidth: number;
-	standoff: number;
-	hovertext: string;
-	hoverlabel: Partial<Label>;
+export interface Annotations extends Label {
+  /** Determines whether or not this annotation is visible. */
+  visible: boolean;
+
+  /**
+   * Sets the text associated with this annotation.
+   * Plotly uses a subset of HTML tags to do things like
+   * newline (<br>), bold (<b></b>), italics (<i></i>),
+   * hyperlinks (<a href='...'></a>). Tags <em>, <sup>, <sub>
+   * <span> are also supported.
+   */
+  text: string;
+
+  /** Sets the angle at which the `text` is drawn with respect to the horizontal. */
+  textangle: string;
+
+  /**
+   * Sets an explicit width for the text box. null (default) lets the
+   * text set the box width. Wider text will be clipped.
+   * There is no automatic wrapping; use <br> to start a new line.
+   */
+  width: number;
+
+  /**
+   * Sets an explicit height for the text box. null (default) lets the
+   * text set the box height. Taller text will be clipped.
+   */
+  height: number;
+
+  /** Sets the opacity of the annotation (text + arrow). */
+  opacity: number;
+
+  /**
+   * Sets the horizontal alignment of the `text` within the box.
+   * Has an effect only if `text` spans more two or more lines
+   * (i.e. `text` contains one or more <br> HTML tags) or if an
+   * explicit width is set to override the text width.
+   */
+  align: 'left' | 'center' | 'right';
+
+  /**
+   * Sets the vertical alignment of the `text` within the box.
+   * Has an effect only if an explicit height is set to override the text height.
+   */
+  valign: 'top' | 'middle' | 'bottom';
+
+  /** Sets the padding (in px) between the `text` and the enclosing border. */
+  borderpad: number;
+
+  /** Sets the width (in px) of the border enclosing the annotation `text`. */
+  borderwidth: number;
+
+  /**
+   * Determines whether or not the annotation is drawn with an arrow.
+   * If *true*, `text` is placed near the arrow's tail.
+   * If *false*, `text` lines up with the `x` and `y` provided.
+   */
+  showarrow: boolean;
+
+  /** Sets the color of the annotation arrow. */
+  arrowcolor: string;
+
+  /** Sets the end annotation arrow head style. */
+  arrowhead: number;
+
+  /** Sets the start annotation arrow head style. */
+  startarrowhead: number;
+
+  /** Sets the annotation arrow head position. */
+  arrowside: 'end' | 'start';
+
+  /**
+   * Sets the size of the end annotation arrow head, relative to `arrowwidth`.
+   * A value of 1 (default) gives a head about 3x as wide as the line.
+   */
+  arrowsize: number;
+
+  /**
+   * Sets the size of the start annotation arrow head, relative to `arrowwidth`.
+   * A value of 1 (default) gives a head about 3x as wide as the line.
+   */
+  startarrowsize: number;
+
+  /** Sets the width (in px) of annotation arrow line. */
+  arrowwidth: number;
+
+  /**
+   * Sets a distance, in pixels, to move the end arrowhead away from the
+   * position it is pointing at, for example to point at the edge of
+   * a marker independent of zoom. Note that this shortens the arrow
+   * from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`
+   * which moves everything by this amount.
+   */
+  standoff: number;
+
+  /**
+   * Sets a distance, in pixels, to move the start arrowhead away from the
+   * position it is pointing at, for example to point at the edge of
+   * a marker independent of zoom. Note that this shortens the arrow
+   * from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`
+   * which moves everything by this amount.
+   */
+  startstandoff: number;
+
+  /**
+   * Sets the x component of the arrow tail about the arrow head.
+   * If `axref` is `pixel`, a positive (negative)
+   * component corresponds to an arrow pointing
+   * from right to left (left to right).
+   * If `axref` is an axis, this is an absolute value on that axis,
+   * like `x`, NOT a relative value.
+   */
+  ax: number;
+
+  /**
+   * Sets the y component of the arrow tail about the arrow head.
+   * If `ayref` is `pixel`, a positive (negative)
+   * component corresponds to an arrow pointing
+   * from bottom to top (top to bottom).
+   * If `ayref` is an axis, this is an absolute value on that axis,
+   * like `y`, NOT a relative value.
+   */
+  ay: number;
+
+  /**
+   * Indicates in what terms the tail of the annotation (ax,ay)
+   * is specified. If `pixel`, `ax` is a relative offset in pixels
+   * from `x`. If set to an x axis id (e.g. *x* or *x2*), `ax` is
+   * specified in the same terms as that axis. This is useful
+   * for trendline annotations which should continue to indicate
+   * the correct trend when zoomed.
+   */
+  axref: 'pixel';
+
+  /**
+   * Indicates in what terms the tail of the annotation (ax,ay)
+   * is specified. If `pixel`, `ay` is a relative offset in pixels
+   * from `y`. If set to a y axis id (e.g. *y* or *y2*), `ay` is
+   * specified in the same terms as that axis. This is useful
+   * for trendline annotations which should continue to indicate
+   * the correct trend when zoomed.
+   */
+  ayref: 'pixel';
+
+  /**
+   * Sets the annotation's x coordinate axis.
+   * If set to an x axis id (e.g. *x* or *x2*), the `x` position refers to an x coordinate
+   * If set to *paper*, the `x` position refers to the distance from
+   * the left side of the plotting area in normalized coordinates
+   * where 0 (1) corresponds to the left (right) side.
+   */
+  xref: 'paper' | 'x';
+
+  /**
+   * Sets the annotation's x position.
+   * If the axis `type` is *log*, then you must take the log of your desired range.
+   * If the axis `type` is *date*, it should be date strings, like date data,
+   * though Date objects and unix milliseconds will be accepted and converted to strings.
+   * If the axis `type` is *category*, it should be numbers, using the scale where each
+   * category is assigned a serial number from zero in the order it appears.
+   */
+  x: number | string;
+
+  /**
+   * Sets the text box's horizontal position anchor
+   * This anchor binds the `x` position to the *left*, *center* or *right* of the annotation.
+   * For example, if `x` is set to 1, `xref` to *paper* and `xanchor` to *right* then the
+   * right-most portion of the annotation lines up with the right-most edge of the plotting area.
+   * If *auto*, the anchor is equivalent to *center* for data-referenced annotations or if there
+   * is an arrow, whereas for paper-referenced with no arrow, the anchor picked corresponds to the closest side.
+   */
+  xanchor: 'auto' | 'left' | 'center' | 'right';
+
+  /**
+   * Shifts the position of the whole annotation and arrow to the
+   * right (positive) or left (negative) by this many pixels.
+   */
+  xshift: number;
+
+  /**
+   * Sets the annotation's y coordinate axis.
+   * If set to an y axis id (e.g. *y* or *y2*), the `y` position refers to an y coordinate
+   * If set to *paper*, the `y` position refers to the distance from
+   * the bottom of the plotting area in normalized coordinates
+   * where 0 (1) corresponds to the bottom (top).
+   */
+  yref: 'paper' | 'y';
+
+  /**
+   * Sets the annotation's y position.
+   * If the axis `type` is *log*, then you must take the log of your desired range.
+   * If the axis `type` is *date*, it should be date strings, like date data,
+   * though Date objects and unix milliseconds will be accepted and converted to strings.
+   * If the axis `type` is *category*, it should be numbers, using the scale where each
+   * category is assigned a serial number from zero in the order it appears.
+   */
+  y: number | string;
+
+  /**
+   * Sets the text box's vertical position anchor
+   * This anchor binds the `y` position to the *top*, *middle* or *bottom* of the annotation.
+   * For example, if `y` is set to 1, `yref` to *paper* and `yanchor` to *top* then the
+   * top-most portion of the annotation lines up with the top-most edge of the plotting area.
+   * If *auto*, the anchor is equivalent to *middle* for data-referenced annotations or if
+   * there is an arrow, whereas for paper-referenced with no arrow, the anchor picked
+   * corresponds to the closest side.
+   */
+  yanchor: 'auto' | 'top' | 'middle' | 'bottom';
+
+  /**
+   * Shifts the position of the whole annotation and arrow up
+   * (positive) or down (negative) by this many pixels.
+   */
+  yshift: number;
+
+  /**
+   * Makes this annotation respond to clicks on the plot.
+   * If you click a data point that exactly matches the `x` and `y` values of this annotation,
+   * and it is hidden (visible: false), it will appear. In *onoff* mode, you must click the same
+   * point again to make it disappear, so if you click multiple points, you can show multiple
+   * annotations. In *onout* mode, a click anywhere else in the plot (on another data point or not)
+   * will hide this annotation. If you need to show/hide this annotation in response to different
+   * `x` or `y` values, you can set `xclick` and/or `yclick`. This is useful for example to label
+   * the side of a bar. To label markers though, `standoff` is preferred over `xclick` and `yclick`.
+   */
+  clicktoshow: false | 'onoff' | 'onout';
+
+  /**
+   * Toggle this annotation when clicking a data point whose `x` value
+   * is `xclick` rather than the annotation's `x` value.
+   */
+  xclick: any;
+
+  /**
+   * Toggle this annotation when clicking a data point whose `y` value
+   * is `yclick` rather than the annotation's `y` value.
+   */
+  yclick: any;
+
+  /**
+   * Sets text to appear when hovering over this annotation.
+   * If omitted or blank, no hover label will appear.
+   */
+  hovertext: string;
+
+  hoverlabel: Partial<Label>;
+
+  /**
+   * Determines whether the annotation text box captures mouse move and click events,
+   * or allows those events to pass through to data points in the plot that may be
+   * behind the annotation. By default `captureevents` is *false* unless `hovertext`
+   * is provided. If you use the event `plotly_clickannotation` without `hovertext`
+   * you must explicitly enable `captureevents`.
+   */
 	captureevents: boolean;
 }
 
+export interface Image {
+  visible: boolean;
+  source: string;
+  layer: 'above' | 'below';
+  sizex: number;
+  sizey: number;
+  sizing: 'fill' | 'contain' | 'stretch';
+  opacity: number;
+  x: number | string;
+  y: number | string;
+  xanchor: 'left' | 'center' | 'right';
+  yanchor: 'top' | 'middle' | 'bottom';
+  xref: 'paper' | 'x';
+  yref: 'paper' | 'y';
+}
+
 export interface Scene {
 	bgcolor: string;
 	camera: Partial<Camera>;
diff --git a/types/postman-collection/index.d.ts b/types/postman-collection/index.d.ts
new file mode 100644
index 0000000000..ba8e0e581a
--- /dev/null
+++ b/types/postman-collection/index.d.ts
@@ -0,0 +1,811 @@
+// Type definitions for postman-collection 3.0
+// Project: https://github.com/postmanlabs/postman-collection
+// Definitions by: Kyle Buzby <https://github.com/kbuzby>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+/// <reference types="node" />
+
+export interface PropertyBaseDefinition {
+    description?: string | DescriptionDefinition;
+}
+
+export class PropertyBase<TDefinition> implements PropertyBaseDefinition {
+    description?: string | DescriptionDefinition;
+
+    constructor(definition?: PropertyBaseDefinition | {info: PropertyBaseDefinition} | string);
+
+    findInParents(property: string, customizer?: (item: PropertyBase<PropertyBaseDefinition>) => boolean): PropertyBase<PropertyBaseDefinition> ;
+
+    findParentContaining(property: any, customizer: (item: PropertyBase<PropertyBaseDefinition>) => boolean): PropertyBase<PropertyBaseDefinition>;
+
+    forEachParent(iterator: (item: any) => void): void;
+    forEachParent(options: {withRoot: boolean}, iterator: (item: any) => void): void;
+
+    meta(): any;
+
+    parent(): PropertyBase<PropertyBaseDefinition> | undefined;
+
+    setParent(parent: PropertyBase<PropertyBaseDefinition>): void;
+
+    toJSON(): TDefinition;
+
+    static propertyIsMeta(_value: any, key: string): boolean;
+
+    static propertyUnprefixMeta(_value: any, key: string): string;
+
+    static toJSON(obj: any): any;
+}
+
+export interface PropertyDefinition extends PropertyBaseDefinition {
+    id?: string;
+    name?: string;
+    disabled?: boolean;
+}
+
+export class Property<TDefinition> extends PropertyBase<TDefinition> implements PropertyDefinition {
+    disabled: boolean;
+    id: string;
+    name: string;
+
+    constructor(definition?: TDefinition | {info: TDefinition, disabled: boolean});
+
+    describe(content: string, type?: string): void;
+
+    toObjectResolved(scope: {variables: VariableList} | null, overrides: any[], options?: {ignoreOwnVariables: boolean}): TDefinition;
+
+    static replaceSubstitutions(str: string, variables: VariableList | VariableList[]): string;
+
+    static replaceSubstitutionsIn<T>(obj: T, variables: VariableList[], mutate: boolean): T;
+}
+
+export interface CertificateDefinition extends PropertyDefinition {
+    matches?: string[] | UrlMatchPatternList;
+    key?: {src?: string} | string;
+    cert?: {src?: string} | string;
+    passphrase?: string;
+}
+
+export class Certificate extends Property<CertificateDefinition> implements CertificateDefinition {
+    cert: {src?: string};
+    key: {src?: string};
+    matches: UrlMatchPatternList;
+    passphrase: string;
+
+    constructor(options: CertificateDefinition);
+
+    canApplyTo(url: string | Url): boolean;
+
+    update(options: CertificateDefinition): void;
+
+    static isCertificate(obj: any): boolean;
+}
+
+export class PropertyList<TElement> extends PropertyBase<PropertyBaseDefinition> {
+    constructor(type: string, parent: any, populate: TElement[]);
+
+    add(item: TElement): void;
+
+    all(): TElement[];
+
+    append(item: TElement): void;
+
+    assimilate(source: PropertyList<TElement> | TElement[], prune: boolean): void;
+
+    clear(): void;
+
+    count(): number;
+
+    each(iterator: (item: TElement) => void, context?: any): void;
+
+    eachParent(iterator: (item: any) => void, context?: any): void;
+
+    filter(rule: (item: TElement) => boolean, context: any): TElement[];
+
+    find(rule: (item: TElement) => boolean, context: any): TElement;
+
+    get(key: string): TElement | undefined;
+
+    has(item: string | TElement, value?: any): boolean;
+
+    idx(index: number): TElement;
+
+    indexOf(item: string): number;
+
+    insert(item: TElement, before: TElement | string): void;
+
+    insertAfter(item: TElement, after: TElement | string): void;
+
+    map(iterator: (item: TElement) => any, context?: any): any;
+
+    one(id: string): TElement;
+
+    populate(items: TElement[]): void;
+
+    prepend(item: TElement): void;
+
+    remove(predicate: ((item: TElement) => boolean) | string | TElement, context: any): void;
+
+    repopulate(items: any): void;
+
+    toJSON(): any;
+
+    toObject(excludeDisabled?: boolean, caseSensitive?: boolean, multiValue?: boolean, sanitizeKeys?: boolean): any;
+
+    toString(): string;
+
+    upsert(item: TElement): boolean | null;
+
+    static isPropertyList(obj: any): boolean;
+}
+
+export class CertificateList extends PropertyList<Certificate> {
+    constructor(parent: any, list: CertificateDefinition[]);
+
+    resolveOne(url: string): CertificateDefinition;
+
+    static isCertificateList(obj: any): boolean;
+}
+
+export interface ItemGroupDefinition extends PropertyDefinition {
+    item?: Array<ItemDefinition | ItemGroupDefinition>;
+    auth?: RequestAuthDefinition;
+    event?: EventDefinition[];
+}
+
+export class ItemGroup<TItem> extends Property<ItemGroupDefinition> {
+    auth?: RequestAuth;
+    items: PropertyList<TItem>;
+    events: EventList;
+
+    constructor(definition?: ItemGroupDefinition);
+
+    authorizeRequestsUsing(type: string | RequestAuthDefinition, options?: VariableList): void;
+
+    forEachItem(callback: (el: TItem) => void): void;
+
+    forEachItemGroup(callback: (el: ItemGroup<TItem>) => void): void;
+
+    oneDeep(idOrName: string): TItem;
+
+    static isItemGroup(obj: any): boolean;
+}
+
+export interface CollectionDefinition extends ItemGroupDefinition {
+    info?: {
+        id?: string;
+        name?: string;
+        version?: string;
+    };
+    variable?: VariableDefinition;
+}
+
+export class Collection extends ItemGroup<Request> {
+    events: EventList;
+    variables: VariableList;
+    version?: Version;
+
+    constructor(definition?: CollectionDefinition, environments?: any[]);
+
+    syncVariablesFrom(obj: {[key: string]: VariableDefinition}, track?: boolean, prune?: boolean): {created: string[], updated: string[], deleted: string[]} | undefined;
+
+    syncVariablesTo(obj?: {[key: string]: VariableDefinition}): {[key: string]: VariableDefinition};
+
+    toJSON(): CollectionDefinition;
+
+    static isCollection(obj: any): boolean;
+}
+
+export interface CookieDefinition {
+    key?: string;
+    value?: string;
+    expires?: string | Date;
+    maxAge?: number;
+    domain: string;
+    path: string;
+    secure?: boolean;
+    httpOnly?: boolean;
+    hostOnly?: boolean;
+    session?: boolean;
+    extensions?: Array<{key: string; value: string}>;
+}
+
+export class Cookie extends PropertyBase<CookieDefinition> implements CookieDefinition {
+    domain: string;
+    expires: Date;
+    extensions?: Array<{key: string; value: string}>;
+    hostOnly?: boolean;
+    httpOnly?: boolean;
+    maxAge?: number;
+    path: string;
+    secure?: boolean;
+    session?: boolean;
+    value?: string;
+
+    constructor(options?: CookieDefinition);
+
+    update(options: CookieDefinition): void;
+
+    valueOf(): string;
+
+    static isCookie(obj: any): boolean;
+
+    static parse(str: string): CookieDefinition;
+
+    static splitParam(param: string): {key: string, value: string | boolean };
+}
+
+export class CookieList extends PropertyList<Cookie> {
+    constructor(parent: any, cookies: Cookie[]);
+
+    static isCookieList(obj: any): boolean;
+}
+
+export interface DescriptionDefinition {
+    content: string;
+    type?: string;
+}
+
+export class Description implements DescriptionDefinition {
+    content: string;
+    type: string;
+
+    constructor(definition?: DescriptionDefinition | string);
+
+    toJSON(): DescriptionDefinition;
+
+    toString(): string;
+
+    update(content: DescriptionDefinition): void;
+    update(content: string, type?: string): void;
+
+    static isDescription(obj: any): boolean;
+}
+
+export interface EventDefinition extends PropertyDefinition {
+    listen?: string;
+    script: string | string[] | ScriptDefinition | Script;
+}
+
+export class Event extends Property<EventDefinition> implements EventDefinition {
+    listen?: string;
+    script: Script;
+
+    constructor(definition: EventDefinition);
+
+    update(definition: EventDefinition): void;
+}
+
+export class EventList extends PropertyList<Event> {
+    constructor(parent: any, populate: Event[]);
+
+    listeners(name: string): Event[];
+
+    listenersOwn(name: string): Event[];
+
+    static isEventList(obj: any): boolean;
+}
+
+export interface FormParamDefinition extends PropertyDefinition {
+    key?: string;
+    value?: any;
+}
+
+export class FormParam extends Property<FormParamDefinition> implements FormParamDefinition {
+    key: string;
+    value: any;
+
+    constructor(options: FormParamDefinition);
+
+    toString(): string;
+
+    valueOf(): any;
+
+    // static parse(): void; // TODO not implemented yet
+}
+
+export interface HeaderDefinition extends PropertyDefinition {
+    key?: string;
+    value?: string;
+    system?: boolean;
+}
+
+export class Header extends Property<HeaderDefinition> implements HeaderDefinition {
+    key: string;
+    value: string;
+
+    constructor(options: string | HeaderDefinition, name?: string)
+
+    toString(): string;
+
+    update(options: HeaderDefinition): void;
+
+    valueOf(): string;
+
+    static create(value?: HeaderDefinition | string, name?: string): Header;
+
+    static isHeader(obj: any): boolean;
+
+    static parse(headerString: string): HeaderDefinition[];
+
+    static parseSingle(header: string): HeaderDefinition;
+
+    static unparse(headers: HeaderList | HeaderDefinition[], separator?: string): string;
+
+    static unparseSingle(header: HeaderDefinition): string;
+}
+
+export class HeaderList extends PropertyList<Header> {
+    constructor(parent: any, headers: Header[]);
+
+    contentSize(): number;
+
+    static isHeaderList(obj: any): boolean;
+}
+
+export interface ItemDefinition extends PropertyDefinition {
+    request?: RequestDefinition;
+    responses?: ResponseDefinition[];
+    events?: EventDefinition[];
+}
+
+export class Item extends Property<ItemDefinition> {
+    events: EventList;
+    request: Request;
+    responses: PropertyList<Response>;
+
+    constructor(definition?: ItemDefinition);
+
+    authorizeRequestUsing(type: string | RequestAuthDefinition, options?: VariableList): void;
+
+    getAuth(): RequestAuth;
+
+    getEvents(name?: string): Event[];
+
+    static isItem(obj: any): boolean;
+}
+
+export interface ProxyConfigDefinition extends PropertyDefinition {
+    match?: string | {pattern: string} | UrlMatchPattern;
+    host?: string;
+    port?: number;
+    tunnel?: boolean;
+}
+
+export class ProxyConfig extends Property<ProxyConfigDefinition> implements ProxyConfigDefinition {
+    host: string;
+    match: UrlMatchPattern;
+    port: number;
+    tunnel: boolean;
+
+    constructor(options?: ProxyConfigDefinition);
+
+    getProtocols(): string[];
+
+    getProxyUrl(): string;
+
+    test(urlStr?: string): boolean;
+
+    update(options: ProxyConfigDefinition): void;
+
+    updateProtocols(protocols: string[]): void;
+
+    static isProxyConfig(obj: any): boolean;
+}
+
+export class ProxyConfigList extends PropertyList<ProxyConfig> {
+    constructor(parent: any, populate: ProxyConfig[]);
+
+    resolve(url: string | Url): ProxyConfig;
+
+    static isProxyConfigList(obj: any): boolean;
+}
+
+export interface QueryParamDefinition extends PropertyDefinition {
+    key: string | null;
+    value: string | null;
+    system?: boolean;
+}
+
+export class QueryParam extends Property<QueryParamDefinition> implements QueryParamDefinition {
+    static _postman_propertyAllowsMultipleValues: boolean;
+    static _postman_propertyIndexKey: string;
+
+    key: string | null;
+    value: string | null;
+    system?: boolean;
+
+    constructor(options: QueryParamDefinition | string);
+
+    toString(): string;
+
+    update(param: string | {key: string, value?: string}): void;
+
+    valueOf(): string;
+
+    static parse(query: string): QueryParamDefinition[];
+
+    static parseSingle(param: string, idx: number, all: string[]): QueryParamDefinition;
+
+    static unparse(params: QueryParamDefinition[], options?: {encode?: boolean, ignoreDisabled?: boolean}): string;
+
+    static unparseSingle(obj: QueryParamDefinition, encode: boolean): string;
+}
+
+export interface RequestDefinition extends PropertyDefinition {
+    url: string | Url;
+    method?: string;
+    header?: HeaderDefinition;
+    body?: RequestBody;
+    auth?: RequestAuthDefinition;
+    proxy?: ProxyConfigDefinition;
+    certificate?: CertificateDefinition;
+}
+
+export class Request extends Property<RequestDefinition> implements RequestDefinition {
+    auth?: RequestAuth;
+    body?: RequestBody;
+    certificate?: Certificate;
+    headers: HeaderList;
+    method: string;
+    proxy?: ProxyConfig;
+    url: Url;
+
+    constructor(options: RequestDefinition | string);
+
+    addHeader(header: Header | HeaderDefinition): void;
+
+    addQueryParams(params: string | QueryParamDefinition[]): void;
+
+    authorizeUsing(type: string | RequestAuthDefinition | null, options?: VariableList): void;
+
+    clone(): Request;
+
+    forEachHeader(callback: (header: Header, context: Request) => void): void;
+
+    getHeaders(options?: {ignoreCase?: boolean, enabled?: boolean}): any;
+
+    removeHeader(toRemove: string | Header, options?: {ignoreCase: boolean}): void;
+
+    removeQueryParams(params: string | string[] | QueryParamDefinition[] | QueryParamDefinition): void;
+
+    toJSON(): RequestDefinition;
+
+    update(options: RequestDefinition): void;
+
+    upsertHeader(header: HeaderDefinition): void;
+
+    static isRequest(obj: any): boolean;
+}
+
+export interface RequestAuthDefinition extends PropertyDefinition {
+    type?: string;
+}
+
+export class RequestAuth extends Property<RequestAuthDefinition> implements RequestAuthDefinition {
+    type: string;
+
+    constructor(options: RequestAuthDefinition, parent?: Property<PropertyDefinition> | PropertyList<RequestAuth>);
+
+    clear(type: string): void;
+
+    current(): any;
+
+    parameters(): VariableList;
+
+    update(options: VariableList | Array<{key: string, value: string}> | {key: string, value: string}, type?: string): void;
+
+    use(type: string, options: VariableList | Array<{key: string, value: string}> | {key: string, value: string}): void;
+
+    static isValidType(type: any): boolean;
+}
+
+export interface RequestBodyDefinition extends PropertyBaseDefinition {
+    mode: string;
+    raw?: string;
+    urlencoded?: QueryParamDefinition[] | PropertyList<QueryParam> | string;
+    file?: string | {src: string};
+    formdata?: FormParamDefinition[] | PropertyList<FormParam>;
+}
+
+export class RequestBody extends PropertyBase<RequestBodyDefinition> implements RequestBodyDefinition {
+    static MODES: {
+        raw: string;
+        formdata: string;
+        urlencoded: string;
+        file: string;
+    };
+
+    file?: {src: string};
+    formdata?: PropertyList<FormParam>;
+    mode: string;
+    raw?: string;
+    urlencoded?: PropertyList<QueryParam>;
+
+    constructor(options: RequestBodyDefinition);
+
+    isEmpty(): boolean;
+
+    toString(): string;
+
+    update(options: RequestBodyDefinition): void;
+}
+
+export interface ResponseDefinition extends PropertyDefinition {
+    code: number;
+    header?: HeaderDefinition[];
+    cookie?: CookieDefinition[];
+    body?: string;
+    stream?: Buffer | Uint8Array;
+    responseTime: number;
+    originalRequest?: RequestDefinition;
+}
+
+export class Response extends Property<ResponseDefinition> implements ResponseDefinition {
+    body?: string;
+    code: number;
+    cookies: CookieList;
+    headers: HeaderList;
+    originalRequest?: Request;
+    responseTime: number;
+    status: string;
+    stream?: Buffer | Uint8Array;
+    responseSize?: number;
+
+    constructor(options: ResponseDefinition);
+
+    dataURI(): string;
+
+    details(): {name: string, detail: string, code: number, standardName: string} | undefined;
+
+    encoding(): {format: string, source: string};
+
+    json(reviver?: any, strict?: boolean): any;
+
+    reason(): string;
+
+    size(): number;
+
+    text(): string | undefined;
+
+    toJSON(): any;
+
+    update(options: ResponseDefinition): void;
+
+    static createFromNode(response: {
+        body: string | Buffer | Uint8Array,
+        headers?: HeaderDefinition[],
+        statusCode: number,
+        statusMessage?: string,
+        elapsedTime: number
+    }, cookies: CookieDefinition[]): Response;
+
+    static isResponse(obj: any): boolean;
+}
+
+export interface ScriptDefinition extends PropertyDefinition {
+    type?: string;
+    src?: string | Url;
+    exec?: string | string[];
+}
+
+export class Script extends Property<ScriptDefinition> implements ScriptDefinition {
+    exec?: string[];
+    src?: Url;
+    type: string;
+
+    constructor(options?: ScriptDefinition | string | string[]);
+
+    toSource(): string | undefined;
+
+    update(options: ScriptDefinition | string | string[]): void;
+
+    static isScript(obj: any): boolean;
+}
+
+export interface UrlDefinition extends PropertyBaseDefinition {
+    auth?: {user: string, password: string};
+    hash?: string;
+    host?: string[] | string;
+    path: string[] | string;
+    port?: string;
+    query?: QueryParamDefinition[] | PropertyList<QueryParam> | string;
+    variable?: VariableDefinition[];
+    protocol?: string;
+}
+
+export class Url extends PropertyBase<UrlDefinition> implements UrlDefinition {
+    auth?: {user: string, password: string};
+    hash?: string;
+    host?: string[];
+    path: string[];
+    port?: string;
+    protocol?: string;
+    query: PropertyList<QueryParam>;
+    variables: VariableList;
+
+    constructor(options: UrlDefinition | string);
+
+    addQueryParams(params: QueryParamDefinition[] | string): void;
+
+    getHost(): string;
+
+    getOAuth1BaseUrl(): string;
+
+    getPath(options?: {unresolved: boolean}): string;
+
+    getPathWithQuery(): string;
+
+    getQueryString(options?: {encode?: boolean, ignoredDisabled?: boolean}): string;
+
+    getRaw(): string;
+
+    getRemote(options?: {forcePort: boolean}): string;
+
+    removeQueryParams(params: QueryParamDefinition[] | QueryParamDefinition | string[] | string): void;
+
+    toString(forceProtocol?: boolean): string;
+
+    update(url: UrlDefinition | string): void;
+
+    static isUrl(obj: any): boolean;
+
+    static parse(url: string): UrlDefinition;
+}
+
+export class UrlMatchPattern {
+    pattern?: string;
+
+    constructor(options: string | {pattern: string});
+
+    createMatchPattern(): {protocols: string[], host: string, path: RegExp} | undefined;
+
+    getProtocols(): string[];
+
+    globPatternToRegexp(pattern: string): RegExp;
+
+    matchAbsoluteHostPattern(matchRegexObject: {protocols: string[], host: string, path: RegExp}, remote: string): boolean;
+
+    matchAnyHost(matchRegexObject: {protocols: string[], host: string, path: RegExp}): boolean;
+
+    matchSuffixHostPattern(matchRegexObject: {protocols: string[], host: string, path: RegExp}, remote: string): boolean;
+
+    test(urlStr: string): boolean;
+
+    testHost(host: string): boolean;
+
+    testPath(path: string): boolean;
+
+    testProtocol(protocol: string): boolean;
+
+    toJSON(): {pattern: string};
+
+    toString(): string;
+
+    update(options: {pattern: string}): void;
+
+    static MATCH_ALL_URLS: string;
+
+    static PROTOCOL_DELIMITER: string;
+}
+
+export class UrlMatchPatternList extends PropertyList<UrlMatchPattern> {
+    constructor(parent: Property<PropertyDefinition>, list: string[]);
+
+    test(urlStr: string): boolean;
+}
+
+export interface VariableDefinition extends PropertyDefinition {
+    value?: any;
+    type?: string;
+    key?: string;
+}
+
+export class Variable extends Property<VariableDefinition> implements VariableDefinition {
+    key?: string;
+    type: string;
+    value: any;
+
+    constructor(definition?: VariableDefinition | {[index: string]: VariableDefinition});
+
+    cast(value: any): any;
+
+    castIn(value: any): any;
+
+    castOut(value: any): any;
+
+    get(): any;
+
+    set(value: any): void;
+
+    toString(): string;
+
+    update(options: VariableDefinition): void;
+
+    valueOf(value: any): any;
+
+    valueType(typeName: string, _noCast: boolean): string;
+
+    static isVariable(obj: any): boolean;
+
+    static types: {
+        string: StringConstructor;
+        boolean: BooleanConstructor;
+        number: NumberConstructor;
+        json: {in: (val: any) => string, out: (val: string) => any};
+        any: {in: <T>(val: T) => T, out: <T>(val: T) => T};
+    };
+}
+
+export class VariableList extends PropertyList<Variable> {
+    constructor(parent: Property<PropertyDefinition>, populate: Variable[]);
+
+    replace(str: string, overrides?: VariableList): string;
+
+    substitute<T>(obj: T, overrides?: VariableList, mutate?: boolean): T;
+
+    syncFromObject(obj: {[key: string]: VariableDefinition}, track?: boolean, prune?: boolean): {created: string[], updated: string[], deleted: string[]} | undefined;
+
+    syncToObject(obj?: {[key: string]: VariableDefinition}): {[key: string]: VariableDefinition};
+
+    static isVariableList(obj: any): boolean;
+}
+
+export interface VariableScopeDefinition extends PropertyDefinition {
+    values?: VariableDefinition[];
+}
+
+export class VariableScope extends Property<VariableScopeDefinition> implements VariableScopeDefinition {
+    values?: VariableDefinition[];
+
+    constructor(definition: VariableScopeDefinition | VariableList | VariableDefinition[], layers?: VariableList[] | VariableList);
+
+    addLayer(list: VariableList): void;
+
+    clear(): void;
+
+    get(key: string): any;
+
+    has(variableName: string): boolean;
+
+    set(key: string, value: any, type: string): void;
+
+    syncVariablesFrom(obj: {[key: string]: VariableDefinition}, track?: boolean, prune?: boolean): {created: string[], updated: string[], deleted: string[]} | undefined;
+
+    syncVariablesTo(obj?: {[key: string]: VariableDefinition}): {[key: string]: VariableDefinition};
+
+    toJSON(): any;
+
+    toObject(excludeDisabled: boolean, caseSensitive: boolean): any;
+
+    unset(key: string): void;
+
+    variables(): {[key: string]: VariableDefinition};
+
+    static isVariableScope(obj: any): boolean;
+}
+
+export interface VersionDefinition extends PropertyBaseDefinition {
+    build?: string;
+    major?: string;
+    minor?: string;
+    patch?: string;
+    prerelease?: string;
+    raw?: string;
+    version?: string;
+}
+
+export class Version extends PropertyBase<VersionDefinition> implements VersionDefinition {
+    build?: string;
+    major?: string;
+    minor?: string;
+    patch?: string;
+    prerelease?: string;
+    raw?: string;
+    string?: string;
+
+    constructor(options?: VersionDefinition | string);
+
+    set(value?: VersionDefinition | string): void;
+
+    toString(): string;
+}
diff --git a/types/postman-collection/postman-collection-tests.ts b/types/postman-collection/postman-collection-tests.ts
new file mode 100644
index 0000000000..2574aa5917
--- /dev/null
+++ b/types/postman-collection/postman-collection-tests.ts
@@ -0,0 +1,869 @@
+import * as pmCollection from 'postman-collection';
+
+// PropertyBaseDefinition tests
+const pbDef: pmCollection.PropertyBaseDefinition = {};
+pbDef.description; // $ExpectType string | DescriptionDefinition | undefined
+
+// PropertyBase tests
+const PropertyBase = pmCollection.PropertyBase;
+
+let pb = new PropertyBase();
+pb = new PropertyBase("string definition");
+pb = new PropertyBase({description: "string description"});
+pb = new PropertyBase({info: {}});
+pb = new PropertyBase({info: {description: "string description"}});
+
+pb.description; // $ExpectType string | DescriptionDefinition | undefined
+pb.findInParents("string"); // $ExpectType PropertyBase<PropertyBaseDefinition>
+pb.findInParents("string", (el) => true); // $ExpectType PropertyBase<PropertyBaseDefinition>
+
+pb.findParentContaining("string", (el) => true); // $ExpectType PropertyBase<PropertyBaseDefinition>
+
+pb.forEachParent((el) => {}); // $ExpectType void
+pb.forEachParent({withRoot: true}, (el) => {}); // $ExpectType void
+
+pb.meta(); // $ExpectType any
+
+pb.parent(); // $ExpectType PropertyBase<PropertyBaseDefinition> | undefined
+
+pb.setParent(pb); // $ExpectType void
+
+pb.toJSON(); // $ExpectType {}
+
+PropertyBase.propertyIsMeta(null, "string"); // $ExpectType boolean
+
+PropertyBase.propertyUnprefixMeta(null, "_String"); // $ExpectType string
+
+PropertyBase.toJSON({}); // $ExpectType any
+
+// PropertyDefinition Tests
+const propDef: pmCollection.PropertyDefinition = {};
+propDef.id; // $ExpectType string | undefined
+propDef.name; // $ExpectType string | undefined
+propDef.disabled; // $$ExpectType boolean | undefined
+propDef.description; // $$ExpectType string | DescriptionDefinition | undefined
+
+// Property Tests
+const Property = pmCollection.Property;
+let p = new Property();
+p = new Property(propDef);
+p = new Property({info: propDef, disabled: true});
+
+p.id; // $ExpectType string
+p.name; // $ExpectType string
+p.disabled; // $ExpectType boolean
+
+p.describe("string"); // $ExpectType void
+p.describe("String", "string"); // $ExpectType void
+
+p.toObjectResolved(null, []); // $ExpectType {}
+p.toObjectResolved({variables: new pmCollection.VariableList(p, [])}, []); // $ExpectType {}
+p.toObjectResolved(null, [], {ignoreOwnVariables: true}); // $ExpectType {}
+
+Property.replaceSubstitutions("string", new pmCollection.VariableList(p, [])); // $ExpectType string
+Property.replaceSubstitutionsIn({}, [new pmCollection.VariableList(p, [])], false); // $ExpectType {}
+
+// CertificateDefinition Tests
+const certDef: pmCollection.CertificateDefinition = {};
+certDef.matches; // $ExpectType string[] | UrlMatchPatternList | undefined
+certDef.key; // $ExpectType string | { src?: string | undefined; } | undefined
+certDef.cert; // $ExpectType string | { src?: string | undefined; } | undefined
+certDef.passphrase; // $ExpectType string | undefined
+
+// Certificate Tests
+const certificate = new pmCollection.Certificate({});
+certificate.cert; // $ExpectType { src?: string | undefined; }
+certificate.key; // $ExpectType { src?: string | undefined; }
+certificate.matches; // $ExpectType UrlMatchPatternList
+certificate.passphrase; // $ExpectType string
+
+certificate.canApplyTo("string"); // $ExpectType boolean
+certificate.canApplyTo(new pmCollection.Url({host: "string", path: "string"})); // $ExpectType boolean
+
+certificate.update({}); // $ExpectType void
+
+pmCollection.Certificate.isCertificate(certificate); // $ExpectType boolean
+
+// PropertyList Tests
+const pList = new pmCollection.PropertyList<pmCollection.Certificate>("Certificate", null, []);
+pList.add(certificate); // $ExpectType void
+pList.all(); // $ExpectType Certificate[]
+pList.append(certificate); // $ExpectType void
+pList.assimilate(pList, false); // $ExpectType void
+pList.assimilate([certificate], false); // ExpectType void
+pList.clear(); // $ExpectType void
+pList.count(); // $ExpectType number
+pList.each((el: pmCollection.Certificate) => {}); // $ExpectType void
+pList.each((el: pmCollection.Certificate) => {}, pList); // $ExpectType void
+pList.eachParent((el: any) => {}); // $ExpectType void
+pList.eachParent((el: any) => {}, pList); // $ExpectType void
+pList.filter((el) => true, pList); // $ExpectType Certificate[]
+pList.find((el) => true, pList); // $ExpectType Certificate
+pList.get("string"); // $ExpectType Certificate | undefined
+pList.has("string"); // $ExpectType boolean
+pList.has("string", null); // $ExpectType boolean
+pList.has(certificate); // $ExpectType boolean
+pList.idx(1); // ExpectType Certificate
+pList.indexOf("string"); // ExpectType number
+pList.insert(certificate, "string"); // ExpectType void
+pList.insert(certificate, certificate); // ExpectType void
+pList.insertAfter(certificate, "string"); // ExpectType void
+pList.insertAfter(certificate, certificate); // ExpectType void
+pList.map((el) => el); // ExpectType any
+pList.map((el) => el, pList); // ExpectType any
+pList.one("string"); // ExpectType Certificate
+pList.populate([]); // ExpectType void
+pList.remove((el) => true, pList); // ExpectType void
+pList.remove("string", pList); // ExpectType void
+pList.remove(certificate, pList); // $ExpectType void
+pList.repopulate(null); // $ExpectType void
+pList.toJSON(); // $ExpectType any
+pList.toObject(true, true, true, true); // $ExpectType any
+pList.toString(); // $ExpectType string
+pList.upsert(certificate); // $ExpectType boolean | null
+pmCollection.PropertyList.isPropertyList(pList); // $ExpectType boolean
+
+// CertificateList Tests
+const certList = new pmCollection.CertificateList(null, [pList]);
+certList.resolveOne("string"); // $ExpectType CertificateDefinition
+pmCollection.CertificateList.isCertificateList(certList); // $ExpectType boolean
+
+// ItemGroupDefinition Tests
+const igDef: pmCollection.ItemGroupDefinition = {};
+igDef.item; // $ExpectType (ItemGroupDefinition | ItemDefinition)[] | undefined
+igDef.auth; // $ExpectType RequestAuthDefinition | undefined
+igDef.event; // $ExpectType EventDefinition[] | undefined
+
+// ItemGroup Tests
+const ig = new pmCollection.ItemGroup<pmCollection.Certificate>();
+ig.auth; // $ExpectType RequestAuth | undefined
+ig.items; // $ExpectType PropertyList<Certificate>
+ig.events; // $ExpectType EventList
+
+ig.authorizeRequestsUsing("string"); // $ExpectType void
+ig.authorizeRequestsUsing({}); // $ExpectType void
+ig.authorizeRequestsUsing("string", new pmCollection.VariableList(ig, [])); // $ExpectType void
+
+ig.forEachItem((el) => {}); // $ExpectType void
+ig.forEachItemGroup((el) => {}); // $ExpectType void
+
+ig.oneDeep("string"); // $ExpectType Certificate
+
+pmCollection.ItemGroup.isItemGroup(ig); // $ExpectType boolean
+
+// CollectionDefinition Tests
+const colDef: pmCollection.CollectionDefinition = {};
+colDef.info; // $ExpectType { id?: string | undefined; name?: string | undefined; version?: string | undefined; } | undefined
+colDef.variable; // $ExpectType VariableDefinition | undefined
+
+let collection: pmCollection.Collection;
+collection = new pmCollection.Collection();
+collection = new pmCollection.Collection({});
+collection = new pmCollection.Collection({}, []);
+
+collection.events; // $ExpectType EventList
+collection.variables; // $ExpectType VariableList
+collection.version; // $ExpectType Version | undefined
+
+collection.syncVariablesFrom({}); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+collection.syncVariablesFrom({}, true); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+
+collection.syncVariablesTo({}); // ExpectType $ExpectType { [key: string]: VariableDefinition; }
+
+collection.toJSON(); // $ExpectType CollectionDefinition
+
+pmCollection.Collection.isCollection(collection); // $ExpectType boolean
+
+// CookieDefinition Tests
+const cookieDef: pmCollection.CookieDefinition = {
+    domain: "string",
+    path: "string"
+};
+cookieDef.key; // $ExpectType string | undefined
+cookieDef.value; // ExpectType string | undefined
+cookieDef.expires; // $ExpectType string | Date | undefined
+cookieDef.maxAge; // $ExpectType number | undefined
+cookieDef.domain; // $ExpectType string
+cookieDef.path; // $ExpectType string
+cookieDef.secure; // $ExpectType boolean | undefined
+cookieDef.httpOnly; // $ExpectType boolean | undefined
+cookieDef.hostOnly; // $ExpectType boolean | undefined
+cookieDef.session; // $ExpectType boolean | undefined
+cookieDef.extensions; // $ExpectType { key: string; value: string; }[] | undefined
+
+// Cookie Tests
+
+let cookie = new pmCollection.Cookie();
+cookie = new pmCollection.Cookie(cookieDef);
+
+cookie.domain; // $ExpectType string
+cookie.expires; // $ExpectType Date
+cookie.extensions; // $ExpectType { key: string; value: string; }[] | undefined
+cookie.hostOnly; // $ExpectType boolean | undefined
+cookie.httpOnly; // $ExpectType boolean | undefined
+cookie.maxAge; // $ExpectType number | undefined
+cookie.path; // $ExpectType string
+cookie.secure; // $ExpectType boolean | undefined
+cookie.session; // $ExpectType boolean | undefined
+cookie.value; // $ExpectType string | undefined
+
+cookie.update(cookieDef); // $ExpectType void
+
+cookie.valueOf(); // $ExpectType string
+
+pmCollection.Cookie.isCookie({}); // $ExpectType boolean
+pmCollection.Cookie.parse("string"); // $ExpectType CookieDefinition
+pmCollection.Cookie.splitParam("string"); // $ExpectType { key: string; value: string | boolean; }
+
+// CookieList Tests
+
+const cookieList = new pmCollection.CookieList(null, [cookie]);
+
+pmCollection.CookieList.isCookieList(cookieList); // $ExpectType boolean
+
+// DescriptionDefinition Tests
+
+const descDef: pmCollection.DescriptionDefinition = {
+    content: "string",
+    type: "string"
+};
+descDef.content; // $ExpectType string
+descDef.type; // $ExpectType string | undefined
+
+// Description Tests
+
+let desc = new pmCollection.Description();
+desc = new pmCollection.Description("string");
+desc = new pmCollection.Description(descDef);
+
+desc.content; // $ExpectType string
+desc.type; // $ExpectType string
+
+desc.toJSON(); // $ExpectType DescriptionDefinition
+desc.toString(); // $ExpectType string
+desc.update("string"); // $ExpectType void
+desc.update("string", "string"); // $ExpectType void
+desc.update(descDef); // $ExpectType void
+
+pmCollection.Description.isDescription(desc); // $ExpectType boolean
+
+// EventDefinition Tests
+
+const eventDesc: pmCollection.EventDefinition = {
+    script: "string"
+};
+eventDesc.listen; // $ExpectType string | undefined
+eventDesc.script; // $ExpectType string | string[] | ScriptDefinition | Script
+
+// Event Tests
+
+const event = new pmCollection.Event(eventDesc);
+event.listen; // $ExpectType string | undefined
+event.script; // $ExpectType Script
+
+event.update(eventDesc); // $ExpectType void
+
+// EventList Tests
+
+const eventList = new pmCollection.EventList(null, [event]);
+eventList.listeners("string"); // $ExpectType Event[]
+eventList.listenersOwn("string"); // $ExpectType Event[]
+
+pmCollection.EventList.isEventList(eventList); // $ExpectType boolean
+
+// FormParamDefinition Tests
+
+const fpDef: pmCollection.FormParamDefinition = {};
+fpDef.key; // $ExpectType string | undefined
+fpDef.value; // $ExpectType any
+
+// FormParam Tests
+
+const fp = new pmCollection.FormParam(fpDef);
+fp.key; // $ExpectType string
+fp.value; // $ExpectType any
+
+fp.toString(); // $ExpectType string
+fp.valueOf(); // $ExpectType any
+
+// HeaderDefinition Tests
+
+const headerDef: pmCollection.HeaderDefinition = {
+    key: "string",
+    value: "string"
+};
+headerDef.key; // $ExpectType string | undefined
+headerDef.value; // $ExpectType string | undefined
+headerDef.system; // $ExpectType boolean | undefined
+
+// Header Tests
+
+let header = new pmCollection.Header("string");
+header = new pmCollection.Header("string", "string");
+header = new pmCollection.Header(headerDef);
+
+header.key; // $ExpectType string
+header.value; // $ExpectType string
+
+header.toString(); // $ExpectType string
+
+header.update(headerDef); // $ExpectType void
+
+header.valueOf(); // $ExpectType string
+
+pmCollection.Header.create("string"); // $ExpectType Header
+pmCollection.Header.create("string", "string"); // $ExpectType Header
+pmCollection.Header.create(headerDef, "string"); // $ExpectType Header
+
+pmCollection.Header.isHeader(header); // $ExpectType boolean
+
+pmCollection.Header.parse("string"); // $ExpectType HeaderDefinition[]
+
+pmCollection.Header.parseSingle("string"); // $ExpectType HeaderDefinition
+
+pmCollection.Header.unparse(new pmCollection.HeaderList(null, [header])); // $ExpectType string
+pmCollection.Header.unparse([headerDef]); // $ExpectType string
+pmCollection.Header.unparse([headerDef], "\n"); // $ExpectType string
+
+pmCollection.Header.unparseSingle(headerDef); // $ExpectType string
+
+// HeaderList Tests
+
+const headerList = new pmCollection.HeaderList(null, [header]);
+
+headerList.contentSize(); // $ExpectType number
+
+pmCollection.HeaderList.isHeaderList(headerList); // $ExpectType boolean
+
+// ItemDefinition Tests
+
+const itemDef: pmCollection.ItemDefinition = {};
+itemDef.request; // $ExpectType RequestDefinition | undefined
+itemDef.responses; // $ExpectType ResponseDefinition[] | undefined
+itemDef.events; // $ExpectType EventDefinition[] | undefined
+
+// Item Tests
+let item = new pmCollection.Item();
+item = new pmCollection.Item(itemDef);
+
+item.events; // $ExpectType EventList
+item.request; // $ExpectType Request
+item.responses; // $ExpectType PropertyList<Response>
+
+item.authorizeRequestUsing("string"); // $ExpectType void
+item.authorizeRequestUsing({}); // $ExpectType void
+item.authorizeRequestUsing("string", new pmCollection.VariableList(item, [])); // $ExpectType void
+
+item.getAuth(); // $ExpectType RequestAuth
+
+item.getEvents(); // $ExpectType Event[]
+item.getEvents("string"); // $ExpectType Event[]
+
+pmCollection.Item.isItem(item); // $ExpectType boolean
+
+// ProxyConfigDefinition Tests
+
+const proxyConfDef: pmCollection.ProxyConfigDefinition = {};
+proxyConfDef.match; // $ExpectType string | { pattern: string; } | UrlMatchPattern | undefined
+proxyConfDef.host; // $ExpectType string | undefined
+proxyConfDef.port; // $ExpectType number | undefined
+proxyConfDef.tunnel; // $ExpectType boolean | undefined
+
+// ProxyConfig Tests
+
+let proxyConf = new pmCollection.ProxyConfig();
+proxyConf = new pmCollection.ProxyConfig(proxyConfDef);
+
+proxyConf.host; // $ExpectType string
+proxyConf.match; // $ExpectType UrlMatchPattern
+proxyConf.port; // $ExpectType number
+proxyConf.tunnel; // $ExpectType boolean
+
+proxyConf.getProtocols(); // $ExpectType string[]
+
+proxyConf.getProxyUrl(); // $ExpectType string
+
+proxyConf.test("string"); // $ExpectType boolean
+
+proxyConf.update(proxyConfDef); // $ExpectType void
+
+proxyConf.updateProtocols(["string"]); // $ExpectType void
+
+pmCollection.ProxyConfig.isProxyConfig(proxyConf); // $ExpectType boolean
+
+// ProxyConfigList Tests
+
+const proxyConfigList = new pmCollection.ProxyConfigList(null, [proxyConf]);
+
+proxyConfigList.resolve("string"); // $ExpectType ProxyConfig
+proxyConfigList.resolve(new pmCollection.Url({host: "string", path: "string"})); // $ExpectType ProxyConfig
+
+pmCollection.ProxyConfigList.isProxyConfigList(proxyConfigList); // $ExpectType boolean
+
+// QueryParamDefinition Tests
+
+const qpDef: pmCollection.QueryParamDefinition = {
+    key: null,
+    value: null
+};
+qpDef.key; // $ExpectType string | null
+qpDef.value; // $ExpectType string | null
+qpDef.system; // $ExpectType boolean | undefined
+
+// QueryParam Tests
+
+let qp = new pmCollection.QueryParam("string");
+qp = new pmCollection.QueryParam(qpDef);
+
+qp.key; // $ExpectType string | null
+qp.value; // $ExpectType string | null
+qp.system; // $ExpectType boolean | undefined
+
+qp.toString(); // $ExpectType string
+
+qp.update("string"); // $ExpectType void
+qp.update({key: "string"}); // $ExpectType void
+qp.update({key: "string", value: "string"}); // $ExpectType void
+
+qp.valueOf(); // $ExpectType string
+
+pmCollection.QueryParam._postman_propertyAllowsMultipleValues; // $ExpectType boolean
+pmCollection.QueryParam._postman_propertyIndexKey; // $ExpectType string
+
+pmCollection.QueryParam.parse("string"); // $ExpectType QueryParamDefinition[]
+
+pmCollection.QueryParam.parseSingle("string", 1, ["string"]); // $ExpectType QueryParamDefinition
+
+pmCollection.QueryParam.unparse([qpDef]); // $ExpectType string
+pmCollection.QueryParam.unparse([qpDef], {encode: true}); // $ExpectType string
+pmCollection.QueryParam.unparse([qpDef], {encode: true, ignoreDisabled: true}); // $ExpectType string
+
+pmCollection.QueryParam.unparseSingle(qpDef, true); // $ExpectType string
+
+// RequestDefinition Tests
+
+const reqDef: pmCollection.RequestDefinition = {
+    url: "string"
+};
+reqDef.url; // $ExpectType string | Url
+reqDef.method; // $ExpectType string | undefined
+reqDef.header; // $ExpectType HeaderDefinition | undefined
+reqDef.body; // $ExpectType RequestBody | undefined
+reqDef.auth; // $ExpectType RequestAuthDefinition | undefined
+reqDef.proxy; // $ExpectType ProxyConfigDefinition | undefined
+reqDef.certificate; // $ExpectType CertificateDefinition | undefined
+
+// Request Tests
+let req = new pmCollection.Request("string");
+req = new pmCollection.Request(reqDef);
+
+req.auth; // $ExpectType RequestAuth | undefined
+req.body; // $ExpectType RequestBody | undefined
+req.certificate; // $ExpectType Certificate | undefined
+req.headers; // $ExpectType HeaderList
+req.method; // $ExpectType string
+req.proxy; // $ExpectType ProxyConfig | undefined
+req.url; // $ExpectType Url
+
+req.update(reqDef); // $ExpectType void
+
+req.authorizeUsing("string"); // $ExpectType void
+req.authorizeUsing({}); // $ExpectType void
+req.authorizeUsing(null); // $ExpectType void
+req.authorizeUsing("string", new pmCollection.VariableList(p, []));
+
+req.getHeaders(); // $ExpectType any
+req.getHeaders({ignoreCase: true}); // $ExpectType any
+req.getHeaders({enabled: true}); // $ExpectType any
+req.getHeaders({ignoreCase: true, enabled: true}); // $ExpectType any
+
+req.forEachHeader((header: pmCollection.Header, context: pmCollection.Request) => {}); // $ExpectType void
+
+req.addHeader(header); // $ExpectType void
+req.addHeader(headerDef); // $ExpectType void
+
+req.removeHeader("string"); // $ExpectType void
+req.removeHeader(header); // $ExpectType void
+req.removeHeader(header, {ignoreCase: true}); // $ExpectType void
+
+req.upsertHeader(headerDef); // $ExpectType void
+
+req.addQueryParams("string"); // $ExpectType void
+req.addQueryParams([qpDef]); // $ExpectType void
+
+req.removeQueryParams("string"); // $ExpectType void
+req.removeQueryParams(["string"]); // $ExpectType void
+req.removeQueryParams([qpDef]); // $ExpectType void
+req.removeQueryParams(qpDef); // $ExpectType void
+
+req.toJSON(); // $ExpectType RequestDefinition
+
+req.clone(); // $ExpectType Request
+
+pmCollection.Request.isRequest(req); // $ExpectType boolean
+
+// RequestAuthDefinition Tests
+
+const reqAuthDef: pmCollection.RequestAuthDefinition = {};
+reqAuthDef.type; // $ExpectType string | undefined
+
+// RequestAuth Tests
+
+let reqAuth = new pmCollection.RequestAuth(reqAuthDef);
+reqAuth = new pmCollection.RequestAuth(reqAuthDef, collection);
+
+reqAuth.type; // $ExpectType string
+
+reqAuth.update(new pmCollection.VariableList(collection, [])); // $ExpectType void
+reqAuth.update({key: "string", value: "string"}); // $ExpectType void
+reqAuth.update([{key: "string", value: "string"}]); // $ExpectType void
+reqAuth.update([{key: "string", value: "string"}], "string"); // $ExpectType void
+
+reqAuth.use("string", new pmCollection.VariableList(collection, [])); // $ExpectType void
+reqAuth.use("string", {key: "string", value: "string"}); // $ExpectType void
+reqAuth.use("string", [{key: "string", value: "string"}]); // $ExpectType void
+
+reqAuth.current(); // $ExpectType any
+
+reqAuth.parameters(); // $ExpectType VariableList
+
+reqAuth.clear("string"); // $ExpectType void
+
+pmCollection.RequestAuth.isValidType(reqAuth); // $ExpectType boolean
+
+// RequestBodyDefinition Tests
+
+const reqBodyDef: pmCollection.RequestBodyDefinition = {mode: 'raw'};
+reqBodyDef.mode; // $ExpectType string
+reqBodyDef.raw; // $ExpectType string | undefined
+reqBodyDef.urlencoded; // $ExpectType string | QueryParamDefinition[] | PropertyList<QueryParam> | undefined
+reqBodyDef.file; // $ExpectType string | { src: string; } | undefined
+reqBodyDef.formdata; // $ExpectType FormParamDefinition[] | PropertyList<FormParam> | undefined
+
+// RequestBody Tests
+
+const reqBody = new pmCollection.RequestBody(reqBodyDef);
+
+reqBody.file; // $ExpectType { src: string; } | undefined
+reqBody.formdata; // $ExpectType PropertyList<FormParam> | undefined
+reqBody.mode; // $ExpectType string
+reqBody.raw; // $ExpectType string | undefined
+reqBody.urlencoded; // $ExpectType PropertyList<QueryParam> | undefined
+
+reqBody.update(reqBodyDef); // $ExpectType void
+
+reqBody.toString(); // $ExpectType string
+
+reqBody.isEmpty(); // $ExpectType boolean
+
+pmCollection.RequestBody.MODES.raw; // $ExpectType string
+pmCollection.RequestBody.MODES.formdata; // $ExpectType string
+pmCollection.RequestBody.MODES.urlencoded; // $ExpectType string
+pmCollection.RequestBody.MODES.file; // $ExpectType string
+
+// ResponseDefinition Tests
+const respDef: pmCollection.ResponseDefinition = {code: 200, responseTime: 1};
+respDef.code; // $ExpectType number
+respDef.header; // $ExpectType HeaderDefinition[] | undefined
+respDef.cookie; // $ExpectType CookieDefinition[] | undefined
+respDef.body; // $ExpectType string | undefined
+respDef.stream; // $ExpectType Buffer | Uint8Array | undefined
+respDef.responseTime; // $ExpectType number
+respDef.originalRequest; // $ExpectType RequestDefinition | undefined
+
+// Response Tests
+const response = new pmCollection.Response(respDef);
+response.body; // $ExpectType string | undefined
+response.code; // $ExpectType number
+response.cookies; // $ExpectType CookieList
+response.headers; // $ExpectType HeaderList
+response.originalRequest; // $ExpectType Request | undefined
+response.responseTime; // $ExpectType number
+response.status; // $ExpectType string
+response.stream; // $ExpectType Buffer | Uint8Array | undefined
+response.responseSize; // $ExpectType number | undefined
+
+response.update(respDef); // $ExpectType void
+
+response.toJSON(); // $ExpectType any
+
+response.reason(); // ExpectType string | undefined
+
+response.details(); // $ExpectType { name: string; detail: string; code: number; standardName: string; } | undefined
+
+response.text(); // $ExpectType string | undefined
+
+response.json(); // $ExpectType any
+
+response.dataURI(); // $ExpectType string
+
+response.size(); // $ExpectType number
+
+response.encoding(); // $ExpectType { format: string; source: string; }
+
+pmCollection.Response.createFromNode({body: "string", statusCode: 200, elapsedTime: 1}, []); // $ExpectType Response
+
+pmCollection.Response.isResponse(response); // $ExpectType boolean
+
+// ScriptDefinition Tests
+
+const scriptDef: pmCollection.ScriptDefinition = {};
+scriptDef.type; // $ExpectType string | undefined
+scriptDef.src; // $ExpectType string | Url | undefined
+scriptDef.exec; // $ExpectType string | string[] | undefined
+
+// Script Tests
+
+let script = new pmCollection.Script();
+script = new pmCollection.Script(scriptDef);
+script = new pmCollection.Script("string");
+script = new pmCollection.Script(["string"]);
+
+script.exec; // $ExpectType string[] | undefined
+script.src; // $ExpectType Url | undefined
+script.type; // $ExpectType string
+
+script.update(scriptDef); // $ExpectType void
+script.update("string"); // $ExpectType void
+script.update(["string"]); // $ExpectType void
+
+script.toSource(); // $ExpectType string | undefined
+
+pmCollection.Script.isScript(script); // $ExpectType boolean
+
+// UrlDefinition Tests
+
+let urlDef: pmCollection.UrlDefinition = {
+    host: "string",
+    path: "string"
+};
+urlDef = {
+    host: ["string"],
+    path: ["string"]
+};
+
+urlDef.auth; // $ExpectType { user: string; password: string; } | undefined
+urlDef.hash; // $ExpectType string | undefined
+urlDef.host; // $ExpectType string | string[] | undefined
+urlDef.path; // $ExpectType string | string[]
+urlDef.port; // $ExpectType string | undefined
+urlDef.query; // $ExpectType string | QueryParamDefinition[] | PropertyList<QueryParam> | undefined
+urlDef.variable; // $ExpectType VariableDefinition[] | undefined
+urlDef.protocol; // $ExpectType string | undefined
+
+// Url Tests
+
+let url = new pmCollection.Url(urlDef);
+url = new pmCollection.Url("string");
+
+url.auth; // $ExpectType { user: string; password: string; } | undefined
+url.hash; // $ExpectType string | undefined
+url.host; // $ExpectType string[] | undefined
+url.path; // $ExpectType string[]
+url.port; // $ExpectType string | undefined
+url.protocol; // $ExpectType string | undefined
+url.query; // $ExpectType PropertyList<QueryParam>
+url.variables; // $ExpectType VariableList
+
+url.addQueryParams("string"); // $ExpectType void
+url.addQueryParams([qp, qpDef]); // $ExpectType void
+
+url.removeQueryParams("string"); // $ExpectType void
+url.removeQueryParams(["string"]); // $ExpectType void
+url.removeQueryParams(qp); // $ExpectType void
+url.removeQueryParams([qp]); // $ExpectType void
+
+url.getRaw(); // $ExpectType string
+
+url.toString(); // $ExpectType string
+url.toString(false); // $ExpectType string
+
+url.getPath(); // $ExpectType string
+url.getPath({unresolved: true}); // $ExpectType string
+
+url.getQueryString(); // $ExpectType string
+url.getQueryString({encode: true}); // $ExpectType string
+url.getQueryString({ignoredDisabled: true}); // $ExpectType string
+url.getQueryString({encode: true, ignoredDisabled: true}); // $ExpectType string
+
+url.getPathWithQuery(); // $ExpectType string
+
+url.getHost(); // $ExpectType string
+
+url.getRemote(); // $ExpectType string
+url.getRemote({forcePort: true}); // $ExpectType string
+
+url.getOAuth1BaseUrl(); // $ExpectType string
+
+pmCollection.Url.parse("string"); // $ExpectType UrlDefinition
+
+pmCollection.Url.isUrl(url); // $ExpectType boolean
+
+// UrlMatchPattern Tests
+let urlMatch = new pmCollection.UrlMatchPattern("string");
+urlMatch = new pmCollection.UrlMatchPattern({pattern: "string"});
+
+urlMatch.pattern; // $ExpectType string | undefined
+
+urlMatch.update({pattern: "string"}); // $ExpectType void
+
+urlMatch.createMatchPattern(); // $ExpectType { protocols: string[]; host: string; path: RegExp; } | undefined
+
+urlMatch.globPatternToRegexp("string"); // $ExpectType RegExp
+
+urlMatch.testProtocol("string"); // $ExpectType boolean
+
+urlMatch.getProtocols(); // $ExpectType string[]
+
+urlMatch.testHost("string"); // $ExpectType boolean
+
+urlMatch.matchAnyHost({protocols: [], host: "string", path: new RegExp('')}); // $ExpectType boolean
+
+urlMatch.matchSuffixHostPattern({protocols: [], host: "string", path: new RegExp('')}, "string"); // $ExpectType boolean
+
+urlMatch.matchAbsoluteHostPattern({protocols: [], host: "string", path: new RegExp('')}, "string"); // $ExpectType boolean
+
+urlMatch.testPath("string"); // $ExpectType boolean
+
+urlMatch.test("string"); // $ExpectType boolean
+
+urlMatch.toString(); // $ExpectType string
+
+urlMatch.toJSON(); // $ExpectType { pattern: string; }
+
+pmCollection.UrlMatchPattern.MATCH_ALL_URLS; // $ExpectType string
+
+pmCollection.UrlMatchPattern.PROTOCOL_DELIMITER; // $ExpectType string
+
+// UrlMatchPatternList Tests
+const urlMatchList = new pmCollection.UrlMatchPatternList(collection, []);
+
+urlMatchList.test("string"); // $ExpectType boolean
+
+// VariableDefinition Tests
+const varDef: pmCollection.VariableDefinition = {};
+varDef.value; // $ExpectType any
+varDef.type; // $ExpectType string | undefined
+varDef.key; // $ExpectType string | undefined
+
+// Variable Tests
+let variable = new pmCollection.Variable(varDef);
+variable = new pmCollection.Variable({key: varDef});
+
+variable.key; // $ExpectType string | undefined
+variable.type; // $ExpectType string
+variable.value; // $ExpectType any
+
+variable.get(); // $ExpectType any
+
+variable.set(null); // $ExpectType void
+
+variable.valueOf(null); // $ExpectType any
+
+variable.toString(); // $ExpectType string
+
+variable.cast({}); // $ExpectType any
+
+variable.castIn({}); // $ExpectType any
+
+variable.castOut({}); // $ExpectType any
+
+variable.valueType("string", true); // $ExpectType string
+
+variable.update(varDef); // $ExpectType void
+
+pmCollection.Variable.isVariable(variable); // $ExpectType boolean
+
+pmCollection.Variable.types.string; // $ExpectType StringConstructor
+pmCollection.Variable.types.boolean; // $ExpectType BooleanConstructor
+pmCollection.Variable.types.number; // $ExpectType NumberConstructor
+pmCollection.Variable.types.json; // $ExpectType { in: (val: any) => string; out: (val: string) => any; }
+pmCollection.Variable.types.any; // $ExpectType { in: <T>(val: T) => T; out: <T>(val: T) => T; }
+
+// VariableList Tests
+
+const vList = new pmCollection.VariableList(collection, [variable]);
+
+vList.replace("string"); // $ExpectType string
+vList.replace("string", vList); // $ExpectType string
+
+vList.substitute("string"); // $ExpectType "string"
+vList.substitute({}, vList); // $ExpectType {}
+vList.substitute(null, vList, false); // $ExpectType null
+
+vList.syncFromObject({}); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+vList.syncFromObject({}, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+vList.syncFromObject({}, false, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+
+vList.syncToObject(); // $ExpectType { [key: string]: VariableDefinition; }
+vList.syncToObject({key: varDef}); // $ExpectType { [key: string]: VariableDefinition; }
+
+pmCollection.VariableList.isVariableList(vList); // $ExpectType boolean
+
+// VariableScopeDefinition Tests
+const varScopeDef: pmCollection.VariableScopeDefinition = {};
+varScopeDef.values; // $ExpectType VariableDefinition[] | undefined
+
+// VariableScope Tests
+let varScope = new pmCollection.VariableScope(varScopeDef, []);
+varScope = new pmCollection.VariableScope(vList, []);
+varScope = new pmCollection.VariableScope([varDef], []);
+varScope = new pmCollection.VariableScope(varScopeDef, [vList]);
+
+varScope.values; // $ExpectType VariableDefinition[] | undefined
+
+varScope.variables(); // ExpectType { [key: string]: VariableDefinition; }
+
+varScope.toObject(false, false); // $ExpectType any
+
+varScope.has("string"); // $ExpectType boolean
+
+varScope.get("string"); // $ExpectType any
+
+varScope.set("string", {}, "any"); // $ExpectType void
+
+varScope.unset("string"); // $ExpectType void
+
+varScope.clear(); // $ExpectType void
+
+varScope.syncVariablesFrom({}); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+varScope.syncVariablesFrom({}, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+varScope.syncVariablesFrom({}, false, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+
+varScope.syncVariablesTo(); // $ExpectType { [key: string]: VariableDefinition; }
+varScope.syncVariablesTo({key: varDef}); // $ExpectType { [key: string]: VariableDefinition; }
+
+varScope.toJSON(); // $ExpectType any
+
+varScope.addLayer(vList); // $ExpectType void
+
+pmCollection.VariableScope.isVariableScope(varScope); // $ExpectType boolean
+
+// VersionDefinition Tests
+const verDef: pmCollection.VersionDefinition = {};
+verDef.build; // $ExpectType string | undefined
+verDef.major; // $ExpectType string | undefined
+verDef.minor; // $ExpectType string | undefined
+verDef.patch; // $ExpectType string | undefined
+verDef.prerelease; // $ExpectType string | undefined
+verDef.raw; // $ExpectType string | undefined
+verDef.version; // $ExpectType string | undefined
+
+// Version Tests
+let version = new pmCollection.Version();
+version = new pmCollection.Version(verDef);
+version = new pmCollection.Version("string");
+
+version.build; // $ExpectType string | undefined
+version.major; // $ExpectType string | undefined
+version.minor; // $ExpectType string | undefined
+version.patch; // $ExpectType string | undefined
+version.prerelease; // $ExpectType string | undefined
+version.raw; // $ExpectType string | undefined
+version.string; // $ExpectType string | undefined
+
+version.set(); // ExpectType void
+version.set(verDef); // $ExpectType void
+version.set("string"); // $ExpectType void
+
+version.toString(); // $ExpectType string
diff --git a/types/postman-collection/tsconfig.json b/types/postman-collection/tsconfig.json
new file mode 100644
index 0000000000..9b0b244020
--- /dev/null
+++ b/types/postman-collection/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "postman-collection-tests.ts"
+    ]
+}
diff --git a/types/postman-collection/tslint.json b/types/postman-collection/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/postman-collection/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index a549871070..2afb026648 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for puppeteer 1.1
+// Type definitions for puppeteer 1.2
 // Project: https://github.com/GoogleChrome/puppeteer#readme
 // Definitions by: Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Christopher Deutsch <https://github.com/cdeutsch>
@@ -410,6 +410,8 @@ export interface ScriptTagOptions {
   path?: string;
   /** Raw JavaScript content to be injected into frame. */
   content?: string;
+  /** Script type. Use 'module' in order to load a Javascript ES6 module. */
+  type?: string;
 }
 
 export interface PageFnOptions {
@@ -459,6 +461,11 @@ export interface ElementHandle extends JSHandle {
    * @since 0.9.0
    */
   click(options?: ClickOptions): Promise<void>;
+  /**
+   * @returns Resolves to the content frame for element handles referencing iframe nodes, or null otherwise.
+   * @since 1.2.0
+   */
+  contentFrame(): Promise<Frame | null>;
   /**
    * Calls focus on the element.
    */
@@ -637,6 +644,18 @@ export interface Request {
   /** Contains the request's post body, if any. */
   postData(): string | undefined;
 
+  /**
+   * A `redirectChain` is a chain of requests initiated to fetch a resource.
+   *
+   * - If there are no redirects and the request was successful, the chain will be empty.
+   * - If a server responds with at least a single redirect, then the chain will contain all the requests that were redirected.
+   *
+   * `redirectChain` is shared between all the requests of the same chain.
+   *
+   * @since 1.2.0
+   */
+  redirectChain(): Request[];
+
   /** Contains the request's resource type as it was perceived by the rendering engine.  */
   resourceType(): ResourceType;
 
diff --git a/types/pusher-js/index.d.ts b/types/pusher-js/index.d.ts
index 383277f121..f73a84ee52 100644
--- a/types/pusher-js/index.d.ts
+++ b/types/pusher-js/index.d.ts
@@ -1,30 +1,31 @@
-// Type definitions for pusher-js 3.0.0
+// Type definitions for pusher-js 4.2
 // Project: https://github.com/pusher/pusher-js
 // Definitions by: Qubo <https://github.com/tkqubo>
+//                 Lance Ivy <https://github.com/cainlevy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
 declare namespace pusher {
     interface PusherStatic {
+        logToConsole: boolean;
+        log: (msg: string) => void;
         new (apiKey: string, config?: Config): Pusher;
     }
 
-    interface Pusher {
+    interface Pusher extends EventsDispatcher {
+        channel(name: string): Channel;
+        allChannels(): Channel[];
+        connect(): void;
+        disconnect(): void;
         subscribe(name: string): Channel;
         subscribeAll(): void;
         unsubscribe(name: string): void;
-        channel(name: string): Channel;
-        allChannels(): Channel[];
-        bind(eventName: string, callback: Function): Pusher;
-        bind_all(callback: Function): Pusher;
-        disconnect(): void;
+        isEncrypted(): boolean;
         key: string;
-        config: Config; //TODO: add GlobalConfig typings
-        channels: any; //TODO: Type this
+        config: Config; // TODO: add GlobalConfig typings
+        channels: any; // TODO: Type this
         global_emitter: EventsDispatcher;
         sessionID: number;
-        timeline: any; //TODO: Type this
+        timeline: any; // TODO: Type this
         connection: ConnectionManager;
     }
 
@@ -43,7 +44,7 @@ declare namespace pusher {
          * Defines how the authentication endpoint, defined using authEndpoint, will be called.
          * There are two options available: ajax and jsonp.
          */
-        authTransport?: string;
+        authTransport?: 'ajax' | 'jsonp';
 
         /**
          * Allows passing additional data to authorizers. Supports query string params and headers (AJAX only).
@@ -51,15 +52,19 @@ declare namespace pusher {
          */
         auth?: AuthConfig;
 
+        /**
+         * If you need custom authorization behavior you can provide your own authorizer function as follows:
+         */
+        authorizer?: Authorizer;
 
         /**
          * Allows connecting to a different datacenter by setting up correct hostnames and ports for the connection.
          */
         cluster?: string;
 
-
         /**
-         * Disables stats collection, so that connection metrics are not submitted to Pusher’s servers.
+         * Disables stats collection, so that connection metrics are not submitted to Pusher’s servers. These stats
+         * are used for internal monitoring only and they do not affect the account stats.
          */
         disableStats?: boolean;
 
@@ -69,8 +74,7 @@ declare namespace pusher {
          * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
          * Additional transports may be added in the future and without adding them to this list, they will be disabled.
          */
-        enabledTransports?: string[];
-
+        enabledTransports?: Transport[];
 
         /**
          * Specified which transports must not be used by Pusher to establish a connection.
@@ -78,7 +82,7 @@ declare namespace pusher {
          * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
          * Additional transports may be added in the future and without adding them to this list, they will be enabled.
          */
-        disabledTransports?: string[];
+        disabledTransports?: Transport[];
 
         /**
          * Ignores null origin checks for HTTP fallbacks. Use with care, it should be disabled only if necessary (i.e. PhoneGap).
@@ -99,6 +103,7 @@ declare namespace pusher {
         pongTimeout?: number;
 
         wsHost?: string;
+        wsPath?: string;
         wsPort?: number;
         wssPort?: number;
         httpHost?: string;
@@ -106,20 +111,34 @@ declare namespace pusher {
         httpsPort?: number;
     }
 
+    type Transport = 'ws' | 'wss' | 'xhr_streaming' | 'xhr_polling' | 'sockjs';
+
     interface AuthConfig {
         params?: { [key: string]: any };
         headers?: { [key: string]: any };
     }
 
-    interface GenericEventsDispatcher<Self extends EventsDispatcher> extends EventsDispatcher {
-        bind(eventName: string, callback: Function, context?: any): Self;
-        bind_all(callback: Function): Self;
-        unbind(eventName?: string, callback?: Function, context?: any): Self;
-        unbind_all(eventName?: string, callback?: Function): Self;
-        emit(eventName: string, data?: any): Self;
+    interface AuthInfo {
+        auth: string;
+        channel_data?: string;
     }
 
-    interface Channel extends GenericEventsDispatcher<Channel> {
+    type Authorizer = (channel: Channel, options: Config) => {
+        authorize: (socketId: string, callback: (errored: boolean, authInfo?: AuthInfo) => void) => void;
+    };
+
+    type EventCallback = (context: any, data: any) => void;
+
+    interface EventsDispatcher {
+        bind(eventName: string, callback: EventCallback, context?: any): this;
+        bind_global(callback: EventCallback): this;
+        unbind(eventName?: string | null, callback?: EventCallback | null, context?: any): this;
+        unbind_global(callback?: EventCallback): this;
+        unbind_all(): this;
+        emit(eventName: string, data?: any): this;
+    }
+
+    interface Channel extends EventsDispatcher {
         /** Triggers an event */
         trigger(eventName: string, data?: any): boolean;
         pusher: Pusher;
@@ -127,28 +146,18 @@ declare namespace pusher {
         subscribed: boolean;
         /**
          * Authenticates the connection as a member of the channel.
-         * @param  {String} socketId
-         * @param  {Function} callback
          */
         authorize(socketId: string, callback: (data: any) => void): void;
     }
 
-    interface EventsDispatcher {
-        bind(eventName: string, callback: Function, context?: any): EventsDispatcher;
-        bind_all(callback: Function): EventsDispatcher;
-        unbind(eventName?: string, callback?: Function, context?: any): EventsDispatcher;
-        unbind_all(eventName?: string, callback?: Function): EventsDispatcher;
-        emit(eventName: string, data?: any): EventsDispatcher;
-    }
-
-    interface ConnectionManager extends GenericEventsDispatcher<ConnectionManager> {
+    interface ConnectionManager extends EventsDispatcher {
         key: string;
-        options: any; //TODO: Timeline.js
+        options: any; // TODO: Timeline.js
         state: string;
         socket_id: string;
-        connection: any; //TODO: Type this
+        connection: any; // TODO: Type this
         encrypted: boolean;
-        timeline: any; //TODO: Type this
+        timeline: any; // TODO: Type this
         connectionCallbacks: {
             message: (message: string) => void;
             ping: () => void;
@@ -167,7 +176,7 @@ declare namespace pusher {
             refused: () => void;
             backoff: () => void;
             retry: () => void;
-            connected: (handshake: any) => void; //TODO: Type this
+            connected: (handshake: any) => void; // TODO: Type this
         };
         /**
          * Establishes a connection to Pusher.
@@ -178,15 +187,10 @@ declare namespace pusher {
         connect(): void;
         /**
          * Sends raw data.
-         * @param {String} data
          */
         send(data: string): boolean;
-        /** Sends an event.
-         *
-         * @param {String} name
-         * @param {String} data
-         * @param {String} [channel]
-         * @returns {Boolean} whether message was sent or not
+        /**
+         * Sends an event.
          */
         send_event(name: string, data: string, channel: string): boolean;
         /** Closes the connection. */
@@ -203,25 +207,20 @@ declare namespace pusher {
          * Returns member's info for given id.
          *
          * Resulting object containts two fields - id and info.
-         *
-         * @param {Number} id
-         * @return {Object} member's info or null
          */
-        get(id: number): T;
+        get(id: string): null | T;
         /**
          * Calls back for each member in unspecified order.
-         *
-         * @param  {Function} callback
          */
-        each(callback: (member: any) => void): void;
-        members: { [id: number]: UserInfo<T> };
+        each(callback: (member: Member<T>) => void): void;
+        members: { [id: string]: Member<T> };
         count: number;
-        myID: number;
-        me: UserInfo<T>;
+        myID: string;
+        me: Member<T>;
     }
 
-    interface UserInfo<T> {
-        id: number;
+    interface Member<T> {
+        id: string;
         info: T;
     }
 }
diff --git a/types/pusher-js/pusher-js-tests.ts b/types/pusher-js/pusher-js-tests.ts
index b393d6cb75..7381c48e73 100644
--- a/types/pusher-js/pusher-js-tests.ts
+++ b/types/pusher-js/pusher-js-tests.ts
@@ -1,40 +1,65 @@
-
 import Pusher = require('pusher-js');
 import { PresenceChannel } from "pusher-js";
 
-var API_KEY: string;
+var APP_KEY: string;
 var pusher: Pusher.Pusher;
 
+/*
+ * samples from https://github.com/pusher/pusher-js
+ */
+
+//
+// Global Configuration
+//
+
+Pusher.logToConsole = true;
+
+Pusher.log = (msg) => {
+    console.log(msg);
+};
+
 //
 // Configuration
 //
 
-pusher = new Pusher(API_KEY, {
+pusher = new Pusher(APP_KEY, {
     authEndpoint: "http://example.com/pusher/auth"
 });
 
-pusher = new Pusher(API_KEY, {
+pusher = new Pusher(APP_KEY, {
     auth: {
         params: { foo: "bar" },
         headers: { baz: "boo" }
     }
 });
 
-pusher = new Pusher(API_KEY, {
+pusher = new Pusher(APP_KEY, {
     auth: {
         params: { foo: "bar" },
         headers: { "X-CSRF-Token": "SOME_CSRF_TOKEN" }
     }
 });
 
-pusher = new Pusher(API_KEY, { cluster: "eu" });
+pusher = new Pusher(APP_KEY, {
+    authorizer: function(channel, options) {
+        return {
+        authorize: function(socketId, callback) {
+            // Do some ajax to get the auth information
+            var authInformation = {auth: "hash"};
+            callback(false, authInformation);
+        }
+        };
+    }
+});
 
-pusher = new Pusher(API_KEY, { enabledTransports: ["ws"] });
+pusher = new Pusher(APP_KEY, { cluster: "eu" });
 
-pusher = new Pusher(API_KEY, { disabledTransports: ["sockjs"] });
+pusher = new Pusher(APP_KEY, { enabledTransports: ["ws"] });
+
+pusher = new Pusher(APP_KEY, { disabledTransports: ["sockjs"] });
 
 // will only use WebSockets
-pusher = new Pusher(API_KEY, {
+pusher = new Pusher(APP_KEY, {
     enabledTransports: ["ws", "xhr_streaming"],
     disabledTransports: ["xhr_streaming"]
 });
@@ -44,48 +69,67 @@ pusher = new Pusher(API_KEY, {
 //
 
 var socket: Pusher.Pusher;
-var my_channel: Pusher.Channel;
-var channels: Pusher.Channel[];
+var channel: Pusher.Channel;
 
-socket = new Pusher(API_KEY);
+socket = new Pusher(APP_KEY);
+
+socket.disconnect();
 
 //
 // Subscribing to channels
 //
 
-my_channel = socket.subscribe('my-channel');
+channel = socket.subscribe('my-channel');
 
-my_channel = socket.subscribe('private-my-channel');
+channel = socket.subscribe('private-my-channel');
 
-channels = socket.allChannels();
-console.group('Pusher - subscribed to:');
-for (var i = 0; i < channels.length; i++) {
-    var channel = channels[i];
-    console.log(channel.name);
-}
-console.groupEnd();
+socket.allChannels().forEach(channel => console.log(channel.name));
 
-my_channel = socket.subscribe('my-channel');
-socket.bind('new-comment',
-    function(data: any) {
-        // add comment into page
-    }
-);
+//
+// Unsubscribing from channels
+//
 
-var channel: Pusher.Channel;
+socket.unsubscribe('my-channel');
 
-var context = { title: 'Pusher' };
-var handler = function(){
-    console.log('My name is ' + this.title);
-};
-channel.bind('new-comment', handler, context);
+socket.unsubscribe('private-my-channel');
 
-channel.unbind('new-comment', handler); // removes just `handler` for the `new-comment` event
-channel.unbind('new-comment'); // removes all handlers for the `new-comment` event
-channel.unbind(null, handler); // removes `handler` for all events
-channel.unbind(null, null, context); // removes all handlers for `context`
-channel.unbind(); // removes all handlers on `channel`
+//
+// Binding to events
+//
 
+channel.bind('new-message', function(data) {
+    console.log(data.message);
+});
+
+channel.bind('my-event', function() {
+    console.log(`hi ${this.name}`);
+}, { name: 'Pusher' });
+
+channel.unbind('new-comment', console.log);
+
+channel.unbind('new-comment');
+
+channel.unbind(null, console.log);
+
+channel.unbind(null, null, context);
+
+channel.unbind();
+
+channel.bind_global(function(event, data) {
+    console.log(`The event ${event} was triggered with data ${data}`);
+});
+
+channel.unbind_global(console.log);
+
+channel.unbind_global();
+
+channel.unbind_all();
+
+//
+// Connection Events
+//
+
+socket.connection.bind('connected', console.log);
 
 //
 //
@@ -110,13 +154,13 @@ var options: Pusher.Config;
 var channelName: string;
 var privateChannelName: string;
 var presenceChannelName: string;
-var add_member: Function;
-var remove_member: Function;
-var update_member_count: Function;
+var add_member: (ctx: any, data?: any) => void;
+var remove_member: (ctx: any, data?: any) => void;
+var update_member_count: (ctx: any, data?: any) => void;
 var eventName: string;
-var callback: Function;
+var callback: (ctx: any, data?: any) => void;
 var applicationKey: string;
-var log: Function;
+var log: (msg: string) => void;
 var $: any;
 var data: any;
 
@@ -156,11 +200,11 @@ pusher = new Pusher('app_key', {
 
 pusher = new Pusher('app_key', { cluster: 'eu' });
 
-pusher = new Pusher('app_key', { encrypted: true } );
+pusher = new Pusher('app_key', { encrypted: true });
 
 pusher = new Pusher('app_key');
-pusher.connection.bind( 'error', function( err: any ) {
-    if( err.data.code === 4004 ) {
+pusher.connection.bind('error', function(err: any) {
+    if (err.data.code === 4004) {
         log('>>> detected limit error');
     }
 });
@@ -179,7 +223,7 @@ pusher.connection.bind('connected', function() {
 
 pusher.connection.bind('connecting_in', function(delay: any) {
     alert("I haven't been able to establish a connection for this feature.  " +
-        "I will try again in " + delay + " seconds.")
+        "I will try again in " + delay + " seconds.");
 });
 
 pusher.connection.bind('state_change', function(states: any) {
@@ -205,22 +249,22 @@ var privateChannel = pusher.subscribe(privateChannelName);
 
 // Presence channels
 
-var presenceChannel: PresenceChannel<any> = <any>pusher.subscribe(presenceChannelName);
+var presenceChannel = pusher.subscribe(presenceChannelName) as Pusher.PresenceChannel<any>;
 
 var count: number = presenceChannel.members.count;
 
-presenceChannel.members.each(function(member: Pusher.UserInfo<any>) {
+presenceChannel.members.each(function(member) {
     var userId = member.id;
     var userInfo = member.info;
 });
 
-var some_user_id: number;
+var some_user_id: string;
 var user = presenceChannel.members.get(some_user_id);
 
 var me = presenceChannel.members.me;
 
 pusher = new Pusher('app_key');
-presenceChannel = <any>pusher.subscribe('presence-example');
+presenceChannel = pusher.subscribe('presence-example') as Pusher.PresenceChannel<any>;
 presenceChannel.bind('pusher:subscription_succeeded', function() {
     var me = presenceChannel.members.me;
     var userId = me.id;
@@ -239,12 +283,12 @@ channel.bind('pusher:subscription_succeeded', function(members: Pusher.Members<a
     });
 });
 
-channel.bind('pusher:member_added', function(member: Pusher.UserInfo<any>) {
+channel.bind('pusher:member_added', function(member: Pusher.Member<any>) {
     // for example:
     add_member(member.id, member.info);
 });
 
-channel.bind('pusher:member_removed', function(member: Pusher.UserInfo<any>) {
+channel.bind('pusher:member_removed', function(member: Pusher.Member<any>) {
     // for example:
     remove_member(member.id, member.info);
 });
@@ -262,7 +306,7 @@ channel.bind('new-price',
 );
 
 var context = { title: 'Pusher' };
-var handler = function(){
+var handler = function() {
     console.log('My name is ' + this.title);
 };
 channel.bind('new-comment', handler, context);
@@ -301,7 +345,7 @@ channel.bind('pusher:subscription_succeeded', function() {
 pusher = new Pusher('APP_KEY');
 channel = pusher.subscribe('private-channel');
 channel.bind('pusher:subscription_error', function(status: number) {
-    if(status == 408 || status == 503){
+    if (status === 408 || status === 503) {
         // retry?
     }
 });
@@ -330,23 +374,22 @@ channel = pusher.subscribe("private-mousemoves");
 
 // this method should be bound as a 'mousemove' event listener
 document.body.addEventListener('mousemove', onMouseMove, false);
-function onMouseMove(ev: any){
+function onMouseMove(ev: any) {
     ev = ev || window.event;
     state.currentX = ev.pageX || ev.clientX;
     state.currentY = ev.pageY || ev.clientY;
 }
 
-setInterval(function(){
-    if(state.currentX !== state.lastX || state.currentY !== state.lastY){
+setInterval(function() {
+    if (state.currentX !== state.lastX || state.currentY !== state.lastY) {
         state.lastX = state.currentX;
         state.lastY = state.currentY;
 
         var text = document.createTextNode(
             'Triggering event due to state change: x: ' + state.currentX + ', y: ' + state.currentY
         );
-        outputEl.replaceChild( text, outputEl.firstChild );
+        outputEl.replaceChild(text, outputEl.firstChild);
 
-        channel.trigger("client-mouse-moved", {x:state.currentX, y: state.currentY});
+        channel.trigger("client-mouse-moved", {x: state.currentX, y: state.currentY});
     }
 }, 300); // send every 300 milliseconds if position has changed
-
diff --git a/types/pusher-js/tslint.json b/types/pusher-js/tslint.json
index a41bf5d19a..2cf1b5c31e 100644
--- a/types/pusher-js/tslint.json
+++ b/types/pusher-js/tslint.json
@@ -1,79 +1,11 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
         "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
         "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
         "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
         "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
         "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "prefer-template": false
     }
 }
diff --git a/types/react-avatar-editor/index.d.ts b/types/react-avatar-editor/index.d.ts
index a3bbf49f3b..9f9ede1ea3 100644
--- a/types/react-avatar-editor/index.d.ts
+++ b/types/react-avatar-editor/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-avatar-editor 10.3
 // Project: https://github.com/mosch/react-avatar-editor
 // Definitions by: Diogo Corrêa <https://github.com/diogocorrea>
+//                 Gabriel Prates <https://github.com/gabsprates>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -45,7 +46,7 @@ export interface AvatarEditorProps {
 }
 
 export default class AvatarEditor extends React.Component<AvatarEditorProps, any> {
-    static getImage(): HTMLCanvasElement;
-    static getImageScaledToCanvas(): HTMLCanvasElement;
-    static getCroppingRect(): CroppedRect;
+    getImage(): HTMLCanvasElement;
+    getImageScaledToCanvas(): HTMLCanvasElement;
+    getCroppingRect(): CroppedRect;
 }
diff --git a/types/react-avatar-editor/react-avatar-editor-tests.tsx b/types/react-avatar-editor/react-avatar-editor-tests.tsx
index 063d083f3f..3abf24aae3 100644
--- a/types/react-avatar-editor/react-avatar-editor-tests.tsx
+++ b/types/react-avatar-editor/react-avatar-editor-tests.tsx
@@ -12,6 +12,14 @@ const imageState: ImageState = {
 };
 
 class AvatarEditorTest extends React.Component {
+    avatar: AvatarEditor;
+
+    test() {
+        const getImage: HTMLCanvasElement = this.avatar.getImage();
+        const getImageScaledToCanvas: HTMLCanvasElement = this.avatar.getImageScaledToCanvas();
+        const getCroppingRect: CroppedRect = this.avatar.getCroppingRect();
+    }
+
     render() {
         return (
             <div>
@@ -37,11 +45,13 @@ class AvatarEditorTest extends React.Component {
                 <AvatarEditor image="" onMouseMove={event => {}} />
                 <AvatarEditor image="" onImageChange={() => {}} />
                 <AvatarEditor image="" onPositionChange={() => {}} />
+                <AvatarEditor
+                    image=""
+                    ref={ref => {
+                        this.avatar = ref!;
+                    }}
+                />
             </div>
         );
     }
 }
-
-const getImage: HTMLCanvasElement = AvatarEditor.getImage();
-const getImageScaledToCanvas: HTMLCanvasElement = AvatarEditor.getImageScaledToCanvas();
-const getCroppingRect: CroppedRect = AvatarEditor.getCroppingRect();
diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index 3cb1c21605..1c81ffc3c8 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -9,6 +9,7 @@ import * as React from "react";
 interface ReactFacebookLoginProps {
     appId: string;
     callback(userInfo: ReactFacebookLoginInfo): void;
+    onFailure?(response: ReactFacebookFailureResponse): void;
 
     autoLoad?: boolean;
     buttonStyle?: React.CSSProperties;
@@ -33,6 +34,10 @@ interface ReactFacebookLoginProps {
     tag?: Node | React.Component<any>;
 }
 
+export interface ReactFacebookFailureResponse {
+    status?: string;
+}
+
 export interface ReactFacebookLoginInfo {
     id: string;
     name: string;
@@ -43,6 +48,9 @@ interface ReactFacebookLoginState {
     isProcessing?: boolean;
 }
 
-declare class ReactFacebookLogin extends React.Component<ReactFacebookLoginProps, ReactFacebookLoginState> { }
+declare class ReactFacebookLogin extends React.Component<
+    ReactFacebookLoginProps,
+    ReactFacebookLoginState
+> {}
 
 export default ReactFacebookLogin;
diff --git a/types/react-facebook-login/react-facebook-login-tests.tsx b/types/react-facebook-login/react-facebook-login-tests.tsx
index 6aab1ccd71..d7b2ebcde8 100644
--- a/types/react-facebook-login/react-facebook-login-tests.tsx
+++ b/types/react-facebook-login/react-facebook-login-tests.tsx
@@ -1,12 +1,16 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
-import FacebookLogin, { ReactFacebookLoginInfo } from 'react-facebook-login';
+import FacebookLogin, { ReactFacebookLoginInfo, ReactFacebookFailureResponse } from 'react-facebook-login';
 
 const responseFacebook = (response: ReactFacebookLoginInfo) => {
     console.log(response);
 };
 
+const failureResponseFacebook = (response: ReactFacebookFailureResponse) => {
+    console.log(response);
+};
+
 const componentClicked = () => {
     console.log("component clicked");
 };
@@ -21,6 +25,17 @@ ReactDOM.render(
     document.getElementById('demo')
 );
 
+ReactDOM.render(
+    <FacebookLogin
+        appId="1088597931155576"
+        autoLoad={true}
+        fields="name,email,picture"
+        onClick={componentClicked}
+        callback={responseFacebook}
+        onFailure={failureResponseFacebook} />,
+    document.getElementById('demo')
+);
+
 ReactDOM.render(
     <FacebookLogin
         appId="1088597931155576"
diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index 6ed7660196..8716cda0e6 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-input-mask 0.7
+// Type definitions for react-input-mask 1.2
 // Project: https://github.com/sanniassin/react-input-mask
 // Definitions by: Alexandre Paré <https://github.com/apare>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -36,6 +36,10 @@ declare namespace reactInputMask {
          * Show mask even in empty input without focus.
          */
         alwaysShowMask?: boolean;
+        /**
+         * Use inputRef instead of ref if you need input node to manage focus, selection, etc.
+         */
+        inputRef?: React.Ref<HTMLInputElement>;
     }
     class ReactInputMask extends React.Component<ReactInputMaskProps> {
     }
diff --git a/types/react-input-mask/react-input-mask-tests.tsx b/types/react-input-mask/react-input-mask-tests.tsx
index d116b2b27a..a34b15ac99 100644
--- a/types/react-input-mask/react-input-mask-tests.tsx
+++ b/types/react-input-mask/react-input-mask-tests.tsx
@@ -1,10 +1,13 @@
 import ReactInputMask from 'react-input-mask';
 import * as React from 'react';
 
+let ref: HTMLInputElement | null = null;
+
 <div>
     <ReactInputMask mask="+4\9 99 999 99" maskChar={null} />
     <ReactInputMask mask="+7 (999) 999-99-99" />
     <ReactInputMask mask="99-99-9999" defaultValue= "13-00-2017" />
     <ReactInputMask mask="99/99/9999" placeholder= "Enter birthdate" />
     <ReactInputMask mask="+7 (999) 999-99-99" />
+    <ReactInputMask mask="+7 (999) 999-99-99" inputRef={(node) => ref = node} />
 </div>;
diff --git a/types/react-native-star-rating/index.d.ts b/types/react-native-star-rating/index.d.ts
new file mode 100644
index 0000000000..2285134c8f
--- /dev/null
+++ b/types/react-native-star-rating/index.d.ts
@@ -0,0 +1,130 @@
+// Type definitions for react-native-star-rating 1.0
+// Project: https://github.com/djchie/react-native-star-rating
+// Definitions by: iRoachie <https://github.com/iRoachie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+import { ImageURISource, StyleProp, ViewStyle } from 'react-native';
+
+export interface StarRatingProps {
+    /**
+     * Style of the button containing the star.
+     */
+    buttonStyle?: StyleProp<ViewStyle>;
+
+    /**
+     * Style of the element containing the star rating component.
+     */
+    containerStyle?: StyleProp<ViewStyle>;
+
+    /**
+     * Sets the interactivity of the star buttons.
+     *
+     * Default is false
+     */
+    disabled?: boolean;
+
+    /**
+     * The name of the icon to represent an empty star.
+     * Refer to react-native-vector-icons.
+     * Also can be a image object, both {uri:xxx.xxx} and require('xx/xx/xx.xxx').
+     *
+     * Default is "star-o"
+     */
+    emptyStar?: string | ImageURISource;
+
+    /**
+     * Color of an empty star.
+     *
+     * Default is gray
+     */
+    emptyStarColor?: string;
+
+    /**
+     * The name of the icon to represent a full star.
+     * Refer to react-native-vector-icons.
+     * Also can be a image object, both {uri:xxx.xxx} and require('xx/xx/xx.xxx')
+     *
+     * Default is "star"
+     */
+    fullStar?: string | ImageURISource;
+
+    /**
+     * Color of a filled star.
+     *
+     * Default is black
+     */
+    fullStarColor?: string;
+
+    /**
+     * The name of the icon to represent an half star.
+     * Refer to react-native-vector-icons.
+     * Also can be a image object, both {uri:xxx.xxx} and require('xx/xx/xx.xxx').
+     *
+     * Default is "star-half-o"
+     */
+    halfStar?: string | ImageURISource;
+
+    /**
+     * Color of a half-filled star.
+     *
+     * Defaults to fullStarColor.
+     */
+    halfStarColor?: string;
+
+    /**
+     * Sets ability to select half stars
+     *
+     * Default is false
+     */
+    halfStarEnabled?: boolean;
+
+    /**
+     * The name of the icon set the star image belongs to.
+     * Refer to react-native-vector-icons.
+     *
+     * Default is "FontAwesome"
+     */
+    iconSet?: string;
+
+    /**
+     * The maximum number of stars possible.
+     *
+     * Default is 5
+     */
+    maxStars?: number;
+
+    /**
+     * The current rating to show.
+     *
+     * Default is 0
+     */
+    rating?: number;
+
+    /**
+     * Renders stars from right to left
+     *
+     * Default is false
+     */
+    reversed?: boolean;
+
+    /**
+     * Size of the star.
+     *
+     * Default is 40
+     */
+    starSize?: number;
+
+    /**
+     * Style to apply to the star.
+     */
+    starStyle?: StyleProp<ViewStyle>;
+
+    /**
+     * A function to handle star button presses.
+     */
+    selectedStar?(rating: number): void;
+}
+
+export default class StarRating extends React.Component<StarRatingProps> {}
diff --git a/types/react-native-star-rating/react-native-star-rating-tests.tsx b/types/react-native-star-rating/react-native-star-rating-tests.tsx
new file mode 100644
index 0000000000..377e802a1d
--- /dev/null
+++ b/types/react-native-star-rating/react-native-star-rating-tests.tsx
@@ -0,0 +1,35 @@
+import * as React from 'react';
+import StarRating from 'react-native-star-rating';
+
+interface State {
+    starCount: number;
+}
+
+class GeneralStarExample extends React.Component<{}, State> {
+    constructor(props: {}) {
+        super(props);
+
+        this.state = {
+            starCount: 3.5
+        };
+    }
+
+    onStarRatingPress = (rating: number) => {
+        this.setState({
+            starCount: rating
+        });
+    }
+
+    render() {
+        return (
+            <StarRating
+                disabled={false}
+                maxStars={5}
+                rating={this.state.starCount}
+                selectedStar={this.onStarRatingPress}
+            />
+        );
+    }
+}
+
+export default GeneralStarExample;
diff --git a/types/react-native-star-rating/tsconfig.json b/types/react-native-star-rating/tsconfig.json
new file mode 100644
index 0000000000..74fff84c8a
--- /dev/null
+++ b/types/react-native-star-rating/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "jsx": "react-native",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "react-native-star-rating-tests.tsx"]
+}
diff --git a/types/react-native-star-rating/tslint.json b/types/react-native-star-rating/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-star-rating/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index 5353ea6de7..3ca2dc80fb 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -1,7 +1,6 @@
 // Type definitions for react-native-video 2.0
 // Project: https://github.com/react-native-community/react-native-video
 // Definitions by: HuHuanming <https://github.com/huhuanming>
-//                 abrahambotros <https://github.com/abrahambotros>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index c4e396783f..0e6bb2d94c 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Huhuanming <https://github.com/huhuanming>
 //                 mhcgrq <https://github.com/mhcgrq>
 //                 fangpenlin <https://github.com/fangpenlin>
-//                 abrahambotros <https://github.com/abrahambotros>
 //                 petejkim <https://github.com/petejkim>
 //                 Kyle Roach <https://github.com/iRoachie>
 //                 phanalpha <https://github.com/phanalpha>
@@ -14,6 +13,8 @@
 //                 Veit Lehmann: <https://github.com/levito>
 //                 Roberto Huertas: <https://github.com/robertohuertasm>
 //                 Steven Miller <https://github.com/YourGamesBeOver>
+//                 Armando Assuncao <https://github.com/ArmandoAssuncao>
+//                 Ciaran Liedeman <https://github.com/cliedeman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -247,6 +248,25 @@ export interface NavigationUriAction extends NavigationUriActionPayload {
   type: 'Navigation/URI';
 }
 
+export interface NavigationPopActionPayload {
+  // n: the number of routes to pop of the stack
+  n?: number;
+  immediate?: boolean;
+}
+
+export interface NavigationPopAction extends NavigationPopActionPayload {
+  type: 'Navigation/POP';
+}
+
+export interface NavigationPopToTopActionPayload {
+  key?: string;
+  immediate?: boolean;
+}
+
+export interface NavigationPopToTopAction extends NavigationPopToTopActionPayload {
+  type: 'Navigation/POP_TO_TOP';
+}
+
 export interface NavigationStackViewConfig {
   mode?: 'card' | 'modal';
   headerMode?: HeaderMode;
@@ -287,7 +307,9 @@ export type NavigationStackAction =
   | NavigationNavigateAction
   | NavigationBackAction
   | NavigationSetParamsAction
-  | NavigationResetAction;
+  | NavigationResetAction
+  | NavigationPopAction
+  | NavigationPopToTopAction;
 
 export type NavigationTabAction =
   NavigationInitAction
@@ -396,15 +418,21 @@ export interface NavigationEventSubscription {
   remove: () => void;
 }
 
-export interface NavigationScreenProp<S> {
+export interface NavigationScreenProp<S, P = NavigationParams> {
   state: S;
   dispatch: NavigationDispatch;
-  goBack: (routeKey?: (string | null)) => boolean;
-  navigate: (
-    routeName: string,
-    params?: NavigationParams,
-    action?: NavigationAction
-  ) => boolean;
+  goBack: (routeKey?: string | null) => boolean;
+  navigate(options: {
+    routeName: string;
+    params?: P;
+    action?: NavigationAction;
+    key?: string;
+  }): boolean;
+  navigate(
+    routeNameOrOptions: string,
+    params?: P,
+    action?: NavigationAction,
+  ): boolean;
   setParams: (newParams: NavigationParams) => boolean;
   addListener: (
     eventName: string,
@@ -575,6 +603,19 @@ export function StackNavigator(
   stackConfig?: StackNavigatorConfig,
 ): NavigationContainer;
 
+export interface SwitchNavigatorConfig {
+  initialRouteName: string;
+  resetOnBlur?: boolean;
+  paths?: NavigationPathsConfig;
+  backBehavior?: 'none' | 'intialRoute';
+}
+
+// Return createNavigationContainer
+export function SwitchNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  switchConfig?: SwitchNavigatorConfig
+): NavigationContainer;
+
 // DrawerItems
 export const DrawerItems: React.ReactType;
 
@@ -623,7 +664,7 @@ export interface TabViewConfig {
     showLabel?: boolean,
     style?: StyleProp<ViewStyle>,
     labelStyle?: StyleProp<TextStyle>,
-
+    iconStyle?: StyleProp<ViewStyle>,
     // Top
     showIcon?: boolean,
     upperCaseLabel?: boolean,
@@ -718,12 +759,16 @@ export namespace NavigationActions {
   const RESET: 'Navigation/RESET';
   const SET_PARAMS: 'Navigation/SET_PARAMS';
   const URI: 'Navigation/URI';
+  const POP: 'Navigation/POP';
+  const POP_TO_TOP: 'Navigation/POP_TO_TOP';
 
   function init(options?: NavigationInitActionPayload): NavigationInitAction;
   function navigate(options: NavigationNavigateActionPayload): NavigationNavigateAction;
   function reset(options: NavigationResetActionPayload): NavigationResetAction;
   function back(options?: NavigationBackActionPayload): NavigationBackAction;
   function setParams(options: NavigationSetParamsActionPayload): NavigationSetParamsAction;
+  function pop(options: NavigationPopActionPayload): NavigationPopAction;
+  function popToTop(options: NavigationPopToTopActionPayload): NavigationPopToTopAction;
 }
 
 /**
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 017a9b9153..d0e65dfc8e 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -24,6 +24,8 @@ import {
     NavigationTransitionProps,
     StackNavigator,
     StackNavigatorConfig,
+    SwitchNavigator,
+    SwitchNavigatorConfig,
     TabBarTop,
     TabNavigator,
     TabNavigatorConfig,
@@ -32,6 +34,8 @@ import {
     HeaderBackButton,
     Header,
     NavigationParams,
+    NavigationPopAction,
+    NavigationPopToTopAction,
 } from 'react-navigation';
 
 // Constants
@@ -58,6 +62,7 @@ class StartScreen extends React.Component<NavigationScreenProps> {
         return (
             <View>
                 <TouchableOpacity onPress={this.navigateToNextScreen} />
+                <TouchableOpacity onPress={this.navigateDifferentlyToNextScreen} />
             </View>
         );
     }
@@ -68,6 +73,13 @@ class StartScreen extends React.Component<NavigationScreenProps> {
         };
         this.props.navigation.navigate(ROUTE_NAME_NEXT_SCREEN, params);
     }
+    private readonly navigateDifferentlyToNextScreen = (): void => {
+        const params = {
+            id: this.props.navigation.state.params && this.props.navigation.state.params.id,
+            name: this.props.navigation.state.params && this.props.navigation.state.params.s,
+        };
+        this.props.navigation.navigate({routeName: ROUTE_NAME_NEXT_SCREEN, params});
+    }
 }
 
 const ROUTE_NAME_NEXT_SCREEN = "NextScreen";
@@ -219,6 +231,30 @@ function renderAdvancedStackNavigator(): JSX.Element {
     );
 }
 
+/**
+ * Switch navigator.
+ */
+
+const switchNavigatorConfig: SwitchNavigatorConfig = {
+    initialRouteName: 'screen',
+    resetOnBlur: false,
+    backBehavior: 'none'
+};
+
+const BasicSwitchNavigator = SwitchNavigator(
+    routeConfigMap,
+    switchNavigatorConfig,
+);
+
+function renderBasicSwitchNavigator(): JSX.Element {
+    return (
+        <BasicSwitchNavigator
+            ref={(ref: any) => { }}
+            style={viewStyle}
+        />
+    );
+}
+
 /**
  * Drawer navigator.
  */
@@ -250,7 +286,7 @@ function renderBasicDrawerNavigator(): JSX.Element {
 }
 
 interface CustomTransitionerProps {
-    navigation: NavigationScreenProp<any>;
+    navigation: NavigationScreenProp<any, any>;
 }
 /**
  * @desc Custom transitioner component. Follows react-navigation/src/views/CardStackTransitioner.js.
@@ -337,3 +373,13 @@ const setParamsAction: NavigationSetParamsAction = NavigationActions.setParams({
         foo: "bar"
     }
 });
+
+const popAction: NavigationPopAction = NavigationActions.pop({
+    n: 1,
+    immediate: true
+});
+
+const popToTopAction: NavigationPopToTopAction = NavigationActions.popToTop({
+    key: "foo",
+    immediate: true
+});
diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
new file mode 100644
index 0000000000..73a8e7ae55
--- /dev/null
+++ b/types/react-places-autocomplete/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for react-places-autocomplete 6.1
+// Project: https://github.com/kenny-hibino/react-places-autocomplete/
+// Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+//
+/// <reference types="googlemaps" />
+
+import * as React from "react";
+
+export interface formattedSuggestionType {
+    mainText: string;
+    secundaryText: string;
+}
+
+export interface PropTypes {
+    inputProps: {
+        value: string;
+        onChange: (value: string) => void;
+        type?: string;
+        name?: string;
+        placeholder?: string;
+        onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
+    };
+    onError?: (status: string, clearSuggestion: () => void) => void;
+    onSelect?: (address: string, placeID: string) => void;
+    renderSuggestion?: (suggestion: string, formattedSuggestion: formattedSuggestionType) => React.ReactNode;
+    classNames?: {
+        root?: string;
+        input?: string;
+        autocompleteContainer?: string;
+        autocompleteItem?: string;
+        autocompleteItemActive?: string;
+    };
+    styles?: {
+        root?: React.CSSProperties;
+        input?: React.CSSProperties;
+        autocompleteContainer?: React.CSSProperties;
+        autocompleteItem?: React.CSSProperties;
+        autocompleteItemActive?: React.CSSProperties;
+    };
+    options?: {
+        bounds?: google.maps.LatLngBounds | google.maps.LatLngBoundsLiteral;
+        componentRestrictions?: google.maps.GeocoderComponentRestrictions;
+        location?: google.maps.LatLng | google.maps.LatLngLiteral;
+        offset?: number | string;
+        radius?: number | string;
+        types?: string[];
+    };
+
+    debounce?: number;
+    highlightFirstSuggestion?: boolean;
+    renderFooter?: () => React.ReactNode;
+    shouldFetchSuggestions?: (value: string) => boolean;
+}
+
+export function geocodeByAddress(address: string, callback: (results: google.maps.GeocoderResult[], status: google.maps.GeocoderStatus) => void): void;
+export function geocodeByPlaceId(placeId: string, callback: (results: google.maps.GeocoderResult[], status: google.maps.GeocoderStatus) => void): void;
+
+export default class PlacesAutocomplete extends React.Component<PropTypes> {}
diff --git a/types/react-places-autocomplete/tsconfig.json b/types/react-places-autocomplete/tsconfig.json
new file mode 100644
index 0000000000..02dbd0279c
--- /dev/null
+++ b/types/react-places-autocomplete/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "files": ["index.d.ts"],
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  }
+}
diff --git a/types/react-places-autocomplete/tslint.json b/types/react-places-autocomplete/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/react-places-autocomplete/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/react-router-dom/index.d.ts b/types/react-router-dom/index.d.ts
index 8286745998..c5b795761c 100644
--- a/types/react-router-dom/index.d.ts
+++ b/types/react-router-dom/index.d.ts
@@ -12,6 +12,7 @@ import * as H from 'history';
 export {
     Prompt,
     MemoryRouter,
+    RedirectProps,
     Redirect,
     RouteComponentProps,
     RouteProps,
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 47274d71e2..01654c8304 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -15,6 +15,7 @@
 //                 Daniel Roth <https://github.com/DaIgeb>
 //                 Egor Shulga <https://github.com/egorshulga>
 //                 Youen Toupin <https://github.com/neuoy>
+//                 Rahul Raina <https://github.com/rraina>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -76,7 +77,7 @@ export interface RouteProps {
 export class Route<T extends RouteProps = RouteProps> extends React.Component<T, any> { }
 
 export interface RouterProps {
-  history: any;
+  history: H.History;
 }
 export class Router extends React.Component<RouterProps, any> { }
 
diff --git a/types/react-select/index.d.ts b/types/react-select/index.d.ts
index d256bb437e..7adf0d0750 100644
--- a/types/react-select/index.d.ts
+++ b/types/react-select/index.d.ts
@@ -22,7 +22,7 @@ export default class ReactSelectClass<TValue = OptionValues> extends React.Compo
 // Other components
 export class Creatable<TValue = OptionValues> extends React.Component<ReactCreatableSelectProps<TValue>> { }
 export class Async<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue>> { }
-export class AsyncCreatable<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue> & ReactCreatableSelectProps<TValue>> { }
+export class AsyncCreatable<TValue = OptionValues> extends React.Component<ReactAsyncCreatableSelectProps<TValue>> { }
 
 export type HandlerRendererResult = JSX.Element | null | false;
 
@@ -591,21 +591,6 @@ export interface ReactAsyncSelectProps<TValue = OptionValues> extends ReactSelec
      */
     cache?: { [key: string]: any } | boolean;
 
-    /**
-     *  whether to strip diacritics when filtering (shared with Select)
-     */
-    ignoreAccents?: boolean;
-
-    /**
-     *  whether to perform case-insensitive filtering (shared with Select)
-     */
-    ignoreCase?: boolean;
-
-    /**
-     *  overrides the isLoading state when set to true
-     */
-    isLoading?: boolean;
-
     /**
      *  function to call to load options asynchronously
      */
@@ -614,29 +599,7 @@ export interface ReactAsyncSelectProps<TValue = OptionValues> extends ReactSelec
     /**
      *  replaces the placeholder while options are loading
      */
-    loadingPlaceholder?: string;
-
-    /**
-     *  the minimum number of characters that trigger loadOptions
-     */
-    minimumInput?: number;
-
-    /**
-     *  placeholder displayed when there are no matching search results (shared with Select)
-     */
-    noResultsText?: string | JSX.Element;
-    /**
-     *  field placeholder; displayed when there's no value (shared with Select)
-     */
-    placeholder?: string;
-
-    /**
-     *  label to prompt for search input
-     */
-    searchPromptText?: string;
-
-    /**
-     *  message to display while options are loading
-     */
-    searchingText?: string;
+    loadingPlaceholder?: string | JSX.Element;
 }
+
+export type ReactAsyncCreatableSelectProps<TValue = OptionValues> = ReactAsyncSelectProps<TValue> & ReactCreatableSelectProps<TValue>;
diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 20a1c5a1fb..503b5f4e02 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -613,9 +613,6 @@ export interface RowInfo {
     /** Materialized row of data */
     row: any;
 
-    /** Original row from your data */
-    original: any;
-
     /** The post-accessed values from the original row */
     rowValues: any;
 
diff --git a/types/react-text-mask/index.d.ts b/types/react-text-mask/index.d.ts
index f4c46bea58..7ed81429e0 100644
--- a/types/react-text-mask/index.d.ts
+++ b/types/react-text-mask/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-text-mask 16.0
+// Type definitions for react-text-mask 5.1
 // Project: https://github.com/text-mask/text-mask
 // Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -9,7 +9,7 @@ import * as React from "react";
 export type maskArray = Array<string | RegExp>;
 
 export interface MaskedInputProps extends React.InputHTMLAttributes<HTMLInputElement> {
-    mask?: maskArray | ((input: HTMLInputElement) => maskArray);
+    mask?: maskArray | ((value: string) => maskArray);
 
     guide?: boolean;
 
@@ -19,9 +19,7 @@ export interface MaskedInputProps extends React.InputHTMLAttributes<HTMLInputEle
 
     pipe?: (conformedValue: string, config: any) => false | string | { value: string, indexesOfPipedChars: number[] };
 
-    onReject?: (infos: { conformedValue: string, maskRejection: boolean, pipeRejection: boolean }) => void;
-
-    onAccept?: () => void;
+    showMask?: boolean;
 }
 
 export interface conformToMaskResult {
diff --git a/types/react-virtualized/dist/es/Grid.d.ts b/types/react-virtualized/dist/es/Grid.d.ts
index 9a6492f368..630e64df69 100644
--- a/types/react-virtualized/dist/es/Grid.d.ts
+++ b/types/react-virtualized/dist/es/Grid.d.ts
@@ -9,7 +9,7 @@ export type GridCellProps = {
     isScrolling: boolean;
     isVisible: boolean;
     key: string;
-    parent: Grid | List | Table;
+    parent: typeof Grid | typeof List | typeof Table;
     rowIndex: number;
     style: React.CSSProperties;
 };
diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index 6293d20c9e..8159c49ff2 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -5,6 +5,7 @@
 //                 Konstantin Nesterov <https://github.com/wasd171>
 //                 Szőke Szabolcs <https://github.com/szabolcsx>
 //                 Kræn Hansen <https://github.com/kraenhansen>
+//                 Steve Zhang <https://github.com/Stevearzh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 86673e2aaa..d1de1c2c46 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -401,7 +401,7 @@ export interface LineProps extends EventAttributes, Partial<PresentationAttribut
     left?: number;
     width?: number;
     height?: number;
-    dataKey: string | number; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
     label?: boolean | object | React.ReactElement<any> | LabelProps['content'];
     points?: Point[];
 }
@@ -782,7 +782,7 @@ export interface TooltipPayload {
     unit?: string;
     color?: string;
     fill?: string;
-    dataKey?: string;
+    dataKey?: DataKey;
     formatter?: TooltipFormatter;
 }
 
diff --git a/types/redux-test-utils/index.d.ts b/types/redux-test-utils/index.d.ts
new file mode 100644
index 0000000000..2c5a36e441
--- /dev/null
+++ b/types/redux-test-utils/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for redux-test-utils 0.2
+// Project: https://github.com/Knegusen/redux-test-utils#readme
+// Definitions by: Huw Martin <https://github.com/huwmartin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { AnyAction, Store, Dispatch } from 'redux';
+
+export function createMockStore(
+  state?: any
+): mockStore<any>;
+
+export function createMockDispatch(): mockDispatch<any>;
+
+export interface mockStore<S> extends Store<S>, mockDispatch<S> {}
+
+export interface mockDispatch<S> {
+  dispatch: Dispatch<S>;
+  getActions: () => AnyAction[];
+  getAction: (type: any) => AnyAction | undefined;
+  isActionTypeDispatched: (type: any) => boolean;
+  isActionDispatched: (action: AnyAction) => boolean;
+}
diff --git a/types/redux-test-utils/package.json b/types/redux-test-utils/package.json
new file mode 100644
index 0000000000..6d68bf2f9b
--- /dev/null
+++ b/types/redux-test-utils/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^3.6.0"
+    }
+}
diff --git a/types/redux-test-utils/redux-test-utils-tests.ts b/types/redux-test-utils/redux-test-utils-tests.ts
new file mode 100644
index 0000000000..9fc8df2c13
--- /dev/null
+++ b/types/redux-test-utils/redux-test-utils-tests.ts
@@ -0,0 +1,37 @@
+import * as chai from 'chai';
+
+import { createMockStore, createMockDispatch } from 'redux-test-utils';
+
+const expect = chai.expect;
+const assert = chai.assert;
+
+function test_creatMockStore() {
+  const state = 'state';
+  const store = createMockStore(state);
+  const action = {
+    type: 'type',
+    data: 'data'
+  };
+  store.dispatch(action);
+
+  expect(store.getAction(action.type)).to.equal(action);
+  expect(store.getActions()).to.equal([action]);
+  expect(store.isActionDispatched(action)).to.be.true;
+  expect(store.isActionTypeDispatched(action.type)).to.be.true;
+  expect(store.getState()).to.be(state);
+}
+
+function test_createMockDispatch() {
+  const state = 'state';
+  const dispatchMock = createMockDispatch();
+  const action = {
+    type: 'type',
+    data: 'data',
+  };
+  dispatchMock.dispatch(action);
+
+  expect(dispatchMock.getAction(action.type)).to.equal(action);
+  expect(dispatchMock.getActions()).to.equal([action]);
+  expect(dispatchMock.isActionDispatched(action)).to.be.true;
+  expect(dispatchMock.isActionTypeDispatched(action.type)).to.be.true;
+}
diff --git a/types/redux-test-utils/tsconfig.json b/types/redux-test-utils/tsconfig.json
new file mode 100644
index 0000000000..5b074d5fa2
--- /dev/null
+++ b/types/redux-test-utils/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-test-utils-tests.ts"
+    ]
+}
diff --git a/types/redux-test-utils/tslint.json b/types/redux-test-utils/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-test-utils/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/relay-runtime/index.d.ts b/types/relay-runtime/index.d.ts
index 2348a4d06b..85a6c9c3ea 100644
--- a/types/relay-runtime/index.d.ts
+++ b/types/relay-runtime/index.d.ts
@@ -99,12 +99,12 @@ export interface PayloadError {
  *
  * May return an Observable or Promise of a raw server response.
  */
-export function FetchFunction(
+export type FetchFunction = (
     operation: RequestNode,
     variables: Variables,
     cacheConfig: CacheConfig,
     uploadables?: UploadableMap
-): ObservableFromValue<QueryPayload>;
+) => ObservableFromValue<QueryPayload>;
 
 /**
  * A function that executes a GraphQL subscription operation, returning one or
@@ -671,14 +671,14 @@ export interface RelayNetwork {
 // ~~~~~~~~~~~~~~~~~~~~~
 // RelayDefaultHandlerProvider
 // ~~~~~~~~~~~~~~~~~~~~~
-export function HandlerProvider(name: string): HandlerInterface | null;
+export type HandlerProvider = (name: string) => HandlerInterface | null;
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // RelayModernEnvironment
 // ~~~~~~~~~~~~~~~~~~~~~
 export interface EnvironmentConfig {
     configName?: string;
-    handlerProvider?: typeof HandlerProvider;
+    handlerProvider?: HandlerProvider;
     network: Network;
     store: Store;
 }
@@ -732,7 +732,7 @@ export class Network {
      * Creates an implementation of the `Network` interface defined in
      * `RelayNetworkTypes` given `fetch` and `subscribe` functions.
      */
-    static create(fetchFn: typeof FetchFunction, subscribeFn?: SubscribeFunction): RelayNetwork;
+    static create(fetchFn: FetchFunction, subscribeFn?: SubscribeFunction): RelayNetwork;
 }
 
 // ~~~~~~~~~~~~~~~~~~~~~
diff --git a/types/riot-route/index.d.ts b/types/riot-route/index.d.ts
new file mode 100644
index 0000000000..453bb185fa
--- /dev/null
+++ b/types/riot-route/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for riot-route 3.1
+// Project: https://github.com/riot/route
+// Definitions by: karak <https://github.com/karak>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import route from './lib/index';
+
+export default route;
diff --git a/types/riot-route/lib/index.d.ts b/types/riot-route/lib/index.d.ts
new file mode 100644
index 0000000000..d824e0a643
--- /dev/null
+++ b/types/riot-route/lib/index.d.ts
@@ -0,0 +1,75 @@
+interface RiotRoute {
+    /**
+     * Execute the given callback when the URL changes.
+     */
+    (callback: (...params: string[]) => void): void;
+
+    /**
+     * Execute the given callback when the URL changes and it match the filter.
+     * @since v2.3
+     */
+    (filter: string, callback: (...params: string[]) => void): void;
+
+    /**
+     * Changes the browser URL and notifies all the listeners assigned with `route(callback)`.
+     */
+    (to: string, title?: string, shouldReplace?: boolean): void;
+
+    /**
+     * Returns a new routing context.
+     * @since v2.3
+     */
+    create(): RiotSubRoute;
+
+    /**
+     * Start listening the url changes
+     * and also exec routing on the current url.
+     */
+    start(autoStart?: boolean): void;
+
+    /**
+     * Stop all the routings. It'll removes the listeners and clear also the callbacks.
+     */
+    stop(): void;
+
+    /**
+     * Study the current browser path "in place" and emit routing without waiting for it to change.
+     */
+    exec(): void;
+
+    /**
+     * This is an utility function to extract the query from the url.
+     * @since v2.3
+     */
+    query(): { [name: string]: string; };
+
+    /**
+     * Change the base path.
+     *
+     * @param arg - a new base or '#' or '#!'
+     */
+    base(arg?: string|RegExp): void;
+
+    /**
+     * Changes the default parser to a custom one.
+     * @param parser
+     * @param secondParser
+     */
+    parser(
+        parser: (path: string) => any[],
+        secondParser?: (path: string, filter: string) => string[] | undefined
+    ): void;
+}
+
+interface RiotSubRoute extends RiotRoute {
+    /**
+     * Stop only subRoute's routings. It'll removes the listeners and clear also the callbacks.
+     *
+     * @since v2.3
+     */
+    stop(): void;
+}
+
+declare const route: RiotRoute;
+
+export default route;
diff --git a/types/riot-route/lib/tag.d.ts b/types/riot-route/lib/tag.d.ts
new file mode 100644
index 0000000000..15c5d884fa
--- /dev/null
+++ b/types/riot-route/lib/tag.d.ts
@@ -0,0 +1,3 @@
+import route from './index';
+
+export default route;
diff --git a/types/riot-route/riot-route-tests.ts b/types/riot-route/riot-route-tests.ts
new file mode 100644
index 0000000000..fab6a2b0df
--- /dev/null
+++ b/types/riot-route/riot-route-tests.ts
@@ -0,0 +1,74 @@
+import { default as route } from 'riot-route';
+import routeFromTag from 'riot-route/lib/tag';
+
+/* () */
+route((collection, id, action) => {
+});
+
+route('/fruit', (name) => {
+    console.log('The list of fruits');
+});
+
+/* create() */
+const subRoute = route.create();
+subRoute('/fruit/apple', () => { /* */ });
+
+/* () */
+route('customers/267393/edit');
+route('customers/267393/edit', 'Editing customer page');
+route('not-found', 'Not found', true);
+
+/* start() */
+route.start();
+route.start(true);
+
+/* stop() */
+route.stop();
+
+/* exec() */
+route.exec();
+
+/* query() */
+route('/search..', () => {
+    const q = route.query();
+    console.log('Search keyword: ' + q.keyword);
+    console.log('Search limit: ' + q.limit);
+});
+
+/* base() */
+route.base('/app');
+route.base('#!');
+route.base(); // reset
+
+/* parser() */
+route.parser((path) => {
+    const raw = path.slice(2).split('?');
+    const uri = raw[0].split('/') as Array<string | { [name: string]: string }>;
+    const qs = raw[1];
+    const params: { [name: string]: string } = {};
+
+    if (qs) {
+        qs.split('&').forEach((v) => {
+            const c = v.split('=');
+            params[c[0]] = c[1];
+        });
+    }
+    uri.push(params);
+    return uri;
+});
+
+(() => {
+    function first(path: string): any[] {
+        return [];
+    }
+
+    function second(path: string, filter: string) {
+        const re = new RegExp(`^${filter.replace(/\*/g, '([^/?#]+?)').replace(/\.\./, '.*')}$`);
+        const args = path.match(re);
+        if (args) {
+            return args.slice(1);
+        }
+    }
+
+    route.parser(first, second);
+})();
diff --git a/types/riot-route/tsconfig.json b/types/riot-route/tsconfig.json
new file mode 100644
index 0000000000..cc6b807db4
--- /dev/null
+++ b/types/riot-route/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "esModuleInterop": true,
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "lib/index.d.ts",
+        "lib/tag.d.ts",
+        "riot-route-tests.ts"
+    ]
+}
diff --git a/types/riot-route/tslint.json b/types/riot-route/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/riot-route/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/rosie/index.d.ts b/types/rosie/index.d.ts
index 51728127ea..1078b53573 100644
--- a/types/rosie/index.d.ts
+++ b/types/rosie/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for rosie
 // Project: https://github.com/rosiejs/rosie
-// Definitions by: Abner Oliveira <https://github.com/abner>, Chris Grigg <https://github.com/subvertallchris>
+// Definitions by: Abner Oliveira <https://github.com/abner>,
+//                 Chris Grigg <https://github.com/subvertallchris>,
+//                 Alex Bukurov <https://github.com/abukurov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -191,7 +193,7 @@ declare namespace rosie {
      * @param {object=} options
      * @return {object}
      */
-    attributes(attributes: string, options?: { [k in keyof T]: T[k] }): T;
+    attributes(attributes?: { [k in keyof T]?: T[k] }, options?: any): T;
 
     /**
      * Generates values for all the registered options using the values given.
@@ -230,4 +232,4 @@ declare namespace rosie {
 declare var rosie: { Factory: rosie.IFactoryStatic };
 
 export = rosie;
-export as namespace Factory;
\ No newline at end of file
+export as namespace Factory;
diff --git a/types/rosie/rosie-tests.ts b/types/rosie/rosie-tests.ts
index 8d7c6d83b8..6c2152a9e7 100644
--- a/types/rosie/rosie-tests.ts
+++ b/types/rosie/rosie-tests.ts
@@ -47,10 +47,12 @@ const personFactory = Factory.define<Person>('Person').attr('firstName', 'John')
 // Building does not require the first (attributes) and second (options) arguments
 personFactory.build();
 personFactory.buildList(3);
+personFactory.attributes();
 
 // Building with attributes does not require the second (options) argument
 personFactory.build({ firstName: "John" });
 personFactory.buildList(3, { firstName: "John" });
+personFactory.attributes({ firstName: "John" });
 
 // It will automatically type up to five dependencies
 personFactory.attr('fullName', ['firstName'], firstName => firstName);
diff --git a/types/select2/index.d.ts b/types/select2/index.d.ts
index e7a974f92d..51e297a9a8 100644
--- a/types/select2/index.d.ts
+++ b/types/select2/index.d.ts
@@ -92,6 +92,8 @@ interface Select2Options {
     dropdownParent?: JQuery;
     debug?: boolean;
     dropdownAdapter?: any;
+    selectionAdapter?: any;
+    resultsAdapter?: any;
 }
 
 interface Select2JQueryEventObject extends JQueryEventObject {
diff --git a/types/seneca/index.d.ts b/types/seneca/index.d.ts
index ecf3c29096..4dfd82cb1c 100644
--- a/types/seneca/index.d.ts
+++ b/types/seneca/index.d.ts
@@ -1,7 +1,9 @@
 // Type definitions for seneca v2.1.0
 // Project: https://www.npmjs.com/package/seneca
 // Definitions by: Peter Snider <https://github.com/psnider>
+//                 Kevyn Bruyere <https://github.com/kevynb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/seneca
+// TypeScript Version: 2.3
 
 
 declare module "seneca" {
@@ -168,11 +170,21 @@ declare module "seneca" {
             sort$?: any;
         }
 
+        interface PartialMessagePayload {
+            transport$: object | {};
+            plugin$: any;
+            fatal$: boolean;
+            tx$: string;
+        }
 
+        type MessagePayload<T> = PartialMessagePayload & T;
 
         type Pattern = string | MinimalPattern;
         type GlobalErrorHandler = (error: Error) => void;
-        type AddCallback = (msg: any, respond: (error: Error | null, msg?: any) => void) => void;
+        type AddCallback<T = any> = (
+            msg: MessagePayload<T>,
+            respond: (error: Error | null, msg?: any) => void,
+        ) => void;
         type ActCallback = (error: Error | null, result?: any) => void;
         type CloseCallback = (optional: any, done: (error: Error) => void) => void;
         type DatabaseID = string;
@@ -199,10 +211,18 @@ declare module "seneca" {
 
             ready(callback: (error: Error) => void): void;
 
-            add(pattern: Pattern, action: AddCallback): this;
-            add(pattern: Pattern, paramspec: any, action: AddCallback): this;
-            act(pattern: Pattern, respond: ActCallback): void;
-            act(pattern: Pattern, msg: any, respond: ActCallback): void;
+            add<PatternType = any, CallBackParams = any>(
+                pattern: PatternType,
+                action: AddCallback<PatternType & CallBackParams>,
+            ): this;
+            add<PatternType = any, CallbackParams = any>(
+                pattern: PatternType,
+                paramspec: any,
+                action: AddCallback<PatternType & CallbackParams>,
+            ): this;
+
+            act<PatternWithArgs = Pattern>(pattern: PatternWithArgs, respond: ActCallback): void;
+            act<PatternWithArgs = Pattern>(pattern: PatternWithArgs, msg: any, respond: ActCallback): void;
             make(entity_canon: string, properties?: any): Entity;
             make(base: string, entity_canon: string, properties?: any): Entity;
             make(zone: string, base: string, entity_canon: string, properties?: any): Entity;
diff --git a/types/seneca/seneca-tests.ts b/types/seneca/seneca-tests.ts
index 6ff0331ff6..376cede3f1 100644
--- a/types/seneca/seneca-tests.ts
+++ b/types/seneca/seneca-tests.ts
@@ -126,3 +126,53 @@ seneca.act('cmd:salestax,net:100,country:US,state:NY', function (err, result) {
 seneca.act('cmd:salestax,net:100,country:IE,category:reduced', function (err, result) {
   console.log('IE: ' + result.total)
 })
+
+/** With Generic Type usage **/
+seneca.add<SalestaxPattern, SalestaxParams>({cmd: 'salestax'}, function(args, callback) {
+    var rate = 0.23;
+    var total = args.net * (1 + rate);
+    callback(null, {total: total});
+});
+
+seneca.act<SalesTaxRequest>({cmd: 'salestax', net: 100}, function(err, result) {
+    console.log(result.total);
+});
+
+seneca.add<ConfigPattern, ConfigParams>({cmd: 'config'}, function(args, callback) {
+    var config: any = {
+        // any added here due to following config[] access
+        rate: 0.23,
+    };
+    var value = config[args.prop];
+    callback(null, {value: value});
+});
+
+seneca.add<SalestaxPattern, SalestaxParams>({cmd: 'salestax'}, function(args, callback) {
+    seneca.act<ConfigRequest>({cmd: 'config', prop: 'rate'}, function(err, result) {
+        var rate = parseFloat(result.value);
+        var total = args.net * (1 + rate);
+        callback(null, {total: total});
+    });
+});
+
+
+interface SalestaxPattern {
+    cmd: 'salestax';
+}
+
+interface SalestaxParams {
+    net: number;
+}
+
+export interface SalesTaxRequest extends SalestaxPattern, SalestaxParams {}
+
+interface ConfigPattern {
+    cmd: 'config';
+}
+
+interface ConfigParams {
+    prop: string;
+}
+
+export interface ConfigRequest extends ConfigPattern, ConfigParams {}
+
diff --git a/types/socket.io-redis/index.d.ts b/types/socket.io-redis/index.d.ts
index 3de732084b..0335dcb300 100644
--- a/types/socket.io-redis/index.d.ts
+++ b/types/socket.io-redis/index.d.ts
@@ -4,14 +4,10 @@
 //                 seeLuck <https://github.com/seeLuck>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+import SocketIO = require("socket.io");
 
-/// <reference types="socket.io" />
-
-declare module 'socket.io-redis' {
-	let redis: SocketIORedisStatic;
-
-	export = redis;
-}
+declare const SocketIORedis: SocketIORedisStatic;
+export = SocketIORedis;
 
 interface SocketIORedisStatic {
 	/**
diff --git a/types/socket.io.users/index.d.ts b/types/socket.io.users/index.d.ts
index 053d80450c..bfc16cd5a4 100644
--- a/types/socket.io.users/index.d.ts
+++ b/types/socket.io.users/index.d.ts
@@ -4,15 +4,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-/// <reference types="node" />
-
-/// <reference types="express-session" />
-/// <reference types="socket.io" />
-
-
 import { EventEmitter } from 'events';
 import { Application } from "express";
 import { SessionOptions } from "express-session";
+import SocketIO = require("socket.io");
 
 declare var CONNECTION_EVENTS: string[];
 declare var Middleware: () => (socket: SocketIO.Socket, next: () => any) => void;
diff --git a/types/socket.io/index.d.ts b/types/socket.io/index.d.ts
index 0d77110716..1583eac66b 100644
--- a/types/socket.io/index.d.ts
+++ b/types/socket.io/index.d.ts
@@ -5,11 +5,8 @@
 
 ///<reference types="node" />
 
-declare module 'socket.io' {
-	var server: SocketIOStatic;
-
-	export = server;
-}
+declare const SocketIO: SocketIOStatic;
+export = SocketIO;
 
 interface SocketIOStatic {
 	/**
@@ -45,7 +42,6 @@ interface SocketIOStatic {
 }
 
 declare namespace SocketIO {
-
 	interface Server {
 		engine: { ws: any };
 
diff --git a/types/socket.io/socket.io-tests.ts b/types/socket.io/socket.io-tests.ts
index cd0cecf6cf..7bfddb1271 100644
--- a/types/socket.io/socket.io-tests.ts
+++ b/types/socket.io/socket.io-tests.ts
@@ -2,7 +2,7 @@ import socketIO = require('socket.io');
 
 function testUsingWithNodeHTTPServer() {
     var app = require('http').createServer(handler);
-    var io = socketIO(app);
+    var io: socketIO.Server = socketIO(app);
     var fs = require('fs');
 
     app.listen(80);
diff --git a/types/socketio-wildcard/index.d.ts b/types/socketio-wildcard/index.d.ts
index 3170a27ca5..76598d59ae 100644
--- a/types/socketio-wildcard/index.d.ts
+++ b/types/socketio-wildcard/index.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="socket.io" />
 /// <reference types="socket.io-client" />
+import SocketIO = require("socket.io");
 
 import EventEmitter = NodeJS.EventEmitter;
 import Socket = SocketIO.Socket;
diff --git a/types/stellar-sdk/index.d.ts b/types/stellar-sdk/index.d.ts
index e4a6e6a06f..955360d3f0 100644
--- a/types/stellar-sdk/index.d.ts
+++ b/types/stellar-sdk/index.d.ts
@@ -739,10 +739,18 @@ export namespace Operation {
     function fromXDRObject<T extends Operation>(xdrOperation: xdr.Operation<T>): T;
 }
 
-export class OperationCallBuilder extends CallBuilder<OperationRecord> { }
+export class OperationCallBuilder extends CallBuilder<OperationRecord> {
+    forAccount(accountId: string): this;
+    forLedger(sequence: string): this;
+    forTransaction(transactionId: string): this;
+}
 export class OrderbookCallBuilder extends CallBuilder<OrderbookRecord> { }
 export class PathCallBuilder extends CallBuilder<PaymentPathRecord> { }
-export class PaymentCallBuilder extends CallBuilder<PaymentOperationRecord> { }
+export class PaymentCallBuilder extends CallBuilder<PaymentOperationRecord> {
+    forAccount(accountId: string): this;
+    forLedger(sequence: string): this;
+    forTransaction(transactionId: string): this;
+}
 
 export class Server {
     constructor(serverURL: string, options?: { allowHttp: boolean })
diff --git a/types/storejs/index.d.ts b/types/storejs/index.d.ts
index 0a677c0ecf..f720d33617 100644
--- a/types/storejs/index.d.ts
+++ b/types/storejs/index.d.ts
@@ -15,8 +15,8 @@ interface StoreJsAPI {
     each(callback: (val: any, namespacedKey: string) => void): void;
     clearAll(): void;
     hasNamespace(namespace: string): boolean;
-    createStore(plugins?: any[], namespace?: string): StoreJsAPI;
-    addPlugin(plugin: any): void;
+    createStore(plugins?: Function[], namespace?: string): StoreJsAPI;
+    addPlugin(plugin: Function): void;
     namespace(namespace: string): StoreJsAPI;
 }
 
@@ -33,3 +33,30 @@ declare const engine: StoreJsEngine;
 declare module 'store/src/store-engine' {
     export = engine;
 }
+declare module 'store/plugins/all' {
+    export = Function;
+}
+declare module 'store/plugins/default' {
+    export = Function;
+}
+declare module 'store/plugins/dump' {
+    export = Function;
+}
+declare module 'store/plugins/events' {
+    export = Function;
+}
+declare module 'store/plugins/expire' {
+    export = Function;
+}
+declare module 'store/plugins/observe' {
+    export = Function;
+}
+declare module 'store/plugins/operations' {
+    export = Function;
+}
+declare module 'store/plugins/update' {
+    export = Function;
+}
+declare module 'store/plugins/v1-backcompat' {
+    export = Function;
+}
diff --git a/types/storejs/storejs-tests.ts b/types/storejs/storejs-tests.ts
index 802f3dd40e..9e631385f5 100644
--- a/types/storejs/storejs-tests.ts
+++ b/types/storejs/storejs-tests.ts
@@ -1,6 +1,15 @@
 // Tests for storagejs.d.ts
 import * as store from 'store';
 import * as engine from 'store/src/store-engine';
+import * as allPlugin from 'store/plugins/all';
+import * as defaultPlugin from 'store/plugins/default';
+import * as dumpPlugin from 'store/plugins/dump';
+import * as eventsPlugin from 'store/plugins/events';
+import * as expirePlugin from 'store/plugins/expire';
+import * as observePlugin from 'store/plugins/observe';
+import * as operationsPlugin from 'store/plugins/operations';
+import * as updatePlugin from 'store/plugins/update';
+import * as v1BackcompatPlugin from 'store/plugins/v1-backcompat';
 
 // https://github.com/marcuswestin/store.js/blob/master/README-More.md#storeenabled-flag
 console.log('storage is supported: ', store.enabled === true);
@@ -52,6 +61,8 @@ store.set('foo', 'bar 1');
 store.set('foo', 'bar 2');
 store.getHistory('foo');
 
+store.addPlugin(expirePlugin);
+
 // https://github.com/marcuswestin/store.js/#make-your-own-build
 
 // Example custom build usage:
@@ -66,9 +77,16 @@ var storages: any[] = [
     //require('store/storages/localStorage'),
     //require('store/storages/cookieStorage')
 ];
-var plugins: any[] = [
-    //require('store/plugins/defaults'),
-    //require('store/plugins/expire')
+var plugins = [
+    allPlugin,
+    defaultPlugin,
+    dumpPlugin,
+    eventsPlugin,
+    expirePlugin,
+    observePlugin,
+    operationsPlugin,
+    updatePlugin,
+    v1BackcompatPlugin,
 ];
 var myStore = engine.createStore(storages, plugins);
 myStore.set('foo', 'bar', new Date().getTime() + 3000); // Using expire plugin to expire in 3 seconds
diff --git a/types/tiny-slider-react/index.d.ts b/types/tiny-slider-react/index.d.ts
new file mode 100644
index 0000000000..b509595f81
--- /dev/null
+++ b/types/tiny-slider-react/index.d.ts
@@ -0,0 +1,259 @@
+// Type definitions for tiny-slider-react 0.3
+// Project: https://github.com/jechav/tiny-slider-react#readme
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+import * as React from "react";
+
+interface CommonOptions {
+    /**
+     * The initial index of the slider.
+     * @defaultValue 0
+     */
+    startIndex?: number;
+    /**
+     * Number of slides being displayed in the viewport.
+     * @defaultValue 1
+     */
+    items?: number;
+    /**
+     * Space between slides (in "px").
+     * @defaultValue 0
+     */
+    gutter?: number;
+    /**
+     * Number of slides going on one "click".
+     * @defaultValue 1
+     */
+    slideBy?: number | "page";
+    /**
+     * Speed of the slide animation (in "ms").
+     * @defaultValue 300
+     */
+    speed?: number;
+    /**
+     * Height of slider container changes according to each slide"s height.
+     * @defaultValue false
+     */
+    autoHeight?: boolean;
+    /**
+     * Controls width attribute of the slides.
+     * @defaultValue false
+     */
+    fixedWidth?: number | false;
+    /**
+     * Space on the outside (in "px").
+     * @defaultValue 0
+     */
+    edgePadding?: number;
+    /**
+     * Controls the display and functionalities of controls components (prev/next buttons). If true, display the controls and add all functionalities.
+     * @defaultValue true
+     */
+    controls?: boolean;
+    /**
+     * Text or markup in the prev/next buttons
+     * @defaultValue ["prev", "next"]
+     */
+    controlsText?: string[];
+    /**
+     * Controls the display and functionalities of nav components (dots). If true, display the nav and add all functionalities.
+     * @defaultValue true
+     */
+    nav?: boolean;
+    /**
+     * Toggles the automatic change of slides
+     * @defaultValue false
+     */
+    autoplay?: boolean;
+    /**
+     * Stops sliding on mouseover.
+     * @defaultValue false
+     */
+    autoplayHoverPause?: boolean;
+    /**
+     * Pauses the sliding when the page is invisiable and resumes it when the page become visiable again
+     * @defaultValue true
+     */
+    autoplayResetOnVisibility?: boolean;
+    /**
+     * Text or markup in the autoplay start/stop button.
+     * @defaultValue ["start", "stop"]
+     */
+    autoplayText?: string[];
+    /**
+     * Time between 2 autoplay slides change (in "ms").
+     * @defaultValue 5000
+     */
+    autoplayTimeout?: number;
+    /**
+     * Activates input detection for touch devices.
+     * @defaultValue true
+     */
+    touch?: boolean;
+    /**
+     * Changing slides by dragging them.
+     * @defaultValue false
+     */
+    mouseDrag?: boolean;
+    /**
+     * Allows using arrow keys to switch slides.
+     * @defaultValue false
+     */
+    arrowKeys?: boolean;
+    /**
+     * Disable slider.
+     * @defaultValue false
+     */
+    disable?: boolean;
+}
+
+export interface ResponsiveOptions {
+    [breakpoint: number]: CommonOptions;
+}
+
+export interface TinySliderSettings extends CommonOptions {
+    /**
+     * Controls animation behaviour.
+     * With carousel everything slides to the side, while gallery uses fade animations and changes all slides at once.
+     * @defaultValue "carousel"
+     */
+    mode?: "carousel" | "gallery";
+    /**
+     * The axis of the slider.
+     * @defaultValue "horizontal"
+     */
+    axis?: "horizontal" | "vertical";
+    /**
+     * The container element/selector around the prev/next buttons.
+     * controlsContainer must have at least 2 child elements.
+     * @defaultValue false
+     */
+    controlsContainer?: HTMLElement | string | false;
+    /**
+     * The container element/selector around the dots.
+     * navContainer must have at least same number of children as the slides.
+     * @defaultValue false
+     */
+    navContainer?: HTMLElement | string | false;
+    /**
+     * Indecate if the dots are thurbnails. If true, they will always be visible even when more than 1 slides displayed in the viewport.
+     * @defaultValue false
+     */
+    navAsThumbnails?: boolean;
+    /**
+     * Direction of slide movement (ascending/descending the slide index).
+     * @defaultValue "forward"
+     */
+    autoplayDirection?: "forward" | "backward";
+    /**
+     * The customized autoplay start/stop button or selector.
+     * @defaultValue false
+     */
+    autoplayButton?: HTMLElement | string | false;
+    /**
+     * Output autoplayButton markup when autoplay is true but a customized autoplayButton is not provided.
+     * @defaultValue true
+     */
+    autoplayButtonOutput?: boolean;
+    /**
+     * Name of intro animation class.
+     * @defaultValue "tns-fadeIn"
+     */
+    animateIn?: string;
+    /**
+     * Name of outro animation class.
+     * @defaultValue "tns-fadeOut"
+     */
+    animateOut?: string;
+    /**
+     * Name of default animation class.
+     * @defaultValue "tns-normal"
+     */
+    animateNormal?: string;
+    /**
+     * Time between each gallery animation (in "ms").
+     * @defaultValue false
+     */
+    animateDelay?: number | false;
+    /**
+     * Moves throughout all the slides seamlessly.
+     * @defaultValue true
+     */
+    loop?: boolean;
+    /**
+     * Moves to the opposite edge when reaching the first or last slide.
+     * @defaultValue false
+     */
+    rewind?: boolean;
+    /**
+     * Breakpoint: Integer.
+     * Defines options for different viewport widths
+     * @defaultValue false
+     */
+    responsive?: ResponsiveOptions | false;
+    /**
+     * Enables lazyloading images that are currently not viewed, thus saving bandwidth
+     * @defaultValue false
+     */
+    lazyload?: boolean;
+    /**
+     * Swipe or drag will not be triggered if the angle is not inside the range when set.
+     * @defaultValue 15
+     */
+    swipeAngle?: number | boolean;
+    /**
+     * Difine the relationship between nested sliders.
+     * Make sure you run the inner slider first, otherwise the height of the inner slider container will be wrong.
+     * @defaultValue false
+     */
+    nested?: "inner" | "outer" | false;
+    /**
+     * Indicate whether the slider will be frozen (controls, nav, autoplay and other functions will stop work) when all slides can be displayed in one page.
+     * @defaultValue true
+     */
+    freezable?: boolean;
+    /**
+     * Callback to be run on initialization.
+     * @defaultValue false
+     */
+    onInit?: () => void | false;
+}
+
+export interface TinySliderInfo {
+    cloneCount: number;
+    container: HTMLElement;
+    controlsContainer?: boolean;
+    hasControls: boolean;
+    index: number;
+    indexCached: number;
+    items: number;
+    navContainer?: HTMLElement;
+    navCurrentIndex?: number;
+    navCurrentIndexCached?: number;
+    navItems?: HTMLCollection;
+    nextButton?: HTMLElement;
+    prevButton?: HTMLElement;
+    slideBy: number;
+    slideCount: number;
+    slideCountNew: number;
+    slideItems: HTMLCollection;
+    visibleNavIndexes?: number;
+    visibleNavIndexesCached?: number;
+}
+
+export interface TinySliderProps {
+    settings?: TinySliderSettings;
+    onClick?: (slideClicked: number, info: string, event: Event) => void;
+    startIndex?: number;
+    onIndexChanged?: (info: TinySliderInfo) => void;
+    onTransitionStart?: (info: TinySliderInfo) => void;
+    onTransitionEnd?: (info: TinySliderInfo) => void;
+    onTouchStart?: (info: TinySliderInfo) => void;
+    onTouchMove?: (info: TinySliderInfo) => void;
+    onTouchEnd?: (info: TinySliderInfo) => void;
+}
+
+declare class TinySlider extends React.Component<TinySliderProps> {}
+
+export default TinySlider;
diff --git a/types/tiny-slider-react/tiny-slider-react-tests.tsx b/types/tiny-slider-react/tiny-slider-react-tests.tsx
new file mode 100644
index 0000000000..29c7eb97c7
--- /dev/null
+++ b/types/tiny-slider-react/tiny-slider-react-tests.tsx
@@ -0,0 +1,28 @@
+import * as React from "react";
+import TinySlider, { TinySliderSettings, TinySliderInfo } from "tiny-slider-react";
+
+const settings: TinySliderSettings = {
+    startIndex: 1,
+    slideBy: "page",
+    speed: 60,
+    controlsText: ["yes", "no"],
+    nav: false,
+    autoplayText: ["start", "stop"],
+    arrowKeys: false,
+    disable: true,
+    mode: "gallery",
+    axis: "vertical",
+    responsive: {
+        600: {
+          startIndex: 3,
+          gutter: 5,
+          fixedWidth: false
+        }
+    }
+};
+
+function handleIndexChanged(info: TinySliderInfo) {
+  console.log(info.hasControls, info.slideCount);
+}
+
+const MyComponent = <TinySlider settings={settings} onIndexChanged={handleIndexChanged} />;
diff --git a/types/tiny-slider-react/tsconfig.json b/types/tiny-slider-react/tsconfig.json
new file mode 100644
index 0000000000..87076a05e3
--- /dev/null
+++ b/types/tiny-slider-react/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "tiny-slider-react-tests.tsx"
+    ]
+}
diff --git a/types/tiny-slider-react/tslint.json b/types/tiny-slider-react/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/tiny-slider-react/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/tracking/index.d.ts b/types/tracking/index.d.ts
index 5625a374b0..e1fc5691cb 100644
--- a/types/tracking/index.d.ts
+++ b/types/tracking/index.d.ts
@@ -8,10 +8,30 @@ declare namespace tracking {
     constructor(colours: string[]);
 
     static registerColor(name: string, predicate: (r: number, g: number, b: number) => boolean): void;
+
+    getColors(): string[];
+    getMinDimension(): number;
+    getMaxDimension(): number;
+    getMinGroupSize(): number;
+    setColors(colors: string[]): void;
+    setMinDimension(minDimension: number): void;
+    setMaxDimension(maxDimension: number): void;
+    setMinGroupSize(maxDimension: number): void;
   }
 
   export class ObjectTracker extends Tracker {
     constructor(objects: string[]);
+
+    getClassifiers(): number[];
+    getEdgesDensity(): number;
+    getInitialScale(): number;
+    getScaleFactor(): number;
+    getStepSize(): number;
+    setClassifiers(classifiers: number[]): void;
+    setEdgesDensity(edgesDensity: number): void;
+    setInitialScale(initialScale: number): void;
+    setScaleFactor(scaleFactor: number): void;
+    setStepSize(stepSize: number): void;
   }
 
   class Tracker {
diff --git a/types/trash/index.d.ts b/types/trash/index.d.ts
index 772b86c434..2da4838695 100644
--- a/types/trash/index.d.ts
+++ b/types/trash/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for trash 4.2
+// Type definitions for trash 4.3
 // Project: https://github.com/sindresorhus/trash#readme
 // Definitions by: Matthew James <https://github.com/matthew-matvei>
+//                 Keiichiro Amemiya <https://github.com/hoishin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface TrashOptions {
@@ -9,4 +10,4 @@ interface TrashOptions {
 
 declare function trash(iterable: Iterable<string>, opts?: TrashOptions): Promise<void>;
 
-export default trash;
+export = trash;
diff --git a/types/trash/trash-tests.ts b/types/trash/trash-tests.ts
index 88a29c80f4..d3722539ce 100644
--- a/types/trash/trash-tests.ts
+++ b/types/trash/trash-tests.ts
@@ -1,4 +1,4 @@
-import trash from "trash";
+import trash = require("trash");
 
 async function testTrashNoArgs() {
     await trash(["/path/to/item1", "/path/to/item2"]);
diff --git a/types/w3c-permissions/index.d.ts b/types/w3c-permissions/index.d.ts
new file mode 100644
index 0000000000..b7658c2e6c
--- /dev/null
+++ b/types/w3c-permissions/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for W3C Permissions API 1.0
+// Project: https://www.w3.org/TR/permissions/
+// Definitions by: Julien Bérubé <https://github.com/jberube>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// https://www.w3.org/TR/permissions/#permissions-interface
+declare class Permissions {
+    query(permissionDesc: PermissionDescriptor): Promise<PermissionStatus>;
+}
+
+// https://www.w3.org/TR/permissions/#status-of-a-permission
+type PermissionState = "granted" | "denied" | "prompt";
+
+// https://www.w3.org/TR/permissions/#permission-registry
+type PermissionName =
+    "geolocation" |
+    "notifications" |
+    "push" |
+    "midi" |
+    "camera" |
+    "microphone" |
+    "speaker" |
+    "device-info" |
+    "background-sync" |
+    "bluetooth" |
+    "persistent-storage" |
+    "ambient-light-sensor" |
+    "accelerometer" |
+    "gyroscope" |
+    "magnetometer" |
+    "clipboard";
+
+// https://www.w3.org/TR/permissions/#status-of-a-permission
+declare class PermissionStatus extends EventTarget {
+    readonly state: PermissionState;
+    onchange(): (this: this, ev: Event) => any;
+}
+
+// https://www.w3.org/TR/permissions/#permission-descriptor
+interface PermissionDescriptor {
+    name: string;
+}
+
+// https://www.w3.org/TR/permissions/#geolocation
+type GeolocationPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#notifications
+type NotificationsPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#push
+interface PushPermissionDescriptor extends PermissionDescriptor {
+    userVisibleOnly?: boolean;
+}
+
+// https://www.w3.org/TR/permissions/#midi
+interface MidiPermissionDescriptor extends PermissionDescriptor {
+    sysex: boolean;
+}
+
+// https://www.w3.org/TR/permissions/#media-devices
+interface DevicePermissionDescriptor extends PermissionDescriptor {
+    deviceId: string;
+}
+
+// https://www.w3.org/TR/permissions/#background-sync
+type BackgroundSyncPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#ambient-light-sensor
+type AmbientLightSensorPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#accelerometer
+type AccelerometerPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#gyroscope
+type GyroscopePermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#magnetometer
+type MagnetometerPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#clipboard
+type ClipboardPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#navigator-and-workernavigator-extension
+interface Navigator {
+    readonly permissions: Permissions;
+}
+
+// https://www.w3.org/TR/permissions/#navigator-and-workernavigator-extension
+interface WorkerNavigator {
+    readonly permissions: Permissions;
+}
diff --git a/types/w3c-permissions/tsconfig.json b/types/w3c-permissions/tsconfig.json
new file mode 100644
index 0000000000..1443bb27e1
--- /dev/null
+++ b/types/w3c-permissions/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "w3c-permissions-tests.ts"
+    ]
+}
diff --git a/types/w3c-permissions/tslint.json b/types/w3c-permissions/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/w3c-permissions/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/w3c-permissions/w3c-permissions-tests.ts b/types/w3c-permissions/w3c-permissions-tests.ts
new file mode 100644
index 0000000000..0cb878e2a7
--- /dev/null
+++ b/types/w3c-permissions/w3c-permissions-tests.ts
@@ -0,0 +1,45 @@
+// Modified from Permissions API spec: https://w3c.github.io/permissions/#examples
+// NOTE: Code kept as close to spec examples as possible
+
+// Example 3
+function showLocalNewsWithGeolocation() {}
+function showButtonToEnableLocalNews() {}
+
+const test = navigator.permissions.query({ name: "geolocation" }).then(({ state }) => {
+    switch (state) {
+      case "granted":
+        showLocalNewsWithGeolocation();
+        break;
+      case "prompt":
+        showButtonToEnableLocalNews();
+        break;
+      default:
+        // Don’t do anything if the permission was denied.
+        break;
+    }
+});
+
+// Example 4
+function updateNotificationButton(state: PermissionState) {
+    const button = document.getElementById('chat-notification-button');
+    if (button) {
+        button.setAttribute('disabled', state === 'denied' ? 'disabled' : '');
+    }
+}
+
+navigator.permissions.query({ name: 'notifications' }).then((result) => {
+    updateNotificationButton(result.state);
+    result.addEventListener('change', () => {
+        updateNotificationButton(result.state);
+    });
+});
+
+// Example 5
+Promise.all([
+    navigator.permissions.query({ name: "geolocation" }),
+    navigator.permissions.query({ name: "notifications" })
+])
+.then(([{ state: geoState }, { state: notifState }]) => {
+    console.log("Geolocation permission state is:", geoState);
+    console.log("Notifications permission state is:", notifState);
+});
diff --git a/types/webidl2/index.d.ts b/types/webidl2/index.d.ts
index 0dd0cc7f10..9992642749 100644
--- a/types/webidl2/index.d.ts
+++ b/types/webidl2/index.d.ts
@@ -33,7 +33,8 @@ export interface WebIDLParseError {
 
 // tslint:disable-next-line interface-name
 export interface IDLTypeDescription {
-    type: string;
+    /** String indicating where this type is used. Can be null if not applicable. */
+    type: string | null;
     /** Boolean indicating if it is a sequence. Same as generic === "sequence" */
     sequence: boolean;
     /** String indicating the generic type (e.g. "Promise", "sequence"). null otherwise. */
@@ -191,7 +192,7 @@ export interface OperationMemberType {
     /** The name of the operation. If a stringifier, may be null. */
     name: string | null;
     /** An array of arguments for the operation. */
-    arguments: Argument[] | null;
+    arguments: Argument[];
     /** A list of extended attributes. */
     extAttrs: ExtendedAttributes[];
 }
@@ -218,8 +219,8 @@ export interface ConstantMemberType {
     type: "const";
     /** Whether its type is nullable. */
     nullable: boolean;
-    /** The type of the constant (a simple type, the type name). */
-    idlType: string;
+    /** An IDL Type of the constant that represents a simple type, the type name. */
+    idlType: IDLTypeDescription;
     /** The name of the constant. */
     name: string;
     /** The constant value */
diff --git a/types/webidl2/webidl2-tests.ts b/types/webidl2/webidl2-tests.ts
index 61b437f563..a1c3165edf 100644
--- a/types/webidl2/webidl2-tests.ts
+++ b/types/webidl2/webidl2-tests.ts
@@ -64,23 +64,27 @@ function logMembers(members: webidl2.IDLInterfaceMemberType[]) {
                 break;
             case "const":
                 console.log(member.name);
+                logIdlType(member.idlType);
                 console.log(member.value);
                 console.log(member.nullable);
                 break;
             case "iterable":
                 console.log(member.readonly);
+                member.idlType.forEach(logIdlType);
                 break;
             case "legacyiterable":
                 console.log(member.readonly);
+                member.idlType.forEach(logIdlType);
                 break;
             case "setlike":
                 console.log(member.readonly);
+                member.idlType.forEach(logIdlType);
                 break;
             case "maplike":
                 console.log(member.readonly);
+                member.idlType.forEach(logIdlType);
                 break;
         }
-        logIdlType(member.idlType);
         logExtAttrs(member.extAttrs);
     }
 }
@@ -120,7 +124,13 @@ function logArguments(args: webidl2.Argument[]) {
     }
 }
 
-function logIdlType(idlType: string | webidl2.IDLTypeDescription | webidl2.IDLTypeDescription[] | null) {
+function logIdlType(idlType: webidl2.IDLTypeDescription) {
+    console.log(idlType.type);
+    console.log(idlType.generic, idlType.nullable, idlType.sequence, idlType.union);
+    logSubIdlType(idlType.idlType);
+}
+
+function logSubIdlType(idlType: string | webidl2.IDLTypeDescription | webidl2.IDLTypeDescription[] | null) {
     if (!idlType) {
         return;
     }
@@ -130,15 +140,9 @@ function logIdlType(idlType: string | webidl2.IDLTypeDescription | webidl2.IDLTy
     }
     if (Array.isArray(idlType)) {
         for (const t of idlType) {
-            logEachType(t);
+            logIdlType(t);
         }
         return;
     }
-    logEachType(idlType);
-
-    function logEachType(t: webidl2.IDLTypeDescription) {
-        console.log(t.type);
-        console.log(t.generic, t.nullable, t.sequence, t.union);
-        logIdlType(t.idlType);
-    }
+    logIdlType(idlType);
 }
diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 9c9239e5ea..2277ec2867 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -134,7 +134,7 @@ declare namespace webpack {
     }
 
     interface Output {
-        /** The output directory as absolute path (required). */
+        /** The output directory as absolute path. */
         path?: string;
         /** The filename of the entry chunk as relative path inside the output.path directory. */
         filename?: string;
@@ -190,8 +190,14 @@ declare namespace webpack {
         sourcePrefix?: string;
         /** This option enables cross-origin loading of chunks. */
         crossOriginLoading?: string | boolean;
+        /** The encoding to use when generating the hash, defaults to 'hex' */
+        hashDigest?: 'hex' | 'latin1' | 'base64';
+        /** The prefix length of the hash digest to use, defaults to 20. */
+        hashDigestLength?: number;
         /** Algorithm used for generation the hash (see node.js crypto package) */
         hashFunction?: string | ((algorithm: string, options?: any) => any);
+        /** An optional salt to update the hash via Node.JS' hash.update. */
+        hashSalt?: string;
         /** An expression which is used to address the global object/scope in runtime code. */
         globalObject?: string;
     }
diff --git a/types/webpack/v3/index.d.ts b/types/webpack/v3/index.d.ts
index d6102808b6..7f943d4151 100644
--- a/types/webpack/v3/index.d.ts
+++ b/types/webpack/v3/index.d.ts
@@ -126,9 +126,9 @@ declare namespace webpack {
     }
 
     interface Output {
-        /** The output directory as absolute path (required). */
+        /** The output directory as absolute path */
         path?: string;
-        /** The filename of the entry chunk as relative path inside the output.path directory. */
+        /** (Required) The filename of the entry chunk as relative path inside the output.path directory. */
         filename?: string;
         /** The filename of non-entry chunks as relative path inside the output.path directory. */
         chunkFilename?: string;
@@ -182,6 +182,14 @@ declare namespace webpack {
         sourcePrefix?: string;
         /** This option enables cross-origin loading of chunks. */
         crossOriginLoading?: string | boolean;
+        /** The encoding to use when generating the hash, defaults to 'hex' */
+        hashDigest?: 'hex' | 'latin1' | 'base64';
+        /** The prefix length of the hash digest to use, defaults to 20. */
+        hashDigestLength?: number;
+        /** Algorithm used for generation the hash (see node.js crypto package) */
+        hashFunction?: string | ((algorithm: string, options?: any) => any);
+        /** An optional salt to update the hash via Node.JS' hash.update. */
+        hashSalt?: string;
     }
 
     interface BaseModule {
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index d6bd908357..8fe0ab1e4d 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -100,7 +100,9 @@ configuration = {
         path: path.join(__dirname, "assets", "[hash]"),
         publicPath: "assets/[hash]/",
         filename: "output.[hash].bundle.js",
-        chunkFilename: "[id].[hash].bundle.js"
+        chunkFilename: "[id].[hash].bundle.js",
+        hashFunction: 'sha256',
+        hashDigestLength: 64,
     }
 };
 
diff --git a/types/wicg-mediasession/index.d.ts b/types/wicg-mediasession/index.d.ts
index ac08c8ef4f..05a769b2a2 100644
--- a/types/wicg-mediasession/index.d.ts
+++ b/types/wicg-mediasession/index.d.ts
@@ -19,10 +19,10 @@ interface MediaSession {
   // Current media session playback state.
   playbackState: MediaSessionPlaybackState;
   // Current media session meta data.
-  metadata?: MediaMetadata|null;
+  metadata: MediaMetadata|null;
 
   // Set/Unset actions handlers.
-  setActionHandler(action: MediaSessionAction, listener?: () => void): void;
+  setActionHandler(action: MediaSessionAction, listener: (() => void)|null): void;
 }
 
 interface MediaImage {
diff --git a/types/yallist/index.d.ts b/types/yallist/index.d.ts
index 8a89697d82..11e2462a74 100644
--- a/types/yallist/index.d.ts
+++ b/types/yallist/index.d.ts
@@ -58,6 +58,7 @@ declare namespace Yallist {
     interface Node<T> {
         prev: Node<T> | null;
         next: Node<T> | null;
+        value: T;
         list?: Yallist<T>;
     }
 }
diff --git a/types/yallist/yallist-tests.ts b/types/yallist/yallist-tests.ts
index 69099c0da9..ffdef9ad79 100644
--- a/types/yallist/yallist-tests.ts
+++ b/types/yallist/yallist-tests.ts
@@ -115,3 +115,4 @@ new Yallist.Node('foo', node, node, myList);
 node.list; // $ExpectType Yallist<string> | undefined
 node.next; // $ExpectType Node<string> | null
 node.prev; // $ExpectType Node<string> | null
+node.value; // $ExpectType string