From f96c1c5d92b4fd59a6c222362c137ddec1235bcb Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Mon, 27 Mar 2017 10:02:11 -0700 Subject: [PATCH] Apply new lint rules to more files --- types/bloomfilter/bloomfilter-tests.ts | 10 +- types/bloomfilter/index.d.ts | 4 +- .../bunyan-blackhole-tests.ts | 8 +- types/chai-subset/chai-subset-tests.ts | 13 +- types/clipboard/clipboard-tests.ts | 11 +- types/clipboard/index.d.ts | 2 +- .../cordova-sqlite-storage-tests.ts | 55 ++--- types/cordova-sqlite-storage/index.d.ts | 1 - types/csv-parse/csv-parse-tests.ts | 26 +- types/csv-parse/index.d.ts | 28 +-- types/csv-parse/tslint.json | 7 +- types/d3-dsv/d3-dsv-tests.ts | 8 - types/d3-dsv/tslint.json | 1 + types/d3-dsv/v0/d3-dsv-tests.ts | 7 +- types/d3-selection/d3-selection-tests.ts | 35 --- types/d3-selection/index.d.ts | 21 +- types/dagre-d3/dagre-d3-tests.ts | 1 - types/deep-equal/deep-equal-tests.ts | 1 - types/dot/dot-tests.ts | 20 +- types/falcor/index.d.ts | 7 - types/falcor/test/browser.ts | 5 +- types/falcor/test/index.ts | 1 - types/fetch-jsonp/fetch-jsonp-tests.ts | 32 +-- types/firmata/firmata-tests.ts | 35 +-- types/firmata/index.d.ts | 224 +++++++++++------- types/flatpickr/flatpickr-tests.ts | 1 - types/freeport/freeport-tests.ts | 1 - types/fusioncharts/fusioncharts-tests.ts | 6 +- types/fusioncharts/fusioncharts.charts.d.ts | 2 - types/fusioncharts/fusioncharts.gantt.d.ts | 2 - types/fusioncharts/fusioncharts.maps.d.ts | 2 - .../fusioncharts.powercharts.d.ts | 2 - types/fusioncharts/fusioncharts.ssgrid.d.ts | 2 - types/fusioncharts/fusioncharts.treemap.d.ts | 2 - types/fusioncharts/fusioncharts.widgets.d.ts | 2 - .../fusioncharts.zoomscatter.d.ts | 2 - types/fusioncharts/index.d.ts | 7 - types/fusioncharts/maps/fusioncharts.usa.d.ts | 2 - .../fusioncharts/maps/fusioncharts.world.d.ts | 2 - .../themes/fusioncharts.theme.carbon.d.ts | 2 - .../themes/fusioncharts.theme.fint.d.ts | 2 - .../themes/fusioncharts.theme.ocean.d.ts | 2 - .../themes/fusioncharts.theme.zune.d.ts | 2 - types/globule/globule-tests.ts | 1 - types/globule/index.d.ts | 1 - types/klaw-sync/index.d.ts | 1 - types/koa-compose/index.d.ts | 1 - types/koa-compose/koa-compose-tests.ts | 8 +- types/leven/leven-tests.ts | 3 +- .../localforage-cordovasqlitedriver-tests.ts | 1 - types/loopback/index.d.ts | 200 ---------------- types/loopback/loopback-tests.ts | 2 +- types/lz-string/lz-string-tests.ts | 12 +- types/modernizr/modernizr-tests.ts | 31 ++- types/modesl/index.d.ts | 1 - types/modesl/modesl-tests.ts | 2 - types/moment-business/index.d.ts | 18 +- .../moment-business/moment-business-tests.ts | 14 +- .../moment-timezone/moment-timezone-tests.ts | 21 +- types/node-waves/index.d.ts | 1 - types/node-waves/node-waves-tests.ts | 1 - types/openfin/index.d.ts | 59 +++-- types/openfin/openfin-tests.ts | 6 +- types/parse-unit/parse-unit-tests.ts | 8 +- types/parsimmon/index.d.ts | 118 ++++----- types/parsimmon/parsimmon-tests.ts | 54 ++--- types/qlik-visualizationextensions/index.d.ts | 41 ++-- .../qlik-visualizationextensions-tests.ts | 2 +- types/rc-slider/index.d.ts | 10 +- types/rc-slider/rc-slider-tests.tsx | 4 +- .../lib/components/common/EditableInput.d.ts | 1 - types/react-color/react-color-tests.tsx | 54 ++--- types/react-copy-to-clipboard/index.d.ts | 9 +- .../react-copy-to-clipboard-tests.tsx | 1 - types/react-day-picker/index.d.ts | 30 ++- .../react-day-picker-tests.tsx | 10 +- types/react-facebook-login/index.d.ts | 13 +- .../react-facebook-login-tests.tsx | 5 - types/react-joyride/react-joyride-tests.tsx | 1 - types/react-leaflet/index.d.ts | 54 ++--- types/react-leaflet/react-leaflet-tests.tsx | 2 +- types/tslint.json | 2 +- 82 files changed, 519 insertions(+), 890 deletions(-) create mode 100644 types/d3-dsv/tslint.json diff --git a/types/bloomfilter/bloomfilter-tests.ts b/types/bloomfilter/bloomfilter-tests.ts index f1f3306d62..650cc97eb4 100644 --- a/types/bloomfilter/bloomfilter-tests.ts +++ b/types/bloomfilter/bloomfilter-tests.ts @@ -1,11 +1,11 @@ -import { BloomFilter } from './index'; +import { BloomFilter } from 'bloomfilter'; function test_bloomfilter() { const m: number = 10; const k: number = 2; - let bloomFilter = new BloomFilter(m, k); - let array: Array = bloomFilter.buckets; - let length: number = bloomFilter.buckets.length; + const bloomFilter = new BloomFilter(m, k); + const array: Int32Array[] = bloomFilter.buckets; + const length: number = bloomFilter.buckets.length; bloomFilter.add('someString'); - let test: boolean = bloomFilter.test('someString'); + const test: boolean = bloomFilter.test('someString'); } diff --git a/types/bloomfilter/index.d.ts b/types/bloomfilter/index.d.ts index 071c32dfc6..00ed408c6d 100644 --- a/types/bloomfilter/index.d.ts +++ b/types/bloomfilter/index.d.ts @@ -3,8 +3,8 @@ // Definitions by: slawiko // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -export declare class BloomFilter { - buckets: Array; +export class BloomFilter { + buckets: Int32Array[]; constructor(m: number, k: number); diff --git a/types/bunyan-blackhole/bunyan-blackhole-tests.ts b/types/bunyan-blackhole/bunyan-blackhole-tests.ts index ef2096a4c8..553d6f52ea 100644 --- a/types/bunyan-blackhole/bunyan-blackhole-tests.ts +++ b/types/bunyan-blackhole/bunyan-blackhole-tests.ts @@ -1,8 +1,6 @@ import blackhole = require("bunyan-blackhole"); - - -var logsLaboursLost = blackhole("lost"); +const logsLaboursLost = blackhole("lost"); const rotten = new Error("Something is rotten in the state of Denmark"); @@ -20,7 +18,5 @@ logsLaboursLost.info({play: "Much Ado About Nothing"}, "Let me be that I am and logsLaboursLost.warn({play: "All's Well That Ends Well"}, "Love all, trust a few, do wrong to none"); logsLaboursLost.error({play: "All's Well That Ends Well"}, "Love all, trust a few, do wrong to none"); -var hamlet = logsLaboursLost.child({play: "Hamlet"}); +const hamlet = logsLaboursLost.child({play: "Hamlet"}); hamlet.info({character: "Polonius"}, "Though this be madness, yet there is method in't"); - - diff --git a/types/chai-subset/chai-subset-tests.ts b/types/chai-subset/chai-subset-tests.ts index 33cf036cf8..717f86cb33 100644 --- a/types/chai-subset/chai-subset-tests.ts +++ b/types/chai-subset/chai-subset-tests.ts @@ -1,14 +1,11 @@ - - import chai = require('chai'); import chaiSubset = require('chai-subset'); chai.use(chaiSubset); -var expect = chai.expect; -var assert = chai.assert; +const { assert, expect } = chai; function test_containSubset() { - var obj = { + const obj = { a: 'b', c: 'd', e: { @@ -34,7 +31,7 @@ function test_containSubset() { } function test_notContainSubset() { - var obj = { + const obj = { a: 'b', c: 'd', e: { @@ -50,7 +47,7 @@ function test_notContainSubset() { } function test_arrayContainSubset() { - var list = [{a: 'a', b: 'b'}, {v: 'f', d: {z: 'g'}} ]; + const list = [{a: 'a', b: 'b'}, {v: 'f', d: {z: 'g'}} ]; expect(list).to.containSubset([{a: 'a', b: 'b'}]); list.should.containSubset([{a: 'a', b: 'b'}]); @@ -58,7 +55,7 @@ function test_arrayContainSubset() { } function test_arrayNotContainSubset() { - var list = [{a: 'a', b: 'b'}, {v: 'f', d: {z: 'g'}} ]; + const list = [{a: 'a', b: 'b'}, {v: 'f', d: {z: 'g'}} ]; expect(list).not.to.containSubset([{a: 'a', b: 'bd'}]); list.should.not.containSubset([{a: 'a', b: 'bd'}]); diff --git a/types/clipboard/clipboard-tests.ts b/types/clipboard/clipboard-tests.ts index 5af2671671..23de4c89e6 100644 --- a/types/clipboard/clipboard-tests.ts +++ b/types/clipboard/clipboard-tests.ts @@ -1,16 +1,16 @@ import * as Clipboard from 'clipboard'; -var cb1 = new Clipboard('.btn'); -var cb2 = new Clipboard(document.getElementById('id'), { +const cb1 = new Clipboard('.btn'); +const cb2 = new Clipboard(document.getElementById('id'), { action: elem => 'copy' }); -var cb3 = new Clipboard(document.querySelectorAll('query'), { +const cb3 = new Clipboard(document.querySelectorAll('query'), { text: elem => null }); -var cb4 = new Clipboard('.btn', { +const cb4 = new Clipboard('.btn', { target: elem => null }); -var cb5 = new Clipboard('.btn', { +const cb5 = new Clipboard('.btn', { action: elem => 'copy', target: elem => null }); @@ -25,4 +25,3 @@ cb2.on('success', e => { e.clearSelection(); }); cb2.on('error', e => { }); - diff --git a/types/clipboard/index.d.ts b/types/clipboard/index.d.ts index ec03d9bee5..5f12a41d5f 100644 --- a/types/clipboard/index.d.ts +++ b/types/clipboard/index.d.ts @@ -54,4 +54,4 @@ declare namespace Clipboard { export = Clipboard; -export as namespace Clipboard; \ No newline at end of file +export as namespace Clipboard; diff --git a/types/cordova-sqlite-storage/cordova-sqlite-storage-tests.ts b/types/cordova-sqlite-storage/cordova-sqlite-storage-tests.ts index bb5a768bf8..6d2e3c3454 100644 --- a/types/cordova-sqlite-storage/cordova-sqlite-storage-tests.ts +++ b/types/cordova-sqlite-storage/cordova-sqlite-storage-tests.ts @@ -1,33 +1,21 @@ // examples taken from https://github.com/litehelpers/Cordova-sqlite-storage function echoTestFunction() { - function successCallback(value: string) { - - } - function errorCallback() { - - } + function successCallback(value: string) {} + function errorCallback() {} window.sqlitePlugin.echoTest(successCallback, errorCallback); } function selfTestFunction() { - function successCallback() { - - } - function errorCallback() { - - } + function successCallback() {} + function errorCallback() {} window.sqlitePlugin.selfTest(successCallback, errorCallback); } function openingDatabase() { - function successcb(db: SQLitePlugin.Database) { + function successcb(db: SQLitePlugin.Database) {} + function errorcb(err: Error) {} - } - function errorcb(err: Error) { - - } - - var db = window.sqlitePlugin.openDatabase({name: 'my.db', location: 'default'}, successcb, errorcb); - var db = window.sqlitePlugin.openDatabase({name: 'my.db', iosDatabaseLocation: 'Library'}, successcb, errorcb); + let db = window.sqlitePlugin.openDatabase({name: 'my.db', location: 'default'}, successcb, errorcb); + db = window.sqlitePlugin.openDatabase({name: 'my.db', iosDatabaseLocation: 'Library'}, successcb, errorcb); } function openingDatabase2() { @@ -104,7 +92,7 @@ function sampleWithPRAGMA() { // Cordova is ready function onDeviceReady() { - var db = window.sqlitePlugin.openDatabase({name: 'my.db', location: 'default'}); + const db = window.sqlitePlugin.openDatabase({name: 'my.db', location: 'default'}); db.transaction(tx => { tx.executeSql('DROP TABLE IF EXISTS test_table'); @@ -134,14 +122,13 @@ function sampleWithPRAGMA() { } } - function sampleWithTransactionLevelNesting() { // Wait for Cordova to load document.addEventListener('deviceready', onDeviceReady, false); // Cordova is ready function onDeviceReady() { - var db = window.sqlitePlugin.openDatabase({name: 'my.db', location: 'default'}); + const db = window.sqlitePlugin.openDatabase({name: 'my.db', location: 'default'}); db.transaction(tx => { tx.executeSql('DROP TABLE IF EXISTS test_table'); @@ -155,7 +142,6 @@ function sampleWithTransactionLevelNesting() { console.log("res.rows.length: " + res.rows.length + " -- should be 1"); console.log("res.rows.item(0).cnt: " + res.rows.item(0).cnt + " -- should be 1"); }); - }, (tx, e) => { console.log("ERROR: " + e.message); }); @@ -163,18 +149,12 @@ function sampleWithTransactionLevelNesting() { } } - function dbClose(db: SQLitePlugin.Database) { - function successcb() { - - } - function errorcb(err: Error) { - - } + function successcb() {} + function errorcb(err: Error) {} db.close(successcb, errorcb); - db.transaction(tx => { tx.executeSql("SELECT LENGTH('tenletters') AS stringlength", [], (tx, res) => { console.log('got stringlength: ' + res.rows.item(0).stringlength); @@ -193,21 +173,16 @@ function dbClose(db: SQLitePlugin.Database) { } function deleteDatabase() { - function successcb() { - - } - function errorcb(err: Error) { - - } + function successcb() {} + function errorcb(err: Error) {} window.sqlitePlugin.deleteDatabase({name: 'my.db', location: 'default'}, successcb, errorcb); } - function quickInstallationTest() { window.sqlitePlugin.openDatabase({ name: 'hello-world.db', location: 'default' }, db => { db.executeSql("select length('tenletters') as stringlength", [], res => { - var stringlength = res.rows.item(0).stringlength; + const stringlength = res.rows.item(0).stringlength; console.log('got stringlength: ' + stringlength); // document.getElementById('deviceready').querySelector('.received').innerHTML = 'stringlength: ' + stringlength; }); diff --git a/types/cordova-sqlite-storage/index.d.ts b/types/cordova-sqlite-storage/index.d.ts index 76e3aac5a3..2f78c908ff 100644 --- a/types/cordova-sqlite-storage/index.d.ts +++ b/types/cordova-sqlite-storage/index.d.ts @@ -65,4 +65,3 @@ declare namespace SQLitePlugin { echoTest(ok?: (value: string) => void, error?: (msg: string) => void): void; } } - diff --git a/types/csv-parse/csv-parse-tests.ts b/types/csv-parse/csv-parse-tests.ts index b0f13121fe..26b2458360 100644 --- a/types/csv-parse/csv-parse-tests.ts +++ b/types/csv-parse/csv-parse-tests.ts @@ -1,20 +1,21 @@ import parse = require('csv-parse'); function callbackAPITest() { - var input = '#Welcome\n"1","2","3","4"\n"a","b","c","d"'; + const input = '#Welcome\n"1","2","3","4"\n"a","b","c","d"'; parse(input, {comment: '#'}, (err, output) => { output.should.eql([ [ '1', '2', '3', '4' ], [ 'a', 'b', 'c', 'd' ] ]); }); } function streamAPITest() { - let output: string[][] = []; + const output: string[][] = []; // Create the parser - var parser = parse({delimiter: ':'}); - let record: string[]; + const parser = parse({delimiter: ':'}); // Use the writable stream api parser.on('readable', () => { - while (record = parser.read()) { + while (true) { + const record = parser.read(); + if (!record) break; output.push(record); } }); @@ -35,12 +36,12 @@ function streamAPITest() { import fs = require('fs'); function pipeFunctionTest() { - var transform = require('stream-transform'); + const transform = require('stream-transform'); - var output: any = []; - var parser = parse({delimiter: ':'}) - var input = fs.createReadStream('/etc/passwd'); - var transformer = transform((record: any[], callback: any) => { + const output: any = []; + const parser = parse({delimiter: ':'}); + const input = fs.createReadStream('/etc/passwd'); + const transformer = transform((record: any[], callback: any) => { setTimeout(() => { callback(null, record.join(' ') + '\n'); }, 500); @@ -51,8 +52,7 @@ function pipeFunctionTest() { import parseSync = require('csv-parse/lib/sync'); function syncApiTest() { - var input = '"key_1","key_2"\n"value 1","value 2"'; - var records = parseSync(input, {columns: true}); + const input = '"key_1","key_2"\n"value 1","value 2"'; + const records = parseSync(input, {columns: true}); records.should.eql([{ key_1: 'value 1', key_2: 'value 2' }]); } - diff --git a/types/csv-parse/index.d.ts b/types/csv-parse/index.d.ts index e780bac27d..cbf79729e5 100644 --- a/types/csv-parse/index.d.ts +++ b/types/csv-parse/index.d.ts @@ -33,16 +33,16 @@ declare namespace parse { * special constants are 'auto', 'unix', 'mac', 'windows', 'unicode'; * defaults to 'auto' (discovered in source or 'unix' if no source is specified). */ - rowDelimiter?: string; + rowDelimiter?: string; /** * Optional character surrounding a field, one character only, defaults to double quotes. */ - quote?: string + quote?: string; /** * Set the escape character, one character only, defaults to double quotes. */ - escape?: string + escape?: string; /** * List of fields as an array, @@ -55,62 +55,62 @@ declare namespace parse { /** * Treat all the characters after this one as a comment, default to '' (disabled). */ - comment?: string + comment?: string; /** * Name of header-record title to name objects by. */ - objname?: string + objname?: string; /** * Preserve quotes inside unquoted field. */ - relax?: boolean + relax?: boolean; /** * Discard inconsistent columns count, default to false. */ - relax_column_count?: boolean + relax_column_count?: boolean; /** * Dont generate empty values for empty lines. */ - skip_empty_lines?: boolean + skip_empty_lines?: boolean; /** * Maximum numer of characters to be contained in the field and line buffers before an exception is raised, * used to guard against a wrong delimiter or rowDelimiter, * default to 128000 characters. */ - max_limit_on_data_read?: number + max_limit_on_data_read?: number; /** * If true, ignore whitespace immediately around the delimiter, defaults to false. * Does not remove whitespace in a quoted field. */ - trim?: boolean + trim?: boolean; /** * If true, ignore whitespace immediately following the delimiter (i.e. left-trim all fields), defaults to false. * Does not remove whitespace in a quoted field. */ - ltrim?: boolean + ltrim?: boolean; /** * If true, ignore whitespace immediately preceding the delimiter (i.e. right-trim all fields), defaults to false. * Does not remove whitespace in a quoted field. */ - rtrim?: boolean + rtrim?: boolean; /** * If true, the parser will attempt to convert read data types to native types. */ - auto_parse?: boolean + auto_parse?: boolean; /** * If true, the parser will attempt to convert read data types to dates. It requires the "auto_parse" option. */ - auto_parse_date?: boolean + auto_parse_date?: boolean; } // TODO: what is this for? diff --git a/types/csv-parse/tslint.json b/types/csv-parse/tslint.json index 2221e40e4a..105f5736e6 100644 --- a/types/csv-parse/tslint.json +++ b/types/csv-parse/tslint.json @@ -1 +1,6 @@ -{ "extends": "../tslint.json" } \ No newline at end of file +{ + "extends": "../tslint.json", + "rules": { + "no-empty-interface": false + } +} diff --git a/types/d3-dsv/d3-dsv-tests.ts b/types/d3-dsv/d3-dsv-tests.ts index a4d958f01b..421add6e65 100644 --- a/types/d3-dsv/d3-dsv-tests.ts +++ b/types/d3-dsv/d3-dsv-tests.ts @@ -12,7 +12,6 @@ import * as d3Dsv from 'd3-dsv'; // Preperatory Steps // ------------------------------------------------------------------------------------------ - const csvTestString: string = '1997,Ford,E350,2.34\n2000,Mercury,Cougar,2.38'; const tsvTestString: string = '1997\tFord\tE350\t2.34\n2000\tMercury\tCougar\t2.38'; const pipedTestString: string = '1997|Ford|E350|2.34\n2000|Mercury|Cougar|2.38'; @@ -34,7 +33,6 @@ let parseMappedArray: d3Dsv.DSVParsedArray; let parseRowsArray: string[][]; let parseRowsMappedArray: ParsedTestObject[]; - let columns: string[]; let num: number; let date: Date; @@ -77,14 +75,12 @@ str = parseMappedArray[0].make; str = parseMappedArray[0].model; num = parseMappedArray[0].length; - // csvParseRows(...) ============================================================================ // without row mapper ----------------------------------------------------------------------- parseRowsArray = d3Dsv.csvParseRows(csvTestString); - str = parseRowsArray[0][0]; // 'Year' of first row // date = parseRowsArray[0][0]; // fails, return value is string @@ -158,14 +154,12 @@ str = parseMappedArray[0].make; str = parseMappedArray[0].model; num = parseMappedArray[0].length; - // tsvParseRows(...) ============================================================================ // without row mapper ----------------------------------------------------------------------- parseRowsArray = d3Dsv.tsvParseRows(tsvTestString); - str = parseRowsArray[0][0]; // 'Year' of first row // date = parseRowsArray[0][0]; // fails, return value is string @@ -244,14 +238,12 @@ str = parseMappedArray[0].make; str = parseMappedArray[0].model; num = parseMappedArray[0].length; - // parseRows(...) ============================================================================ // without row mapper ----------------------------------------------------------------------- parseRowsArray = dsv.parseRows(pipedTestString); - str = parseRowsArray[0][0]; // 'Year' of first row // date = parseRowsArray[0][0]; // fails, return value is string diff --git a/types/d3-dsv/tslint.json b/types/d3-dsv/tslint.json new file mode 100644 index 0000000000..2221e40e4a --- /dev/null +++ b/types/d3-dsv/tslint.json @@ -0,0 +1 @@ +{ "extends": "../tslint.json" } \ No newline at end of file diff --git a/types/d3-dsv/v0/d3-dsv-tests.ts b/types/d3-dsv/v0/d3-dsv-tests.ts index 587d4d5a55..ac3e76a689 100644 --- a/types/d3-dsv/v0/d3-dsv-tests.ts +++ b/types/d3-dsv/v0/d3-dsv-tests.ts @@ -1,8 +1,5 @@ - - import d3dsv = require("d3-dsv"); -var csv = d3dsv(","); - -var rows = csv.parse("a,b,c\n1,2,3\n4,5,6"); +const csv = d3dsv(","); +const rows = csv.parse("a,b,c\n1,2,3\n4,5,6"); diff --git a/types/d3-selection/d3-selection-tests.ts b/types/d3-selection/d3-selection-tests.ts index 43d8708938..0b2dec77c2 100644 --- a/types/d3-selection/d3-selection-tests.ts +++ b/types/d3-selection/d3-selection-tests.ts @@ -1,4 +1,3 @@ - /** * Typescript definition tests for d3/d3-selection module * @@ -9,7 +8,6 @@ import * as d3Selection from 'd3-selection'; - // --------------------------------------------------------------------------------------- // Some preparatory work for definition testing below // --------------------------------------------------------------------------------------- @@ -56,7 +54,6 @@ interface CircleDatumAlternative { // Tests of Top-Level Selection Functions // --------------------------------------------------------------------------------------- - // test top-level .selection() ----------------------------------------------------------- const topSelection: d3Selection.Selection = d3Selection.selection(); @@ -101,16 +98,13 @@ maybeSVG2 = d3Selection.select(maybeSVG1.node()); // fails, as node type mismatches selection type // let body7: d3Selection.Selection = d3Selection.select(maybeSVG1.node()); - // test "special case DOM objects" d3Selection.select(xDoc); d3Selection.select(xWindow); - // test top-level selectAll() ------------------------------------------------------------- - // Using selectAll(), selectAll(null) or selectAll(undefined) creates an empty selection let emptyRootSelection: d3Selection.Selection = d3Selection.selectAll(); @@ -137,7 +131,6 @@ const baseTypeElements2: d3Selection.Selection = d3Selection.selectAll(divElements.nodes()); - // Using selectAll(...) with node array argument and type parameters creates selection // with Group element of type HTMLDivElement and datum of DivDatum type. The parent element is of type 'null' with datum of type 'undefined' @@ -145,10 +138,8 @@ const divElements4: d3Selection.Selection(baseTypeElements.nodes()); // fails as baseTypeEl.node() is not of type HTMLBodyElement - // selectAll(...) accepts NodeListOf<...> argument - const xSVGCircleElementList: NodeListOf = document.querySelectorAll('circle'); const circleSelection: d3Selection.Selection = d3Selection.selectAll(xSVGCircleElementList); @@ -156,14 +147,10 @@ const circleSelection: d3Selection.Selection = d3Selection.selectAll(document.links); - - // --------------------------------------------------------------------------------------- // Tests of Sub-Selection Functions // --------------------------------------------------------------------------------------- - - // select(...) sub-selection -------------------------------------------------------------- // Expected: datum propagates down from selected element to sub-selected descendant element @@ -211,12 +198,10 @@ firstG = svgEl.select(function(d, i, g) { return this.querySelector('g')!; // this of type SVGSVGElement by type inference }); - // firstG = svgEl.select(function() { // return this.querySelector('a'); // fails, return type HTMLAnchorElement is not compatible with SVGGElement expected by firstG // }); - // selectAll(...) sub-selection -------------------------------------------------------------- // Expected: datum from selected element(s) does not propagate down to sub-selected descendant elements. @@ -234,14 +219,12 @@ let elementsUnknownData: d3Selection.Selection = svgEl.selectAll('g'); // gElementsOldData = svgEl.selectAll('g'); // fails default type parameters of selectAll for group element type and datum type do not match - // Using selectAll(...) sub-selection with a selector function argument. function svgGroupSelectorAll(this: SVGSVGElement, d: SVGDatum, i: number, groups: SVGSVGElement[]): NodeListOf { return this.querySelectorAll('g'); // this-type compatible with group element-type to which the selector function will be appplied } - gElementsOldData = svgEl.selectAll(svgGroupSelectorAll); function wrongSvgGroupSelectorAll(this: HTMLElement, d: SVGDatum, i: number, groups: HTMLElement[]): NodeListOf { @@ -305,7 +288,6 @@ maybeG.selectAll(function(d, i, g) { // selector(...) and selectorAll(...) ---------------------------------------------------- - // d3Selection.select(d3Selection.selector('g')); // fails, selector as argument to top-level select not supported // supported on sub-selection @@ -352,12 +334,10 @@ filterdGElements2 = d3Selection.selectAll('.any-svg-type').filt // return that.tagName === 'g'|| that.tagName === 'G'; // }); // fails without using narrowing generic on filter method - // matcher() ----------------------------------------------------------------------------- filterdGElements = gElementsOldData.filter(d3Selection.matcher('.top-level')); - // --------------------------------------------------------------------------------------- // Tests of Modification // --------------------------------------------------------------------------------------- @@ -377,7 +357,6 @@ str = body.html(); // Setters tests ------------------------------------------------------------------------- - let circles: d3Selection.Selection; let divs: d3Selection.Selection; @@ -425,7 +404,6 @@ divs = divs return d.padding === '0px'; // boolean return value }); - // style(...) Tests divs = divs @@ -451,7 +429,6 @@ divs = divs // .style('color', function() { return 'green'; }, 'test') // fails, test: invalid priority value .style('color', () => 'green', 'important'); // boolean return + test: priority = 'important'; - // property(...) Tests circles = circles @@ -514,7 +491,6 @@ body = body // Tests of Datum and Data Join // --------------------------------------------------------------------------------------- - const data: CircleDatum[] = [ { nodeId: 'c1', cx: 10, cy: 10, r: 5, name: 'foo', label: 'Foo' }, { nodeId: 'c2', cx: 20, cy: 20, r: 5, name: 'bar', label: 'Bar' }, @@ -527,7 +503,6 @@ const data2: CircleDatumAlternative[] = [ { nodeId: 'c4', cx: 10, cy: 15, r: 10, name: 'newbie', label: 'Newbie', color: 'red' } ]; - // Tests of Datum ----------------------------------------------------------------------- // TEST GETTER @@ -564,7 +539,6 @@ newBodyDatum = body.datum(function(d, i, g) { // return { newFoo: 'new foo' }; // }).datum(); // inferred type - // SCENARIO 1: Fully type-parameterized // object-based @@ -616,10 +590,8 @@ d3Selection.select('#svg-1') // irrelevant typing to get contextual typing in la return d.length > 0 && d[0].color === 'green'; }); - // Tests of Data Join -------------------------------------------------------------------- - const dimensions: SVGDatum = { width: 500, height: 300 @@ -741,7 +713,6 @@ circles2 = enterCircles.merge(circles2); // merge enter and update selections // FURTHER DATA-JOIN TESTs (function argument, changes in data type between old and new data) - const matrix = [ [11975, 5871, 8916, 2868], [1951, 10048, 2060, 6171], @@ -876,7 +847,6 @@ newParagraph2 = body.insert(typeValueFunction, 'p.second-paragraph'); newParagraph2 = body.insert(typeValueFunction, beforeValueFunction); newParagraph2 = body.insert(typeValueFunction); - // sort(...) ----------------------------------------------------------------------------- // NB: Return new selection of same type @@ -932,12 +902,10 @@ circles = circles.each(function(d, i, g) { // check chaining return type by re- // call() ------------------------------------------------------------------------------- function enforceMinRadius(selection: d3Selection.Selection, minRadius: number): void { - selection.attr('r', function(d) { const r: number = +d3Selection.select(this).attr('r'); return Math.max(r, minRadius); }); - } // returns 'this' selection @@ -959,7 +927,6 @@ circles = circles.call(enforceMinRadius, 40); // check chaining return type by r let listener: undefined | ((this: HTMLBodyElement, datum: BodyDatum, index: number, group: HTMLBodyElement[] | ArrayLike) => void); - body = body.on('click', function(d, i, g) { const that: HTMLBodyElement = this; // const that2: SVGElement = this; // fails, type mismatch @@ -981,7 +948,6 @@ if (listener) { // remove listener body = body.on('click', null); // check chaining return type by re-assigning - // dispatch(...) ------------------------------------------------------------------------- const fooEventParam: d3Selection.CustomEventParameters = { @@ -1009,7 +975,6 @@ body = body.dispatch('fooEvent', function(d, i, g) { // re-assign for chaining t return eParam; }); - // event and customEvent() ---------------------------------------------------------------- // TODO: Tests of event are related to issue #3 (https://github.com/tomwanzek/d3-v4-definitelytyped/issues/3) diff --git a/types/d3-selection/index.d.ts b/types/d3-selection/index.d.ts index 49cd141dfa..b007573b1f 100644 --- a/types/d3-selection/index.d.ts +++ b/types/d3-selection/index.d.ts @@ -44,7 +44,6 @@ export interface EnterElement { */ export type ContainerElement = HTMLElement | SVGSVGElement | SVGGElement; - /** * Interface for optional parameters map, when dispatching custom events * on a selection @@ -69,7 +68,6 @@ export interface CustomEventParameters { */ export type ValueFn = (this: T, datum: Datum, index: number, groups: T[] | ArrayLike) => Result; - /** * TransitionLike is a helper interface to represent a quasi-Transition, without specifying the full Transition interface in this file. * For example, whereever d3-zoom allows a Transition to be passed in as an argument, it internally immediately invokes its `selection()` @@ -88,8 +86,6 @@ export interface TransitionLike { tween(name: string, tweenFn: ValueFn void)>): TransitionLike; } - - // -------------------------------------------------------------------------- // All Selection related interfaces and function // -------------------------------------------------------------------------- @@ -155,7 +151,6 @@ export function selectAll(nodes: GElement[] */ export function selectAll(nodes: ArrayLike): Selection; - /** * A D3 Selection of elements. * @@ -165,7 +160,6 @@ export function selectAll(nodes: ArrayLike< * The fourth generic "PDatum" refers to the type of the datum of the parent element(s). */ interface Selection { - // Sub-selection ------------------------- /** @@ -625,7 +619,6 @@ interface Selection Selection; * Selects the root element, document.documentElement. This function can also be used to test for selections * (instanceof d3.selection) or to extend the selection prototype. */ -export var selection: SelectionFn; - +export const selection: SelectionFn; // --------------------------------------------------------------------------- // on.js event and customEvent related @@ -899,7 +889,7 @@ interface BaseEvent { * rather than from the generated UMD bundle; not all bundlers observe jsnext:main. * Also beware of conflicts with the window.event global. */ -export var event: any; // Could be of all sorts of types, too general: BaseEvent | Event | MouseEvent | TouchEvent | ... | OwnCustomEventType; +export const event: any; // Could be of all sorts of types, too general: BaseEvent | Event | MouseEvent | TouchEvent | ... | OwnCustomEventType; /** * Invokes the specified listener, using the specified "that" as "this" context and passing the specified arguments, if any. @@ -984,7 +974,6 @@ export function touches(container: ContainerElement, touches?: TouchList): Array // local.js related // --------------------------------------------------------------------------- - export interface Local { /** * Retrieves a local variable stored on the node (or one of its parents). @@ -1050,7 +1039,6 @@ export interface NamespaceLocalObject { */ export function namespace(prefixedLocal: string): NamespaceLocalObject | string; - // --------------------------------------------------------------------------- // namespaces.js related // --------------------------------------------------------------------------- @@ -1063,8 +1051,7 @@ export interface NamespaceMap { [prefix: string]: string; } /** * Map of namespace prefixes to corresponding fully qualified namespace strings */ -export var namespaces: NamespaceMap; - +export const namespaces: NamespaceMap; // --------------------------------------------------------------------------- // window.js related @@ -1078,13 +1065,11 @@ export var namespaces: NamespaceMap; */ export function window(DOMNode: Window | Document | Element): Window; - // --------------------------------------------------------------------------- // creator.js and matcher.js Complex helper closure generating functions // for explicit bound-context dependent use // --------------------------------------------------------------------------- - /** * Given the specified element name, returns a function which creates an element of the given name, * assuming that "this" is the parent element. diff --git a/types/dagre-d3/dagre-d3-tests.ts b/types/dagre-d3/dagre-d3-tests.ts index 2b1a958ef7..16bfb29b0c 100644 --- a/types/dagre-d3/dagre-d3-tests.ts +++ b/types/dagre-d3/dagre-d3-tests.ts @@ -1,4 +1,3 @@ - namespace DagreD3Tests { const gDagre = new dagreD3.graphlib.Graph(); const graph = gDagre.graph(); diff --git a/types/deep-equal/deep-equal-tests.ts b/types/deep-equal/deep-equal-tests.ts index ed23a35838..d889f5929d 100644 --- a/types/deep-equal/deep-equal-tests.ts +++ b/types/deep-equal/deep-equal-tests.ts @@ -1,4 +1,3 @@ - import deepEqual = require("deep-equal"); const isDeepEqual1: boolean = deepEqual({}, {}); diff --git a/types/dot/dot-tests.ts b/types/dot/dot-tests.ts index 0987f9eb46..507f63e81d 100644 --- a/types/dot/dot-tests.ts +++ b/types/dot/dot-tests.ts @@ -1,32 +1,30 @@ +const headertmpl = "

