diff --git a/package-lock.json b/package-lock.json index c77362e92..8eed518e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { "name": "flex-layout-srcs", - "version": "6.0.0-beta.15", + "version": "6.0.0-beta.16", "lockfileVersion": 1, "requires": true, "dependencies": { "@angular/animations": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.0.0.tgz", - "integrity": "sha512-jl3WZmM/csNeyzdb1cEEc5cUX7jLn3NvPYEiP/ZkKmib0XBGIGBBv7xiuoivTJFJsE4/N5sCFEHRFLnuBBE+OA==", + "version": "6.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.0-rc.0.tgz", + "integrity": "sha512-pKn7KuW76UHmsi4303/VAjCvspckOFcp96FANMoOO2cWyTNF6U2m+LFLEARiwmzNc17hz1tuR3bot4i9748jCw==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -22,54 +22,85 @@ } }, "@angular/common": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.0.0.tgz", - "integrity": "sha512-oo/KESihAZo0FsZPHthO9PYhanN4Q+Lo7Lb2HNbWnD+xRIPa1yFC12JOWiD+SPPfFGWMI6aW3wAlcoej1+QKSw==", + "version": "6.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.1.0-rc.0.tgz", + "integrity": "sha512-hHf/LrmyHnPKptQvSV838ulqWLDh6paSjn8GhyroNtWxOJrgY/BchfzumJjimZJURh+XGUJhL3ClTWPqtb7Lbw==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.0.0.tgz", - "integrity": "sha512-UsYfsvHf4VVtkhzM7tyabh8co7gqWZTm3p79hbLDeyCEojl0AkrwbSgh0DQnKRxp4Tu3DEeeDkg1ahA7n19I8A==", + "version": "6.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.1.0-rc.0.tgz", + "integrity": "sha512-bdMF5yg8FNXtcKqsXW1gTdJIMT4Ttwbg7ZAPTe/7gpcRvh5WikTFxfEg9CAmESKHsJJe5d3brAl+OnbIzzJEsA==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler-cli": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.0.0.tgz", - "integrity": "sha512-RV0xTSTPT3yOnbS5Gx6lMAETQeTUr72Ifu0+JZh9AV07xGVislZ+SdQGSeNgXoqxise6e65lJp3Nrb5KE4Lv6g==", + "version": "6.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.1.0-rc.0.tgz", + "integrity": "sha512-xqT/SbdDWujHm9EKvspRNWoypof5T56/dxh9koHS1f0V+d2vwDUSIOqprWcKsQ+1ZCO/oVLGsEzJ+H3pFE0mKA==", "dev": true, "requires": { "chokidar": "^1.4.2", "minimist": "^1.2.0", "reflect-metadata": "^0.1.2", - "tsickle": "^0.27.2" + "tsickle": "^0.30.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz", + "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "tsickle": { + "version": "0.30.0", + "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.30.0.tgz", + "integrity": "sha512-A4ALnEDQNrECn5xhgHmoXKM5qERCM395pKIfqcV57ex3zEInVogu/A191Btv8OPEINkr3xQ3Q2XRywyqkge3Qg==", + "dev": true, + "requires": { + "jasmine-diff": "^0.1.3", + "minimist": "^1.2.0", + "mkdirp": "^0.5.1", + "source-map": "^0.6.0", + "source-map-support": "^0.5.0" + } + } } }, "@angular/core": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.0.0.tgz", - "integrity": "sha512-52X2ZKXOoaMRYaC/ycHePTkXuwku8qJFxoEXAFBItAkk9rebLU4CD8Fx1Z9vUd8aWu1uFfLTxqkgE0mUyBANZw==", + "version": "6.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.1.0-rc.0.tgz", + "integrity": "sha512-U3haKm6kveRz2mYlDtaJiyeOLmQv3b6f0UedaERnpr7l4d2gRQZxCRVJltzvZL7EhEruA0otfS31u0/iUkcEzg==", "requires": { "tslib": "^1.9.0" } }, "@angular/forms": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.0.0.tgz", - "integrity": "sha512-4eVfCcSyPRhml7Xa6ia/DgDl3JhOnEdBdHo+jads1YL5AF6D08Tthngjf3KjuctGqZDACPyxNt6ciX4g8IbGCA==", + "version": "6.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.1.0-rc.0.tgz", + "integrity": "sha512-/gGAHpsG29s6qQfEVjKp1KkX5uRYLoSFo+4elkLhKenUPU28dhrrTOzj9lOdzDttjvq0bhW0V23rBt1ZM9z/GQ==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/http": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.0.0.tgz", - "integrity": "sha512-nBZ4KmXx0KR+cIPOMBsJpPhcec5wSCbVtTYRH0zTxmzTmqM3g6+i0PECpqbVgcQEGiOxBLcmXNWfXZl5czpiqw==", + "version": "6.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.1.0-rc.0.tgz", + "integrity": "sha512-rqsdBe49ksyg7opZyqIojRNFBh91JQw3wZzyEDH1hFu8TtElj7Ippmg+MwcdSZQ3urbfZz7+KtMHFcm205wrWQ==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -85,26 +116,26 @@ } }, "@angular/platform-browser": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.0.0.tgz", - "integrity": "sha512-ExI1o40BJIbJKFz1p1ivGSgLA1+T0uUo8rjheOZhcGDwCNx54/RapCFLdcHCNiW8NzAIzx+kt4DdXnCSKitnDA==", + "version": "6.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.1.0-rc.0.tgz", + "integrity": "sha512-AFT9jwTN9NpKvu+MuRkogVJioqkTFdP0E1pDlctXVIRSaYNEix3xa5wXFm/BFLNxZKzBP0ekVrwmQzQ41MT8UQ==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0.tgz", - "integrity": "sha512-yk4wZYn2bosuvDaYaEq6UuEeI966/28uCljm5iBfo3l8Vuv2IChk5664M68O6C+KwWzCCWDHvIqm0q178YUYug==", + "version": "6.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.0-rc.0.tgz", + "integrity": "sha512-e/q0y1n7Wv8gn4IbC7crX/yC3RKArUbHkwgH7V0DknpDAxZ02joa3/iQR8pYXMGbz2hgSlESkQB/5Xung+Qfwg==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/platform-server": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-6.0.0.tgz", - "integrity": "sha512-1dmaM3xpayBdZrkpmhPfpJ1CDNntxlizL1td2DMRUfFqMNyE7acbc7vRuV9BOgniPGsMKphYQXczERNfoVeuSw==", + "version": "6.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-6.1.0-rc.0.tgz", + "integrity": "sha512-tr93Xj2X0rmlyzVz/8SubQYGbG9jodPJV67nhCd4HXf7Y/U/pfSH6RJ++EG90lJGjRAL9mq0An5zO9cjy+79tw==", "dev": true, "requires": { "domino": "^2.0.1", @@ -113,9 +144,9 @@ } }, "@angular/router": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.0.0.tgz", - "integrity": "sha512-ONrfgfYmFGz0Ht2MvymMvBMxPI9w5037ZfJWpTu1/Xo1XmVOawzj2SvYfEzTqexznWcTAALggq/A23k8r9ArKA==", + "version": "6.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.1.0-rc.0.tgz", + "integrity": "sha512-f1FCANv2f3OE+VWJ1AHtFOKWZlv07OO1tqQo4FDELO6N/3zAkbgVCEYbyE+5n5MuOB5t099Uc1avUlDMnI9wuQ==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -2478,6 +2509,11 @@ "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=", "dev": true }, + "buffer-from": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz", + "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==" + }, "buffered-spawn": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffered-spawn/-/buffered-spawn-1.1.2.tgz", @@ -4670,6 +4706,14 @@ "stringmap": "^0.2.2", "typescript": "~2.7.1", "urlencode": "^1.1.0" + }, + "dependencies": { + "typescript": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", + "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==", + "dev": true + } } }, "di": { @@ -4687,8 +4731,7 @@ "diff": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", - "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==", - "dev": true + "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==" }, "diff-match-patch": { "version": "1.0.0", @@ -4846,9 +4889,9 @@ } }, "domino": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/domino/-/domino-2.0.2.tgz", - "integrity": "sha512-vzykUakUw5s1p0RrN/vI2sShYo3pLRy/z7PM1PuOIZIlMOJ0XfOnrckGE5f4MxIQVe5XcrH7yG9mR+l77mgLVA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/domino/-/domino-2.0.3.tgz", + "integrity": "sha512-QkW2THVtKJw9FmV6awFQbcpaJPIqQtF+F1PMO5EXIdULVit9IaU3w+ZQgBjrR6hSHgP97TKyo/tcFqkgwfYenA==", "dev": true }, "domutils": { @@ -11739,6 +11782,14 @@ "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=", "dev": true }, + "jasmine-diff": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/jasmine-diff/-/jasmine-diff-0.1.3.tgz", + "integrity": "sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=", + "requires": { + "diff": "^3.2.0" + } + }, "jasminewd2": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz", @@ -19177,10 +19228,11 @@ } }, "tsickle": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.27.2.tgz", - "integrity": "sha512-KW+ZgY0t2cq2Qib1sfdgMiRnk+cr3brUtzZoVWjv+Ot3jNxVorFBUH+6In6hl8Dg7BI2AAFf69NHkwvZNMSFwA==", + "version": "0.32.0", + "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.32.0.tgz", + "integrity": "sha512-n/XCe2J2oiWNf/JNG18K0isS7dC16znYUvCf11/CuCQbJQGvLAPWyD11543oMtLGUD7A/ygHW62kfQfy182Mfw==", "requires": { + "jasmine-diff": "^0.1.3", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "source-map": "^0.6.0", @@ -19193,10 +19245,11 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-support": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz", - "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz", + "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", "requires": { + "buffer-from": "^1.0.0", "source-map": "^0.6.0" } } @@ -19321,9 +19374,9 @@ "dev": true }, "typescript": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", - "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", + "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", "dev": true }, "typescript-eslint-parser": { @@ -20419,7 +20472,8 @@ }, "ws": { "version": "1.1.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz", + "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=", "dev": true, "requires": { "options": ">=0.0.5", diff --git a/package.json b/package.json index 10bf87ae7..d4c651f48 100644 --- a/package.json +++ b/package.json @@ -28,26 +28,26 @@ }, "dependencies": { "@angular/cdk": "6.0.0", - "@angular/common": "^6.0.0", - "@angular/compiler": "^6.0.0", - "@angular/core": "^6.0.0", - "@angular/platform-browser": "^6.0.0", + "@angular/common": "^6.1.0-rc.0", + "@angular/compiler": "^6.1.0-rc.0", + "@angular/core": "^6.1.0-rc.0", + "@angular/platform-browser": "^6.1.0-rc.0", "core-js": "^2.4.1", "rxjs": "^6.0.0", "systemjs": "0.19.43", - "tsickle": "^0.27.0", + "tsickle": "^0.32.0", "tslib": "^1.8.0", "zone.js": "^0.8.26" }, "devDependencies": { - "@angular/animations": "^6.0.0", - "@angular/compiler-cli": "^6.0.0", - "@angular/forms": "^6.0.0", - "@angular/http": "^6.0.0", + "@angular/animations": "^6.1.0-rc.0", + "@angular/compiler-cli": "^6.1.0-rc.0", + "@angular/forms": "^6.1.0-rc.0", + "@angular/http": "^6.1.0-rc.0", "@angular/material": "6.0.0", - "@angular/platform-browser-dynamic": "^6.0.0", - "@angular/platform-server": "^6.0.0", - "@angular/router": "^6.0.0", + "@angular/platform-browser-dynamic": "^6.1.0-rc.0", + "@angular/platform-server": "^6.1.0-rc.0", + "@angular/router": "^6.1.0-rc.0", "@google-cloud/storage": "^1.4.0", "@types/chalk": "^0.4.31", "@types/fs-extra": "^4.0.5", @@ -124,7 +124,7 @@ "tsconfig-paths": "^2.3.0", "tslint": "^5.8.0", "tsutils": "^2.22.2", - "typescript": "~2.7.2", + "typescript": "~2.9.2", "uglify-js": "^2.8.14" } } diff --git a/src/lib/core/breakpoints/breakpoint-tools.spec.ts b/src/lib/core/breakpoints/breakpoint-tools.spec.ts index 57ac0f2f9..2b7e7ebc0 100644 --- a/src/lib/core/breakpoints/breakpoint-tools.spec.ts +++ b/src/lib/core/breakpoints/breakpoint-tools.spec.ts @@ -14,7 +14,7 @@ import {ORIENTATION_BREAKPOINTS} from './data/orientation-break-points'; describe('breakpoint-tools', () => { let all: BreakPoint[]; - let findByAlias = (alias): BreakPoint|null => all.reduce((pos, it) => { + let findByAlias = (alias): BreakPoint|null => all.reduce((pos: BreakPoint|null, it) => { return pos || ((it.alias == alias) ? it : null); }, null); diff --git a/src/lib/core/breakpoints/data/orientation-break-points.spec.ts b/src/lib/core/breakpoints/data/orientation-break-points.spec.ts index fa1c6ba90..a7f3f570f 100644 --- a/src/lib/core/breakpoints/data/orientation-break-points.spec.ts +++ b/src/lib/core/breakpoints/data/orientation-break-points.spec.ts @@ -16,7 +16,7 @@ import {FlexLayoutModule} from '../../../module'; describe('break-point-provider', () => { let breakPoints: BreakPoint[]; - let findByAlias = (alias): BreakPoint|null => breakPoints.reduce((pos, it) => { + let findByAlias = (alias): BreakPoint|null => breakPoints.reduce((pos: BreakPoint|null, it) => { return pos || ((it.alias == alias) ? it : null); }, null); diff --git a/src/lib/core/match-media/mock/mock-match-media.ts b/src/lib/core/match-media/mock/mock-match-media.ts index 81d87a5da..d45f130a4 100644 --- a/src/lib/core/match-media/mock/mock-match-media.ts +++ b/src/lib/core/match-media/mock/mock-match-media.ts @@ -28,6 +28,8 @@ export class MockMatchMedia extends MatchMedia { */ useOverlaps = false; + protected _registry: Map; + constructor(_zone: NgZone, @Inject(PLATFORM_ID) _platformId: Object, @Inject(DOCUMENT) _document: any, diff --git a/src/lib/core/observable-media/observable-media.spec.ts b/src/lib/core/observable-media/observable-media.spec.ts index 1816dd5b2..f1f749658 100644 --- a/src/lib/core/observable-media/observable-media.spec.ts +++ b/src/lib/core/observable-media/observable-media.spec.ts @@ -22,7 +22,7 @@ describe('observable-media', () => { let knownBreakPoints: BreakPoint[] = []; let findMediaQuery: (alias: string) => string = (alias) => { const NOT_FOUND = `${alias} not found`; - return knownBreakPoints.reduce((mediaQuery, bp) => { + return knownBreakPoints.reduce((mediaQuery: string|null, bp) => { return mediaQuery || ((bp.alias === alias) ? bp.mediaQuery : null); }, null) as string || NOT_FOUND; }; diff --git a/src/lib/core/style-utils/style-utils.ts b/src/lib/core/style-utils/style-utils.ts index f90ca6a88..5834ae806 100644 --- a/src/lib/core/style-utils/style-utils.ts +++ b/src/lib/core/style-utils/style-utils.ts @@ -24,7 +24,9 @@ export class StyleUtils { /** * Applies styles given via string pair or object map to the directive element */ - applyStyleToElement(element: HTMLElement, style: StyleDefinition, value?: string | number) { + applyStyleToElement(element: HTMLElement, + style: StyleDefinition | string, + value?: string | number) { let styles = {}; if (typeof style === 'string') { styles[style] = value; diff --git a/src/lib/extended/style/style-transforms.ts b/src/lib/extended/style/style-transforms.ts index 0588e828f..765ad2507 100644 --- a/src/lib/extended/style/style-transforms.ts +++ b/src/lib/extended/style/style-transforms.ts @@ -11,14 +11,10 @@ export type NgStyleMap = {[klass: string]: string}; // NgStyle selectors accept NgStyleType values export type NgStyleType = string | Set | NgStyleRawList | NgStyleMap; -/** - * Callback function for SecurityContext.STYLE sanitization - */ +/** Callback function for SecurityContext.STYLE sanitization */ export type NgStyleSanitizer = (val: any) => string; -/** - * NgStyle allowed inputs - */ +/** NgStyle allowed inputs */ export class NgStyleKeyValue { constructor(public key: string, public value: string, noQuotes = true) { this.key = noQuotes ? key.replace(/['"]/g, '').trim() : key.trim(); @@ -28,9 +24,7 @@ export class NgStyleKeyValue { } } -/** - * Transform Operators for @angular/flex-layout NgStyle Directive - */ +/** Transform Operators for @angular/flex-layout NgStyle Directive */ export const ngStyleUtils = { getType, buildRawList, @@ -59,9 +53,7 @@ function buildRawList(source: any, delimiter = ';'): NgStyleRawList { .filter(val => val !== ''); } -/** - * Convert array of key:value strings to a iterable map object - */ +/** Convert array of key:value strings to a iterable map object */ function buildMapFromList(styles: NgStyleRawList, sanitize?: NgStyleSanitizer): NgStyleMap { let sanitizeValue = (it: NgStyleKeyValue) => { if (sanitize) { @@ -77,9 +69,7 @@ function buildMapFromList(styles: NgStyleRawList, sanitize?: NgStyleSanitizer): .reduce(keyValuesToMap, {}); } -/** - * Convert Set or raw Object to an iterable NgStyleMap - */ +/** Convert Set or raw Object to an iterable NgStyleMap */ function buildMapFromSet(source: any, sanitize?: NgStyleSanitizer): NgStyleMap { let list = new Array(); if (getType(source) == 'set') { @@ -93,17 +83,13 @@ function buildMapFromSet(source: any, sanitize?: NgStyleSanitizer): NgStyleMap { } -/** - * Convert 'key:value' -> [key, value] - */ -function stringToKeyValue(it: string): NgStyleKeyValue|null { +/** Convert 'key:value' -> [key, value] */ +function stringToKeyValue(it: string): NgStyleKeyValue { let [key, val] = it.split(':'); - return val ? new NgStyleKeyValue(key, val) : null; + return new NgStyleKeyValue(key, val); } -/** - * Convert [ [key,value] ] -> { key : value } - */ +/** Convert [ [key,value] ] -> { key : value } */ function keyValuesToMap(map: NgStyleMap, entry: NgStyleKeyValue): NgStyleMap { if (!!entry.key) { map[entry.key] = entry.value; diff --git a/src/lib/tsconfig-build.json b/src/lib/tsconfig-build.json index 36c1ee0ab..fe31d3e48 100644 --- a/src/lib/tsconfig-build.json +++ b/src/lib/tsconfig-build.json @@ -6,6 +6,7 @@ "experimentalDecorators": true, "noUnusedParameters": true, "strictNullChecks": true, + "strictFunctionTypes": true, "importHelpers": true, "newLine": "lf", "module": "es2015", diff --git a/tools/gulp/tsconfig.json b/tools/gulp/tsconfig.json index c9f6a32c5..6f7fe595a 100644 --- a/tools/gulp/tsconfig.json +++ b/tools/gulp/tsconfig.json @@ -6,9 +6,10 @@ "module": "commonjs", "moduleResolution": "node", "outDir": "../../dist/tools/gulp", - "strictNullChecks": false, - "noEmitOnError": false, - "noImplicitAny": false, + "strictNullChecks": true, + "strictFunctionTypes": true, + "noEmitOnError": true, + "noImplicitAny": true, "target": "es5", "removeComments": true, "types": [ diff --git a/tsconfig.json b/tsconfig.json index ed9cc6308..e25c20853 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,7 @@ "moduleResolution": "node", "noUnusedParameters": true, "strictNullChecks": true, + "strictFunctionTypes": true, "skipLibCheck": true, "target": "es2015", "lib": ["es5", "es2015", "dom"],