Here is the page using a header template< / h2 >\n"
+ "{{#def.header}}\n"
+ "{{=it.name}}";
-var customizableheadertmpl = "{{#def.header}}"
+const customizableheadertmpl = "{{#def.header}}"
+ "\n{{#def.mycustominjectionintoheader || ''} }";
-var pagetmplwithcustomizableheader = "Here is the page with customized header template
\n"
+const pagetmplwithcustomizableheader = "Here is the page with customized header template
\n"
+ "{{##def.mycustominjectionintoheader:\n"
+ "
{{=it.title}} is not {{=it.name}}
\n"
+ "#}}\n"
+ "{{#def.customheader}}\n"
+ "{{=it.name}}";
-var def = {
+const def = {
header: headertmpl,
customheader: customizableheadertmpl
};
-var data = {
+const data = {
title: "My title",
name: "My name"
};
-var pagefn = doT.template(pagetmpl, undefined, def);
-var content = pagefn(data);
+let pagefn = doT.template(pagetmpl, undefined, def);
+const content = pagefn(data);
pagefn = doT.template(pagetmplwithcustomizableheader, undefined, def);
-var contentcustom = pagefn(data);
+const contentcustom = pagefn(data);
diff --git a/types/electron/index.d.ts b/types/electron/index.d.ts
index 11103b3a18..6e257c4261 100644
--- a/types/electron/index.d.ts
+++ b/types/electron/index.d.ts
@@ -1264,7 +1264,7 @@ declare namespace Electron {
* Sets the menu as the window top menu.
* Note: This API is not available on macOS.
*/
- setMenu(menu: Menu): void;
+ setMenu(menu: Menu | null): void;
/**
* Sets the progress value in the progress bar.
* On Linux platform, only supports Unity desktop environment, you need to
diff --git a/types/electron/test/main.ts b/types/electron/test/main.ts
index 35a85a81dc..67a1a9954d 100644
--- a/types/electron/test/main.ts
+++ b/types/electron/test/main.ts
@@ -145,6 +145,9 @@ app.on('ready', () => {
mainWindow.webContents.capturePage({x: 0, y: 0, width: 100, height: 200}, image => {
console.log(image.toPNG());
});
+
+ mainWindow.setMenu(null);
+ mainWindow.setMenu(Menu.buildFromTemplate([]));
});
app.commandLine.appendSwitch('enable-web-bluetooth');
diff --git a/types/falcor/index.d.ts b/types/falcor/index.d.ts
index 1bf3c9ba23..44d9118ca2 100644
--- a/types/falcor/index.d.ts
+++ b/types/falcor/index.d.ts
@@ -41,26 +41,22 @@ export {
* DataSources may retrieve JSON Graph information from anywhere, including device memory, a remote machine, or even a lazily-run computation.
**/
export abstract class DataSource {
-
/**
* The get method retrieves values from the DataSource's associated JSONGraph object.
**/
get(pathSets: PathSet[]): Observable;
-
/**
* The set method accepts values to set in the DataSource's associated JSONGraph object.
**/
set(jsonGraphEnvelope: JSONGraphEnvelope): Observable;
-
/**
* Invokes a function in the DataSource's JSONGraph object.
**/
call(functionPath: Path, args?: any[], refSuffixes?: PathSet[], thisPaths?: PathSet[]): Observable;
}
-
/////////////////////////////////////////////////////
// Model
/////////////////////////////////////////////////////
@@ -215,7 +211,6 @@ export class Model {
getPath(): Path;
}
-
/////////////////////////////////////////////////////
// ModelResponse
/////////////////////////////////////////////////////
@@ -232,13 +227,11 @@ interface Thenable {
then(onFulfilled?: (value: T) => U | Thenable, onRejected?: (error: any) => U | Thenable | void): Thenable;
}
-
/////////////////////////////////////////////////////
// Observable
/////////////////////////////////////////////////////
export class Observable{
-
/**
* The forEach method is a synonym for {@link Observable.prototype.subscribe} and triggers the execution of the Observable, causing the values within to be pushed to a callback.
* An Observable is like a pipe of water that is closed.
diff --git a/types/falcor/test/browser.ts b/types/falcor/test/browser.ts
index 073d777679..d2390f107d 100644
--- a/types/falcor/test/browser.ts
+++ b/types/falcor/test/browser.ts
@@ -1,6 +1,4 @@
-
-
-var model = new falcor.Model({source: new falcor.HttpDataSource('/model.json')});
+const model = new falcor.Model({source: new falcor.HttpDataSource('/model.json')});
model.get('greeting').then(response => {
document.write(response.json.greeting);
@@ -15,4 +13,3 @@ model.set({
});
model.set(falcor.pathValue('greeting', 'Hello, world'));
-
diff --git a/types/falcor/test/index.ts b/types/falcor/test/index.ts
index 2798b72645..8eea62b2f2 100644
--- a/types/falcor/test/index.ts
+++ b/types/falcor/test/index.ts
@@ -127,4 +127,3 @@ subscription.dispose();
modelResponse.then(res => res.json.items.length);
modelResponse.then(res => res, error => console.error.bind(error));
modelResponse.then(res => res.json.items.length).then((l: number) => l + 1);
-
diff --git a/types/fetch-jsonp/fetch-jsonp-tests.ts b/types/fetch-jsonp/fetch-jsonp-tests.ts
index 058f47e70c..6a0d58f513 100644
--- a/types/fetch-jsonp/fetch-jsonp-tests.ts
+++ b/types/fetch-jsonp/fetch-jsonp-tests.ts
@@ -4,45 +4,45 @@ import * as fetchJsonp from 'fetch-jsonp';
fetchJsonp('/users.jsonp')
.then(function(response) {
- return response.json()
+ return response.json();
}).then(function(json) {
- console.log('parsed json', json)
+ console.log('parsed json', json);
}).catch(function(ex) {
- console.log('parsing failed', ex)
- })
+ console.log('parsing failed', ex);
+ });
fetchJsonp('/users.jsonp', {
jsonpCallback: 'custom_callback'
})
.then(function(response) {
- return response.json()
+ return response.json();
}).then(function(json) {
- console.log('parsed json', json)
+ console.log('parsed json', json);
}).catch(function(ex) {
- console.log('parsing failed', ex)
- })
+ console.log('parsing failed', ex);
+ });
fetchJsonp('/users.jsonp', {
timeout: 3000,
jsonpCallback: 'custom_callback'
})
.then(function(response) {
- return response.json()
+ return response.json();
}).then(function(json) {
- console.log('parsed json', json)
+ console.log('parsed json', json);
}).catch(function(ex) {
- console.log('parsing failed', ex)
- })
+ console.log('parsing failed', ex);
+ });
// Taken from https://github.com/camsong/fetch-jsonp/blob/v1.0.2/examples/index.html
-var result = fetchJsonp('http://www.flickr.com/services/feeds/photos_public.gne?format=json', {
+const result = fetchJsonp('http://www.flickr.com/services/feeds/photos_public.gne?format=json', {
jsonpCallback: 'jsoncallback',
timeout: 3000
-})
+});
result.then(function(response) {
- return response.json()
+ return response.json();
}).then(function(json) {
document.body.innerHTML = JSON.stringify(json);
})['catch'](function(ex) {
document.body.innerHTML = 'failed:' + ex;
-})
+});
diff --git a/types/firmata/firmata-tests.ts b/types/firmata/firmata-tests.ts
index 5e1eab09cb..d50160e2dd 100644
--- a/types/firmata/firmata-tests.ts
+++ b/types/firmata/firmata-tests.ts
@@ -1,42 +1,33 @@
-import * as Board from 'firmata'
+import * as Board from 'firmata';
-function test_basic_board()
-{
- let board = new Board('');
+function test_basic_board() {
+ const board = new Board('');
}
-function test_board_with_callback()
-{
- let board = new Board('', (error: any) =>
- {
+function test_board_with_callback() {
+ const board = new Board('', (error: any) => {
board.pinMode(13, board.MODES.OUTPUT);
board.pinMode(12, Board.PIN_MODE.OUTPUT);
});
}
-function test_board_with_listener()
-{
- let board = new Board('');
+function test_board_with_listener() {
+ const board = new Board('');
- board.on('ready', () =>
- {
+ board.on('ready', () => {
board.pinMode(13, board.MODES.OUTPUT);
board.pinMode(12, Board.PIN_MODE.OUTPUT);
});
}
-function test_class_extension()
-{
- class MyBoard extends Board
- {
- Disconnect()
- {
+function test_class_extension() {
+ class MyBoard extends Board {
+ Disconnect() {
this.transport.close((error: any) => {});
}
}
- let myBoard: MyBoard = new MyBoard('', () =>
- {
+ const myBoard: MyBoard = new MyBoard('', () => {
myBoard.Disconnect();
});
-}
\ No newline at end of file
+}
diff --git a/types/firmata/index.d.ts b/types/firmata/index.d.ts
index 4bda44d3f9..a24fae435b 100644
--- a/types/firmata/index.d.ts
+++ b/types/firmata/index.d.ts
@@ -5,7 +5,7 @@
///
-import * as SerialPort from 'serialport'
+import * as SerialPort from 'serialport';
export = Board;
@@ -15,8 +15,7 @@ export = Board;
* This is a starting point that appeared to work fine for months within a project of my company, but I give no
* guarantee that it cannot be improved.
*/
-declare class Board extends NodeJS.EventEmitter
-{
+declare class Board extends NodeJS.EventEmitter {
constructor(serialPort: string, callback?: (error: any) => void)
MODES: Board.PinModes;
STEPPER: Board.StepperConstants;
@@ -84,7 +83,11 @@ declare class Board extends NodeJS.EventEmitter
// TODO untested --- TWW
sendOneWireDelay(pin: number, delay: number): void
// TODO untested --- TWW
- sendOneWireWriteAndRead(pin: number, device: number, data: number|number[], numBytesToRead: number,
+ sendOneWireWriteAndRead(
+ pin: number,
+ device: number,
+ data: number|number[],
+ numBytesToRead: number,
callback: (error?: Error, data?: number) => void): void
setSamplingInterval(interval: number): void
getSamplingInterval(): number
@@ -92,124 +95,165 @@ declare class Board extends NodeJS.EventEmitter
reportDigitalPin(pin: number, value: Board.REPORTING): void
// TODO untested/incomplete --- TWW
pingRead(opts: any, callback: () => void): void
- stepperConfig(deviceNum: number, type: number, stepsPerRev: number, dirOrMotor1Pin: number,
- stepOrMotor2Pin: number, motor3Pin?: number, motor4Pin?: number): void
- stepperStep(deviceNum: number, direction: Board.STEPPER_DIRECTION, steps: number, speed: number,
- accel: number|((bool?: boolean) => void), decel?: number, callback?: (bool?: boolean) => void): void
+ stepperConfig(
+ deviceNum: number,
+ type: number,
+ stepsPerRev: number,
+ dirOrMotor1Pin: number,
+ stepOrMotor2Pin: number,
+ motor3Pin?: number,
+ motor4Pin?: number): void
+ stepperStep(
+ deviceNum: number,
+ direction: Board.STEPPER_DIRECTION,
+ steps: number,
+ speed: number,
+ accel: number|((bool?: boolean) => void),
+ decel?: number,
+ callback?: (bool?: boolean) => void): void;
// TODO untested --- TWW
- serialConfig(options: { portId: Board.SERIAL_PORT_ID, baud: number, rxPin?: number, txPin?: number }): void
+ serialConfig(options: { portId: Board.SERIAL_PORT_ID, baud: number, rxPin?: number, txPin?: number }): void;
// TODO untested --- TWW
- serialWrite(portId: Board.SERIAL_PORT_ID, inBytes: number[]): void
+ serialWrite(portId: Board.SERIAL_PORT_ID, inBytes: number[]): void;
// TODO untested --- TWW
- serialRead(portId: Board.SERIAL_PORT_ID, maxBytesToRead: number, callback: () => void): void
+ serialRead(portId: Board.SERIAL_PORT_ID, maxBytesToRead: number, callback: () => void): void;
// TODO untested --- TWW
- serialStop(portId: Board.SERIAL_PORT_ID): void
+ serialStop(portId: Board.SERIAL_PORT_ID): void;
// TODO untested --- TWW
- serialClose(portId: Board.SERIAL_PORT_ID): void
+ serialClose(portId: Board.SERIAL_PORT_ID): void;
// TODO untested --- TWW
- serialFlush(portId: Board.SERIAL_PORT_ID): void
+ serialFlush(portId: Board.SERIAL_PORT_ID): void;
// TODO untested --- TWW
- serialListen(portId: Board.SERIAL_PORT_ID): void
+ serialListen(portId: Board.SERIAL_PORT_ID): void;
// TODO untested --- TWW
- sysexResponse(commandByte: number, handler: (data: number[]) => void): void
+ sysexResponse(commandByte: number, handler: (data: number[]) => void): void;
// TODO untested --- TWW
- sysexCommand(message: number[]): void
- reset(): void
- static isAcceptablePort(port: Board.Port): boolean
- static requestPort(callback: (error: any, port: Board.Port) => any): void
+ sysexCommand(message: number[]): void;
+ reset(): void;
+ static isAcceptablePort(port: Board.Port): boolean;
+ static requestPort(callback: (error: any, port: Board.Port) => any): void;
// TODO untested --- TWW
- static encode(data: number[]): number[]
+ static encode(data: number[]): number[];
// TODO untested --- TWW
- static decode(data: number[]): number[]
+ static decode(data: number[]): number[];
// TODO untested/incomplete --- TWW
- protected _sendOneWireSearch(type: any, event: any, pin: number, callback: () => void): void
+ protected _sendOneWireSearch(type: any, event: any, pin: number, callback: () => void): void;
// TODO untested/incomplete --- TWW
- protected _sendOneWireRequest(pin: number, subcommand: any, device: any, numBytesToRead: any, correlationId: any,
- delay: number, dataToWrite: any, event: any, callback: () => void): void
+ protected _sendOneWireRequest(
+ pin: number,
+ subcommand: any,
+ device: any,
+ numBytesToRead: any,
+ correlationId: any,
+ delay: number,
+ dataToWrite: any,
+ event: any, callback: () => void): void;
}
-declare namespace Board
-{
- export interface PinModes
- {
- INPUT: PIN_MODE, OUTPUT: PIN_MODE, ANALOG: PIN_MODE, PWM: PIN_MODE, SERVO: PIN_MODE, SHIFT: PIN_MODE,
- I2C: PIN_MODE, ONEWIRE: PIN_MODE, STEPPER: PIN_MODE, SERIAL: PIN_MODE, PULLUP: PIN_MODE, IGNORE: PIN_MODE,
- PING_READ: PIN_MODE, UNKOWN: PIN_MODE
+declare namespace Board {
+ interface PinModes {
+ INPUT: PIN_MODE;
+ OUTPUT: PIN_MODE;
+ ANALOG: PIN_MODE;
+ PWM: PIN_MODE;
+ SERVO: PIN_MODE;
+ SHIFT: PIN_MODE;
+ I2C: PIN_MODE;
+ ONEWIRE: PIN_MODE;
+ STEPPER: PIN_MODE;
+ SERIAL: PIN_MODE;
+ PULLUP: PIN_MODE;
+ IGNORE: PIN_MODE;
+ PING_READ: PIN_MODE;
+ UNKOWN: PIN_MODE;
}
- export interface StepperConstants
- {
- TYPE: { DRIVER: STEPPER_TYPE, TWO_WIRE: STEPPER_TYPE, FOUR_WIRE: STEPPER_TYPE },
+ interface StepperConstants {
+ TYPE: {
+ DRIVER: STEPPER_TYPE,
+ TWO_WIRE: STEPPER_TYPE,
+ FOUR_WIRE: STEPPER_TYPE,
+ };
RUNSTATE: {
- STOP: STEPPER_RUN_STATE, ACCEL: STEPPER_RUN_STATE, DECEL: STEPPER_RUN_STATE, RUN: STEPPER_RUN_STATE
- },
- DIRECTION: { CCW: STEPPER_DIRECTION, CW: STEPPER_DIRECTION }
+ STOP: STEPPER_RUN_STATE,
+ ACCEL: STEPPER_RUN_STATE,
+ DECEL: STEPPER_RUN_STATE,
+ RUN: STEPPER_RUN_STATE,
+ };
+ DIRECTION: { CCW: STEPPER_DIRECTION, CW: STEPPER_DIRECTION };
}
// tslint:disable-next-line interface-name
- export interface I2cModes
- {
- WRITE: I2C_MODE, READ: I2C_MODE, CONTINUOUS_READ: I2C_MODE, STOP_READING: I2C_MODE
+ interface I2cModes {
+ WRITE: I2C_MODE;
+ READ: I2C_MODE;
+ CONTINUOUS_READ: I2C_MODE;
+ STOP_READING: I2C_MODE;
}
- export interface SerialModes
- {
- CONTINUOUS_READ: SERIAL_MODE, STOP_READING: SERIAL_MODE
+ interface SerialModes {
+ CONTINUOUS_READ: SERIAL_MODE;
+ STOP_READING: SERIAL_MODE;
}
- export interface SerialPortIds
- {
- HW_SERIAL0: SERIAL_PORT_ID, HW_SERIAL1: SERIAL_PORT_ID, HW_SERIAL2: SERIAL_PORT_ID,
- HW_SERIAL3: SERIAL_PORT_ID, SW_SERIAL0: SERIAL_PORT_ID, SW_SERIAL1: SERIAL_PORT_ID,
- SW_SERIAL2: SERIAL_PORT_ID, SW_SERIAL3: SERIAL_PORT_ID, DEFAULT: SERIAL_PORT_ID,
+ interface SerialPortIds {
+ HW_SERIAL0: SERIAL_PORT_ID;
+ HW_SERIAL1: SERIAL_PORT_ID;
+ HW_SERIAL2: SERIAL_PORT_ID;
+ HW_SERIAL3: SERIAL_PORT_ID;
+ SW_SERIAL0: SERIAL_PORT_ID;
+ SW_SERIAL1: SERIAL_PORT_ID;
+ SW_SERIAL2: SERIAL_PORT_ID;
+ SW_SERIAL3: SERIAL_PORT_ID;
+ DEFAULT: SERIAL_PORT_ID;
}
- export interface SerialPinTypes
- {
- RES_RX0: SERIAL_PIN_TYPE, RES_TX0: SERIAL_PIN_TYPE, RES_RX1: SERIAL_PIN_TYPE, RES_TX1: SERIAL_PIN_TYPE,
- RES_RX2: SERIAL_PIN_TYPE, RES_TX2: SERIAL_PIN_TYPE, RES_RX3: SERIAL_PIN_TYPE, RES_TX3: SERIAL_PIN_TYPE,
+ interface SerialPinTypes {
+ RES_RX0: SERIAL_PIN_TYPE;
+ RES_TX0: SERIAL_PIN_TYPE;
+ RES_RX1: SERIAL_PIN_TYPE;
+ RES_TX1: SERIAL_PIN_TYPE;
+ RES_RX2: SERIAL_PIN_TYPE;
+ RES_TX2: SERIAL_PIN_TYPE;
+ RES_RX3: SERIAL_PIN_TYPE;
+ RES_TX3: SERIAL_PIN_TYPE;
}
- export interface Pins
- {
- mode: PIN_MODE,
- value: PIN_STATE|number,
- supportedModes: PIN_MODE[],
- analogChannel: number,
- report: REPORTING,
- state: PIN_STATE|PULLUP_STATE, // TODO not sure if this exists anymore... --- TWW
+ interface Pins {
+ mode: PIN_MODE;
+ value: PIN_STATE | number;
+ supportedModes: PIN_MODE[];
+ analogChannel: number;
+ report: REPORTING;
+ state: PIN_STATE | PULLUP_STATE; // TODO not sure if this exists anymore... --- TWW
}
- export interface Firmware
- {
- name: string,
- version: Version,
+ interface Firmware {
+ name: string;
+ version: Version;
}
- export interface Settings
- {
- reportVersionTimeout: number,
- samplingInterval: number,
+ interface Settings {
+ reportVersionTimeout: number;
+ samplingInterval: number;
serialport: {
baudRate: number,
- bufferSize: number
- }
+ bufferSize: number,
+ };
}
- export interface Port
- {
- comName: string,
+ interface Port {
+ comName: string;
}
- export interface Version
- {
- major: number,
- minor: number
+ interface Version {
+ major: number;
+ minor: number;
}
// TODO these enums could actually be non-const in the future (provides some benefits) --- TWW
// https://github.com/firmata/firmata.js/blob/v0.15.0/lib/firmata.js#L449-L464
- export const enum PIN_MODE {
+ const enum PIN_MODE {
INPUT = 0x00,
OUTPUT = 0x01,
ANALOG = 0x02,
@@ -226,30 +270,30 @@ declare namespace Board
UNKNOWN = 0x10,
}
- export const enum PIN_STATE {
+ const enum PIN_STATE {
LOW = 0,
HIGH = 1
}
- export const enum REPORTING {
+ const enum REPORTING {
ON = 1,
OFF = 0,
}
- export const enum PULLUP_STATE {
+ const enum PULLUP_STATE {
ENABLED = 1,
DISABLED = 0,
}
// https://github.com/firmata/firmata.js/blob/v0.15.0/lib/firmata.js#L474-L478
- export const enum STEPPER_TYPE {
+ const enum STEPPER_TYPE {
DRIVER = 1,
TWO_WIRE = 2,
FOUR_WIRE = 4,
}
// https://github.com/firmata/firmata.js/blob/v0.15.0/lib/firmata.js#L479-L484
- export const enum STEPPER_RUN_STATE {
+ const enum STEPPER_RUN_STATE {
STOP = 0,
ACCEL = 1,
DECEL = 2,
@@ -257,13 +301,13 @@ declare namespace Board
}
// https://github.com/firmata/firmata.js/blob/v0.15.0/lib/firmata.js#L485-L488
- export const enum STEPPER_DIRECTION {
+ const enum STEPPER_DIRECTION {
CCW = 0,
CW = 1,
}
// https://github.com/firmata/firmata.js/blob/v0.15.0/lib/firmata.js#L466-L471
- export const enum I2C_MODE {
+ const enum I2C_MODE {
WRITE = 0,
READ = 1,
CONTINUOUS_READ = 2,
@@ -271,13 +315,13 @@ declare namespace Board
}
// https://github.com/firmata/firmata.js/blob/v0.15.0/lib/firmata.js#L491-L494
- export const enum SERIAL_MODE {
+ const enum SERIAL_MODE {
CONTINUOUS_READ = 0x00,
STOP_READING = 0x01,
}
// https://github.com/firmata/firmata.js/blob/v0.15.0/lib/firmata.js#L497-L512
- export const enum SERIAL_PORT_ID {
+ const enum SERIAL_PORT_ID {
HW_SERIAL0 = 0x00,
HW_SERIAL1 = 0x01,
HW_SERIAL2 = 0x02,
@@ -290,7 +334,7 @@ declare namespace Board
}
// https://github.com/firmata/firmata.js/blob/v0.15.0/lib/firmata.js#L515-L524
- export const enum SERIAL_PIN_TYPE {
+ const enum SERIAL_PIN_TYPE {
RES_RX0 = 0x00,
RES_TX0 = 0x01,
RES_RX1 = 0x02,
@@ -300,4 +344,4 @@ declare namespace Board
RES_RX3 = 0x06,
RES_TX3 = 0x07,
}
-}
\ No newline at end of file
+}
diff --git a/types/flatpickr/flatpickr-tests.ts b/types/flatpickr/flatpickr-tests.ts
index 9f0211c79d..f6800e38b7 100644
--- a/types/flatpickr/flatpickr-tests.ts
+++ b/types/flatpickr/flatpickr-tests.ts
@@ -12,4 +12,3 @@ if (input != null) {
}
picker1.destroy();
-
diff --git a/types/freeport/freeport-tests.ts b/types/freeport/freeport-tests.ts
index d64a72f496..2746aeb4ed 100644
--- a/types/freeport/freeport-tests.ts
+++ b/types/freeport/freeport-tests.ts
@@ -1,4 +1,3 @@
-
import freeport = require('freeport');
let num: number,
diff --git a/types/fusioncharts/fusioncharts-tests.ts b/types/fusioncharts/fusioncharts-tests.ts
index af71a2378a..ad6afac65b 100644
--- a/types/fusioncharts/fusioncharts-tests.ts
+++ b/types/fusioncharts/fusioncharts-tests.ts
@@ -4,9 +4,7 @@ FusionCharts.addEventListener('ready', (eventObject) => {
eventObject.stopPropagation();
});
-FusionCharts.ready((fusioncharts) => {
-
-});
+FusionCharts.ready((fusioncharts) => {});
FusionCharts.version;
@@ -48,4 +46,4 @@ chart.clone();
chart.zoomTo(0, 3);
chart.zoomOut();
chart.setJSONData(chartData);
-chart.ref;
\ No newline at end of file
+chart.ref;
diff --git a/types/fusioncharts/fusioncharts.charts.d.ts b/types/fusioncharts/fusioncharts.charts.d.ts
index f06060a054..82a41f7333 100644
--- a/types/fusioncharts/fusioncharts.charts.d.ts
+++ b/types/fusioncharts/fusioncharts.charts.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var charts: (H: FusionChartStatic) => FusionChartStatic;
export = charts;
export as namespace charts;
-
diff --git a/types/fusioncharts/fusioncharts.gantt.d.ts b/types/fusioncharts/fusioncharts.gantt.d.ts
index d29fa26f78..e9dd4cfccf 100644
--- a/types/fusioncharts/fusioncharts.gantt.d.ts
+++ b/types/fusioncharts/fusioncharts.gantt.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var gantt: (H: FusionChartStatic) => FusionChartStatic;
export = gantt;
export as namespace gantt;
-
diff --git a/types/fusioncharts/fusioncharts.maps.d.ts b/types/fusioncharts/fusioncharts.maps.d.ts
index 1894383758..48c5869608 100644
--- a/types/fusioncharts/fusioncharts.maps.d.ts
+++ b/types/fusioncharts/fusioncharts.maps.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var maps: (H: FusionChartStatic) => FusionChartStatic;
export = maps;
export as namespace maps;
-
diff --git a/types/fusioncharts/fusioncharts.powercharts.d.ts b/types/fusioncharts/fusioncharts.powercharts.d.ts
index 46178c8b8f..e2004e8423 100644
--- a/types/fusioncharts/fusioncharts.powercharts.d.ts
+++ b/types/fusioncharts/fusioncharts.powercharts.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var powercharts: (H: FusionChartStatic) => FusionChartStatic;
export = powercharts;
export as namespace powercharts;
-
diff --git a/types/fusioncharts/fusioncharts.ssgrid.d.ts b/types/fusioncharts/fusioncharts.ssgrid.d.ts
index b44f5336c1..fb7c2d51a2 100644
--- a/types/fusioncharts/fusioncharts.ssgrid.d.ts
+++ b/types/fusioncharts/fusioncharts.ssgrid.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var ssgrid: (H: FusionChartStatic) => FusionChartStatic;
export = ssgrid;
export as namespace ssgrid;
-
diff --git a/types/fusioncharts/fusioncharts.treemap.d.ts b/types/fusioncharts/fusioncharts.treemap.d.ts
index c555a627bc..146c8b8b54 100644
--- a/types/fusioncharts/fusioncharts.treemap.d.ts
+++ b/types/fusioncharts/fusioncharts.treemap.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var treemap: (H: FusionChartStatic) => FusionChartStatic;
export = treemap;
export as namespace treemap;
-
diff --git a/types/fusioncharts/fusioncharts.widgets.d.ts b/types/fusioncharts/fusioncharts.widgets.d.ts
index a4547b99b7..ea16eb60c9 100644
--- a/types/fusioncharts/fusioncharts.widgets.d.ts
+++ b/types/fusioncharts/fusioncharts.widgets.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var widgets: (H: FusionChartStatic) => FusionChartStatic;
export = widgets;
export as namespace widgets;
-
diff --git a/types/fusioncharts/fusioncharts.zoomscatter.d.ts b/types/fusioncharts/fusioncharts.zoomscatter.d.ts
index 106908b6df..277050a77a 100644
--- a/types/fusioncharts/fusioncharts.zoomscatter.d.ts
+++ b/types/fusioncharts/fusioncharts.zoomscatter.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var zoomscatter: (H: FusionChartStatic) => FusionChartStatic;
export = zoomscatter;
export as namespace zoomscatter;
-
diff --git a/types/fusioncharts/index.d.ts b/types/fusioncharts/index.d.ts
index 9c46955075..e218e32cd5 100644
--- a/types/fusioncharts/index.d.ts
+++ b/types/fusioncharts/index.d.ts
@@ -3,9 +3,7 @@
// Definitions by: Rohit Kumar , Shivaraj KV
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
declare namespace FusionCharts {
-
type ChartDataFormats = 'json' | 'jsonurl' | 'csv' | 'xml' | 'xmlurl';
type ImageHAlign = 'left' | 'right' | 'middle';
@@ -33,7 +31,6 @@ declare namespace FusionCharts {
}
interface ChartObject {
-
type?: string;
id?: string;
@@ -251,7 +248,6 @@ declare namespace FusionCharts {
configure(options: {}): void;
ref: {};
-
}
interface FusionChartStatic {
@@ -286,10 +282,7 @@ declare namespace FusionCharts {
options: {};
debugger: Debugger;
-
-
}
-
}
declare var FusionCharts: FusionCharts.FusionChartStatic;
diff --git a/types/fusioncharts/maps/fusioncharts.usa.d.ts b/types/fusioncharts/maps/fusioncharts.usa.d.ts
index 16ed0d6c91..5b02b82aa8 100644
--- a/types/fusioncharts/maps/fusioncharts.usa.d.ts
+++ b/types/fusioncharts/maps/fusioncharts.usa.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var usa: (H: FusionChartStatic) => FusionChartStatic;
export = usa;
export as namespace usa;
-
diff --git a/types/fusioncharts/maps/fusioncharts.world.d.ts b/types/fusioncharts/maps/fusioncharts.world.d.ts
index 3e545e2556..e950cc08e3 100644
--- a/types/fusioncharts/maps/fusioncharts.world.d.ts
+++ b/types/fusioncharts/maps/fusioncharts.world.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var world: (H: FusionChartStatic) => FusionChartStatic;
export = world;
export as namespace world;
-
diff --git a/types/fusioncharts/themes/fusioncharts.theme.carbon.d.ts b/types/fusioncharts/themes/fusioncharts.theme.carbon.d.ts
index 79ba171231..80b8096801 100644
--- a/types/fusioncharts/themes/fusioncharts.theme.carbon.d.ts
+++ b/types/fusioncharts/themes/fusioncharts.theme.carbon.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var carbon: (H: FusionChartStatic) => FusionChartStatic;
export = carbon;
export as namespace carbon;
-
diff --git a/types/fusioncharts/themes/fusioncharts.theme.fint.d.ts b/types/fusioncharts/themes/fusioncharts.theme.fint.d.ts
index cee08aa6b2..a72265a049 100644
--- a/types/fusioncharts/themes/fusioncharts.theme.fint.d.ts
+++ b/types/fusioncharts/themes/fusioncharts.theme.fint.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var fint: (H: FusionChartStatic) => FusionChartStatic;
export = fint;
export as namespace fint;
-
diff --git a/types/fusioncharts/themes/fusioncharts.theme.ocean.d.ts b/types/fusioncharts/themes/fusioncharts.theme.ocean.d.ts
index 8b7e3828c0..2f77db1f9b 100644
--- a/types/fusioncharts/themes/fusioncharts.theme.ocean.d.ts
+++ b/types/fusioncharts/themes/fusioncharts.theme.ocean.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var ocean: (H: FusionChartStatic) => FusionChartStatic;
export = ocean;
export as namespace ocean;
-
diff --git a/types/fusioncharts/themes/fusioncharts.theme.zune.d.ts b/types/fusioncharts/themes/fusioncharts.theme.zune.d.ts
index 06ab4c1787..2f76b88de5 100644
--- a/types/fusioncharts/themes/fusioncharts.theme.zune.d.ts
+++ b/types/fusioncharts/themes/fusioncharts.theme.zune.d.ts
@@ -1,7 +1,5 @@
-
import { FusionChartStatic } from "fusioncharts";
declare var zune: (H: FusionChartStatic) => FusionChartStatic;
export = zune;
export as namespace zune;
-
diff --git a/types/globule/globule-tests.ts b/types/globule/globule-tests.ts
index 78697ba199..cf3d69c4b8 100644
--- a/types/globule/globule-tests.ts
+++ b/types/globule/globule-tests.ts
@@ -25,4 +25,3 @@ const dest = mappings[0].dest;
mappings = globule.mapping(['*.js'], { srcBase: '/home/code' });
mappings = globule.mapping(['*.js', '*.less']);
mappings = globule.mapping(['*.js'], ['*.less']);
-
diff --git a/types/globule/index.d.ts b/types/globule/index.d.ts
index 4add1d4461..08f00ec082 100644
--- a/types/globule/index.d.ts
+++ b/types/globule/index.d.ts
@@ -84,4 +84,3 @@ interface GlobuleStatic {
declare var globule: GlobuleStatic;
export = globule;
-
diff --git a/types/google-protobuf/google/protobuf/api_pb.d.ts b/types/google-protobuf/google/protobuf/api_pb.d.ts
index a7ba91088c..abb0c56df0 100644
--- a/types/google-protobuf/google/protobuf/api_pb.d.ts
+++ b/types/google-protobuf/google/protobuf/api_pb.d.ts
@@ -21,8 +21,8 @@ export class Api extends jspb.Message {
hasSourceContext(): boolean;
clearSourceContext(): void;
- getSourceContext(): google_protobuf_source_context_pb.SourceContext;
- setSourceContext(value: google_protobuf_source_context_pb.SourceContext): void;
+ getSourceContext(): google_protobuf_source_context_pb.SourceContext | undefined;
+ setSourceContext(value?: google_protobuf_source_context_pb.SourceContext): void;
clearMixinsList(): void;
getMixinsList(): Array;
@@ -48,7 +48,7 @@ export namespace Api {
methodsList: Array,
optionsList: Array,
version: string,
- sourceContext: google_protobuf_source_context_pb.SourceContext.AsObject,
+ sourceContext?: google_protobuf_source_context_pb.SourceContext.AsObject,
mixinsList: Array,
syntax: google_protobuf_type_pb.Syntax,
}
diff --git a/types/google-protobuf/google/protobuf/compiler/plugin_pb.d.ts b/types/google-protobuf/google/protobuf/compiler/plugin_pb.d.ts
index 0e3491e702..bc4a15554f 100644
--- a/types/google-protobuf/google/protobuf/compiler/plugin_pb.d.ts
+++ b/types/google-protobuf/google/protobuf/compiler/plugin_pb.d.ts
@@ -34,10 +34,10 @@ export class Version extends jspb.Message {
export namespace Version {
export type AsObject = {
- major: number,
- minor: number,
- patch: number,
- suffix: string,
+ major?: number,
+ minor?: number,
+ patch?: number,
+ suffix?: string,
}
}
@@ -60,7 +60,7 @@ export class CodeGeneratorRequest extends jspb.Message {
hasCompilerVersion(): boolean;
clearCompilerVersion(): void;
getCompilerVersion(): Version;
- setCompilerVersion(value: Version): void;
+ setCompilerVersion(value?: Version): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): CodeGeneratorRequest.AsObject;
@@ -75,7 +75,7 @@ export class CodeGeneratorRequest extends jspb.Message {
export namespace CodeGeneratorRequest {
export type AsObject = {
fileToGenerateList: Array,
- parameter: string,
+ parameter?: string,
protoFileList: Array,
compilerVersion: Version.AsObject,
}
@@ -104,7 +104,7 @@ export class CodeGeneratorResponse extends jspb.Message {
export namespace CodeGeneratorResponse {
export type AsObject = {
- error: string,
+ error?: string,
fileList: Array,
}
@@ -136,9 +136,9 @@ export namespace CodeGeneratorResponse {
export namespace File {
export type AsObject = {
- name: string,
- insertionPoint: string,
- content: string,
+ name?: string,
+ insertionPoint?: string,
+ content?: string,
}
}
}
diff --git a/types/google-protobuf/google/protobuf/descriptor_pb.d.ts b/types/google-protobuf/google/protobuf/descriptor_pb.d.ts
index 294cbab1dc..920850a8d8 100644
--- a/types/google-protobuf/google/protobuf/descriptor_pb.d.ts
+++ b/types/google-protobuf/google/protobuf/descriptor_pb.d.ts
@@ -71,12 +71,12 @@ export class FileDescriptorProto extends jspb.Message {
hasOptions(): boolean;
clearOptions(): void;
getOptions(): FileOptions;
- setOptions(value: FileOptions): void;
+ setOptions(value?: FileOptions): void;
hasSourceCodeInfo(): boolean;
clearSourceCodeInfo(): void;
getSourceCodeInfo(): SourceCodeInfo;
- setSourceCodeInfo(value: SourceCodeInfo): void;
+ setSourceCodeInfo(value?: SourceCodeInfo): void;
hasSyntax(): boolean;
clearSyntax(): void;
@@ -95,8 +95,8 @@ export class FileDescriptorProto extends jspb.Message {
export namespace FileDescriptorProto {
export type AsObject = {
- name: string,
- package: string,
+ name?: string,
+ package?: string,
dependencyList: Array,
publicDependencyList: Array,
weakDependencyList: Array,
@@ -106,7 +106,7 @@ export namespace FileDescriptorProto {
extensionList: Array,
options: FileOptions.AsObject,
sourceCodeInfo: SourceCodeInfo.AsObject,
- syntax: string,
+ syntax?: string,
}
}
@@ -149,7 +149,7 @@ export class DescriptorProto extends jspb.Message {
hasOptions(): boolean;
clearOptions(): void;
getOptions(): MessageOptions;
- setOptions(value: MessageOptions): void;
+ setOptions(value?: MessageOptions): void;
clearReservedRangeList(): void;
getReservedRangeList(): Array;
@@ -173,7 +173,7 @@ export class DescriptorProto extends jspb.Message {
export namespace DescriptorProto {
export type AsObject = {
- name: string,
+ name?: string,
fieldList: Array,
extensionList: Array,
nestedTypeList: Array,
@@ -208,8 +208,8 @@ export namespace DescriptorProto {
export namespace ExtensionRange {
export type AsObject = {
- start: number,
- end: number,
+ start?: number,
+ end?: number,
}
}
@@ -236,8 +236,8 @@ export namespace DescriptorProto {
export namespace ReservedRange {
export type AsObject = {
- start: number,
- end: number,
+ start?: number,
+ end?: number,
}
}
}
@@ -291,7 +291,7 @@ export class FieldDescriptorProto extends jspb.Message {
hasOptions(): boolean;
clearOptions(): void;
getOptions(): FieldOptions;
- setOptions(value: FieldOptions): void;
+ setOptions(value?: FieldOptions): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): FieldDescriptorProto.AsObject;
@@ -305,15 +305,15 @@ export class FieldDescriptorProto extends jspb.Message {
export namespace FieldDescriptorProto {
export type AsObject = {
- name: string,
- number: number,
- label: FieldDescriptorProto.Label,
- type: FieldDescriptorProto.Type,
- typeName: string,
- extendee: string,
- defaultValue: string,
- oneofIndex: number,
- jsonName: string,
+ name?: string,
+ number?: number,
+ label?: FieldDescriptorProto.Label,
+ type?: FieldDescriptorProto.Type,
+ typeName?: string,
+ extendee?: string,
+ defaultValue?: string,
+ oneofIndex?: number,
+ jsonName?: string,
options: FieldOptions.AsObject,
}
@@ -337,6 +337,7 @@ export namespace FieldDescriptorProto {
TYPE_SINT32 = 17,
TYPE_SINT64 = 18,
}
+
export enum Label {
LABEL_OPTIONAL = 1,
LABEL_REQUIRED = 2,
@@ -353,7 +354,7 @@ export class OneofDescriptorProto extends jspb.Message {
hasOptions(): boolean;
clearOptions(): void;
getOptions(): OneofOptions;
- setOptions(value: OneofOptions): void;
+ setOptions(value?: OneofOptions): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): OneofDescriptorProto.AsObject;
@@ -367,7 +368,7 @@ export class OneofDescriptorProto extends jspb.Message {
export namespace OneofDescriptorProto {
export type AsObject = {
- name: string,
+ name?: string,
options: OneofOptions.AsObject,
}
}
@@ -386,7 +387,7 @@ export class EnumDescriptorProto extends jspb.Message {
hasOptions(): boolean;
clearOptions(): void;
getOptions(): EnumOptions;
- setOptions(value: EnumOptions): void;
+ setOptions(value?: EnumOptions): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): EnumDescriptorProto.AsObject;
@@ -400,7 +401,7 @@ export class EnumDescriptorProto extends jspb.Message {
export namespace EnumDescriptorProto {
export type AsObject = {
- name: string,
+ name?: string,
valueList: Array,
options: EnumOptions.AsObject,
}
@@ -420,7 +421,7 @@ export class EnumValueDescriptorProto extends jspb.Message {
hasOptions(): boolean;
clearOptions(): void;
getOptions(): EnumValueOptions;
- setOptions(value: EnumValueOptions): void;
+ setOptions(value?: EnumValueOptions): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): EnumValueDescriptorProto.AsObject;
@@ -434,8 +435,8 @@ export class EnumValueDescriptorProto extends jspb.Message {
export namespace EnumValueDescriptorProto {
export type AsObject = {
- name: string,
- number: number,
+ name?: string,
+ number?: number,
options: EnumValueOptions.AsObject,
}
}
@@ -454,7 +455,7 @@ export class ServiceDescriptorProto extends jspb.Message {
hasOptions(): boolean;
clearOptions(): void;
getOptions(): ServiceOptions;
- setOptions(value: ServiceOptions): void;
+ setOptions(value?: ServiceOptions): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): ServiceDescriptorProto.AsObject;
@@ -468,7 +469,7 @@ export class ServiceDescriptorProto extends jspb.Message {
export namespace ServiceDescriptorProto {
export type AsObject = {
- name: string,
+ name?: string,
methodList: Array,
options: ServiceOptions.AsObject,
}
@@ -493,7 +494,7 @@ export class MethodDescriptorProto extends jspb.Message {
hasOptions(): boolean;
clearOptions(): void;
getOptions(): MethodOptions;
- setOptions(value: MethodOptions): void;
+ setOptions(value?: MethodOptions): void;
hasClientStreaming(): boolean;
clearClientStreaming(): void;
@@ -517,12 +518,12 @@ export class MethodDescriptorProto extends jspb.Message {
export namespace MethodDescriptorProto {
export type AsObject = {
- name: string,
- inputType: string,
- outputType: string,
+ name?: string,
+ inputType?: string,
+ outputType?: string,
options: MethodOptions.AsObject,
- clientStreaming: boolean,
- serverStreaming: boolean,
+ clientStreaming?: boolean,
+ serverStreaming?: boolean,
}
}
@@ -619,21 +620,21 @@ export class FileOptions extends jspb.Message {
export namespace FileOptions {
export type AsObject = {
- javaPackage: string,
- javaOuterClassname: string,
- javaMultipleFiles: boolean,
- javaGenerateEqualsAndHash: boolean,
- javaStringCheckUtf8: boolean,
- optimizeFor: FileOptions.OptimizeMode,
- goPackage: string,
- ccGenericServices: boolean,
- javaGenericServices: boolean,
- pyGenericServices: boolean,
- deprecated: boolean,
- ccEnableArenas: boolean,
- objcClassPrefix: string,
- csharpNamespace: string,
- swiftPrefix: string,
+ javaPackage?: string,
+ javaOuterClassname?: string,
+ javaMultipleFiles?: boolean,
+ javaGenerateEqualsAndHash?: boolean,
+ javaStringCheckUtf8?: boolean,
+ optimizeFor?: FileOptions.OptimizeMode,
+ goPackage?: string,
+ ccGenericServices?: boolean,
+ javaGenericServices?: boolean,
+ pyGenericServices?: boolean,
+ deprecated?: boolean,
+ ccEnableArenas?: boolean,
+ objcClassPrefix?: string,
+ csharpNamespace?: string,
+ swiftPrefix?: string,
uninterpretedOptionList: Array,
}
@@ -682,10 +683,10 @@ export class MessageOptions extends jspb.Message {
export namespace MessageOptions {
export type AsObject = {
- messageSetWireFormat: boolean,
- noStandardDescriptorAccessor: boolean,
- deprecated: boolean,
- mapEntry: boolean,
+ messageSetWireFormat?: boolean,
+ noStandardDescriptorAccessor?: boolean,
+ deprecated?: boolean,
+ mapEntry?: boolean,
uninterpretedOptionList: Array,
}
}
@@ -738,12 +739,12 @@ export class FieldOptions extends jspb.Message {
export namespace FieldOptions {
export type AsObject = {
- ctype: FieldOptions.CType,
- packed: boolean,
- jstype: FieldOptions.JSType,
- lazy: boolean,
- deprecated: boolean,
- weak: boolean,
+ ctype?: FieldOptions.CType,
+ packed?: boolean,
+ jstype?: FieldOptions.JSType,
+ lazy?: boolean,
+ deprecated?: boolean,
+ weak?: boolean,
uninterpretedOptionList: Array,
}
@@ -752,6 +753,7 @@ export namespace FieldOptions {
CORD = 1,
STRING_PIECE = 2,
}
+
export enum JSType {
JS_NORMAL = 0,
JS_STRING = 1,
@@ -809,8 +811,8 @@ export class EnumOptions extends jspb.Message {
export namespace EnumOptions {
export type AsObject = {
- allowAlias: boolean,
- deprecated: boolean,
+ allowAlias?: boolean,
+ deprecated?: boolean,
uninterpretedOptionList: Array,
}
}
@@ -838,7 +840,7 @@ export class EnumValueOptions extends jspb.Message {
export namespace EnumValueOptions {
export type AsObject = {
- deprecated: boolean,
+ deprecated?: boolean,
uninterpretedOptionList: Array,
}
}
@@ -866,7 +868,7 @@ export class ServiceOptions extends jspb.Message {
export namespace ServiceOptions {
export type AsObject = {
- deprecated: boolean,
+ deprecated?: boolean,
uninterpretedOptionList: Array,
}
}
@@ -899,8 +901,8 @@ export class MethodOptions extends jspb.Message {
export namespace MethodOptions {
export type AsObject = {
- deprecated: boolean,
- idempotencyLevel: MethodOptions.IdempotencyLevel,
+ deprecated?: boolean,
+ idempotencyLevel?: MethodOptions.IdempotencyLevel,
uninterpretedOptionList: Array,
}
@@ -962,12 +964,12 @@ export class UninterpretedOption extends jspb.Message {
export namespace UninterpretedOption {
export type AsObject = {
nameList: Array,
- identifierValue: string,
- positiveIntValue: number,
- negativeIntValue: number,
- doubleValue: number,
+ identifierValue?: string,
+ positiveIntValue?: number,
+ negativeIntValue?: number,
+ doubleValue?: number,
stringValue: Uint8Array | string,
- aggregateValue: string,
+ aggregateValue?: string,
}
export class NamePart extends jspb.Message {
@@ -993,8 +995,8 @@ export namespace UninterpretedOption {
export namespace NamePart {
export type AsObject = {
- namePart: string,
- isExtension: boolean,
+ namePart?: string,
+ isExtension?: boolean,
}
}
}
@@ -1060,8 +1062,8 @@ export namespace SourceCodeInfo {
export type AsObject = {
pathList: Array,
spanList: Array,
- leadingComments: string,
- trailingComments: string,
+ leadingComments?: string,
+ trailingComments?: string,
leadingDetachedCommentsList: Array,
}
}
@@ -1122,9 +1124,9 @@ export namespace GeneratedCodeInfo {
export namespace Annotation {
export type AsObject = {
pathList: Array,
- sourceFile: string,
- begin: number,
- end: number,
+ sourceFile?: string,
+ begin?: number,
+ end?: number,
}
}
}
diff --git a/types/google-protobuf/google/protobuf/struct_pb.d.ts b/types/google-protobuf/google/protobuf/struct_pb.d.ts
index 46c28ad1df..ed033e91ce 100644
--- a/types/google-protobuf/google/protobuf/struct_pb.d.ts
+++ b/types/google-protobuf/google/protobuf/struct_pb.d.ts
@@ -46,13 +46,13 @@ export class Value extends jspb.Message {
hasStructValue(): boolean;
clearStructValue(): void;
- getStructValue(): Struct;
- setStructValue(value: Struct): void;
+ getStructValue(): Struct | undefined;
+ setStructValue(value?: Struct): void;
hasListValue(): boolean;
clearListValue(): void;
- getListValue(): ListValue;
- setListValue(value: ListValue): void;
+ getListValue(): ListValue | undefined;
+ setListValue(value?: ListValue): void;
getKindCase(): Value.KindCase;
@@ -75,8 +75,8 @@ export namespace Value {
numberValue: number,
stringValue: string,
boolValue: boolean,
- structValue: Struct.AsObject,
- listValue: ListValue.AsObject,
+ structValue?: Struct.AsObject,
+ listValue?: ListValue.AsObject,
}
export enum KindCase {
diff --git a/types/google-protobuf/google/protobuf/type_pb.d.ts b/types/google-protobuf/google/protobuf/type_pb.d.ts
index 186bad8d36..cb330a9318 100644
--- a/types/google-protobuf/google/protobuf/type_pb.d.ts
+++ b/types/google-protobuf/google/protobuf/type_pb.d.ts
@@ -23,8 +23,8 @@ export class Type extends jspb.Message {
hasSourceContext(): boolean;
clearSourceContext(): void;
- getSourceContext(): google_protobuf_source_context_pb.SourceContext;
- setSourceContext(value: google_protobuf_source_context_pb.SourceContext): void;
+ getSourceContext(): google_protobuf_source_context_pb.SourceContext | undefined;
+ setSourceContext(value?: google_protobuf_source_context_pb.SourceContext): void;
getSyntax(): Syntax;
setSyntax(value: Syntax): void;
@@ -45,7 +45,7 @@ export namespace Type {
fieldsList: Array,
oneofsList: Array,
optionsList: Array,
- sourceContext: google_protobuf_source_context_pb.SourceContext.AsObject,
+ sourceContext?: google_protobuf_source_context_pb.SourceContext.AsObject,
syntax: Syntax,
}
}
@@ -128,6 +128,7 @@ export namespace Field {
TYPE_SINT32 = 17,
TYPE_SINT64 = 18,
}
+
export enum Cardinality {
CARDINALITY_UNKNOWN = 0,
CARDINALITY_OPTIONAL = 1,
@@ -152,8 +153,8 @@ export class Enum extends jspb.Message {
hasSourceContext(): boolean;
clearSourceContext(): void;
- getSourceContext(): google_protobuf_source_context_pb.SourceContext;
- setSourceContext(value: google_protobuf_source_context_pb.SourceContext): void;
+ getSourceContext(): google_protobuf_source_context_pb.SourceContext | undefined;
+ setSourceContext(value?: google_protobuf_source_context_pb.SourceContext): void;
getSyntax(): Syntax;
setSyntax(value: Syntax): void;
@@ -173,7 +174,7 @@ export namespace Enum {
name: string,
enumvalueList: Array,
optionsList: Array,
- sourceContext: google_protobuf_source_context_pb.SourceContext.AsObject,
+ sourceContext?: google_protobuf_source_context_pb.SourceContext.AsObject,
syntax: Syntax,
}
}
@@ -214,8 +215,8 @@ export class Option extends jspb.Message {
hasValue(): boolean;
clearValue(): void;
- getValue(): google_protobuf_any_pb.Any;
- setValue(value: google_protobuf_any_pb.Any): void;
+ getValue(): google_protobuf_any_pb.Any | undefined;
+ setValue(value?: google_protobuf_any_pb.Any): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): Option.AsObject;
@@ -230,7 +231,7 @@ export class Option extends jspb.Message {
export namespace Option {
export type AsObject = {
name: string,
- value: google_protobuf_any_pb.Any.AsObject,
+ value?: google_protobuf_any_pb.Any.AsObject,
}
}
diff --git a/types/google-protobuf/index.d.ts b/types/google-protobuf/index.d.ts
index 9dcb7ea609..8ed770deca 100644
--- a/types/google-protobuf/index.d.ts
+++ b/types/google-protobuf/index.d.ts
@@ -170,13 +170,14 @@ export class Map {
arr: Array<[K, V]>,
valueCtor?: {new(init: any): V});
toArray(): Array<[K, V]>;
- toObject(
+ toObject(includeInstance?: boolean): Array<[K, V]>;
+ toObject(
includeInstance: boolean,
- valueToObject: (includeInstance: boolean) => any): Array<[K, V]>;
- static fromObject(
- entries: Array<[K, V]>,
+ valueToObject: (includeInstance: boolean, valueWrapper: V) => VO): Array<[K, VO]>;
+ static fromObject(
+ entries: Array<[TK, TV]>,
valueCtor: any,
- valueFromObject: any): Map;
+ valueFromObject: any): Map;
getLength(): number;
clear(): void;
del(key: K): boolean;
@@ -186,7 +187,7 @@ export class Map {
forEach(
callback: (entry: V, key: K) => void,
thisArg?: {}): void;
- set(key: K, value: V): void;
+ set(key: K, value: V): this;
get(key: K): (V | undefined);
has(key: K): boolean;
}
diff --git a/types/graphql/error/GraphQLError.d.ts b/types/graphql/error/GraphQLError.d.ts
index 12f65a506c..857f25b593 100644
--- a/types/graphql/error/GraphQLError.d.ts
+++ b/types/graphql/error/GraphQLError.d.ts
@@ -27,7 +27,7 @@ export class GraphQLError extends Error {
*
* Enumerable, and appears in the result of JSON.stringify().
*/
- locations?: Array<{ line: number, column: number }> | void;
+ locations?: Array<{ line: number, column: number }> | undefined;
/**
* An array describing the JSON-path into the execution response which
@@ -35,23 +35,23 @@ export class GraphQLError extends Error {
*
* Enumerable, and appears in the result of JSON.stringify().
*/
- path?: Array | void;
+ path?: Array | undefined;
/**
* An array of GraphQL AST Nodes corresponding to this error.
*/
- nodes?: Array | void;
+ nodes?: Array | undefined;
/**
* The source GraphQL document corresponding to this error.
*/
- source?: Source | void;
+ source?: Source | undefined;
/**
* An array of character offsets within the source GraphQL document
* which correspond to this error.
*/
- positions?: Array | void;
+ positions?: Array | undefined;
/**
* The original error thrown from a field resolver during execution.
diff --git a/types/graphql/index.d.ts b/types/graphql/index.d.ts
index 43d810de02..de2a1405e6 100644
--- a/types/graphql/index.d.ts
+++ b/types/graphql/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for graphql v0.8.2
+// Type definitions for graphql 0.9
// Project: https://www.npmjs.com/package/graphql
-// Definitions by: TonyYang , Caleb Meredith , Dominic Watson
+// Definitions by: TonyYang , Caleb Meredith , Dominic Watson , Firede
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -105,6 +105,12 @@ export {
// Asserts a string is a valid GraphQL name.
assertValidName,
+ // Compares two GraphQLSchemas and detects breaking changes.
+ findBreakingChanges,
+
+ // Report all deprecated usage within a GraphQL document.
+ findDeprecatedUsages,
+
BreakingChange,
IntrospectionDirective,
diff --git a/types/graphql/language/ast.d.ts b/types/graphql/language/ast.d.ts
index 238cbe7210..d0f25b65d0 100644
--- a/types/graphql/language/ast.d.ts
+++ b/types/graphql/language/ast.d.ts
@@ -85,7 +85,7 @@ export type Token = {
/**
* For non-punctuation tokens, represents the interpreted value of the token.
*/
- value: string | void;
+ value: string | undefined;
/**
* Tokens exist as nodes in a double-linked-list amongst all tokens
diff --git a/types/graphql/language/visitor.d.ts b/types/graphql/language/visitor.d.ts
index 1d0f399d6e..d4c528501e 100644
--- a/types/graphql/language/visitor.d.ts
+++ b/types/graphql/language/visitor.d.ts
@@ -42,7 +42,7 @@ export const QueryDocumentKeys: {
export const BREAK: any;
-export function visit(root: any, visitor: any, keyMap: any): any;
+export function visit(root: any, visitor: any, keyMap?: any): any;
export function visitInParallel(visitors: any): any;
diff --git a/types/graphql/type/definition.d.ts b/types/graphql/type/definition.d.ts
index 6fef914d8e..cf077ad5ba 100644
--- a/types/graphql/type/definition.d.ts
+++ b/types/graphql/type/definition.d.ts
@@ -126,6 +126,10 @@ export type GraphQLNamedType =
GraphQLEnumType |
GraphQLInputObjectType;
+export function isNamedType(type: GraphQLType): boolean;
+
+export function assertNamedType(type: GraphQLType): GraphQLNamedType;
+
export function getNamedType(type: GraphQLType): GraphQLNamedType;
/**
@@ -237,13 +241,13 @@ export type GraphQLTypeResolver = (
value: TSource,
context: TContext,
info: GraphQLResolveInfo
-) => GraphQLObjectType;
+) => GraphQLObjectType | string | Promise;
export type GraphQLIsTypeOfFn = (
source: TSource,
context: TContext,
info: GraphQLResolveInfo
-) => boolean;
+) => boolean | Promise;
export type GraphQLFieldResolver = (
source: TSource,
@@ -265,7 +269,7 @@ export interface GraphQLResolveInfo {
variableValues: { [variableName: string]: any };
}
-export type ResponsePath = { prev: ResponsePath, key: string | number } | void;
+export type ResponsePath = { prev: ResponsePath, key: string | number } | undefined;
export interface GraphQLFieldConfig {
type: GraphQLOutputType;
@@ -426,6 +430,7 @@ export class GraphQLEnumType {
constructor(config: GraphQLEnumTypeConfig);
getValues(): Array;
+ getValue(name: string): GraphQLEnumValue;
serialize(value: any): string;
parseValue(value: any): any;
parseLiteral(valueNode: ValueNode): any;
diff --git a/types/graphql/utilities/TypeInfo.d.ts b/types/graphql/utilities/TypeInfo.d.ts
index 2957114ae5..b4fa855569 100644
--- a/types/graphql/utilities/TypeInfo.d.ts
+++ b/types/graphql/utilities/TypeInfo.d.ts
@@ -5,6 +5,7 @@ import {
GraphQLInputType,
GraphQLField,
GraphQLArgument,
+ GraphQLEnumValue,
GraphQLType,
} from '../type/definition';
import { GraphQLDirective } from '../type/directives';
@@ -30,6 +31,7 @@ export class TypeInfo {
getFieldDef(): GraphQLField;
getDirective(): GraphQLDirective;
getArgument(): GraphQLArgument;
+ getEnumValue(): GraphQLEnumValue;
enter(node: ASTNode): any;
leave(node: ASTNode): any;
}
@@ -40,4 +42,4 @@ export interface getFieldDef {
parentType: GraphQLType,
fieldNode: FieldNode
): GraphQLField
-}
\ No newline at end of file
+}
diff --git a/types/graphql/utilities/buildASTSchema.d.ts b/types/graphql/utilities/buildASTSchema.d.ts
index cf782a30ec..94f4e2a47a 100644
--- a/types/graphql/utilities/buildASTSchema.d.ts
+++ b/types/graphql/utilities/buildASTSchema.d.ts
@@ -26,15 +26,3 @@ export function getDescription(node: { loc?: Location }): string;
* document.
*/
export function buildSchema(source: string | Source): GraphQLSchema;
-
-/**
- * Given an ast node, returns its string description based on a contiguous
- * block full-line of comments preceding it.
- */
-export function getDescription(node: { loc?: Location }): string;
-
-/**
- * A helper function to build a GraphQLSchema directly from a source
- * document.
- */
-export function buildSchema(source: string | Source): GraphQLSchema;
diff --git a/types/graphql/utilities/findDeprecatedUsages.d.ts b/types/graphql/utilities/findDeprecatedUsages.d.ts
new file mode 100644
index 0000000000..58e9ae1685
--- /dev/null
+++ b/types/graphql/utilities/findDeprecatedUsages.d.ts
@@ -0,0 +1,13 @@
+import { GraphQLSchema } from '../type/schema';
+import { DocumentNode } from '../language/ast';
+import { GraphQLError } from '../error/GraphQLError';
+
+/**
+ * A validation rule which reports deprecated usages.
+ *
+ * Returns a list of GraphQLError instances describing each deprecated use.
+ */
+export function findDeprecatedUsages(
+ schema: GraphQLSchema,
+ ast: DocumentNode
+): Array
diff --git a/types/graphql/utilities/getOperationAST.d.ts b/types/graphql/utilities/getOperationAST.d.ts
index 65c7735a5d..ce99d39b2b 100644
--- a/types/graphql/utilities/getOperationAST.d.ts
+++ b/types/graphql/utilities/getOperationAST.d.ts
@@ -7,5 +7,5 @@ import { DocumentNode, OperationDefinitionNode } from '../language/ast';
*/
export function getOperationAST(
documentAST: DocumentNode,
- operationName: string
+ operationName?: string
): OperationDefinitionNode;
diff --git a/types/graphql/utilities/index.d.ts b/types/graphql/utilities/index.d.ts
index 47cfd70ff9..8815046735 100644
--- a/types/graphql/utilities/index.d.ts
+++ b/types/graphql/utilities/index.d.ts
@@ -73,3 +73,6 @@ export { assertValidName } from './assertValidName';
// Compares two GraphQLSchemas and detects breaking changes.
export { findBreakingChanges } from './findBreakingChanges';
export { BreakingChange } from './findBreakingChanges';
+
+// Report all deprecated usage within a GraphQL document.
+export { findDeprecatedUsages } from './findDeprecatedUsages';
diff --git a/types/howler/index.d.ts b/types/howler/index.d.ts
index df3f6a363b..0966f4a472 100644
--- a/types/howler/index.d.ts
+++ b/types/howler/index.d.ts
@@ -11,7 +11,7 @@ interface HowlerGlobal {
unload(): void;
usingWebAudio: boolean;
noAudio: boolean;
- mobileAudioEnable: boolean;
+ mobileAutoEnable: boolean;
autoSuspend: boolean;
ctx: AudioContext;
masterGain: GainNode;
diff --git a/types/klaw-sync/index.d.ts b/types/klaw-sync/index.d.ts
index d344879e1a..e68af63739 100644
--- a/types/klaw-sync/index.d.ts
+++ b/types/klaw-sync/index.d.ts
@@ -34,4 +34,3 @@ interface Options {
}
export function klawSync(root: string, options?: Options): ReadonlyArray-
-
diff --git a/types/koa-compose/index.d.ts b/types/koa-compose/index.d.ts
index a1037f187c..88047abcc9 100644
--- a/types/koa-compose/index.d.ts
+++ b/types/koa-compose/index.d.ts
@@ -3,7 +3,6 @@
// Definitions by: jKey Lu
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
declare function compose(middleware: Array>): compose.ComposedMiddleware;
declare namespace compose {
diff --git a/types/koa-compose/koa-compose-tests.ts b/types/koa-compose/koa-compose-tests.ts
index cb7b78b397..4c12ca6571 100644
--- a/types/koa-compose/koa-compose-tests.ts
+++ b/types/koa-compose/koa-compose-tests.ts
@@ -1,15 +1,13 @@
-
import compose = require('koa-compose');
-var fn1: compose.Middleware = (context: any, next: () => Promise): Promise =>
+const fn1: compose.Middleware = (context: any, next: () => Promise): Promise =>
Promise
.resolve(console.log('in fn1'))
.then(() => next());
-var fn2: compose.Middleware = (context: any, next: () => Promise): Promise =>
+const fn2: compose.Middleware = (context: any, next: () => Promise): Promise =>
Promise
.resolve(console.log('in fn2'))
.then(() => next());
-
-var fn = compose([fn1, fn2]);
\ No newline at end of file
+const fn = compose([fn1, fn2]);
diff --git a/types/leaflet/index.d.ts b/types/leaflet/index.d.ts
index 21b8664e97..0efffe8f9e 100644
--- a/types/leaflet/index.d.ts
+++ b/types/leaflet/index.d.ts
@@ -38,60 +38,60 @@ declare namespace L {
}
namespace LineUtil {
- function simplify(points: PointExpression[], tolerance: number): Point[];
+ function simplify(points: Point[], tolerance: number): Point[];
- function pointToSegmentDistance(p: PointExpression, p1: PointExpression, p2: PointExpression): number;
+ function pointToSegmentDistance(p: Point, p1: Point, p2: Point): number;
- function closestPointOnSegment(p: PointExpression, p1: PointExpression, p2: PointExpression): Point;
+ function closestPointOnSegment(p: Point, p1: Point, p2: Point): Point;
}
namespace PolyUtil {
- function clipPolygon(points: PointExpression[], bounds: BoundsExpression, round?: boolean): Point[];
+ function clipPolygon(points: Point[], bounds: BoundsExpression, round?: boolean): Point[];
}
- class DomUtil {
+ module DomUtil {
/**
* Get Element by its ID or with the given HTML-Element
*/
- static get(element: string | HTMLElement): HTMLElement;
- static getStyle(el: HTMLElement, styleAttrib: string): string;
- static create(tagName: string, className?: string, container?: HTMLElement): HTMLElement;
- static remove(el: HTMLElement): void;
- static empty(el: HTMLElement): void;
- static toFront(el: HTMLElement): void;
- static toBack(el: HTMLElement): void;
- static hasClass(el: HTMLElement, name: string): boolean;
- static addClass(el: HTMLElement, name: string): void;
- static removeClass(el: HTMLElement, name: string): void;
- static setClass(el: HTMLElement, name: string): void;
- static getClass(el: HTMLElement): string;
- static setOpacity(el: HTMLElement, opacity: number): void;
- static testProp(props: string[]): string | boolean/*=false*/;
- static setTransform(el: HTMLElement, offset: Point, scale?: number): void;
- static setPosition(el: HTMLElement, position: Point): void;
- static getPosition(el: HTMLElement): Point;
- static disableTextSelection(): void;
- static enableTextSelection(): void;
- static disableImageDrag(): void;
- static enableImageDrag(): void;
- static preventOutline(el: HTMLElement): void;
- static restoreOutline(): void;
+ function get(element: string | HTMLElement): HTMLElement | null;
+ function getStyle(el: HTMLElement, styleAttrib: string): string | null;
+ function create(tagName: string, className?: string, container?: HTMLElement): HTMLElement;
+ function remove(el: HTMLElement): void;
+ function empty(el: HTMLElement): void;
+ function toFront(el: HTMLElement): void;
+ function toBack(el: HTMLElement): void;
+ function hasClass(el: HTMLElement, name: string): boolean;
+ function addClass(el: HTMLElement, name: string): void;
+ function removeClass(el: HTMLElement, name: string): void;
+ function setClass(el: HTMLElement, name: string): void;
+ function getClass(el: HTMLElement): string;
+ function setOpacity(el: HTMLElement, opacity: number): void;
+ function testProp(props: string[]): string | false;
+ function setTransform(el: HTMLElement, offset: Point, scale?: number): void;
+ function setPosition(el: HTMLElement, position: Point): void;
+ function getPosition(el: HTMLElement): Point;
+ function disableTextSelection(): void;
+ function enableTextSelection(): void;
+ function disableImageDrag(): void;
+ function enableImageDrag(): void;
+ function preventOutline(el: HTMLElement): void;
+ function restoreOutline(): void;
}
- abstract class CRS {
+ interface CRS {
latLngToPoint(latlng: LatLngExpression, zoom: number): Point;
pointToLatLng(point: PointExpression, zoom: number): LatLng;
- project(latlng: LatLngExpression): Point;
+ project(latlng: LatLng | LatLngLiteral): Point;
unproject(point: PointExpression): LatLng;
scale(zoom: number): number;
zoom(scale: number): number;
getProjectedBounds(zoom: number): Bounds;
distance(latlng1: LatLngExpression, latlng2: LatLngExpression): number;
- wrapLatLng(latlng: LatLngExpression): LatLng;
+ wrapLatLng(latlng: LatLng | LatLngLiteral): LatLng;
- code: string;
- wrapLng: [number, number];
- wrapLat: [number, number];
+ code?: string;
+ wrapLng?: [number, number];
+ wrapLat?: [number, number];
infinite: boolean;
}
@@ -104,10 +104,10 @@ declare namespace L {
}
interface Projection {
- project(latlng: LatLngExpression): Point;
+ project(latlng: LatLng | LatLngLiteral): Point;
unproject(point: PointExpression): LatLng;
- bounds: LatLngBounds;
+ bounds: Bounds;
}
namespace Projection {
@@ -118,7 +118,6 @@ declare namespace L {
class LatLng {
constructor(latitude: number, longitude: number, altitude?: number);
- constructor(coords: LatLngTuple | [number, number, number] | LatLngLiteral | {lat: number, lng: number, alt?: number});
equals(otherLatLng: LatLngExpression, maxMargin?: number): boolean;
toString(): string;
distanceTo(otherLatLng: LatLngExpression): number;
@@ -127,7 +126,7 @@ declare namespace L {
lat: number;
lng: number;
- alt: number;
+ alt?: number;
}
interface LatLngLiteral {
@@ -177,9 +176,8 @@ declare namespace L {
class Point {
constructor(x: number, y: number, round?: boolean);
- constructor(coords: PointTuple | {x: number, y: number});
clone(): Point;
- add(otherPoint: PointExpression): Point; // investigate if this mutates or returns a new instance
+ add(otherPoint: PointExpression): Point; // non-destructive, returns a new point
subtract(otherPoint: PointExpression): Point;
divideBy(num: number): Point;
multiplyBy(num: number): Point;
@@ -216,8 +214,8 @@ declare namespace L {
intersects(otherBounds: BoundsExpression): boolean;
overlaps(otherBounds: BoundsExpression): boolean;
- min: Point;
- max: Point;
+ min?: Point;
+ max?: Point;
}
type BoundsExpression = Bounds | BoundsLiteral;
@@ -403,7 +401,7 @@ declare namespace L {
addTo(map: Map): this;
remove(): this;
removeFrom(map: Map): this;
- getPane(name?: string): HTMLElement;
+ getPane(name?: string): HTMLElement | undefined;
// Popup methods
bindPopup(content: ((layer: Layer) => Content) | Content | Popup, options?: PopupOptions): this;
@@ -413,7 +411,7 @@ declare namespace L {
togglePopup(): this;
isPopupOpen(): boolean;
setPopupContent(content: Content | Popup): this;
- getPopup(): Popup;
+ getPopup(): Popup | undefined;
// Tooltip methods
bindTooltip(content: ((layer: Layer) => Content) | Tooltip | Content, options?: TooltipOptions): this;
@@ -423,14 +421,14 @@ declare namespace L {
toggleTooltip(): this;
isTooltipOpen(): boolean;
setTooltipContent(content: Content | Tooltip): this;
- getTooltip(): Tooltip;
+ getTooltip(): Tooltip | undefined;
// Extension methods
- onAdd(map: Map): this;
- onRemove(map: Map): this;
- getEvents(): {[name: string]: (event: Event) => void};
- getAttribution(): string;
- beforeAdd(map: Map): this;
+ onAdd?: (map: Map) => this;
+ onRemove?: (map: Map) => this;
+ getEvents?: () => {[name: string]: (event: Event) => void};
+ getAttribution?: () => string | null;
+ beforeAdd?: (map: Map) => this;
}
interface GridLayerOptions {
@@ -454,8 +452,7 @@ declare namespace L {
constructor(options?: GridLayerOptions);
bringToFront(): this;
bringToBack(): this;
- getAttribution(): string;
- getContainer(): HTMLElement;
+ getContainer(): HTMLElement | null;
setOpacity(opacity: number): this;
setZIndex(zIndex: number): this;
isLoading(): boolean;
@@ -500,7 +497,7 @@ declare namespace L {
}
interface WMSOptions extends TileLayerOptions {
- layers: string;
+ layers?: string;
styles?: string;
format?: string;
transparent?: boolean;
@@ -547,7 +544,7 @@ declare namespace L {
getBounds(): LatLngBounds;
/** Get the img element that represents the ImageOverlay on the map */
- getElement(): HTMLImageElement;
+ getElement(): HTMLImageElement | undefined;
options: ImageOverlayOptions;
}
@@ -582,7 +579,7 @@ declare namespace L {
setStyle(style: PathOptions): this;
bringToFront(): this;
bringToBack(): this;
- getElement(): HTMLElement;
+ getElement(): Element | undefined;
options: PathOptions;
}
@@ -607,7 +604,7 @@ declare namespace L {
constructor(latlngs: LatLngExpression[], options?: PolylineOptions);
toGeoJSON(): GeoJSONFeature;
- feature: GeoJSONFeature;
+ feature?: GeoJSONFeature;
}
function polyline(latlngs: LatLngExpression[], options?: PolylineOptions): Polyline;
@@ -616,7 +613,7 @@ declare namespace L {
constructor(latlngs: LatLngExpression[], options?: PolylineOptions);
toGeoJSON(): GeoJSONFeature;
- feature: GeoJSONFeature;
+ feature?: GeoJSONFeature;
}
function polygon(latlngs: LatLngExpression[], options?: PolylineOptions): Polygon;
@@ -641,7 +638,7 @@ declare namespace L {
getRadius(): number;
options: CircleMarkerOptions;
- feature: GeoJSONFeature;
+ feature?: GeoJSONFeature;
}
function circleMarker(latlng: LatLngExpression, options?: CircleMarkerOptions): CircleMarker;
@@ -726,7 +723,7 @@ declare namespace L {
/**
* Returns the layer with the given internal ID.
*/
- getLayer(id: number): Layer;
+ getLayer(id: number): Layer | undefined;
/**
* Returns an array of all the layers added to the group.
@@ -743,7 +740,7 @@ declare namespace L {
*/
getLayerId(layer: Layer): number;
- feature: GeoJSONFeatureCollection | GeoJSONFeature | GeoJSONGeometryCollection;
+ feature?: GeoJSONFeatureCollection | GeoJSONFeature | GeoJSONGeometryCollection;
}
/**
@@ -783,7 +780,7 @@ declare namespace L {
*/
function featureGroup(layers?: Layer[]): FeatureGroup;
- type StyleFunction = (feature: GeoJSONFeature) => PathOptions;
+ type StyleFunction = (feature?: GeoJSONFeature) => PathOptions;
interface GeoJSONOptions extends LayerOptions {
/**
@@ -878,7 +875,7 @@ declare namespace L {
/**
* Reverse of coordsToLatLng
*/
- static latLngToCoords(latlng: LatLng): [number, number, number]; // A three tuple can be assigned to a two or three tuple
+ static latLngToCoords(latlng: LatLng): [number, number] | [number, number, number];
/**
* Reverse of coordsToLatLngs closed determines whether the first point should be
@@ -990,13 +987,13 @@ declare namespace L {
constructor(options?: ControlOptions);
getPosition(): ControlPosition;
setPosition(position: ControlPosition): this;
- getContainer(): HTMLElement;
+ getContainer(): HTMLElement | undefined;
addTo(map: Map): this;
remove(): this;
// Extension methods
- onAdd(map: Map): HTMLElement;
- onRemove(map: Map): void;
+ onAdd?: (map: Map) => HTMLElement;
+ onRemove?: (map: Map) => void;
options: ControlOptions;
}
@@ -1094,11 +1091,11 @@ declare namespace L {
class Popup extends Layer {
constructor(options?: PopupOptions, source?: Layer);
- getLatLng(): LatLng;
+ getLatLng(): LatLng | undefined;
setLatLng(latlng: LatLngExpression): this;
- getContent(): Content;
+ getContent(): Content | ((source: Layer) => Content) | undefined;
setContent(htmlContent: ((source: Layer) => Content) | Content): this;
- getElement(): HTMLElement;
+ getElement(): HTMLElement | undefined;
update(): void;
isOpen(): boolean;
bringToFront(): this;
@@ -1125,11 +1122,11 @@ declare namespace L {
class Tooltip extends Layer {
constructor(options?: TooltipOptions, source?: Layer);
setOpacity(val: number): void;
- getLatLng(): LatLng;
+ getLatLng(): LatLng | undefined;
setLatLng(latlng: LatLngExpression): this;
- getContent(): Content;
+ getContent(): Content | undefined;
setContent(htmlContent: ((source: Layer) => Content) | Content): this;
- getElement(): HTMLElement;
+ getElement(): HTMLElement | undefined;
update(): void;
isOpen(): boolean;
bringToFront(): this;
@@ -1178,8 +1175,8 @@ declare namespace L {
enabled(): boolean;
// Extension methods
- addHooks(): void;
- removeHooks(): void;
+ addHooks?: () => void;
+ removeHooks?: () => void;
}
interface Event {
@@ -1280,7 +1277,7 @@ declare namespace L {
function stop(ev: Event): typeof DomEvent;
- function getMousePosition(ev: Event, container?: HTMLElement): Point;
+ function getMousePosition(ev: {clientX: number, clientY: number} /*MouseEvent from lib.d.ts*/, container?: HTMLElement): Point;
function getWheelDelta(ev: Event): number;
@@ -1350,7 +1347,7 @@ declare namespace L {
/**
* Name of the pane or the pane as HTML-Element
*/
- getPane(pane: string | HTMLElement): HTMLElement;
+ getPane(pane: string | HTMLElement): HTMLElement | undefined;
getPanes(): {[name: string]: HTMLElement} & DefaultMapPanes;
getContainer(): HTMLElement;
whenReady(fn: () => void, context?: any): this;
@@ -1393,7 +1390,7 @@ declare namespace L {
dragging: Handler;
keyboard: Handler;
scrollWheelZoom: Handler;
- tap: Handler;
+ tap?: Handler;
touchZoom: Handler;
options: MapOptions;
@@ -1449,7 +1446,7 @@ declare namespace L {
function icon(options: IconOptions): Icon;
interface DivIconOptions extends BaseIconOptions {
- html?: string;
+ html?: string | false;
bgPos?: PointExpression;
iconSize?: PointExpression;
iconAnchor?: PointExpression;
@@ -1484,11 +1481,11 @@ declare namespace L {
setZIndexOffset(offset: number): this;
setIcon(icon: Icon | DivIcon): this;
setOpacity(opacity: number): this;
- getElement(): HTMLElement;
+ getElement(): HTMLElement | undefined;
// Properties
options: MarkerOptions;
- dragging: Handler;
+ dragging?: Handler;
}
function marker(latlng: LatLngExpression, options?: MarkerOptions): Marker;
@@ -1511,7 +1508,7 @@ declare namespace L {
const any3d: boolean;
const mobile: boolean;
const mobileWebkit: boolean;
- const mobiWebkit3d: boolean;
+ const mobileWebkit3d: boolean;
const mobileOpera: boolean;
const mobileGecko: boolean;
const touch: boolean;
@@ -1530,7 +1527,7 @@ declare namespace L {
function stamp(obj: any): number;
function throttle(fn: () => void, time: number, context: any): () => void;
function wrapNum(num: number, range: number[], includeMax?: boolean): number;
- function falseFn(): () => false;
+ function falseFn(): false;
function formatNum(num: number, digits?: number): number;
function trim(str: string): string;
function splitWords(str: string): string[];
@@ -1541,7 +1538,7 @@ declare namespace L {
function indexOf(array: any[], el: any): number;
function requestAnimFrame(fn: () => void, context?: any, immediate?: boolean): number;
function cancelAnimFrame(id: number): void;
- let lastId: string;
+ let lastId: number;
let emptyImageUrl: string;
}
}
diff --git a/types/leaflet/leaflet-tests.ts b/types/leaflet/leaflet-tests.ts
index b7107c55fa..5936742a13 100644
--- a/types/leaflet/leaflet-tests.ts
+++ b/types/leaflet/leaflet-tests.ts
@@ -13,10 +13,6 @@ latLng = L.latLng([12, 13, 0]);
latLng = new L.LatLng(12, 13);
latLng = new L.LatLng(12, 13, 0);
-latLng = new L.LatLng(latLngLiteral);
-latLng = new L.LatLng({lat: 12, lng: 13, alt: 0});
-latLng = new L.LatLng(latLngTuple);
-latLng = new L.LatLng([12, 13, 0]);
const latLngBoundsLiteral: L.LatLngBoundsLiteral = [[12, 13], latLngTuple];
@@ -39,8 +35,6 @@ point = L.point({x: 12, y: 13});
point = new L.Point(12, 13);
point = new L.Point(12, 13, true);
-point = new L.Point(pointTuple);
-point = new L.Point({x: 12, y: 13});
let distance: number;
point.distanceTo(point);
@@ -67,18 +61,13 @@ bounds = new L.Bounds(boundsLiteral);
let points: L.Point[];
points = L.LineUtil.simplify([point, point], 1);
-points = L.LineUtil.simplify([pointTuple, pointTuple], 2);
distance = L.LineUtil.pointToSegmentDistance(point, point, point);
-distance = L.LineUtil.pointToSegmentDistance(pointTuple, pointTuple, pointTuple);
point = L.LineUtil.closestPointOnSegment(point, point, point);
-point = L.LineUtil.closestPointOnSegment(pointTuple, pointTuple, pointTuple);
points = L.PolyUtil.clipPolygon(points, bounds);
points = L.PolyUtil.clipPolygon(points, bounds, true);
-points = L.PolyUtil.clipPolygon([pointTuple, pointTuple], boundsLiteral);
-points = L.PolyUtil.clipPolygon([pointTuple, pointTuple], boundsLiteral, true);
let mapOptions: L.MapOptions = {};
mapOptions = {
@@ -275,8 +264,8 @@ L.DomEvent
.disableClickPropagation(htmlElement)
.preventDefault(domEvent)
.stop(domEvent);
-point = L.DomEvent.getMousePosition(domEvent);
-point = L.DomEvent.getMousePosition(domEvent, htmlElement);
+point = L.DomEvent.getMousePosition(domEvent as MouseEvent);
+point = L.DomEvent.getMousePosition(domEvent as MouseEvent, htmlElement);
const wheelDelta: number = L.DomEvent.getWheelDelta(domEvent);
map = map
@@ -391,7 +380,7 @@ let twoCoords: [number, number] = [1, 2];
latLng = L.GeoJSON.coordsToLatLng(twoCoords);
twoCoords = L.GeoJSON.latLngToCoords(latLng);
-let threeCoords: [number, number, number] = [1, 2, 3];
+let threeCoords: [number, number] = [1, 2];
latLng = L.GeoJSON.coordsToLatLng(threeCoords);
threeCoords = L.GeoJSON.latLngToCoords(latLng);
diff --git a/types/leven/leven-tests.ts b/types/leven/leven-tests.ts
index 4e87d3d90e..4ca0406529 100644
--- a/types/leven/leven-tests.ts
+++ b/types/leven/leven-tests.ts
@@ -1,8 +1,7 @@
-
import leven = require('leven');
leven('baz', 'bar');
// => "1"
leven('foo', 'bar');
-// => "3"
\ No newline at end of file
+// => "3"
diff --git a/types/localforage-cordovasqlitedriver/localforage-cordovasqlitedriver-tests.ts b/types/localforage-cordovasqlitedriver/localforage-cordovasqlitedriver-tests.ts
index 5b678beeb7..22b550da0b 100644
--- a/types/localforage-cordovasqlitedriver/localforage-cordovasqlitedriver-tests.ts
+++ b/types/localforage-cordovasqlitedriver/localforage-cordovasqlitedriver-tests.ts
@@ -1,4 +1,3 @@
-
declare const cordovaSQLiteDriver: LocalForageDriver;
() => {
diff --git a/types/lodash.nth/index.d.ts b/types/lodash.nth/index.d.ts
new file mode 100644
index 0000000000..9576fa5a4e
--- /dev/null
+++ b/types/lodash.nth/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for lodash.nth 4.0
+// Project: http://lodash.com/
+// Definitions by: Brian Zengel , Ilya Mochalov , Stepan Mikhaylyuk
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { nth } from "lodash";
+export = nth;
diff --git a/types/lodash.nth/tsconfig.json b/types/lodash.nth/tsconfig.json
new file mode 100644
index 0000000000..92ebbc6458
--- /dev/null
+++ b/types/lodash.nth/tsconfig.json
@@ -0,0 +1,21 @@
+{
+ "files": [
+ "index.d.ts"
+ ],
+ "compilerOptions": {
+ "module": "commonjs",
+ "lib": [
+ "es6"
+ ],
+ "noImplicitAny": true,
+ "noImplicitThis": true,
+ "strictNullChecks": false,
+ "baseUrl": "../",
+ "typeRoots": [
+ "../"
+ ],
+ "types": [],
+ "noEmit": true,
+ "forceConsistentCasingInFileNames": true
+ }
+}
\ No newline at end of file
diff --git a/types/lodash.nth/tslint.json b/types/lodash.nth/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/types/lodash.nth/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/types/loopback/index.d.ts b/types/loopback/index.d.ts
index 2d4af5caa9..5eadbb871f 100644
--- a/types/loopback/index.d.ts
+++ b/types/loopback/index.d.ts
@@ -14,7 +14,6 @@ import * as core from "express-serve-static-core";
declare function l(): l.LoopBackApplication;
declare namespace l {
-
/**
* The `App` object represents a Loopback application
* The App object extends [Express](expressjs.com/api.html#express) and
@@ -35,7 +34,6 @@ declare namespace l {
// interface ILoopbackAplication extends express.Application { };
interface LoopBackApplication extends core.Application {
-
start(): void;
/**
@@ -49,7 +47,6 @@ declare namespace l {
* @param {any} connector Connector object as returne
* by `require('loopback-connector-{name}')`
*/
-
connector(name: string, connector: any): void;
/**
@@ -57,13 +54,11 @@ declare namespace l {
* @param {string} name The data source name
* @param {any} config The data source confi
*/
-
dataSource(name: string, config: any): void;
/**
* Enable app wide authentication
*/
-
enableAuth(): void;
/**
@@ -90,7 +85,6 @@ declare namespace l {
* listen(cb?: () => void):http.Serve
*
*/
-
// listen(port?: number, cb?: () => void): any;
/**
@@ -114,7 +108,6 @@ declare namespace l {
* @en
* @returns {any} the model clas
*/
-
model(Model: any|string, config: {dataSource: string|any, public?: boolean, relations?: any}): any;
/**
@@ -152,14 +145,12 @@ declare namespace l {
* ``
* @returns {Array} Array of model classes
*/
-
models(): any[];
/**
* Get all remote objects.
* @returns {any} [Remote objects](apidocs.strongloop.com/strong-remoting/#remoteObjectsoptions).
*/
-
remoteObjects(): any;
/**
@@ -168,7 +159,6 @@ declare namespace l {
* *NOTE:** Calling `app.remotes()` more than once returns only a single set of remote objects.
* @returns {any} remoteObjects
*/
-
remotes(): any;
/**
@@ -198,7 +188,6 @@ declare namespace l {
* @returns {any} this (fluent API
* @header app.middlewareFromConfig(factory, config
*/
-
middlewareFromConfig(factory: () => void, config: {phase: string, enabled?: boolean, params?: any[]|any, paths?: any[]|string|RegExp}): any;
/**
@@ -228,7 +217,6 @@ declare namespace l {
* @returns {any} this (fluent API
* @header app.defineMiddlewarePhases(nameOrArray
*/
-
defineMiddlewarePhases(nameOrArray: string|string[]): any;
/**
@@ -244,7 +232,6 @@ declare namespace l {
* @returns {any} this (fluent API
* @header app.middleware(name, handler
*/
-
middleware(name: string, paths?: any[]|string|RegExp, handler?: core.Handler): any;
}
@@ -265,7 +252,6 @@ declare namespace l {
// interface Router extends core.Router { }
// interface Send extends core.Send { }
-
/**
* LoopBack core module. It provides static properties and
* methods to create models and data sources. The module itself is a function
@@ -286,9 +272,7 @@ declare namespace l {
* @class loopback
* @header loopback
*/
-
class loopback {
-
/** Version of LoopBack framework. Static read-only property. */
version: string;
@@ -385,7 +369,6 @@ declare namespace l {
* @param {any} options (optional
* @header loopback.createMode
*/
-
static createModel(name: string, properties: any, options: any): void;
/**
@@ -395,7 +378,6 @@ declare namespace l {
* @returns {Model} The model clas
* @header loopback.findModel(modelName
*/
-
static findModel(modelName: string): Model;
/**
@@ -405,7 +387,6 @@ declare namespace l {
* @returns {Model} The model clas
* @header loopback.getModel(modelName
*/
-
static getModel(modelName: string): Model;
/**
@@ -416,7 +397,6 @@ declare namespace l {
* @returns {Model} The subclass if found or the base clas
* @header loopback.getModelByType(modelType
*/
-
static getModelByType(modelType: Model): Model;
/**
@@ -424,16 +404,13 @@ declare namespace l {
* @param {string} [name] The name of the data source.
* If not provided, the `'default'` is used
*/
-
static memory(name?: string): void;
-
/**
* Add a remote method to a model.
* @param {() => void} fn
* @param {any} options (optional
*/
-
static remoteMethod(fn: () => void, options: any): void;
/**
@@ -443,7 +420,6 @@ declare namespace l {
* @param {string} path Path to the template file.
* @returns {() => void
*/
-
static template(path: string): void;
// NOTE*** DEPRECATE in 3.0
@@ -455,7 +431,6 @@ declare namespace l {
// *
// * @header loopback.setDefaultDataSourceForType(type, dataSource)
// */
-
// setDefaultDataSourceForType(type: string, dataSource: any|DataSource): DataSource;
// /**
@@ -463,16 +438,13 @@ declare namespace l {
// * @param {string} type The datasource type.
// * @returns {DataSource} The data source instance
// */
-
// getDefaultDataSourceForType(type: string): DataSource;
// /**
// * Attach any model that does not have a dataSource to
// * the default dataSource for the type the Model requests
// */
-
// autoAttach(): void;
-
}
/**
@@ -481,7 +453,6 @@ declare namespace l {
*/
class Registry {
-
static addACL(acls: any[], acl: any): void;
/**
@@ -492,7 +463,6 @@ declare namespace l {
* @property {any} [relations] Model relations to add/update
* @header loopback.configureModel(ModelCtor, config
*/
-
configureModel(ModelCtor: Model, config: {dataSource: any, relations?: any}): void;
/**
@@ -503,7 +473,6 @@ declare namespace l {
* @property {*} [*] Other connector properties.
* See the relevant connector documentation
*/
-
createDataSource(name: string, options: {connector: any, properties?: any}): void;
/**
@@ -559,7 +528,6 @@ declare namespace l {
* @param {any} options (optional
* @header loopback.createMode
*/
-
createModel(name: string, properties: any, options: any): void;
/**
@@ -569,7 +537,6 @@ declare namespace l {
* @returns {Model} The model clas
* @header loopback.findModel(modelName
*/
-
findModel(modelOrName: string ): Model;
/**
@@ -579,7 +546,6 @@ declare namespace l {
* @returns {Model} The model clas
* @header loopback.getModel(modelName
*/
-
getModel(modelOrName: string): Model;
/**
@@ -590,7 +556,6 @@ declare namespace l {
* @returns {Model} The subclass if found or the base clas
* @header loopback.getModelByType(modelType
*/
-
getModelByType(modelType: Model): Model;
/**
@@ -598,7 +563,6 @@ declare namespace l {
* @param {string} [name] The name of the data source.
* If not provided, the `'default'` is used
*/
-
memory(name?: string): void;
// **NOTE** DEPRECATE ON 3.x
@@ -610,7 +574,6 @@ declare namespace l {
// *
// * @header loopback.setDefaultDataSourceForType(type, dataSource)
// */
-
// setDefaultDataSourceForType(type: string, dataSource: any|DataSource): DataSource;
// /**
@@ -618,14 +581,12 @@ declare namespace l {
// * @param {string} type The datasource type.
// * @returns {DataSource} The data source instance
// */
-
// getDefaultDataSourceForType(type: string): DataSource;
// /**
// * Attach any model that does not have a dataSource to
// * the default dataSource for the type the Model requests
// */
-
// autoAttach(): void;
}
@@ -636,7 +597,6 @@ declare namespace l {
* @options {Context} context The context object
* @constructor
*/
-
class AccessContext {
/** context The context object */
constructor(context: Context);
@@ -648,28 +608,24 @@ declare namespace l {
* @param {string} [principalName] The principal name
* @returns {boolean}
*/
-
addPrincipal(principalType: string, principalId: any, principalName?: string): boolean;
/**
* Get the user id
* @returns {*}
*/
-
getUserId(): any;
/**
* Get the application id
* @returns {*}
*/
-
getAppId(): any;
/**
* Check if the access context has authenticated principals
* @returns {boolean}
*/
-
isAuthenticated(): boolean;
}
@@ -723,7 +679,6 @@ declare namespace l {
* @class
* @constructor
*/
-
class AccessRequest {
constructor(model: string, property: string, accessType: string, permission: string);
@@ -731,21 +686,18 @@ declare namespace l {
* Does the given `ACL` apply to this `AccessRequest`
* @param {ACL} acl
*/
-
exactlyMatches(acl: ACL): void;
/**
* Is the request for access allowed
* @returns {boolean}
*/
-
isAllowed(): boolean;
/**
* Does the request contain any wildcards
* @returns {boolean}
*/
-
isWildcard(): boolean;
}
@@ -758,7 +710,6 @@ declare namespace l {
* @returns {Principal}
* @class
*/
-
class Principal {
constructor(type: string, id: any, name: string);
@@ -767,7 +718,6 @@ declare namespace l {
* Returns true if argument principal is equal to this principal.
* @param {any} p The other principa
*/
-
equals(p: any): void;
}
@@ -841,9 +791,7 @@ declare namespace l {
* @class
* @constructor
*/
-
class Model {
-
/** The name of the model. */
static modelName: string;
@@ -868,7 +816,6 @@ declare namespace l {
* @param {string|Error} err The error object.
* @param {boolean} allowed True if the request is allowed; false otherwise
*/
-
static checkAccess(token: AccessToken, modelId: any, sharedMethod: any, ctx: any, callback: (err: string|Error, allowed: boolean) => void): void;
/**
@@ -878,7 +825,6 @@ declare namespace l {
* `false` if the method defined on the prototype (eg.
* `MyModel.prototype.myMethod`)
*/
-
static disableRemoteMethod(name: string, isStatic: boolean): void;
/**
@@ -886,7 +832,6 @@ declare namespace l {
* @param {string} name The name of the method.
* The name of the method (include "prototype." if the method is defined on the prototype).
*/
-
static disableRemoteMethodByName(name: string): void;
/**
@@ -896,7 +841,6 @@ declare namespace l {
* @param {Application} app Attached application object.
* @end
*/
-
static getApp(callback: (err: Error, app: Application) => void): void;
/**
@@ -934,7 +878,6 @@ declare namespace l {
* @param {any} options The remoting options.
* See [Remote methods - Options](docs.strongloop.com/display/LB/Remote+methods#Remotemethods-Options)
*/
-
remoteMethod(name: string, options: any): void;
/**
@@ -942,7 +885,6 @@ declare namespace l {
* Add any setup or configuration code you want executed when the model is created.
* See [Setting up a custom model](docs.strongloop.com/display/LB/Extending+built-in+models#Extendingbuilt-inmodels-Settingupacustommodel)
*/
-
static setup(): void;
}
@@ -957,7 +899,6 @@ declare namespace l {
* @property {() => void } ctor The constructor
* @property {any} http The HTTP settings
*/
-
class SharedClass {
/** The SharedClass name */
ctor: () => void;
@@ -975,7 +916,6 @@ declare namespace l {
* @param {string} name The method name
* @param {any} options Set of options used to create a SharedMethod. See the full set of options https://apidocs.strongloop.com/strong-remoting/#sharedmethod
*/
-
defineMethod(name: string, options: any): void;
/**
@@ -983,14 +923,12 @@ declare namespace l {
* @param {string} fn The function or method name
* @param {boolean} isStatic Disable a static or prototype method
*/
-
disableMethod(fn: string, isStatic: boolean): void;
/**
* Disable a sharedMethod with the given static or prototype method name.
* @param {string} methodName The method name
*/
-
disableMethodByName(methodName: string): void;
/**
@@ -999,7 +937,6 @@ declare namespace l {
* @param {boolean} isStatic Required if fn is a String. Only find a static method with the given name.
* @return {any} SharedMethod https://apidocs.strongloop.com/strong-remoting/#sharedmethod
*/
-
find(fn: () => void|string, isStatic: boolean ): any;
/**
@@ -1007,7 +944,6 @@ declare namespace l {
* @param {string} methodName the method name Find a static or prototype method with the given name.
* @return {any} SharedMethod
*/
-
findMethodByName(methodName: string): any;
/**
@@ -1015,7 +951,6 @@ declare namespace l {
* @param {string} fn The function or method name
* @param {boolean} isStatic Disable a static or prototype method
*/
-
getKeyFromMethodNameAndTarget(fn: string, isStatic: boolean): void;
/**
@@ -1023,7 +958,6 @@ declare namespace l {
* @param {any} options
* @return {any[]} An array of shared methods SharedMethod[]
*/
-
methods(options: {includeDisabled: boolean}): any[];
/**
@@ -1044,7 +978,6 @@ declare namespace l {
*
* @param {() => void} resolver The resolver function.
*/
-
resolve(resolver: () => void): void;
}
@@ -1066,9 +999,7 @@ declare namespace l {
* ```
* @class PersistedModel
*/
-
class PersistedModel extends Model {
-
/**
* Apply an update list
* **Note: this is not atomic*
@@ -1076,7 +1007,6 @@ declare namespace l {
* @param {any} options An optional options object to pass to underlying data-access calls.
* @param {() => void} callback Callback function
*/
-
static bulkUpdate(updates: any[], options: any, callback: () => void): void;
/**
@@ -1088,14 +1018,12 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {Array} changes An Array of [Change](#change) objects
*/
-
static changes(since: number, filter: any, callback: (err: Error, changes: any[]) => void): void;
/**
* Create a checkpoint
* @param {() => void} callback
*/
-
static checkpoint(callback: () => void): void;
/**
@@ -1110,7 +1038,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {number} count number of instances updated
*/
-
static count(where?: any, callback?: (err: Error, count: number) => void): void;
/**
@@ -1120,7 +1047,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} models Model instances or null
*/
-
static create(data?: any|any[], callback?: (err: Error, models: any) => void): void;
/**
@@ -1128,7 +1054,6 @@ declare namespace l {
* @param {any} options Only changes to models matching this where filter will be included in the ChangeStream.
* @param {() => void} callback
*/
-
static createChangeStream(options: {where: any}, callback: (err: Error, changes: any) => void): void;
/**
@@ -1137,7 +1062,6 @@ declare namespace l {
* @param {Array} deltas
* @param {() => void} callback
*/
-
static createUpdates(deltas: any[], callback: () => void): void;
/**
@@ -1146,7 +1070,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {number} currentCheckpointId Current checkpoint ID
*/
-
static currentCheckpoint(callback: (err: Error, currentCheckpointId: number) => void): void;
/**
@@ -1163,7 +1086,6 @@ declare namespace l {
* @param {any} info Additional information about the command outcome.
* @param {number} info.count number of instances (rows, documents) destroyed
*/
-
static destroyAll(where?: any, callback?: (err: Error, info: any, infoCount: number) => void): void;
/**
@@ -1172,7 +1094,6 @@ declare namespace l {
* @callback {() => void} callback Callback function called with `(err)` arguments. Required.
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object)
*/
-
static destroyById(id: any, callback: (err: Error) => void): void;
/**
@@ -1184,13 +1105,11 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} result any with `deltas` and `conflicts` properties; see [Change.diff()](#change-diff) for details
*/
-
static diff(since: number, remoteChanges: any[], callback: (err: Error, result: any) => void): void;
/**
* Enable the tracking of changes made to the model. Usually for replication.
*/
-
static enableChangeTracking(): void;
/**
@@ -1200,7 +1119,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {boolean} exists True if the instance with the specified ID exists; false otherwise
*/
-
static exists(id: any, callback: (err: Error, exists: boolean) => void): void;
/**
@@ -1243,7 +1161,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} instance Model instance matching the specified ID or null if no instance matches
*/
-
static findById(id: any, filter?: {fields?: string|any|any[]; include?: string|any|any[]; }, callback?: (err: Error, instance: any) => void): void;
/**
@@ -1269,7 +1186,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {Array} model First model instance that matches the filter or null if none found
*/
-
static findOne(filter?: {fields?: string|any|any[]; include?: string|any|any[]; order?: string; skip?: number; where?: any; }, callback?: (err: Error, model: any) => void): void;
/**
@@ -1302,7 +1218,6 @@ declare namespace l {
* @param {any} instance Model instance matching the `where` filter, if found.
* @param {boolean} created True if the instance matching the `where` filter was created
*/
-
static findOrCreate(
data: any,
filter?: {
@@ -1319,14 +1234,12 @@ declare namespace l {
* Get the `Change` model.
* Throws an error if the change model is not correctly setup.
*/
-
static getChangeModel(): void;
/**
* Get the `id` property name of the constructor
* @returns {string} The `id` property nam
*/
-
static getIdName(): string;
/**
@@ -1335,7 +1248,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {string} sourceId Source identifier for the model or dataSource
*/
-
static getSourceId(callback: (err: Error, sourceId: string) => void): void;
/**
@@ -1343,7 +1255,6 @@ declare namespace l {
* change error handling
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object)
*/
-
static handleChangeError(err: Error): void;
/**
@@ -1352,7 +1263,6 @@ declare namespace l {
* @callback {() => void} callback
* @param {Error} er
*/
-
static rectifyChange(id: any, callback: (err: Error) => void): void;
/**
@@ -1367,7 +1277,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} instance Replaced instance
*/
-
static replaceById(id: any, data: any, options?: {validate: boolean; }, callback?: (err: Error, instance: any) => void): void;
/**
@@ -1381,7 +1290,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} model Replaced model instance.
*/
-
static replaceOrCreate(data: any, options?: {validate: boolean; }, callback?: (err: Error, model: any) => void): void;
/**
@@ -1396,7 +1304,6 @@ declare namespace l {
* @param {any] checkpoints The new checkpoints to use as the "since"
* argument for the next replication
*/
-
static replicate(since?: number, targetModel?: Model, options?: any, optionsFilter?: any, callback?: (err: Error, conflicts: Conflict[], param: any) => void): void;
/**
@@ -1424,7 +1331,6 @@ declare namespace l {
* @param {number} info.count number of instances (rows, documents) updated.
*
*/
-
static updateAll(where?: any, data?: any, callback?: (err: Error, info: any, infoCount: number) => void): void;
/**
@@ -1434,7 +1340,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} model Updated model instance
*/
-
static upsert(data: any, callback: (err: Error, model: any) => void): void;
/**
@@ -1453,7 +1358,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} model Updated model instance
*/
-
static upsertWithWhere(data: any, callback: (err: Error, model: any) => void): void;
/**
@@ -1461,28 +1365,24 @@ declare namespace l {
* Triggers `destroy` hook (async) before and after destroying object.
* @param {() => void} callback Callback function
*/
-
destroy(callback: () => void): void;
/**
* Get the `id` value for the `PersistedModel`
* @returns {*} The `id` valu
*/
-
getId(): any;
/**
* Get the `id` property name of the constructor
* @returns {string} The `id` property nam
*/
-
getIdName(): string;
/**
* Determine if the data model is new.
* @returns {boolean} Returns true if the data model is new; false otherwise
*/
-
isNewRecord(): boolean;
/**
@@ -1491,7 +1391,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} instance Model instance
*/
-
reload(callback: (err: Error, instance: any) => void): void;
/**
@@ -1504,7 +1403,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} instance Replaced instance
*/
-
replaceAttributes(data: any, options?: {validate: boolean}, callback?: (err: Error, instance: any) => void): void;
/**
@@ -1518,7 +1416,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} instance Model instance saved or created
*/
-
save(options?: {validate: boolean; throws: boolean}, callback?: (err: Error, instance: any) => void): void;
/**
@@ -1527,7 +1424,6 @@ declare namespace l {
* Override this method to handle complex IDs
* @param {*} val The `id` value. Will be converted to the type that the `id` property specifies
*/
-
setId(val: any): void;
/**
@@ -1539,7 +1435,6 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} instance Updated instance
*/
-
updateAttribute(name: string, value: any, callback: (err: Error, instance: any) => void): void;
/**
@@ -1550,14 +1445,12 @@ declare namespace l {
* @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
* @param {any} instance Updated instance
*/
-
updateAttributes(data: any, callback: (err: Error, instance: any) => void): void;
// **NOTE** Deprecate for v3.x
// /**
// * Alias for `destroyAll`
// */
-
// **NOTE** Deprecate for v3.x
// deleteAll(): void;
@@ -1565,21 +1458,18 @@ declare namespace l {
// /**
// * Alias for updateAll.
// */
-
// update(): void;
// **NOTE** Deprecate for v3.x
// /**
// * Alias for destroyById.
// */
-
// removeById(): void;
// **NOTE** Deprecate for v3.x
// /**
// * Alias for destroyById.
// */
-
// deleteById(): void;
// **NOTE** Deprecate for v3.x
@@ -1587,7 +1477,6 @@ declare namespace l {
// * Alias for destroy.
// * @header PersistedModel.remove
// */
-
// remove(): void;
// **NOTE** Deprecate for v3.x
@@ -1595,7 +1484,6 @@ declare namespace l {
// * Alias for destroy.
// * @header PersistedModel.delete
// */
-
// delete(): void;
// **NOTE** Deprecate for v3.x
@@ -1608,16 +1496,13 @@ declare namespace l {
// * @param {Error} err
// * @param {any} changes
// */
-
// createany(options: any, optionsWhere: any, callback: (err: Error, changes: any) => void): void;
-
}
/**
* Serve the LoopBack favicon.
* @header loopback.favicon(
*/
-
function favicon(): void;
/**
@@ -1629,7 +1514,6 @@ declare namespace l {
* For more information, see [Exposing models over a REST API](docs.strongloop.com/display/DOC/Exposing+models+over+a+REST+API).
* @header loopback.rest(
*/
-
function rest(): void;
/**
@@ -1641,7 +1525,6 @@ declare namespace l {
* for the full list of available options.
* @header loopback.static(root, [options])
*/
-
function static(root: string, options: any): void;
/**
@@ -1654,13 +1537,11 @@ declare namespace l {
* }
* ```
*/
-
function status(): void;
/**
* Rewrite the url to replace current user literal with the logged in user id
*/
-
function rewriteUserLiteral(): void;
/**
@@ -1711,7 +1592,6 @@ declare namespace l {
* to be handled by error-handling middleware.
* @header loopback.urlNotFound(
*/
-
function urlNotFound(): void;
/**
@@ -1728,9 +1608,7 @@ declare namespace l {
* @class AccessToken
* @inherits {PersistedModel}
*/
-
class AccessToken extends PersistedModel {
-
/** Generated token ID */
id: string;
@@ -1749,7 +1627,6 @@ declare namespace l {
* @param {Error} err
* @param {string} toke
*/
-
static createAccessTokenId(callback: (err: Error, token: string) => void): void;
/**
@@ -1760,7 +1637,6 @@ declare namespace l {
* @param {Error} err
* @param {AccessToken} toke
*/
-
static findForRequest(req: any, options?: any, callback?: (err: Error, token: AccessToken) => void): void;
/**
@@ -1770,7 +1646,6 @@ declare namespace l {
* @param {Error} err
* @param {boolean} isValid
*/
-
validate(callback: (err: Error, isValid: boolean) => void): void;
// **NOTE** Deprecate for 3.x
@@ -1781,9 +1656,7 @@ declare namespace l {
// * assert(AccessToken.ANONYMOUS.id === '$anonymous');
// * ```
// */
-
// ANONYMOUS(): void;
-
}
/**
@@ -1812,7 +1685,6 @@ declare namespace l {
* @class ACL
* @inherits PersistedMode
*/
-
class ACL extends PersistedModel {
/** model Name of the model. */
model: string;
@@ -1851,7 +1723,6 @@ declare namespace l {
* READ, REPLICATE, WRITE, or EXECUTE.
* @param {() => void} callback Callback functio
*/
-
static checkAccessForContext(context: {principals: any[]; model: string|Model; id: any; property: string; accessType: string; }, callback: () => void): void;
/**
@@ -1864,7 +1735,6 @@ declare namespace l {
* @param {string|Error} err The error object
* @param {boolean} allowed is the request allow
*/
-
static checkAccessForToken(token: AccessToken, model: string, modelId: any, method: string, callback: (err: string|Error, allowed: boolean) => void): void;
/**
@@ -1878,7 +1748,6 @@ declare namespace l {
* @param {string|Error} err The error object
* @param {AccessRequest} result The access permissio
*/
-
static checkPermission(principalType: string, principalId: string, model: string, property: string, accessType: string, callback: (err: string|Error, result: AccessRequest) => void): void;
/**
@@ -1887,7 +1756,6 @@ declare namespace l {
* @param {AccessRequest} req The request
* @returns {number}
*/
-
static getMatchingScore(rule: ACL, req: AccessRequest): number;
/**
@@ -1897,7 +1765,6 @@ declare namespace l {
* @param {string|*} role Role id/name
* @param {() => void} cb Callback functio
*/
-
static isMappedToRole(principalType: string, principalId: string|any, role: string|any, cb: () => void): void;
/**
@@ -1906,7 +1773,6 @@ declare namespace l {
* @param {string|number} id Principal id or name
* @param {() => void} cb Callback function
*/
-
static resolvePrincipal(type: string, id: string|number, cb: () => void): void;
/**
@@ -1914,7 +1780,6 @@ declare namespace l {
* @param {AccessRequest} req The request
* @returns {number} scor
*/
-
score(req: AccessRequest): number;
}
@@ -1959,7 +1824,6 @@ declare namespace l {
* @class Application
* @inherits {PersistedModel}
*/
-
class Application extends PersistedModel {
/** Generated ID. */
id: string;
@@ -2099,7 +1963,6 @@ declare namespace l {
* @class Change
* @inherits {PersistedModel}
*/
-
class Change extends PersistedModel {
/** Hash of the modelName and ID. */
id: string;
@@ -2107,7 +1970,6 @@ declare namespace l {
/** The current model revision. */
rev: string;
-
prev: string;
checkpoint: number;
@@ -2164,7 +2026,6 @@ declare namespace l {
* @param {Error} err
* @param {any} result See above.
*/
-
// static diff(modelName: string, since: number, remoteChanges: Change[], callback: (err: Error, result: any) => void): void;
/**
@@ -2176,13 +2037,11 @@ declare namespace l {
* @param {Change} change
* @end
*/
-
static findOrCreateChange(modelName: string, modelId: string, callback: (err: Error, change: Change) => void): void;
/**
* Get the checkpoint model.
*/
-
static getCheckpointModel(): void;
/**
@@ -2190,7 +2049,6 @@ declare namespace l {
* **Default: `sha1`*
* @param {string} str The string to be hashed
*/
-
static hash(str: string): void;
/**
@@ -2198,14 +2056,12 @@ declare namespace l {
* @param {string} modelName
* @param {string} modelId
*/
-
static idForModel(modelName: string, modelId: string): void;
/**
* Correct all change list entries.
* @param {() => void} c
*/
-
static rectifyAll(cb: () => void): void;
/**
@@ -2216,14 +2072,12 @@ declare namespace l {
* @param {Error} err
* @param {Array} changes Changes that were tracke
*/
-
static rectifyModelChanges(modelName: string, modelIds: any[], callback: (err: Error, changes: any[]) => void): void;
/**
* Get the revision string for the given object
* @param {any} inst The data to get the revision string for
*/
-
static revisionForInst(inst: any): void;
/**
@@ -2231,7 +2085,6 @@ declare namespace l {
* @param {Change} change
* @return {boolean
*/
-
conflictsWith(change: Change): void;
/**
@@ -2240,20 +2093,17 @@ declare namespace l {
* @param {Error} err
* @param {string} rev The current revisio
*/
-
currentRevision(callback: (err: Error, rev: string) => void): void;
/**
* Compare two changes.
* @param {Change} change
*/
-
equals(change: Change): void;
/**
* Get the `Model` class for `change.modelName`.
*/
-
getModelCtor(): void;
/**
@@ -2261,7 +2111,6 @@ declare namespace l {
* @param {Change} change
* @return {boolean
*/
-
isBasedOn(change: Change): void;
/**
@@ -2270,7 +2119,6 @@ declare namespace l {
* @param {Error} err
* @param {Change} chang
*/
-
rectify(callback: (err: Error, change: Change) => void): void;
/**
@@ -2280,7 +2128,6 @@ declare namespace l {
* - `Change.DELETE`
* - `Change.UNKNOWN
*/
-
type(): void;
}
@@ -2295,7 +2142,6 @@ declare namespace l {
* @property {ModelClass} target The target model instance
* @class Change.Conflic
*/
-
class Conflict {
source: any;
target: any;
@@ -2308,7 +2154,6 @@ declare namespace l {
* @param {Change} sourceChange
* @param {Change} targetChang
*/
-
changes(callback: (err: Error, sourceChange: Change, targetChange: Change) => void): void;
/**
@@ -2318,7 +2163,6 @@ declare namespace l {
* @param {PersistedModel} source
* @param {PersistedModel} targe
*/
-
models(callback: (err: Error, source: PersistedModel, target: PersistedModel) => void): void;
/**
@@ -2331,7 +2175,6 @@ declare namespace l {
* @callback {() => void} callback
* @param {Error} err
*/
-
resolve(callback: (err: Error) => void): void;
/**
@@ -2341,7 +2184,6 @@ declare namespace l {
* @callback {() => void} callback
* @param {Error} err
*/
-
resolveManually(data: any, callback: (err: Error) => void): void;
/**
@@ -2349,7 +2191,6 @@ declare namespace l {
* @callback {() => void} callback
* @param {Error} err
*/
-
resolveUsingSource(callback: (err: Error) => void): void;
/**
@@ -2357,7 +2198,6 @@ declare namespace l {
* @callback {() => void} callback
* @param {Error} err
*/
-
resolveUsingTarget(callback: (err: Error) => void): void;
/**
@@ -2370,7 +2210,6 @@ declare namespace l {
* ```
* @returns {Conflict} A new Conflict instance
*/
-
swapParties(): Conflict;
/**
@@ -2385,7 +2224,6 @@ declare namespace l {
* @param {Error} err
* @param {string} type The conflict type
*/
-
type(callback: (err: Error, type: string) => void): void;
}
@@ -2399,7 +2237,6 @@ declare namespace l {
* @class Email
* @inherits {Model}
*/
-
class Email extends Model {
/** Email addressee. Required. */
to: string;
@@ -2438,15 +2275,12 @@ declare namespace l {
* @prop {string} html Body HTML (optional)
* @param {() => void} callback Called after the e-mail is sent or the sending faile
*/
-
static send(callback: () => void, options: { from: string; to: string; subject: string; text: string; html: string; }): void;
/**
* A shortcut for Email.send(this).
*/
-
send(): void;
-
}
/**
@@ -2454,7 +2288,6 @@ declare namespace l {
* @class
*/
class KeyValueModel {
-
/**
* Set the TTL (time to live) in ms (milliseconds) for a given key.
* TTL is the remaining time before a key-value pair is discarded from the database.
@@ -2470,7 +2303,6 @@ declare namespace l {
* @param {any} options
* @param {() => void} callback
*/
-
static expire(key: string, ttl: number, options: any, callback: () => void): PromiseLike;
/**
@@ -2487,7 +2319,6 @@ declare namespace l {
* @param {any} options
* @param {() => void} callback
*/
-
static get(key: string, option?: any, callback?: (err: Error, result: any) => void): PromiseLike;
/**
@@ -2529,7 +2360,6 @@ declare namespace l {
* @param {any} filter.options
* @return {any} result AsyncIterator An Object implementing next(cb) -> Promise function that can be used to iterate all keys.
*/
-
static iterateKeys(filter: {match: string; options: any}): any;
/**
@@ -2550,7 +2380,6 @@ declare namespace l {
* @param {() => void} callback
* @return {PromiseLike}
*/
-
static keys(filter: {match: string; options: any}, callback: () => void): PromiseLike;
/**
@@ -2568,7 +2397,6 @@ declare namespace l {
* @param {number|any} Optional settings for the key-value pair. If a Number is provided, it is set as the TTL (time to live) in ms (milliseconds) for the key-value pair.
* @param {() => void} callback
*/
-
static set(key: string, value: any, options?: number|any, callback?: (err: Error) => void): PromiseLike;
/**
@@ -2583,7 +2411,6 @@ declare namespace l {
* @param {any} options
* @param {() => void} callback
*/
-
static ttl(key: string, options?: any, cb?: (error: Error) => void): PromiseLike;
}
@@ -2592,7 +2419,6 @@ declare namespace l {
* @class Role
* @header Role objec
*/
-
class Role {
/**
* List roles for a given principal.
@@ -2601,7 +2427,6 @@ declare namespace l {
* @param {Error} err Error object.
* @param {string[]} roles An Array of role IDs
*/
-
static getRoles(context: any, callback: (err: Error, roles: string[]) => void): void;
/**
@@ -2610,7 +2435,6 @@ declare namespace l {
* @param {Error} err Error object.
* @param {boolean} isAuthenticated True if the user is authenticated.
*/
-
static isAuthenticated(context: any, callback: (err: Error, isAuthenticated: boolean) => void): void;
/**
@@ -2621,7 +2445,6 @@ declare namespace l {
* @param {Error} err Error object.
* @param {boolean} isInRole True if the principal is in the specified role.
*/
-
static isInRole(role: string, context: any, callback: (err: Error, isInRole: boolean) => void): void;
/**
@@ -2631,7 +2454,6 @@ declare namespace l {
* @param {*} userId The user ID
* @param {() => void} callback Callback function
*/
-
static isOwner(modelClass: () => void, modelId: any, userId: any, callback: () => void): void;
/**
@@ -2641,7 +2463,6 @@ declare namespace l {
* if a principal is in the specified role.
* Should provide a callback or return a promise.
*/
-
static registerResolver(role: string, resolver: () => void): void;
}
@@ -2653,9 +2474,7 @@ declare namespace l {
* @class RoleMapping
* @inherits {PersistedModel}
*/
-
class RoleMapping extends PersistedModel {
-
/** Generated ID. */
id: string;
@@ -2671,7 +2490,6 @@ declare namespace l {
* @param {Error} err
* @param {Application} application
*/
-
application(callback: (err: Error, application: Application) => void): void;
/**
@@ -2680,7 +2498,6 @@ declare namespace l {
* @param {Error} err
* @param {User} childUser
*/
-
childRole(callback: (err: Error, childUser: User) => void): void;
/**
@@ -2689,7 +2506,6 @@ declare namespace l {
* @param {Error} err
* @param {User} user
*/
-
user(callback: (err: Error, user: User) => void): void;
}
@@ -2700,9 +2516,7 @@ declare namespace l {
* Scope has many resource access entrie
* @class scope
*/
-
class Scope {
-
/**
* Check if the given scope is allowed to access the model/property
* @param {string} scope The scope name
@@ -2713,9 +2527,7 @@ declare namespace l {
* @param {string|Error} err The error object
* @param {AccessRequest} result The access permission
*/
-
static checkPermission(scope: string, model: string, property: string, accessType: string, callback: (err: string|Error, result: AccessRequest) => void): void;
-
}
/**
@@ -2755,9 +2567,7 @@ declare namespace l {
* @class User
* @inherits {PersistedModel}
*/
-
class User extends PersistedModel {
-
/** Must be unique. */
username: string;
@@ -2819,7 +2629,6 @@ declare namespace l {
* @callback {() => void} callback
* @param {Error} er
*/
-
static confirm(userId: any, token: string, redirect: string, callback: (err: Error) => void): void;
/**
@@ -2831,7 +2640,6 @@ declare namespace l {
* @param {any} user The User this token is being generated for.
* @param {() => void} cb The generator must pass back the new token with this function cal
*/
-
static generateVerificationToken(user: any, cb: () => void): void;
/**
@@ -2850,7 +2658,6 @@ declare namespace l {
* @param {Error} err Error object
* @param {AccessToken} token Access token if login is successfu
*/
-
static login(credentials: any, include?: string[]|string, callback?: (err: Error, token: AccessToken) => void): void;
/**
@@ -2866,7 +2673,6 @@ declare namespace l {
* @callback {() => void} callback
* @param {Error} er
*/
-
static logout(accessTokenID: string, callback: (err: Error) => void): void;
/**
@@ -2876,7 +2682,6 @@ declare namespace l {
* @param {string} realmDelimiter The realm delimiter, if not set, no realm is needed
* @returns {any} The normalized credential objec
*/
-
static normalizeCredentials(credentials: any, realmRequired: boolean, realmDelimiter: string): any;
/**
@@ -2887,7 +2692,6 @@ declare namespace l {
* @callback {() => void} callback
* @param {Error} er
*/
-
static resetPassword(options: {}, callback: (err: Error) => void): void;
/**
@@ -2899,7 +2703,6 @@ declare namespace l {
* @param {string|Error} err The error string or object
* @param {AccessToken} token The generated access token object
*/
-
createAccessToken(ttl: number, options?: any, cb?: (err: string|Error, token: AccessToken) => void): void;
/**
@@ -2909,7 +2712,6 @@ declare namespace l {
* @param {Error} err Error object
* @param {boolean} isMatch Returns true if the given `password` matches recor
*/
-
hasPassword(password: string, callback: (err: Error, isMatch: boolean) => void): void;
/**
@@ -2943,10 +2745,8 @@ declare namespace l {
* object, instead simply execute the callback with the token! User saving
* and email sending will be handled in the `verify()` method
*/
-
verify(options: {type: string, to: string, from: string, subject: string, text: string, template: string, redirect: string, generateVerificationToken: () => void}): void;
}
}
export = l;
-
diff --git a/types/loopback/loopback-tests.ts b/types/loopback/loopback-tests.ts
index b21bf8c759..938891912a 100644
--- a/types/loopback/loopback-tests.ts
+++ b/types/loopback/loopback-tests.ts
@@ -16,4 +16,4 @@ class Server {
// start the web server
};
}
-}
\ No newline at end of file
+}
diff --git a/types/lz-string/lz-string-tests.ts b/types/lz-string/lz-string-tests.ts
index e9bffed120..0ad913265d 100644
--- a/types/lz-string/lz-string-tests.ts
+++ b/types/lz-string/lz-string-tests.ts
@@ -1,9 +1,7 @@
-
-
-var input = "Someting to compress";
-var encoded: string;
-var decoded: string;
-var encodedU8: Uint8Array;
+const input = "Someting to compress";
+let encoded: string;
+let decoded: string;
+let encodedU8: Uint8Array;
encoded = LZString.compress(input);
decoded = LZString.decompress(encoded);
@@ -14,4 +12,4 @@ decoded = LZString.decompressFromBase64(encoded);
encoded = LZString.compressToEncodedURIComponent(input);
decoded = LZString.compressToEncodedURIComponent(encoded);
encodedU8 = LZString.compressToUint8Array(input);
-decoded = LZString.decompressFromUint8Array(encodedU8);
\ No newline at end of file
+decoded = LZString.decompressFromUint8Array(encodedU8);
diff --git a/types/modernizr/modernizr-tests.ts b/types/modernizr/modernizr-tests.ts
index 3e62ae478e..ece0cecb5d 100644
--- a/types/modernizr/modernizr-tests.ts
+++ b/types/modernizr/modernizr-tests.ts
@@ -1,13 +1,11 @@
-
-
-declare var $: any;
+declare const $: any;
window.alert = (thing?: string) => {
$('#content').append('
' + thing + '
');
};
$(() => {
- var audio = new Audio();
+ const audio = new Audio();
audio.src = Modernizr.audio.ogg ? 'background.ogg' :
Modernizr.audio.mp3 ? 'background.mp3' :
'background.m4a';
@@ -15,13 +13,13 @@ $(() => {
if (Modernizr.webgl) {
// loadAllWebGLScripts();
} else {
- var msg = 'With a different browser you’ll get to see the WebGL experience here: get.webgl.org.';
+ const msg = 'With a different browser you’ll get to see the WebGL experience here: get.webgl.org.';
document.getElementById('#notice').innerHTML = msg;
}
Modernizr.prefixed('boxSizing');
Modernizr.prefixed('requestAnimationFrame', window);
- var ms = Modernizr.prefixed("matchesSelector", HTMLElement.prototype, true);
+ const ms = Modernizr.prefixed("matchesSelector", HTMLElement.prototype, true);
Modernizr.prefixed('requestAnimationFrame', window, false);
Modernizr.mq('only all and (max-width: 400px)');
@@ -29,7 +27,7 @@ $(() => {
Modernizr.mq('only screen and (max-width: 768px)');
Modernizr.addTest('track', () => {
- var video = document.createElement('video');
+ const video = document.createElement('video');
return typeof video.addTextTrack === 'function';
});
@@ -45,7 +43,7 @@ $(() => {
Modernizr.testAllProps('boxSizing');
- var elem: Element;
+ const elem: Element = null as any;
Modernizr.hasEvent('gesturestart', elem);
if (!Modernizr.input.autofocus) {
@@ -53,7 +51,6 @@ $(() => {
}
});
-
Modernizr.on('flash', result => {
if (result) {
// the browser has flash
@@ -63,22 +60,22 @@ Modernizr.on('flash', result => {
});
Modernizr.addTest('itsTuesday', () => {
- var d = new Date();
+ const d = new Date();
return d.getDay() === 2;
});
Modernizr.addTest('hasJquery', 'jQuery' in window);
-var detects = {
+const detects = {
hasjquery: 'jQuery' in window,
itstuesday: () => {
- var d = new Date();
+ const d = new Date();
return d.getDay() === 2;
}
};
Modernizr.addTest(detects);
-var keyframes = Modernizr.atRule('@keyframes');
+const keyframes = Modernizr.atRule('@keyframes');
if (keyframes) {
// keyframes are supported
// could be `@-webkit-keyframes` or `@keyframes`
@@ -92,25 +89,25 @@ Modernizr.hasEvent('blur'); // true;
Modernizr.hasEvent('devicelight', window); // true;
-var query = Modernizr.mq('(min-width: 900px)');
+const query = Modernizr.mq('(min-width: 900px)');
if (query) {
// the browser window is larger than 900px
}
Modernizr.prefixed('boxSizing');
-var raf = Modernizr.prefixed('requestAnimationFrame', window);
+const raf = Modernizr.prefixed('requestAnimationFrame', window);
raf(() => {
});
-var rAFProp = Modernizr.prefixed('requestAnimationFrame', window, false);
+const rAFProp = Modernizr.prefixed('requestAnimationFrame', window, false);
rAFProp === 'WebkitRequestAnimationFrame'; // in older webkit
Modernizr.prefixedCSS('transition'); // '-moz-transition' in old Firefox
Modernizr.prefixedCSSValue('background', 'linear-gradient(left, red, red)');
-var rule = Modernizr._prefixes.join('transform: rotate(20deg); ');
+let rule = Modernizr._prefixes.join('transform: rotate(20deg); ');
rule === 'transform: rotate(20deg); webkit-transform: rotate(20deg); moz-transform: rotate(20deg); o-transform: rotate(20deg); ms-transform: rotate(20deg);';
rule = 'display:' + Modernizr._prefixes.join('flex; display:') + 'flex';
diff --git a/types/modesl/index.d.ts b/types/modesl/index.d.ts
index 6b1c532bd3..95d34599f6 100644
--- a/types/modesl/index.d.ts
+++ b/types/modesl/index.d.ts
@@ -104,4 +104,3 @@ export class Server extends EventEmitter {
export function eslSetLogLevel(level: any): void;
export function setLogLevel(level: any): void;
-
diff --git a/types/modesl/modesl-tests.ts b/types/modesl/modesl-tests.ts
index c3788833d0..6b40281f95 100644
--- a/types/modesl/modesl-tests.ts
+++ b/types/modesl/modesl-tests.ts
@@ -4,7 +4,6 @@ const freeswitchListener = new modesl.Server(() => {
// console.log('Server listening on localhost at port 8022');
});
-
const freeswitchConnection = new modesl.Connection("freeswitch-host", 8021, 'password', () => {
// console.log('connection initialized');
@@ -31,4 +30,3 @@ const freeswitchConnection = new modesl.Connection("freeswitch-host", 8021, 'pas
});
});
});
-
diff --git a/types/moment-business/index.d.ts b/types/moment-business/index.d.ts
index 90ff725c63..9d400c62dd 100644
--- a/types/moment-business/index.d.ts
+++ b/types/moment-business/index.d.ts
@@ -2,14 +2,12 @@
// Project: https://github.com/jmeas/moment-business
// Definitions by: Greg Sieranski
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+
import * as moment from "moment";
-
-declare module "moment-business" {
- export function weekDays(startMoment: moment.Moment, endMoment: moment.Moment): number
- export function weekendDays(startMoment: moment.Moment, endMoment: moment.Moment): number
- export function addWeekDays(moment: moment.Moment, amount: number): moment.Moment
- export function subtractWeekDays(moment: moment.Moment, amount: number): moment.Moment
- export function isWeekDay(moment: moment.Moment): boolean
- export function isWeekendDay(moment: moment.Moment): boolean
-}
+
+export function weekDays(startMoment: moment.Moment, endMoment: moment.Moment): number;
+export function weekendDays(startMoment: moment.Moment, endMoment: moment.Moment): number;
+export function addWeekDays(moment: moment.Moment, amount: number): moment.Moment;
+export function subtractWeekDays(moment: moment.Moment, amount: number): moment.Moment;
+export function isWeekDay(moment: moment.Moment): boolean;
+export function isWeekendDay(moment: moment.Moment): boolean;
diff --git a/types/moment-business/moment-business-tests.ts b/types/moment-business/moment-business-tests.ts
index 75f5c23b84..4f8ae296df 100644
--- a/types/moment-business/moment-business-tests.ts
+++ b/types/moment-business/moment-business-tests.ts
@@ -1,9 +1,9 @@
import * as moment from "moment";
import * as mb from "moment-business";
-
-let a = mb.isWeekDay(moment())
-let b = mb.isWeekendDay(moment());
-let c = mb.addWeekDays(moment(), 1);
-let d = mb.subtractWeekDays(moment(), 1);
-let e = mb.weekDays(moment(), moment());
-let f = mb.weekendDays(moment(), moment());
+
+mb.isWeekDay(moment());
+mb.isWeekendDay(moment());
+mb.addWeekDays(moment(), 1);
+mb.subtractWeekDays(moment(), 1);
+mb.weekDays(moment(), moment());
+mb.weekendDays(moment(), moment());
diff --git a/types/moment-timezone/moment-timezone-tests.ts b/types/moment-timezone/moment-timezone-tests.ts
index 2d728fc70e..7355142466 100644
--- a/types/moment-timezone/moment-timezone-tests.ts
+++ b/types/moment-timezone/moment-timezone-tests.ts
@@ -1,18 +1,16 @@
-
-
import moment = require('moment-timezone');
-var june = moment("2014-06-01T12:00:00Z");
+const june = moment("2014-06-01T12:00:00Z");
june.tz('America/Los_Angeles').format('ha z');
-var a = moment.tz("2013-11-18 11:55", "America/Toronto");
-var b = moment.tz("May 12th 2014 8PM", "MMM Do YYYY hA", "America/Toronto");
-var c = moment.tz(1403454068850, "America/Toronto");
-var d = moment.tz("May 12th 2014 8PM", "MMM Do YYYY hA", true, "America/Toronto");
+const a = moment.tz("2013-11-18 11:55", "America/Toronto");
+const b = moment.tz("May 12th 2014 8PM", "MMM Do YYYY hA", "America/Toronto");
+const c = moment.tz(1403454068850, "America/Toronto");
+const d = moment.tz("May 12th 2014 8PM", "MMM Do YYYY hA", true, "America/Toronto");
a.tz();
-var num = 1367337600000,
+const num = 1367337600000,
arr = [2013, 5, 1],
str = "2013-12-01",
date = new Date(2013, 4, 1),
@@ -53,7 +51,7 @@ moment.tz(obj, "America/Los_Angeles");
moment.tz.zone('America/Los_Angeles').abbr(1403465838805);
moment.tz.zone('America/Los_Angeles').offset(1403465838805);
-var zone = moment.tz.zone('America/New_York');
+const zone = moment.tz.zone('America/New_York');
zone.parse(Date.UTC(2012, 2, 19, 8, 30)); // 240
moment.tz.add('America/Los_Angeles|PST PDT|80 70|0101|1Lzm0 1zb0 Op0');
@@ -80,7 +78,6 @@ moment.tz.setDefault('America/Los_Angeles');
moment.tz.guess();
-var zoneAbbr: string = moment.tz('America/Los_Angeles').zoneAbbr();
-
-var zoneName: string = moment.tz('America/Los_Angeles').zoneName();
+const zoneAbbr: string = moment.tz('America/Los_Angeles').zoneAbbr();
+const zoneName: string = moment.tz('America/Los_Angeles').zoneName();
diff --git a/types/msgpack/index.d.ts b/types/msgpack/index.d.ts
index 7d15442ce3..9d318641ae 100644
--- a/types/msgpack/index.d.ts
+++ b/types/msgpack/index.d.ts
@@ -3,81 +3,86 @@
// Definitions by: Shinya Mochizuki
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-interface MsgPackStatic {
- /**
- * @param data string or ByteArray.
- * @param toString return string value if true.
- *
- * @return string or ByteArray or false. pack failed if false.
- */
- pack(data: any, toString?: boolean): any;
+declare namespace msgpack {
+ interface MsgPackStatic {
+ /**
+ * @param data string or ByteArray.
+ * @param toString return string value if true.
+ *
+ * @return string or ByteArray or false. pack failed if false.
+ */
+ pack(data: any, toString?: boolean): any;
- /**
- * @param data string or ByteArray.
- *
- * @return string or ByteArray or undefined. unpack failed if undefined.
- */
- unpack(data: any): any;
+ /**
+ * @param data string or ByteArray.
+ *
+ * @return string or ByteArray or undefined. unpack failed if undefined.
+ */
+ unpack(data: any): any;
- worker: string;
+ worker: string;
- upload(url: string, option: MsgPackUploadOption, callback: MsgPackUploadCallback): void;
+ upload(url: string, option: MsgPackUploadOption, callback: MsgPackUploadCallback): void;
- download(url: string, option: MsgPackDownloadOption, callback: MsgPackDownloadCallback): void;
+ download(url: string, option: MsgPackDownloadOption, callback: MsgPackDownloadCallback): void;
+ }
+
+ interface MsgPackUploadOption {
+ /**
+ * string or ByteArray
+ */
+ data: any;
+
+ /**
+ * use WebWorker if true.
+ */
+ worker?: boolean;
+
+ /**
+ * timeout sec.
+ */
+ timeout?: number;
+
+ before?: (xhr: XMLHttpRequest, option: MsgPackUploadOption) => void;
+
+ after?: (xhr: XMLHttpRequest, option: MsgPackUploadOption, result: MsgPackCallbackResult) => void;
+ }
+
+ interface MsgPackUploadCallback {
+ (data: string, option: MsgPackUploadOption, result: MsgPackCallbackResult): void;
+ }
+
+ interface MsgPackDownloadOption {
+ /**
+ * use WebWorker if true.
+ */
+ worker?: boolean;
+
+ /**
+ * timeout sec.
+ */
+ timeout?: number;
+
+ before?: (xhr: XMLHttpRequest, option: MsgPackDownloadOption) => void;
+
+ after?: (xhr: XMLHttpRequest, option: MsgPackDownloadOption, result: MsgPackCallbackResult) => void;
+ }
+
+ interface MsgPackDownloadCallback {
+ /**
+ * @param data string or ByteArray
+ */
+ (data: any, option: MsgPackDownloadCallback, result: MsgPackCallbackResult): void;
+ }
+
+ interface MsgPackCallbackResult {
+ status: number;
+
+ ok: boolean;
+ }
}
-interface MsgPackUploadOption {
- /**
- * string or ByteArray
- */
- data: any;
+declare var msgpack: msgpack.MsgPackStatic;
- /**
- * use WebWorker if true.
- */
- worker?: boolean;
-
- /**
- * timeout sec.
- */
- timeout?: number;
-
- before?: (xhr: XMLHttpRequest, option: MsgPackUploadOption) => void;
-
- after?: (xhr: XMLHttpRequest, option: MsgPackUploadOption, result: MsgPackCallbackResult) => void;
-}
-
-interface MsgPackUploadCallback {
- (data: string, option: MsgPackUploadOption, result: MsgPackCallbackResult): void;
-}
-
-interface MsgPackDownloadOption {
- /**
- * use WebWorker if true.
- */
- worker?: boolean;
-
- /**
- * timeout sec.
- */
- timeout?: number;
-
- before?: (xhr: XMLHttpRequest, option: MsgPackDownloadOption) => void;
-
- after?: (xhr: XMLHttpRequest, option: MsgPackDownloadOption, result: MsgPackCallbackResult) => void;
-}
-
-interface MsgPackDownloadCallback {
- /**
- * @param data string or ByteArray
- */
- (data: any, option: MsgPackDownloadCallback, result: MsgPackCallbackResult): void;
-}
-
-interface MsgPackCallbackResult {
- status: number;
-
- ok: boolean;
-}
-
-declare var msgpack: MsgPackStatic;
+export = msgpack;
+export as namespace msgpack;
diff --git a/types/msgpack/msgpack-tests.ts b/types/msgpack/msgpack-tests.ts
index da0d12b926..b0b9a716a0 100644
--- a/types/msgpack/msgpack-tests.ts
+++ b/types/msgpack/msgpack-tests.ts
@@ -1,5 +1,3 @@
-
-
var packed = msgpack.pack("");
msgpack.unpack(packed);
@@ -12,17 +10,17 @@ var uploadOption = {
data: "",
worker: false,
timeout: 10,
- before: (xhr: XMLHttpRequest, option: MsgPackUploadOption) => { },
- after: (xhr: XMLHttpRequest, option: MsgPackUploadOption, result: MsgPackCallbackResult) => { }
+ before: (xhr: XMLHttpRequest, option: msgpack.MsgPackUploadOption) => { },
+ after: (xhr: XMLHttpRequest, option: msgpack.MsgPackUploadOption, result: msgpack.MsgPackCallbackResult) => { }
};
-var uploadCallback = (data: string, option: MsgPackUploadOption, result: MsgPackCallbackResult) => { };
+var uploadCallback = (data: string, option: msgpack.MsgPackUploadOption, result: msgpack.MsgPackCallbackResult) => { };
msgpack.upload(url, uploadOption, uploadCallback);
var downloadOption = {
worker: false,
timeout: 10,
- before: (xhr: XMLHttpRequest, option: MsgPackDownloadOption) => { },
- after: (xhr: XMLHttpRequest, option: MsgPackDownloadOption, result: MsgPackCallbackResult) => { }
+ before: (xhr: XMLHttpRequest, option: msgpack.MsgPackDownloadOption) => { },
+ after: (xhr: XMLHttpRequest, option: msgpack.MsgPackDownloadOption, result: msgpack.MsgPackCallbackResult) => { }
};
-var downloadCallback = (data: any, option: MsgPackDownloadOption, result: MsgPackCallbackResult) => { };
+var downloadCallback = (data: any, option: msgpack.MsgPackDownloadOption, result: msgpack.MsgPackCallbackResult) => { };
msgpack.download(url, downloadOption, downloadCallback);
diff --git a/types/node-waves/index.d.ts b/types/node-waves/index.d.ts
index ce5c63da2e..60114e79e8 100644
--- a/types/node-waves/index.d.ts
+++ b/types/node-waves/index.d.ts
@@ -21,7 +21,6 @@ export interface WavesConfig {
}
export interface RippleOptions {
-
/**
* Specify how long to wait between starting and stopping the ripple.
*
diff --git a/types/node-waves/node-waves-tests.ts b/types/node-waves/node-waves-tests.ts
index adfb59703a..b9eac6682e 100644
--- a/types/node-waves/node-waves-tests.ts
+++ b/types/node-waves/node-waves-tests.ts
@@ -1,4 +1,3 @@
-
import { init, ripple, attach, calm } from "node-waves";
init({ delay: 300 });
diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index e7dbe3c1a7..f132b2e64f 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1209,7 +1209,7 @@ declare module "os" {
export function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string }
export var constants: {
UV_UDP_REUSEADDR: number,
- errno: {
+ signals: {
SIGHUP: number;
SIGINT: number;
SIGQUIT: number;
@@ -1245,7 +1245,7 @@ declare module "os" {
SIGSYS: number;
SIGUNUSED: number;
},
- signals: {
+ errno: {
E2BIG: number;
EACCES: number;
EADDRINUSE: number;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 63067a9305..568d15d096 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -1591,6 +1591,129 @@ namespace os_tests {
result = os.networkInterfaces();
}
+
+ {
+ let result: number;
+
+ result = os.constants.signals.SIGHUP;
+ result = os.constants.signals.SIGINT;
+ result = os.constants.signals.SIGQUIT;
+ result = os.constants.signals.SIGILL;
+ result = os.constants.signals.SIGTRAP;
+ result = os.constants.signals.SIGABRT;
+ result = os.constants.signals.SIGIOT;
+ result = os.constants.signals.SIGBUS;
+ result = os.constants.signals.SIGFPE;
+ result = os.constants.signals.SIGKILL;
+ result = os.constants.signals.SIGUSR1;
+ result = os.constants.signals.SIGSEGV;
+ result = os.constants.signals.SIGUSR2;
+ result = os.constants.signals.SIGPIPE;
+ result = os.constants.signals.SIGALRM;
+ result = os.constants.signals.SIGTERM;
+ result = os.constants.signals.SIGCHLD;
+ result = os.constants.signals.SIGSTKFLT;
+ result = os.constants.signals.SIGCONT;
+ result = os.constants.signals.SIGSTOP;
+ result = os.constants.signals.SIGTSTP;
+ result = os.constants.signals.SIGTTIN;
+ result = os.constants.signals.SIGTTOU;
+ result = os.constants.signals.SIGURG;
+ result = os.constants.signals.SIGXCPU;
+ result = os.constants.signals.SIGXFSZ;
+ result = os.constants.signals.SIGVTALRM;
+ result = os.constants.signals.SIGPROF;
+ result = os.constants.signals.SIGWINCH;
+ result = os.constants.signals.SIGIO;
+ result = os.constants.signals.SIGPOLL;
+ result = os.constants.signals.SIGPWR;
+ result = os.constants.signals.SIGSYS;
+ result = os.constants.signals.SIGUNUSED;
+ }
+
+ {
+ let result: number;
+
+ result = os.constants.errno.E2BIG;
+ result = os.constants.errno.EACCES;
+ result = os.constants.errno.EADDRINUSE;
+ result = os.constants.errno.EADDRNOTAVAIL;
+ result = os.constants.errno.EAFNOSUPPORT;
+ result = os.constants.errno.EAGAIN;
+ result = os.constants.errno.EALREADY;
+ result = os.constants.errno.EBADF;
+ result = os.constants.errno.EBADMSG;
+ result = os.constants.errno.EBUSY;
+ result = os.constants.errno.ECANCELED;
+ result = os.constants.errno.ECHILD;
+ result = os.constants.errno.ECONNABORTED;
+ result = os.constants.errno.ECONNREFUSED;
+ result = os.constants.errno.ECONNRESET;
+ result = os.constants.errno.EDEADLK;
+ result = os.constants.errno.EDESTADDRREQ;
+ result = os.constants.errno.EDOM;
+ result = os.constants.errno.EDQUOT;
+ result = os.constants.errno.EEXIST;
+ result = os.constants.errno.EFAULT;
+ result = os.constants.errno.EFBIG;
+ result = os.constants.errno.EHOSTUNREACH;
+ result = os.constants.errno.EIDRM;
+ result = os.constants.errno.EILSEQ;
+ result = os.constants.errno.EINPROGRESS;
+ result = os.constants.errno.EINTR;
+ result = os.constants.errno.EINVAL;
+ result = os.constants.errno.EIO;
+ result = os.constants.errno.EISCONN;
+ result = os.constants.errno.EISDIR;
+ result = os.constants.errno.ELOOP;
+ result = os.constants.errno.EMFILE;
+ result = os.constants.errno.EMLINK;
+ result = os.constants.errno.EMSGSIZE;
+ result = os.constants.errno.EMULTIHOP;
+ result = os.constants.errno.ENAMETOOLONG;
+ result = os.constants.errno.ENETDOWN;
+ result = os.constants.errno.ENETRESET;
+ result = os.constants.errno.ENETUNREACH;
+ result = os.constants.errno.ENFILE;
+ result = os.constants.errno.ENOBUFS;
+ result = os.constants.errno.ENODATA;
+ result = os.constants.errno.ENODEV;
+ result = os.constants.errno.ENOENT;
+ result = os.constants.errno.ENOEXEC;
+ result = os.constants.errno.ENOLCK;
+ result = os.constants.errno.ENOLINK;
+ result = os.constants.errno.ENOMEM;
+ result = os.constants.errno.ENOMSG;
+ result = os.constants.errno.ENOPROTOOPT;
+ result = os.constants.errno.ENOSPC;
+ result = os.constants.errno.ENOSR;
+ result = os.constants.errno.ENOSTR;
+ result = os.constants.errno.ENOSYS;
+ result = os.constants.errno.ENOTCONN;
+ result = os.constants.errno.ENOTDIR;
+ result = os.constants.errno.ENOTEMPTY;
+ result = os.constants.errno.ENOTSOCK;
+ result = os.constants.errno.ENOTSUP;
+ result = os.constants.errno.ENOTTY;
+ result = os.constants.errno.ENXIO;
+ result = os.constants.errno.EOPNOTSUPP;
+ result = os.constants.errno.EOVERFLOW;
+ result = os.constants.errno.EPERM;
+ result = os.constants.errno.EPIPE;
+ result = os.constants.errno.EPROTO;
+ result = os.constants.errno.EPROTONOSUPPORT;
+ result = os.constants.errno.EPROTOTYPE;
+ result = os.constants.errno.ERANGE;
+ result = os.constants.errno.EROFS;
+ result = os.constants.errno.ESPIPE;
+ result = os.constants.errno.ESRCH;
+ result = os.constants.errno.ESTALE;
+ result = os.constants.errno.ETIME;
+ result = os.constants.errno.ETIMEDOUT;
+ result = os.constants.errno.ETXTBSY;
+ result = os.constants.errno.EWOULDBLOCK;
+ result = os.constants.errno.EXDEV;
+ }
}
////////////////////////////////////////////////////
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index da214056fc..f18f006e0c 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -1152,7 +1152,7 @@ declare module "os" {
export function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string }
export var constants: {
UV_UDP_REUSEADDR: number,
- errno: {
+ signals: {
SIGHUP: number;
SIGINT: number;
SIGQUIT: number;
@@ -1188,7 +1188,7 @@ declare module "os" {
SIGSYS: number;
SIGUNUSED: number;
},
- signals: {
+ errno: {
E2BIG: number;
EACCES: number;
EADDRINUSE: number;
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index 8711d60974..2348bd2dd6 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -1508,6 +1508,129 @@ namespace os_tests {
result = os.networkInterfaces();
}
+
+ {
+ let result: number;
+
+ result = os.constants.signals.SIGHUP;
+ result = os.constants.signals.SIGINT;
+ result = os.constants.signals.SIGQUIT;
+ result = os.constants.signals.SIGILL;
+ result = os.constants.signals.SIGTRAP;
+ result = os.constants.signals.SIGABRT;
+ result = os.constants.signals.SIGIOT;
+ result = os.constants.signals.SIGBUS;
+ result = os.constants.signals.SIGFPE;
+ result = os.constants.signals.SIGKILL;
+ result = os.constants.signals.SIGUSR1;
+ result = os.constants.signals.SIGSEGV;
+ result = os.constants.signals.SIGUSR2;
+ result = os.constants.signals.SIGPIPE;
+ result = os.constants.signals.SIGALRM;
+ result = os.constants.signals.SIGTERM;
+ result = os.constants.signals.SIGCHLD;
+ result = os.constants.signals.SIGSTKFLT;
+ result = os.constants.signals.SIGCONT;
+ result = os.constants.signals.SIGSTOP;
+ result = os.constants.signals.SIGTSTP;
+ result = os.constants.signals.SIGTTIN;
+ result = os.constants.signals.SIGTTOU;
+ result = os.constants.signals.SIGURG;
+ result = os.constants.signals.SIGXCPU;
+ result = os.constants.signals.SIGXFSZ;
+ result = os.constants.signals.SIGVTALRM;
+ result = os.constants.signals.SIGPROF;
+ result = os.constants.signals.SIGWINCH;
+ result = os.constants.signals.SIGIO;
+ result = os.constants.signals.SIGPOLL;
+ result = os.constants.signals.SIGPWR;
+ result = os.constants.signals.SIGSYS;
+ result = os.constants.signals.SIGUNUSED;
+ }
+
+ {
+ let result: number;
+
+ result = os.constants.errno.E2BIG;
+ result = os.constants.errno.EACCES;
+ result = os.constants.errno.EADDRINUSE;
+ result = os.constants.errno.EADDRNOTAVAIL;
+ result = os.constants.errno.EAFNOSUPPORT;
+ result = os.constants.errno.EAGAIN;
+ result = os.constants.errno.EALREADY;
+ result = os.constants.errno.EBADF;
+ result = os.constants.errno.EBADMSG;
+ result = os.constants.errno.EBUSY;
+ result = os.constants.errno.ECANCELED;
+ result = os.constants.errno.ECHILD;
+ result = os.constants.errno.ECONNABORTED;
+ result = os.constants.errno.ECONNREFUSED;
+ result = os.constants.errno.ECONNRESET;
+ result = os.constants.errno.EDEADLK;
+ result = os.constants.errno.EDESTADDRREQ;
+ result = os.constants.errno.EDOM;
+ result = os.constants.errno.EDQUOT;
+ result = os.constants.errno.EEXIST;
+ result = os.constants.errno.EFAULT;
+ result = os.constants.errno.EFBIG;
+ result = os.constants.errno.EHOSTUNREACH;
+ result = os.constants.errno.EIDRM;
+ result = os.constants.errno.EILSEQ;
+ result = os.constants.errno.EINPROGRESS;
+ result = os.constants.errno.EINTR;
+ result = os.constants.errno.EINVAL;
+ result = os.constants.errno.EIO;
+ result = os.constants.errno.EISCONN;
+ result = os.constants.errno.EISDIR;
+ result = os.constants.errno.ELOOP;
+ result = os.constants.errno.EMFILE;
+ result = os.constants.errno.EMLINK;
+ result = os.constants.errno.EMSGSIZE;
+ result = os.constants.errno.EMULTIHOP;
+ result = os.constants.errno.ENAMETOOLONG;
+ result = os.constants.errno.ENETDOWN;
+ result = os.constants.errno.ENETRESET;
+ result = os.constants.errno.ENETUNREACH;
+ result = os.constants.errno.ENFILE;
+ result = os.constants.errno.ENOBUFS;
+ result = os.constants.errno.ENODATA;
+ result = os.constants.errno.ENODEV;
+ result = os.constants.errno.ENOENT;
+ result = os.constants.errno.ENOEXEC;
+ result = os.constants.errno.ENOLCK;
+ result = os.constants.errno.ENOLINK;
+ result = os.constants.errno.ENOMEM;
+ result = os.constants.errno.ENOMSG;
+ result = os.constants.errno.ENOPROTOOPT;
+ result = os.constants.errno.ENOSPC;
+ result = os.constants.errno.ENOSR;
+ result = os.constants.errno.ENOSTR;
+ result = os.constants.errno.ENOSYS;
+ result = os.constants.errno.ENOTCONN;
+ result = os.constants.errno.ENOTDIR;
+ result = os.constants.errno.ENOTEMPTY;
+ result = os.constants.errno.ENOTSOCK;
+ result = os.constants.errno.ENOTSUP;
+ result = os.constants.errno.ENOTTY;
+ result = os.constants.errno.ENXIO;
+ result = os.constants.errno.EOPNOTSUPP;
+ result = os.constants.errno.EOVERFLOW;
+ result = os.constants.errno.EPERM;
+ result = os.constants.errno.EPIPE;
+ result = os.constants.errno.EPROTO;
+ result = os.constants.errno.EPROTONOSUPPORT;
+ result = os.constants.errno.EPROTOTYPE;
+ result = os.constants.errno.ERANGE;
+ result = os.constants.errno.EROFS;
+ result = os.constants.errno.ESPIPE;
+ result = os.constants.errno.ESRCH;
+ result = os.constants.errno.ESTALE;
+ result = os.constants.errno.ETIME;
+ result = os.constants.errno.ETIMEDOUT;
+ result = os.constants.errno.ETXTBSY;
+ result = os.constants.errno.EWOULDBLOCK;
+ result = os.constants.errno.EXDEV;
+ }
}
////////////////////////////////////////////////////
diff --git a/types/openfin/index.d.ts b/types/openfin/index.d.ts
index 994a64939f..e6c11d0180 100644
--- a/types/openfin/index.d.ts
+++ b/types/openfin/index.d.ts
@@ -8,16 +8,16 @@
/**
* JavaScript API
- * The JavaScript API allows you to create an HTML/JavaScript application that has access to the native windowing environment,
+ * The JavaScript API allows you to create an HTML/JavaScript application that has access to the native windowing environment,
* can communicate with other applications and has access to sandboxed system-level features.
*
* API Ready
- * When using the OpenFin API, it is important to ensure that it has been fully loaded before making any API calls. To verify
- * that the API is in fact ready, be sure to make any API calls either from within the fin.desktop.main() method or explicitly
+ * When using the OpenFin API, it is important to ensure that it has been fully loaded before making any API calls. To verify
+ * that the API is in fact ready, be sure to make any API calls either from within the fin.desktop.main() method or explicitly
* after it has returned. This avoids the situation of trying to access methods that are not yet fully injected.
*
* Overview
- * When running within the OpenFin Runtime your web applications have access to the "fin" namespace and all the modules within the API
+ * When running within the OpenFin Runtime your web applications have access to the "fin" namespace and all the modules within the API
* without the need to include additional source files. You can treat the "fin" namespace as you would the "window", "navigator" or "document" objects.
**/
declare namespace fin {
@@ -136,8 +136,8 @@ declare namespace fin {
*/
scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
/**
- * Sets new shortcut configuration for current application.
- * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
+ * Sets new shortcut configuration for current application.
+ * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
* be able to change shortcut states.
*/
setShortcuts(config: ShortCutConfig, callback?: () => void, errorCallback?: (reason: string) => void): void;
@@ -150,7 +150,7 @@ declare namespace fin {
*/
terminate(callback?: () => void, errorCallback?: (reason: string) => void): void;
/**
- * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
+ * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
* to continue and to generate another "not-responding" message after a certain period of time.
*/
wait(callback?: () => void, errorCallback?: (reason: string) => void): void;
@@ -244,8 +244,8 @@ declare namespace fin {
*/
customData?: any;
/**
- * Specifies that the window will be positioned in the center of the primary monitor when loaded for the first time on a machine.
- * When the window corresponding to that id is loaded again, the position from before the window was closed is used.
+ * Specifies that the window will be positioned in the center of the primary monitor when loaded for the first time on a machine.
+ * When the window corresponding to that id is loaded again, the position from before the window was closed is used.
* This option overrides defaultLeft and defaultTop. Default: false.
*/
defaultCentered?: boolean;
@@ -260,12 +260,12 @@ declare namespace fin {
*/
defaultWidth?: number;
/**
- * The default top position of the window. Specifies the position of the top of the window when loaded for the first time on a machine.
+ * The default top position of the window. Specifies the position of the top of the window when loaded for the first time on a machine.
* When the window corresponding to that id is loaded again, the value of top is taken to be the last value before the window was closed. Default: 100.
*/
defaultTop?: number;
/**
- * The default width of the window. Specifies the width of the window when loaded for the first time on a machine.
+ * The default width of the window. Specifies the width of the window when loaded for the first time on a machine.
* When the window corresponding to that id is loaded again, the width is taken to be the last width of the window before it was closed. Default: 800.
*/
defaultLeft?: number;
@@ -364,7 +364,7 @@ declare namespace fin {
*/
url?: string;
/**
- * When set to false, the window will render before the "load" event is fired on the content's window.
+ * When set to false, the window will render before the "load" event is fired on the content's window.
* Caution, when false you will see an initial empty white window. Default: true.
*/
waitForPageLoad?: boolean;
@@ -463,7 +463,7 @@ declare namespace fin {
send(destinationUuid: string, name: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
send(destinationUuid: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
/**
- * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
+ * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
* topic combination that has already been published to upon subscription you will receive the last 20 missed messages in the order they were published.
*/
subscribe(senderUuid: string, name: string, topic: string, listener: (message: any, uuid: string, name: string) => void,
@@ -492,8 +492,8 @@ declare namespace fin {
/**
* Notification
- * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
- * A notification is typically used to alert the user of some important event which requires his or her attention.
+ * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
+ * A notification is typically used to alert the user of some important event which requires his or her attention.
* Notifications are a child or your application that are controlled by the runtime.
*/
interface OpenFinNotification {
@@ -533,8 +533,8 @@ declare namespace fin {
*/
onClick?(callback: () => void): void;
/**
- * Invoked when the notification is closed via .close() method on the created notification instance
- * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
+ * Invoked when the notification is closed via .close() method on the created notification instance
+ * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
* NOTE: this is not invoked when the notification is dismissed via a swipe. For the swipe dismissal callback see onDismiss
*/
onClose?(callback: () => void): void;
@@ -559,7 +559,7 @@ declare namespace fin {
/**
* System
- * An object representing the core of OpenFin Runtime.
+ * An object representing the core of OpenFin Runtime.
* Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
*/
interface OpenFinSystem {
@@ -574,7 +574,7 @@ declare namespace fin {
listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
callback?: () => void, errorCallback?: (reason: string) => void): void;
/**
- * Clears cached data containing window state/positions,
+ * Clears cached data containing window state/positions,
* application resource files (images, HTML, JavaScript files), cookies, and items stored in the Local Storage.
*/
clearCache(options: CacheOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
@@ -636,7 +636,7 @@ declare namespace fin {
*/
getMousePosition(callback?: (mousePosition: VirtualScreenCoordinates) => void, errorCallback?: (reason: string) => void): void;
/**
- * Retrieves an array of all of the runtime processes that are currently running.
+ * Retrieves an array of all of the runtime processes that are currently running.
* Each element in the array is an object containing the uuid and the name of the application to which the process belongs.
*/
getProcessList(callback?: (processInfoList: ProcessInfo[]) => void, errorCallback?: (reason: string) => void): void;
@@ -706,7 +706,6 @@ declare namespace fin {
* Update the OpenFin Runtime Proxy settings.
*/
updateProxySettings(type: string, address: string, port: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-
}
interface CacheOptions {
@@ -999,8 +998,8 @@ declare namespace fin {
*
* Creates a new OpenFin Window
*
- * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
- * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+ * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+ * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
* The new window appears in the same process as the parent window.
* @param {any} options - The options of the window
* @param {Function} [callback] - Called if the window creation was successful
@@ -1021,8 +1020,8 @@ declare namespace fin {
/**
* Window
- * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
- * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+ * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+ * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
* The new window appears in the same process as the parent window.
*/
interface OpenFinWindow {
@@ -1031,9 +1030,9 @@ declare namespace fin {
*/
name: string;
/**
- * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
- * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
- * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
+ * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
+ * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
+ * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
* Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
* @returns {Window} Native window
*/
@@ -1109,7 +1108,7 @@ declare namespace fin {
*/
getBounds(callback?: (bounds: WindowBounds) => void, errorCallback?: (reason: string) => void): void;
/**
- * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
+ * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
* Please note that calling window is included in the result array.
*/
getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
@@ -1686,4 +1685,4 @@ declare namespace fin {
| "top-right"
| "bottom-left"
| "bottom-right";
-}
\ No newline at end of file
+}
diff --git a/types/openfin/openfin-tests.ts b/types/openfin/openfin-tests.ts
index 6693408eec..95ed176fb1 100644
--- a/types/openfin/openfin-tests.ts
+++ b/types/openfin/openfin-tests.ts
@@ -46,7 +46,7 @@ function test_application() {
application.getGroups(allGroups => {
console.log("There are a total of " + allGroups.length + " groups.");
- var groupCounter = 1;
+ let groupCounter = 1;
allGroups.forEach(windowGroup => {
console.log("Group " + groupCounter + " contains " +
windowGroup.length + " windows.");
@@ -548,7 +548,7 @@ function test_window() {
resizable: false,
state: "normal"
}, () => {
- var _win = finWindow.getNativeWindow();
+ const _win = finWindow.getNativeWindow();
_win.addEventListener("DOMContentLoaded", () => { finWindow.show(); });
}, error => {
console.log("Error creating window:", error);
@@ -725,4 +725,4 @@ function test_window() {
frame: false,
maxWidth: 500
});
-}
\ No newline at end of file
+}
diff --git a/types/parse-unit/parse-unit-tests.ts b/types/parse-unit/parse-unit-tests.ts
index 772641c302..dd5dcb7e9f 100644
--- a/types/parse-unit/parse-unit-tests.ts
+++ b/types/parse-unit/parse-unit-tests.ts
@@ -1,4 +1,4 @@
-import parse = require('parse-unit')
-let [number, length] = parse('10px')
-number === 50
-length === 'px'
+import parse = require('parse-unit');
+const [number, length] = parse('10px');
+number === 50;
+length === 'px';
diff --git a/types/parsimmon/index.d.ts b/types/parsimmon/index.d.ts
index ee196dd1ff..718fc1246d 100644
--- a/types/parsimmon/index.d.ts
+++ b/types/parsimmon/index.d.ts
@@ -42,9 +42,9 @@
declare function Parsimmon(fn: (input: string, i: number) => Parsimmon.Result): Parsimmon.Parser;
declare namespace Parsimmon {
- export type StreamType = string;
+ type StreamType = string;
- export interface Index {
+ interface Index {
/** zero-based character offset */
offset: number;
/** one-based line offset */
@@ -53,26 +53,26 @@ declare namespace Parsimmon {
column: number;
}
- export interface Mark {
+ interface Mark {
start: Index;
end: Index;
value: T;
}
- export type Result = Success | Failure;
+ type Result = Success | Failure;
- export interface Success {
+ interface Success {
status: true;
value: T;
}
- export interface Failure {
+ interface Failure {
status: false;
expected: string[];
index: Index;
}
- export interface Parser {
+ interface Parser {
/**
* parse the string
*/
@@ -155,41 +155,41 @@ declare namespace Parsimmon {
/**
* Alias of `Parsimmon(fn)` for backwards compatibility.
*/
- export function Parser(fn: (input: string, i: number) => Parsimmon.Result): Parser;
+ function Parser(fn: (input: string, i: number) => Parsimmon.Result): Parser;
/**
* To be used inside of Parsimmon(fn). Generates an object describing how
* far the successful parse went (index), and what value it created doing
* so. See documentation for Parsimmon(fn).
*/
- export function makeSuccess(index: number, value: T): Success;
+ function makeSuccess(index: number, value: T): Success;
/**
* To be used inside of Parsimmon(fn). Generates an object describing how
* far the unsuccessful parse went (index), and what kind of syntax it
* expected to see (expectation). See documentation for Parsimmon(fn).
*/
- export function makeFailure(furthest: number, expectation: string): Failure;
+ function makeFailure(furthest: number, expectation: string): Failure;
/**
* Returns true if obj is a Parsimmon parser, otherwise false.
*/
- export function isParser(obj: any): boolean;
+ function isParser(obj: any): boolean;
/**
* is a parser that expects to find "my-string", and will yield the same.
*/
- export function string(string: string): Parser;
+ function string(string: string): Parser;
/**
* Returns a parser that looks for exactly one character from string, and yields that character.
*/
- export function oneOf(string: string): Parser;
+ function oneOf(string: string): Parser;
/**
* Returns a parser that looks for exactly one character NOT from string, and yields that character.
*/
- export function noneOf(string: string): Parser;
+ function noneOf(string: string): Parser;
/**
* Returns a parser that looks for a match to the regexp and yields the given match group
@@ -197,145 +197,145 @@ declare namespace Parsimmon {
* parse location. The regexp may only use the following flags: imu. Any other flag will
* result in an error being thrown.
*/
- export function regexp(myregex: RegExp, group?: number): Parser;
+ function regexp(myregex: RegExp, group?: number): Parser;
/**
* This was the original name for Parsimmon.regexp, but now it is just an alias.
*/
- export function regex(myregex: RegExp, group?: number): Parser;
+ function regex(myregex: RegExp, group?: number): Parser;
/**
* Returns a parser that doesn't consume any of the string, and yields result.
*/
- export function succeed(result: U): Parser;
+ function succeed(result: U): Parser;
/**
* This is an alias for Parsimmon.succeed(result).
*/
- export function of(result: U): Parser;
+ function of(result: U): Parser;
/**
* accepts a variable number of parsers that it expects to find in order, yielding an array of the results.
*/
- export function seq(p1: Parser): Parser<[T]>;
- export function seq(p1: Parser, p2: Parser): Parser<[T, U]>;
- export function seq(p1: Parser, p2: Parser, p3: Parser): Parser<[T, U, V]>;
- export function seq(p1: Parser, p2: Parser, p3: Parser, p4: Parser): Parser<[T, U, V, W]>;
- export function seq(p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser): Parser<[T, U, V, W, X]>;
- export function seq(p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser, p6: Parser): Parser<[T, U, V, W, X, Y]>;
- export function seq(p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser, p6: Parser, p7: Parser): Parser<[T, U, V, W, X, Y, Z]>;
- export function seq(...parsers: Array>): Parser;
- export function seq(...parsers: Array>): Parser;
+ function seq(p1: Parser): Parser<[T]>;
+ function seq(p1: Parser, p2: Parser): Parser<[T, U]>;
+ function seq(p1: Parser, p2: Parser, p3: Parser): Parser<[T, U, V]>;
+ function seq