Skip to content

Commit

Permalink
Bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Hypercubed committed Apr 9, 2020
1 parent 5e5e3fd commit d9d68cb
Show file tree
Hide file tree
Showing 79 changed files with 678 additions and 1,631 deletions.
1,468 changes: 340 additions & 1,128 deletions package-lock.json

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions package.json
Expand Up @@ -42,16 +42,16 @@
"d3-array": "^2.4.0",
"d3-brush": "^1.1.5",
"d3-color": "^1.4.0",
"d3-format": "^1.4.2",
"d3-format": "^1.4.4",
"d3-hierarchy": "^1.1.9",
"d3-interpolate": "^1.4.0",
"d3-scale": "^3.2.1",
"d3-selection": "^1.4.1",
"d3-shape": "^1.3.7",
"d3-time-format": "^2.2.2",
"d3-time-format": "^2.2.3",
"d3-transition": "^1.3.2",
"emoji-flags": "^1.2.0",
"moment-timezone": "^0.5.27",
"moment-timezone": "^0.5.28",
"ngx-moment": "^3.5.0",
"resize-observer-polyfill": "^1.5.1",
"rxjs": "~6.5.5",
Expand All @@ -64,30 +64,30 @@
"@angular/cli": "^9.1.1",
"@angular/compiler-cli": "~9.1.1",
"@angular/language-service": "~9.1.1",
"@swimlane/prettier-config-swimlane": "^2.0.0",
"@types/jasmine": "~3.3.8",
"@swimlane/prettier-config-swimlane": "^3.0.1",
"@types/jasmine": "^3.5.10",
"@types/jasminewd2": "~2.0.3",
"@types/json-schema": "^7.0.4",
"@types/node": "^12.11.1",
"angular-cli-ghpages": "^0.6.1",
"codelyzer": "^5.1.2",
"cross-env": "^6.0.3",
"jasmine-core": "~3.4.0",
"codelyzer": "^5.2.2",
"cross-env": "^7.0.2",
"jasmine-core": "^3.5.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"karma": "^5.0.0",
"karma-chrome-launcher": "^3.1.0",
"karma-coverage-istanbul-reporter": "^2.1.1",
"karma-jasmine": "^3.1.1",
"karma-jasmine-html-reporter": "^1.5.3",
"ng-packagr": "^9.1.0",
"npm-run-all": "^4.1.5",
"prettier": "^1.16.4",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tslint": "~5.15.0",
"prettier": "^2.0.4",
"protractor": "^5.4.3",
"ts-node": "^8.8.2",
"tslint": "^6.1.1",
"tslint-config-prettier": "^1.15.0",
"tslint-config-security": "^1.16.0",
"tslint-config-swimlane": "^3.0.4",
"typescript": "~3.6.4"
"tslint-config-swimlane": "^5.0.0",
"typescript": "^3.8.3"
}
}
2 changes: 1 addition & 1 deletion projects/swimlane/ngx-charts/karma.conf.js
@@ -1,7 +1,7 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html

