pyret-npm 0.0.73 → 0.0.75
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/pyret-lang/build/phaseA/base.jarr +76 -68
- package/pyret-lang/build/phaseA/lib-compiled/charts-d9ab4ce9dff6abe771a0ea5d7862476d87e5f7e2a7574918748d38ff2dc812d2-module.js +66 -62
- package/pyret-lang/build/phaseA/lib-compiled/charts-d9ab4ce9dff6abe771a0ea5d7862476d87e5f7e2a7574918748d38ff2dc812d2-static.js +65 -61
- package/pyret-lang/build/phaseA/lib-compiled/charts-lib-359cf1f1fc9f5068be80e4ee4c0fc54b3b80d94c49a0ce7bcfdbc2581b5b6c6d-module.js +9 -6
- package/pyret-lang/build/phaseA/lib-compiled/charts-lib-359cf1f1fc9f5068be80e4ee4c0fc54b3b80d94c49a0ce7bcfdbc2581b5b6c6d-static.js +9 -6
|
@@ -1153,7 +1153,7 @@
|
|
|
1153
1153
|
name: 'secondary',
|
|
1154
1154
|
range: axesConfig.secondary.range,
|
|
1155
1155
|
...(axesConfig.secondary.name === 'x' ? xAxisType : yAxisType),
|
|
1156
|
-
nice: true, zero:
|
|
1156
|
+
nice: true, zero: false,
|
|
1157
1157
|
domain: (axis && isNotFullStacked) ? { signal: 'extent(domain("secondaryLabels"))' } : { data: 'table', field: 'value1' }
|
|
1158
1158
|
};
|
|
1159
1159
|
const scales = [
|
|
@@ -1809,6 +1809,8 @@
|
|
|
1809
1809
|
const height = globalOptions['height'];
|
|
1810
1810
|
const xAxisLabel = globalOptions['x-axis'];
|
|
1811
1811
|
const yAxisLabel = globalOptions['y-axis'];
|
|
1812
|
+
const xMinValue = getNumOrDefault(globalOptions['x-min'], undefined);
|
|
1813
|
+
const xMaxValue = getNumOrDefault(globalOptions['x-max'], undefined);
|
|
1812
1814
|
const yAxisType = globalOptions['y-axis-type'];
|
|
1813
1815
|
const background = getColorOrDefault(globalOptions['backgroundColor'], 'transparent');
|
|
1814
1816
|
|
|
@@ -1861,7 +1863,9 @@
|
|
|
1861
1863
|
{ name: 'binSize', update: 'invert("binScale", dotSize)' },
|
|
1862
1864
|
{ name: 'actualDotSize', update: 'scale("dotScale", 0) - scale("dotScale", 1)' },
|
|
1863
1865
|
{ name: 'headspace', value: '0.25' },
|
|
1864
|
-
{ name: 'wrapMaxY', update: 'floor(domain("dotScale")[1] * (1 - headspace))' }
|
|
1866
|
+
{ name: 'wrapMaxY', update: 'floor(domain("dotScale")[1] * (1 - headspace))' },
|
|
1867
|
+
{ name: 'xMinValue', value: xMinValue },
|
|
1868
|
+
{ name: 'xMaxValue', value: xMaxValue },
|
|
1865
1869
|
];
|
|
1866
1870
|
const scales = [
|
|
1867
1871
|
{
|
|
@@ -1869,7 +1873,8 @@
|
|
|
1869
1873
|
type: 'linear',
|
|
1870
1874
|
zero: false,
|
|
1871
1875
|
range: { signal: '[0, width - dotSize / 2]' },
|
|
1872
|
-
domain: { data: 'rawTable', field: 'value' }
|
|
1876
|
+
domain: { data: 'rawTable', field: 'value' },
|
|
1877
|
+
domainMin: { signal: 'xMinValue' }, domainMax: { signal: 'xMaxValue' },
|
|
1873
1878
|
},
|
|
1874
1879
|
{
|
|
1875
1880
|
name: 'dotScale',
|
|
@@ -2171,8 +2176,6 @@
|
|
|
2171
2176
|
const trendlineWidth = toFixnum(get(rawData, 'trendlineWidth'));
|
|
2172
2177
|
const trendlineOpacity = toFixnum(get(rawData, 'trendlineOpacity'));
|
|
2173
2178
|
const trendlineDegree = toFixnum(get(rawData, 'trendlineDegree'));
|
|
2174
|
-
const xMinValue = getNumOrDefault(globalOptions['x-min'], undefined);
|
|
2175
|
-
const xMaxValue = getNumOrDefault(globalOptions['x-max'], undefined);
|
|
2176
2179
|
const yMinValue = getNumOrDefault(globalOptions['y-min'], undefined);
|
|
2177
2180
|
const yMaxValue = getNumOrDefault(globalOptions['y-max'], undefined);
|
|
2178
2181
|
const imageScaleFactorX = autosizeImage ? '-datum.imageWidth' : -pointSize;
|
|
@@ -2610,7 +2613,7 @@
|
|
|
2610
2613
|
}),
|
|
2611
2614
|
})),
|
|
2612
2615
|
transform: [
|
|
2613
|
-
{ type: 'formula', as: 'yprime', expr: 'datum.y
|
|
2616
|
+
{ type: 'formula', as: 'yprime', expr: 'datum.y - datum.delta' }
|
|
2614
2617
|
]
|
|
2615
2618
|
},
|
|
2616
2619
|
{
|
|
@@ -1153,7 +1153,7 @@
|
|
|
1153
1153
|
name: 'secondary',
|
|
1154
1154
|
range: axesConfig.secondary.range,
|
|
1155
1155
|
...(axesConfig.secondary.name === 'x' ? xAxisType : yAxisType),
|
|
1156
|
-
nice: true, zero:
|
|
1156
|
+
nice: true, zero: false,
|
|
1157
1157
|
domain: (axis && isNotFullStacked) ? { signal: 'extent(domain("secondaryLabels"))' } : { data: 'table', field: 'value1' }
|
|
1158
1158
|
};
|
|
1159
1159
|
const scales = [
|
|
@@ -1809,6 +1809,8 @@
|
|
|
1809
1809
|
const height = globalOptions['height'];
|
|
1810
1810
|
const xAxisLabel = globalOptions['x-axis'];
|
|
1811
1811
|
const yAxisLabel = globalOptions['y-axis'];
|
|
1812
|
+
const xMinValue = getNumOrDefault(globalOptions['x-min'], undefined);
|
|
1813
|
+
const xMaxValue = getNumOrDefault(globalOptions['x-max'], undefined);
|
|
1812
1814
|
const yAxisType = globalOptions['y-axis-type'];
|
|
1813
1815
|
const background = getColorOrDefault(globalOptions['backgroundColor'], 'transparent');
|
|
1814
1816
|
|
|
@@ -1861,7 +1863,9 @@
|
|
|
1861
1863
|
{ name: 'binSize', update: 'invert("binScale", dotSize)' },
|
|
1862
1864
|
{ name: 'actualDotSize', update: 'scale("dotScale", 0) - scale("dotScale", 1)' },
|
|
1863
1865
|
{ name: 'headspace', value: '0.25' },
|
|
1864
|
-
{ name: 'wrapMaxY', update: 'floor(domain("dotScale")[1] * (1 - headspace))' }
|
|
1866
|
+
{ name: 'wrapMaxY', update: 'floor(domain("dotScale")[1] * (1 - headspace))' },
|
|
1867
|
+
{ name: 'xMinValue', value: xMinValue },
|
|
1868
|
+
{ name: 'xMaxValue', value: xMaxValue },
|
|
1865
1869
|
];
|
|
1866
1870
|
const scales = [
|
|
1867
1871
|
{
|
|
@@ -1869,7 +1873,8 @@
|
|
|
1869
1873
|
type: 'linear',
|
|
1870
1874
|
zero: false,
|
|
1871
1875
|
range: { signal: '[0, width - dotSize / 2]' },
|
|
1872
|
-
domain: { data: 'rawTable', field: 'value' }
|
|
1876
|
+
domain: { data: 'rawTable', field: 'value' },
|
|
1877
|
+
domainMin: { signal: 'xMinValue' }, domainMax: { signal: 'xMaxValue' },
|
|
1873
1878
|
},
|
|
1874
1879
|
{
|
|
1875
1880
|
name: 'dotScale',
|
|
@@ -2171,8 +2176,6 @@
|
|
|
2171
2176
|
const trendlineWidth = toFixnum(get(rawData, 'trendlineWidth'));
|
|
2172
2177
|
const trendlineOpacity = toFixnum(get(rawData, 'trendlineOpacity'));
|
|
2173
2178
|
const trendlineDegree = toFixnum(get(rawData, 'trendlineDegree'));
|
|
2174
|
-
const xMinValue = getNumOrDefault(globalOptions['x-min'], undefined);
|
|
2175
|
-
const xMaxValue = getNumOrDefault(globalOptions['x-max'], undefined);
|
|
2176
2179
|
const yMinValue = getNumOrDefault(globalOptions['y-min'], undefined);
|
|
2177
2180
|
const yMaxValue = getNumOrDefault(globalOptions['y-max'], undefined);
|
|
2178
2181
|
const imageScaleFactorX = autosizeImage ? '-datum.imageWidth' : -pointSize;
|
|
@@ -2610,7 +2613,7 @@
|
|
|
2610
2613
|
}),
|
|
2611
2614
|
})),
|
|
2612
2615
|
transform: [
|
|
2613
|
-
{ type: 'formula', as: 'yprime', expr: 'datum.y
|
|
2616
|
+
{ type: 'formula', as: 'yprime', expr: 'datum.y - datum.delta' }
|
|
2614
2617
|
]
|
|
2615
2618
|
},
|
|
2616
2619
|
{
|