{{=it.title}}

"; - -var headertmpl = "

{{=it.title}}

"; - -var pagetmpl = "

Here is the page using a header template< / h2 >\n" +const pagetmpl = "

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/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/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/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/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/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/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(p1: Parser, p2: Parser, p3: Parser, p4: Parser): Parser<[T, U, V, W]>; + function seq(p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser): Parser<[T, U, V, W, X]>; + function seq(p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser, p6: Parser): Parser<[T, U, V, W, X, Y]>; + function seq(p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser, p6: Parser, p7: Parser): Parser<[T, U, V, W, X, Y, Z]>; + function seq(...parsers: Array>): Parser; + function seq(...parsers: Array>): Parser; /** * Takes the string passed to parser.parse(string) and the error returned from * parser.parse(string) and turns it into a human readable error message string. * Note that there are certainly better ways to format errors, so feel free to write your own. */ - export function formatError(string: string, error: Result): string; + function formatError(string: string, error: Result): string; /** * Matches all parsers sequentially, and passes their results as the arguments to a function. * Similar to calling Parsimmon.seq and then .map, but the values are not put in an array. */ - export function seqMap(p1: Parser, cb: (a1: T) => U): Parser; - export function seqMap(p1: Parser, p2: Parser, cb: (a1: T, a2: U) => V): Parser; - export function seqMap(p1: Parser, p2: Parser, p3: Parser, cb: (a1: T, a2: U, a3: V) => W): Parser; - export function seqMap(p1: Parser, p2: Parser, p3: Parser, p4: Parser, cb: (a1: T, a2: U, a3: V, a4: W) => X): Parser; - export function seqMap(p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser, cb: (a1: T, a2: U, a3: V, a4: W, a5: X) => Y): Parser; - export function seqMap(p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser, p6: Parser, cb: (a1: T, a2: U, a3: V, a4: W, a5: X, a6: Y) => Z): Parser; - export function seqMap( + function seqMap(p1: Parser, cb: (a1: T) => U): Parser; + function seqMap(p1: Parser, p2: Parser, cb: (a1: T, a2: U) => V): Parser; + function seqMap(p1: Parser, p2: Parser, p3: Parser, cb: (a1: T, a2: U, a3: V) => W): Parser; + function seqMap(p1: Parser, p2: Parser, p3: Parser, p4: Parser, cb: (a1: T, a2: U, a3: V, a4: W) => X): Parser; + function seqMap(p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser, cb: (a1: T, a2: U, a3: V, a4: W, a5: X) => Y): Parser; + function seqMap(p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser, p6: Parser, cb: (a1: T, a2: U, a3: V, a4: W, a5: X, a6: Y) => Z): Parser; + function seqMap( p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser, p6: Parser, p7: Parser, cb: (a1: T, a2: U, a3: V, a4: W, a5: X, a6: Y, a7: Z) => A): Parser; - export function seqMap( + function seqMap( p1: Parser, p2: Parser, p3: Parser, p4: Parser, p5: Parser, p6: Parser, p7: Parser, p8: Parser, cb: (a1: T, a2: U, a3: V, a4: W, a5: X, a6: Y, a7: Z, a8: A) => B): Parser; - export type SuccessFunctionType = (index: number, result: U) => Result; - export type FailureFunctionType = (index: number, msg: string) => Result; - export type ParseFunctionType = (stream: StreamType, index: number) => Result; + type SuccessFunctionType = (index: number, result: U) => Result; + type FailureFunctionType = (index: number, msg: string) => Result; + type ParseFunctionType = (stream: StreamType, index: number) => Result; /** * allows to add custom primitive parsers. */ - export function custom(parsingFunction: (success: SuccessFunctionType, failure: FailureFunctionType) => ParseFunctionType): Parser; + function custom(parsingFunction: (success: SuccessFunctionType, failure: FailureFunctionType) => ParseFunctionType): Parser; /** * accepts a variable number of parsers, and yields the value of the first one that succeeds, * backtracking in between. */ - export function alt(...parsers: Array>): Parser; - export function alt(...parsers: Array>): Parser; + function alt(...parsers: Array>): Parser; + function alt(...parsers: Array>): Parser; /** * Accepts two parsers, and expects zero or more matches for content, separated by separator, yielding an array. */ - export function sepBy(content: Parser, separator: Parser): Parser; + function sepBy(content: Parser, separator: Parser): Parser; /** * This is the same as Parsimmon.sepBy, but matches the content parser at least once. */ - export function sepBy1(content: Parser, separator: Parser): Parser; + function sepBy1(content: Parser, separator: Parser): Parser; /** * accepts a function that returns a parser, which is evaluated the first time the parser is used. * This is useful for referencing parsers that haven't yet been defined. */ - export function lazy(f: () => Parser): Parser; - export function lazy(description: string, f: () => Parser): Parser; + function lazy(f: () => Parser): Parser; + function lazy(description: string, f: () => Parser): Parser; /** * fail paring with a message */ - export function fail(message: string): Parser; + function fail(message: string): Parser; /** * is equivalent to Parsimmon.regex(/[a-z]/i) */ - export var letter: Parser; + const letter: Parser; /** * is equivalent to Parsimmon.regex(/[a-z]*`/i) */ - export var letters: Parser; + const letters: Parser; /** * is equivalent to Parsimmon.regex(/[0-9]/) */ - export var digit: Parser; + const digit: Parser; /** * is equivalent to Parsimmon.regex(/[0-9]*`/) */ - export var digits: Parser; + const digits: Parser; /** * is equivalent to Parsimmon.regex(/\s+/) */ - export var whitespace: Parser; + const whitespace: Parser; /** * is equivalent to Parsimmon.regex(/\s*`/) */ - export var optWhitespace: Parser; + const optWhitespace: Parser; /** * consumes and yields the next character of the stream. */ - export var any: Parser; + const any: Parser; /** * consumes and yields the entire remainder of the stream. */ - export var all: Parser; + const all: Parser; /** * expects the end of the stream. */ - export var eof: Parser; + const eof: Parser; /** * is a parser that yields the current index of the parse. */ - export var index: Parser; + const index: Parser; /** * Returns a parser that yield a single character if it passes the predicate */ - export function test(predicate: (char: string) => boolean): Parser; + function test(predicate: (char: string) => boolean): Parser; /** * Returns a parser yield a string containing all the next characters that pass the predicate */ - export function takeWhile(predicate: (char: string) => boolean): Parser; + function takeWhile(predicate: (char: string) => boolean): Parser; } export = Parsimmon; diff --git a/types/parsimmon/parsimmon-tests.ts b/types/parsimmon/parsimmon-tests.ts index 6be7eb307a..e0ce697909 100644 --- a/types/parsimmon/parsimmon-tests.ts +++ b/types/parsimmon/parsimmon-tests.ts @@ -1,4 +1,3 @@ - import P = require('parsimmon'); import { Parser, Mark, Result, Index } from "parsimmon"; @@ -14,43 +13,35 @@ class Bar { // -- -- -- -- -- -- -- -- -- -- -- -- -- -var str: string; -var strArr: string[]; -var bool: boolean; -var num: number; -var index: Index; -var regex: RegExp; +let str: string; +let strArr: string[]; +let bool: boolean; +let num: number; +let index: Index; -var foo: Foo; -var bar: Bar; - -var strArr: string[]; -var fooArr: Foo[]; -var barArr: Bar[]; +let foo: Foo; +declare const bar: Bar; // -- -- -- -- -- -- -- -- -- -- -- -- -- -var strPar: Parser; -var numPar: Parser; -var voidPar: Parser; -var anyPar: Parser; -var indexPar: Parser; +let strPar: Parser; +let numPar: Parser; +let voidPar: Parser; +let anyPar: Parser; +let indexPar: Parser; -var fooPar: Parser; -var barPar: Parser; -var fooOrBarPar: Parser; +let fooPar: Parser; +let barPar: Parser; +let fooOrBarPar: Parser; // -- -- -- -- -- -- -- -- -- -- -- -- -- -var anyArrPar: Parser; - -var strArrPar: Parser; -var fooArrPar: Parser; -var barArrPar: Parser; +let strArrPar: Parser; +let fooArrPar: Parser; // -- -- -- -- -- -- -- -- -- -- -- -- -- -var fooMarkPar: Parser>; +let fooMarkPar: Parser>; const result = fooMarkPar.parse(str); if (result.status) { @@ -61,7 +52,7 @@ if (result.status) { // -- -- -- -- -- -- -- -- -- -- -- -- -- -var fooResult: Result; +let fooResult: Result; // https://github.com/Microsoft/TypeScript/issues/12882 if (fooResult.status === true) { @@ -126,13 +117,13 @@ fooPar = fooPar.desc(str); // -- -- -- -- -- -- -- -- -- -- -- -- -- strPar = P.string(str); -strPar = P.regex(regex); +strPar = P.regex(/rgx/); fooPar = P.succeed(foo); fooArrPar = P.seq(fooPar, fooPar); -var par: Parser<[Bar, Foo, number]> = P.seq(barPar, fooPar, numPar); -var par2: Parser = P.seq(barPar, fooPar, numPar).map(([a, b, c]: [Bar, Foo, number]) => 42); +const par: Parser<[Bar, Foo, number]> = P.seq(barPar, fooPar, numPar); +const par2: Parser = P.seq(barPar, fooPar, numPar).map(([a, b, c]: [Bar, Foo, number]) => 42); fooPar = P.custom((success, failure) => (stream, i) => { str = stream; num = i; return success(num, foo); }); fooPar = P.custom((success, failure) => (stream, i) => failure(num, str)); @@ -140,7 +131,6 @@ fooPar = P.custom((success, failure) => (stream, i) => failure(num, str)); fooPar = P.alt(fooPar, fooPar); anyPar = P.alt(barPar, fooPar, numPar); - fooPar = P.lazy(() => { return fooPar; }); diff --git a/types/qlik-visualizationextensions/index.d.ts b/types/qlik-visualizationextensions/index.d.ts index e5d5850423..97ffca8733 100644 --- a/types/qlik-visualizationextensions/index.d.ts +++ b/types/qlik-visualizationextensions/index.d.ts @@ -226,7 +226,7 @@ declare namespace BackendAPI { * Validation error. * REF(NxValidationError) */ - //?Type = REF(NxValidationError)? + // ?Type = REF(NxValidationError)? qError: INxValidationError; } @@ -2235,11 +2235,7 @@ declare namespace VisualizationAPI { } declare namespace ExtensionAPI { - - - interface IExtensionModel { - - } + interface IExtensionModel {} interface IExtensionComponent { model: IExtensionModel; @@ -2249,13 +2245,12 @@ declare namespace ExtensionAPI { component: IExtensionComponent; } - - //ExtensionAPI + // ExtensionAPI type SelectionModeType = "CONFIRM" | "QUICK"; interface IInitialProperties { - qHyperCubeDef?: any; //IHyperCubeDef; - qListObjectDef?: any; //IListObjectDef; + qHyperCubeDef?: any; // IHyperCubeDef; + qListObjectDef?: any; // IListObjectDef; fixed?: boolean; width?: number; percent?: boolean; @@ -2287,7 +2282,7 @@ declare namespace ExtensionAPI { // qHyperCubeDef: IVisualizationHyperCubeDef; // qListObjectDef: IVis - //[""]: + // [""]: } //#region IDefinition @@ -2451,7 +2446,7 @@ declare namespace ExtensionAPI { items: any; } - //?Das selbe wie Appearance? + // ?Das selbe wie Appearance? interface ISettings { uses: "settings"; min?: number; @@ -2468,16 +2463,17 @@ declare namespace ExtensionAPI { } declare module "qlik" { - var e: RootAPI.IRoot; export = e; + const e: RootAPI.IRoot; + export = e; } interface IQVAngular { /** - * Register a new directive with the compiler. - * - * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind) - * @param directiveFactory An injectable directive factory function. - */ + * Register a new directive with the compiler. + * + * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind) + * @param directiveFactory An injectable directive factory function. + */ directive(name: string, directiveFactory: ng.Injectable): void; directive(object: { [directiveName: string]: ng.Injectable }): void; @@ -2496,10 +2492,11 @@ interface IQVAngular { service(name: string, serviceConstructor: ng.Injectable): T; service(object: { [name: string]: ng.Injectable }): T; - //provider(name: string, serviceProviderFactory: ng.IServiceProviderFactory): void; - //provider(name: string, serviceProviderConstructor: ng.IServiceProviderClass): void; + // provider(name: string, serviceProviderFactory: ng.IServiceProviderFactory): void; + // provider(name: string, serviceProviderConstructor: ng.IServiceProviderClass): void; } declare module "qvangular" { - var e: IQVAngular; export = e; -} \ No newline at end of file + const e: IQVAngular; + export = e; +} diff --git a/types/qlik-visualizationextensions/qlik-visualizationextensions-tests.ts b/types/qlik-visualizationextensions/qlik-visualizationextensions-tests.ts index 76a71d22dc..0afce187e4 100644 --- a/types/qlik-visualizationextensions/qlik-visualizationextensions-tests.ts +++ b/types/qlik-visualizationextensions/qlik-visualizationextensions-tests.ts @@ -1,3 +1,3 @@ import qlik = require("qlik"); -const t = qlik.currApp(); \ No newline at end of file +const t = qlik.currApp(); diff --git a/types/rc-slider/index.d.ts b/types/rc-slider/index.d.ts index 704412eda6..37ce19ac59 100644 --- a/types/rc-slider/index.d.ts +++ b/types/rc-slider/index.d.ts @@ -7,11 +7,11 @@ import * as React from 'react'; declare namespace RcSliderClass { - export interface Marks { + interface Marks { [number: number]: JSX.Element | string | { style: any, label: string | JSX.Element }; } - export interface CommonApiProps { + interface CommonApiProps { /** * Additional CSS class for the root DOM node * @default '' @@ -100,8 +100,7 @@ declare namespace RcSliderClass { value?: number; } - - export interface RangeProps extends CommonApiProps { + interface RangeProps extends CommonApiProps { /** * Set initial positions of handles. * @default [0,0] @@ -128,7 +127,7 @@ declare namespace RcSliderClass { pushable?: boolean; } - export interface HandleProps extends CommonApiProps { + interface HandleProps extends CommonApiProps { /** * Class name */ @@ -152,5 +151,4 @@ declare namespace RcSliderClass { class Handle extends React.Component { } } - export = RcSliderClass; diff --git a/types/rc-slider/rc-slider-tests.tsx b/types/rc-slider/rc-slider-tests.tsx index f6e2442558..55c0674741 100644 --- a/types/rc-slider/rc-slider-tests.tsx +++ b/types/rc-slider/rc-slider-tests.tsx @@ -24,7 +24,7 @@ ReactDOM.render( marks={{ 1: "1" }} step={0.01} vertical={true} - handle={() => { return }} + handle={() => } included={true} disabled={false} dots={true} @@ -45,4 +45,4 @@ ReactDOM.render( allowCross={false} pushable={true} />, document.querySelector('.app') -); \ No newline at end of file +); diff --git a/types/react-color/lib/components/common/EditableInput.d.ts b/types/react-color/lib/components/common/EditableInput.d.ts index 78df9473f2..f786399c9e 100644 --- a/types/react-color/lib/components/common/EditableInput.d.ts +++ b/types/react-color/lib/components/common/EditableInput.d.ts @@ -16,4 +16,3 @@ export interface EditableInputProps extends ClassAttributes { } export default class EditableInput extends Component {} - diff --git a/types/react-color/react-color-tests.tsx b/types/react-color/react-color-tests.tsx index e4e6f2348b..71ed800375 100644 --- a/types/react-color/react-color-tests.tsx +++ b/types/react-color/react-color-tests.tsx @@ -1,22 +1,22 @@ -import * as React from "react" -import { StatelessComponent } from "react" -import { render } from "react-dom" +import * as React from "react"; +import { StatelessComponent } from "react"; +import { render } from "react-dom"; import { AlphaPicker, BlockPicker, ChromePicker, CirclePicker, CompactPicker, GithubPicker, HuePicker, MaterialPicker, PhotoshopPicker, SketchPicker, SliderPicker, SwatchesPicker, TwitterPicker, CustomPicker, InjectedColorProps, ColorResult, Color -} from "react-color" -import { Alpha, Checkboard, EditableInput, Hue, Saturation } from "react-color/lib/components/common" +} from "react-color"; +import { Alpha, Checkboard, EditableInput, Hue, Saturation } from "react-color/lib/components/common"; interface CustomProps extends InjectedColorProps { - color?: Color + color?: Color; } -var CustomComponent: StatelessComponent = (props: CustomProps) => { - function onChange (color: ColorResult) { - console.log(color) +const CustomComponent: StatelessComponent = (props: CustomProps) => { + function onChange(color: ColorResult) { + console.log(color); } return ( @@ -27,23 +27,23 @@ var CustomComponent: StatelessComponent = (props: CustomProps) => { - ) -} -var Custom = CustomPicker(CustomComponent) + ); +}; +const Custom = CustomPicker(CustomComponent); -var colors: Array = ["#000", "#333"] +const colors = ["#000", "#333"]; -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) -render(, document.getElementById("main")) +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); +render(, document.getElementById("main")); diff --git a/types/react-copy-to-clipboard/index.d.ts b/types/react-copy-to-clipboard/index.d.ts index 1b0c9e942e..e4a0948962 100644 --- a/types/react-copy-to-clipboard/index.d.ts +++ b/types/react-copy-to-clipboard/index.d.ts @@ -11,20 +11,17 @@ export as namespace CopyToClipboard; export = CopyToClipboard; declare namespace CopyToClipboard { - - export interface Options { + interface Options { debug: boolean; message: string; } - export interface Props { + interface Props { text: string; - onCopy?: (a: string) => void, + onCopy?: (a: string) => void; options?: Options; } - } declare class CopyToClipboard extends React.Component { } - diff --git a/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx b/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx index 195e7a8ceb..4d412f0257 100644 --- a/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx +++ b/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx @@ -1,4 +1,3 @@ - import * as React from "react"; import * as CopyToClipboard from "react-copy-to-clipboard"; diff --git a/types/react-day-picker/index.d.ts b/types/react-day-picker/index.d.ts index be90f72d07..8dc5fcd12e 100644 --- a/types/react-day-picker/index.d.ts +++ b/types/react-day-picker/index.d.ts @@ -7,7 +7,7 @@ import * as React from 'react'; declare namespace DayPicker { - export interface LocaleUtils { + interface LocaleUtils { formatDay(day: Date, locale: string): string; formatMonthTitle(month: Date, locale: string): string; formatWeekdayLong(weekday: number, locale: string): string; @@ -16,7 +16,7 @@ declare namespace DayPicker { getMonths(locale: string): [string, string, string, string, string, string, string, string, string, string, string, string]; } - export interface DateUtils { + interface DateUtils { addMonths(d: Date, n: number): Date; clone(d: Date): Date; isSameDay(d1: Date, d2: Date): Date; @@ -27,16 +27,16 @@ declare namespace DayPicker { isDayInRange(day: Date, range: RangeModifier): boolean; } - export interface CaptionElementProps { + interface CaptionElementProps { date: Date; - classNames: ClassNames, + classNames: ClassNames; localeUtils: LocaleUtils; locale: string; months: undefined; onClick?: React.MouseEventHandler; } - export interface NavbarElementProps { + interface NavbarElementProps { className: string; classNames: ClassNames; previousMonth: Date; @@ -51,14 +51,14 @@ declare namespace DayPicker { locale: string; } - export interface WeekdayElementProps { + interface WeekdayElementProps { weekday: number; className: string; localeUtils: LocaleUtils; locale: string; } - export interface ClassNames { + interface ClassNames { container: string; interactionDisabled: string; navBar: string; @@ -80,28 +80,26 @@ declare namespace DayPicker { outside: string; } - export interface RangeModifier { + interface RangeModifier { from: Date; to: Date; } - export interface BeforeModifier { + interface BeforeModifier { before: Date; } - export interface AfterModifier { + interface AfterModifier { after: Date; } - export interface FunctionModifier { - (date: Date): boolean; - } - export type Modifier = Date | RangeModifier | BeforeModifier | AfterModifier | FunctionModifier; + type FunctionModifier = (date: Date) => boolean; + type Modifier = Date | RangeModifier | BeforeModifier | AfterModifier | FunctionModifier; - export interface Modifiers { + interface Modifiers { today: Modifier | Modifier[]; outside: Modifier | Modifier[]; [other: string]: Modifier | Modifier[] | undefined; } - export interface Props { + interface Props { canChangeMonth?: boolean; captionElement?: React.ReactElement> | React.ComponentClass | diff --git a/types/react-day-picker/react-day-picker-tests.tsx b/types/react-day-picker/react-day-picker-tests.tsx index 8c2755f9b5..52da9e9735 100644 --- a/types/react-day-picker/react-day-picker-tests.tsx +++ b/types/react-day-picker/react-day-picker-tests.tsx @@ -16,6 +16,7 @@ DayPicker.DateUtils.clone(new Date()); DayPicker.DateUtils.isDayInRange(new Date(), { from: new Date(), to: new Date(2050) }); interface MyCaptionProps extends DayPicker.CaptionElementProps { + myProp: number; } class Caption extends React.Component { render() { @@ -32,8 +33,7 @@ class Caption extends React.Component { ); } } - - +; type CaptionElementProps = Partial; class CaptionElement extends React.Component { @@ -46,7 +46,7 @@ class CaptionElement extends React.Component {
{ localeUtils.formatMonthTitle(date, locale) }
- ) - } + ); + }; } - }/> + }/>; diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts index 8716b03217..577846e4a5 100644 --- a/types/react-facebook-login/index.d.ts +++ b/types/react-facebook-login/index.d.ts @@ -7,8 +7,7 @@ import * as React from "react"; declare namespace ReactFacebookLogin { - - export interface ReactFacebookLoginProps { + interface ReactFacebookLoginProps { appId: string; callback: (userInfo: ReactFacebookLoginInfo) => void; @@ -33,19 +32,17 @@ declare namespace ReactFacebookLogin { xfbml?: boolean; } - export interface ReactFacebookLoginInfo { + interface ReactFacebookLoginInfo { id: string; name: string; } - export interface ReactFacebookLoginState { + interface ReactFacebookLoginState { isSdkLoaded?: boolean; isProcessing?: boolean; } - } -declare class ReactFacebookLogin extends React.Component { -} +declare class ReactFacebookLogin extends React.Component {} -export = ReactFacebookLogin; \ No newline at end of file +export = ReactFacebookLogin; diff --git a/types/react-facebook-login/react-facebook-login-tests.tsx b/types/react-facebook-login/react-facebook-login-tests.tsx index 7f0d89ea8f..0efd5aa548 100644 --- a/types/react-facebook-login/react-facebook-login-tests.tsx +++ b/types/react-facebook-login/react-facebook-login-tests.tsx @@ -22,7 +22,6 @@ ReactDOM.render( document.getElementById('demo') ); - ReactDOM.render( { - private responseFacebook(response: ReactFacebookLoginInfo) { console.log(response); } @@ -78,9 +76,7 @@ class MyComponent extends React.Component { } } - class MyComponent2 extends React.Component { - private responseFacebook(response: ReactFacebookLoginInfo) { console.log(response); } @@ -96,4 +92,3 @@ class MyComponent2 extends React.Component { ); } } - diff --git a/types/react-joyride/react-joyride-tests.tsx b/types/react-joyride/react-joyride-tests.tsx index 9674560f5e..68e11ba94c 100644 --- a/types/react-joyride/react-joyride-tests.tsx +++ b/types/react-joyride/react-joyride-tests.tsx @@ -52,4 +52,3 @@ class NewComponent extends React.Component { }); } } - diff --git a/types/react-leaflet/index.d.ts b/types/react-leaflet/index.d.ts index eff286623a..ac67612757 100644 --- a/types/react-leaflet/index.d.ts +++ b/types/react-leaflet/index.d.ts @@ -66,7 +66,6 @@ interface LeafletDraggingEvents { onmoveend?: (event: Leaflet.Event) => void; } - interface MapProps extends React.HTMLProps, LeafletLayerEvents, LeafletMapStateChangeEvents, LeafletPopupEvents, LeafletTooltipEvents, LeafletLocationEvents, LeafletInteractionEvents, LeafletOtherEvents, Leaflet.MapOptions { animate?: boolean; @@ -78,20 +77,18 @@ interface MapProps extends React.HTMLProps, id?: string; } -declare type Map = React.ComponentClass; -declare const Map: Map; +type Map = React.ComponentClass; +export const Map: Map; interface MapInstance extends React.Component { leafletElement: Leaflet.Map; } - interface PaneProps { name?: string; style?: React.CSSProperties; className?: string; } -declare const Pane: React.ComponentClass; - +export const Pane: React.ComponentClass; // There is no Layer class, these are the base props for all layers on the map interface LayerProps extends LeafletInteractionEvents { @@ -107,7 +104,6 @@ interface LayerProps extends LeafletInteractionEvents { ontooltipclose?: (event: Leaflet.TooltipEvent) => void; } - interface MarkerProps extends LayerProps, LeafletDraggingEvents { position: Leaflet.LatLngExpression; draggable?: boolean; @@ -115,7 +111,7 @@ interface MarkerProps extends LayerProps, LeafletDraggingEvents { zIndexOffset?: number; opacity?: number; } -declare const Marker: React.ComponentClass; +export const Marker: React.ComponentClass; interface MarkerInstance extends React.Component { leafletElement: Leaflet.Marker; } @@ -123,11 +119,11 @@ interface MarkerInstance extends React.Component { interface PopupProps extends LayerProps, Leaflet.PopupOptions { position?: Leaflet.LatLngExpression; } -declare const Popup: React.ComponentClass; +export const Popup: React.ComponentClass; // tslint:disable-next-line:no-empty-interface interface TooltipProps extends LayerProps, Leaflet.TooltipOptions { } -declare const Tooltip: React.ComponentClass; +export const Tooltip: React.ComponentClass; interface GridLayerProps extends LayerProps { opacity?: number; @@ -140,84 +136,80 @@ interface GridLayerProps extends LayerProps { ontileload?: (event: Leaflet.TileEvent) => void; onload?: (event: Leaflet.Event) => void; } -declare const GridLayer: React.ComponentClass; +export const GridLayer: React.ComponentClass; interface TileLayerProps extends GridLayerProps, Leaflet.TileLayerOptions { url: string; } -declare const TileLayer: React.ComponentClass; +export const TileLayer: React.ComponentClass; interface ImageOverlayProps extends LayerProps, LeafletInteractionEvents { url: string; opacity?: string; } -declare const ImageOverlay: React.ComponentClass; +export const ImageOverlay: React.ComponentClass; interface WMSTileLayerProps extends TileLayerProps { url: string; } -declare const WMSTileLayer: React.ComponentClass; +export const WMSTileLayer: React.ComponentClass; // Path is an abstract class // tslint:disable-next-line:no-empty-interface interface PathProps extends LeafletLayerEvents, LeafletInteractionEvents, Leaflet.PathOptions { } - interface CircleProps extends PathProps { center: Leaflet.LatLngExpression; radius?: number; } -declare const Circle: React.ComponentClass; +export const Circle: React.ComponentClass; interface CircleMarkerProps extends PathProps { center: Leaflet.LatLngExpression; radius?: number; } -declare const CircleMarker: React.ComponentClass; +export const CircleMarker: React.ComponentClass; interface PolylineProps extends PathProps { positions: Leaflet.LatLngExpression[] | Leaflet.LatLngExpression[][]; } -declare const Polyline: React.ComponentClass; +export const Polyline: React.ComponentClass; interface PolygonProps extends PathProps { positions: Leaflet.LatLngExpression[] | Leaflet.LatLngExpression[][] | Leaflet.LatLngExpression[][][]; } -declare const Polygon: React.ComponentClass; +export const Polygon: React.ComponentClass; interface RectangleProps extends PathProps { bounds: Leaflet.LatLngBoundsExpression; } -declare const Rectangle: React.ComponentClass; - +export const Rectangle: React.ComponentClass; // tslint:disable-next-line:no-empty-interface interface LayerGroupProps extends LayerProps { } -declare const LayerGroup: React.ComponentClass; +export const LayerGroup: React.ComponentClass; // tslint:disable-next-line:no-empty-interface interface FeatureGroupProps extends LayerGroupProps, Leaflet.PathOptions { } -declare const FeatureGroup: React.ComponentClass; +export const FeatureGroup: React.ComponentClass; interface GeoJSONProps extends FeatureGroupProps { data: GeoJSON.GeoJsonObject; } -declare const GeoJSON: React.ComponentClass; - - +export const GeoJSON: React.ComponentClass; interface AttributionControlProps { position?: Leaflet.ControlPosition; } -declare const AttributionControl: React.ComponentClass; +export const AttributionControl: React.ComponentClass; interface LayersControlProps { position?: Leaflet.ControlPosition; } -declare const LayersControl: React.ComponentClass & { BaseLayer: LayersControl.BaseLayer, Overlay: LayersControl.Overlay }; +export const LayersControl: React.ComponentClass & { BaseLayer: LayersControl.BaseLayer, Overlay: LayersControl.Overlay }; -declare namespace LayersControl { +export namespace LayersControl { interface LayersControlLayerProps { name: string; checked?: boolean; @@ -229,9 +221,9 @@ declare namespace LayersControl { interface ScaleControlProps { position: Leaflet.ControlPosition; } -declare const ScaleControl: React.ComponentClass; +export const ScaleControl: React.ComponentClass; interface ZoomControlProps { position: Leaflet.ControlPosition; } -declare const ZoomControl: React.ComponentClass; +export const ZoomControl: React.ComponentClass; diff --git a/types/react-leaflet/react-leaflet-tests.tsx b/types/react-leaflet/react-leaflet-tests.tsx index 763e719de1..cabb2632dd 100644 --- a/types/react-leaflet/react-leaflet-tests.tsx +++ b/types/react-leaflet/react-leaflet-tests.tsx @@ -187,7 +187,7 @@ export class MarkerWithDivIconExample extends Component { new Leaflet.DivIcon({}) }/> - ) + ); } } diff --git a/types/tslint.json b/types/tslint.json index 490445671d..56b31d320a 100644 --- a/types/tslint.json +++ b/types/tslint.json @@ -1 +1 @@ -{ "extends": "../node_modules/types-publisher/tslint-definitions.json" } +{ "extends": "../node_modules/types-publisher/tslint-definitions.json" } \ No newline at end of file