module.exports = function(config) {
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
Expand Down
Expand Up @@ -258,7 +258,7 @@ export class AreaChartNormalizedComponent extends BaseChartComponent {

let total = 0;
for (const group of this.results) {
const d = group.series.find(item => {
const d = group.series.find((item) => {
let a = item.name;
let b = val;
if (this.scaleType === 'time') {
Expand All @@ -273,7 +273,7 @@ export class AreaChartNormalizedComponent extends BaseChartComponent {
}

for (const group of this.results) {
let d = group.series.find(item => {
let d = group.series.find((item) => {
let a = item.name;
let b = val;
if (this.scaleType === 'time') {
Expand Down Expand Up @@ -346,7 +346,7 @@ export class AreaChartNormalizedComponent extends BaseChartComponent {
return 0;
});
} else if (this.scaleType === 'linear') {
values = values.map(v => Number(v));
values = values.map((v) => Number(v));
const min = Math.min(...values);
const max = Math.max(...values);
domain = [min, max];
Expand All @@ -365,7 +365,7 @@ export class AreaChartNormalizedComponent extends BaseChartComponent {
}

getSeriesDomain(): any[] {
return this.results.map(d => d.name);
return this.results.map((d) => d.name);
}

getXScale(domain, width): any {
Expand All @@ -385,9 +385,7 @@ export class AreaChartNormalizedComponent extends BaseChartComponent {
}

getYScale(domain, height): any {
const scale = scaleLinear()
.range([height, 0])
.domain(domain);
const scale = scaleLinear().range([height, 0]).domain(domain);
return this.roundDomains ? scale.nice() : scale;
}

Expand Down Expand Up @@ -461,7 +459,7 @@ export class AreaChartNormalizedComponent extends BaseChartComponent {
}

onActivate(item) {
const idx = this.activeEntries.findIndex(d => {
const idx = this.activeEntries.findIndex((d) => {
return d.name === item.name && d.value === item.value;
});
if (idx > -1) {
Expand All @@ -473,7 +471,7 @@ export class AreaChartNormalizedComponent extends BaseChartComponent {
}

onDeactivate(item) {
const idx = this.activeEntries.findIndex(d => {
const idx = this.activeEntries.findIndex((d) => {
return d.name === item.name && d.value === item.value;
});

Expand Down
Expand Up @@ -258,7 +258,7 @@ export class AreaChartStackedComponent extends BaseChartComponent {
const val = this.xSet[i];
let d0 = 0;
for (const group of this.results) {
let d = group.series.find(item => {
let d = group.series.find((item) => {
let a = item.name;
let b = val;
if (this.scaleType === 'time') {
Expand Down Expand Up @@ -312,7 +312,7 @@ export class AreaChartStackedComponent extends BaseChartComponent {
let domain = [];

if (this.scaleType === 'linear') {
values = values.map(v => Number(v));
values = values.map((v) => Number(v));
}

let min;
Expand Down Expand Up @@ -351,7 +351,7 @@ export class AreaChartStackedComponent extends BaseChartComponent {
const val = this.xSet[i];
let sum = 0;
for (const group of this.results) {
const d = group.series.find(item => {
const d = group.series.find((item) => {
let a = item.name;
let b = val;
if (this.scaleType === 'time') {
Expand All @@ -376,7 +376,7 @@ export class AreaChartStackedComponent extends BaseChartComponent {
}

getSeriesDomain(): any[] {
return this.results.map(d => d.name);
return this.results.map((d) => d.name);
}

getXScale(domain, width): any {
Expand All @@ -396,9 +396,7 @@ export class AreaChartStackedComponent extends BaseChartComponent {
}

getYScale(domain, height): any {
const scale = scaleLinear()
.range([height, 0])
.domain(domain);
const scale = scaleLinear().range([height, 0]).domain(domain);
return this.roundDomains ? scale.nice() : scale;
}

Expand Down Expand Up @@ -472,7 +470,7 @@ export class AreaChartStackedComponent extends BaseChartComponent {
}

onActivate(item) {
const idx = this.activeEntries.findIndex(d => {
const idx = this.activeEntries.findIndex((d) => {
return d.name === item.name && d.value === item.value;
});
if (idx > -1) {
Expand All @@ -484,7 +482,7 @@ export class AreaChartStackedComponent extends BaseChartComponent {
}

onDeactivate(item) {
const idx = this.activeEntries.findIndex(d => {
const idx = this.activeEntries.findIndex((d) => {
return d.name === item.name && d.value === item.value;
});

Expand Down
Expand Up @@ -70,7 +70,7 @@ describe('<ngx-charts-area-chart>', () => {
const fills = Array.from(compiled.querySelectorAll('path.area')).map((areaElement: Element) =>
areaElement.getAttribute('fill')
);
expect(colors.every(color => fills.includes(color))).toBeTruthy();
expect(colors.every((color) => fills.includes(color))).toBeTruthy();
});
});
});
Expand Up @@ -285,7 +285,7 @@ export class AreaChartComponent extends BaseChartComponent {
let domain = [];

if (this.scaleType === 'linear') {
values = values.map(v => Number(v));
values = values.map((v) => Number(v));
}

let min;
Expand Down Expand Up @@ -344,7 +344,7 @@ export class AreaChartComponent extends BaseChartComponent {
}

getSeriesDomain(): any[] {
return this.results.map(d => d.name);
return this.results.map((d) => d.name);
}

getXScale(domain, width): any {
Expand All @@ -364,9 +364,7 @@ export class AreaChartComponent extends BaseChartComponent {
}

getYScale(domain, height): any {
const scale = scaleLinear()
.range([height, 0])
.domain(domain);
const scale = scaleLinear().range([height, 0]).domain(domain);
return this.roundDomains ? scale.nice() : scale;
}

Expand Down Expand Up @@ -471,7 +469,7 @@ export class AreaChartComponent extends BaseChartComponent {
}

onActivate(item) {
const idx = this.activeEntries.findIndex(d => {
const idx = this.activeEntries.findIndex((d) => {
return d.name === item.name && d.value === item.value;
});
if (idx > -1) {
Expand All @@ -483,7 +481,7 @@ export class AreaChartComponent extends BaseChartComponent {
}

onDeactivate(item) {
const idx = this.activeEntries.findIndex(d => {
const idx = this.activeEntries.findIndex((d) => {
return d.name === item.name && d.value === item.value;
});

Expand Down
Expand Up @@ -64,7 +64,7 @@ export class AreaSeriesComponent implements OnChanges {
let currentArea;
let startingArea;

const xProperty = d => {
const xProperty = (d) => {
const label = d.name;
return this.xScale(label);
};
Expand All @@ -77,18 +77,18 @@ export class AreaSeriesComponent implements OnChanges {

startingArea = area<any>()
.x(xProperty)
.y0(d => this.yScale.range()[0])
.y1(d => this.yScale.range()[0]);
.y0((d) => this.yScale.range()[0])
.y1((d) => this.yScale.range()[0]);
} else {
currentArea = area<any>()
.x(xProperty)
.y0(() => (this.baseValue === 'auto' ? this.yScale.range()[0] : this.yScale(this.baseValue)))
.y1(d => this.yScale(d.value));
.y1((d) => this.yScale(d.value));

startingArea = area<any>()
.x(xProperty)
.y0(d => (this.baseValue === 'auto' ? this.yScale.range()[0] : this.yScale(this.baseValue)))
.y1(d => (this.baseValue === 'auto' ? this.yScale.range()[0] : this.yScale(this.baseValue)));
.y0((d) => (this.baseValue === 'auto' ? this.yScale.range()[0] : this.yScale(this.baseValue)))
.y1((d) => (this.baseValue === 'auto' ? this.yScale.range()[0] : this.yScale(this.baseValue)));
}

currentArea.curve(this.curve);
Expand All @@ -113,13 +113,13 @@ export class AreaSeriesComponent implements OnChanges {
if (this.colors.scaleType === 'linear') {
this.hasGradient = true;
if (this.stacked || this.normalized) {
const d0values = this.data.series.map(d => d.d0);
const d1values = this.data.series.map(d => d.d1);
const d0values = this.data.series.map((d) => d.d0);
const d1values = this.data.series.map((d) => d.d1);
const max = Math.max(...d1values);
const min = Math.min(...d0values);
this.gradientStops = this.colors.getLinearGradientStops(max, min);
} else {
const values = this.data.series.map(d => d.value);
const values = this.data.series.map((d) => d.value);
const max = Math.max(...values);
this.gradientStops = this.colors.getLinearGradientStops(max);
}
Expand All @@ -131,15 +131,15 @@ export class AreaSeriesComponent implements OnChanges {

isActive(entry): boolean {
if (!this.activeEntries) return false;
const item = this.activeEntries.find(d => {
const item = this.activeEntries.find((d) => {
return entry.name === d.name;
});
return item !== undefined;
}

isInactive(entry): boolean {
if (!this.activeEntries || this.activeEntries.length === 0) return false;
const item = this.activeEntries.find(d => {
const item = this.activeEntries.find((d) => {
return entry.name === d.name;
});
return item === undefined;
Expand Down
Expand Up @@ -220,16 +220,11 @@ export class BarHorizontal2DComponent extends BaseChartComponent {
const height = this.groupScale.bandwidth();
const spacing = this.innerDomain.length / (height / this.barPadding + 1);

return scaleBand()
.rangeRound([0, height])
.paddingInner(spacing)
.domain(this.innerDomain);
return scaleBand().rangeRound([0, height]).paddingInner(spacing).domain(this.innerDomain);
}

getValueScale(): any {
const scale = scaleLinear()
.range([0, this.dims.width])
.domain(this.valuesDomain);
const scale = scaleLinear().range([0, this.dims.width]).domain(this.valuesDomain);

return this.roundDomains ? scale.nice() : scale;
}
Expand Down Expand Up @@ -351,9 +346,9 @@ export class BarHorizontal2DComponent extends BaseChartComponent {
}

const items = this.results
.map(g => g.series)
.map((g) => g.series)
.flat()
.filter(i => {
.filter((i) => {
if (fromLegend) {
return i.label === item.name;
} else {
Expand All @@ -371,7 +366,7 @@ export class BarHorizontal2DComponent extends BaseChartComponent {
item.series = group.name;
}

this.activeEntries = this.activeEntries.filter(i => {
this.activeEntries = this.activeEntries.filter((i) => {
if (fromLegend) {
return i.label !== item.name;
} else {
Expand Down

0 comments on commit d9d68cb

Please sign in to comment.