add stats tests, handle imports

pull/1299/head
Rich-Harris 7 years ago
parent 75c1fbcf7b
commit 788aa89b41

@ -1,3 +1,5 @@
import { Node } from './interfaces';
const now = (typeof process !== 'undefined' && process.hrtime)
? () => {
const t = process.hrtime();
@ -61,13 +63,31 @@ export default class Stats {
this.currentChildren = this.currentTiming ? this.currentTiming.children : this.timings;
}
toJSON() {
render({ imports }: {
imports: Node[]
}) {
const timings = Object.assign({
total: now() - this.startTime
}, collapseTimings(this.timings));
return {
timings
timings,
warnings: [], // TODO
imports: imports.map(node => {
return {
source: node.source.value,
specifiers: node.specifiers.map(specifier => {
return {
name: (
specifier.type === 'ImportDefaultSpecifier' ? 'default' :
specifier.type === 'ImportNamespaceSpecifier' ? '*' :
specifier.imported.name
),
as: specifier.local.name
};
})
}
})
};
}
}

@ -385,7 +385,9 @@ export default class Generator {
ast: this.ast,
js,
css,
stats: this.stats.toJSON(),
stats: this.stats.render({
imports: this.imports
}),
// TODO deprecate
code: js.code,

@ -0,0 +1,59 @@
import * as fs from 'fs';
import assert from 'assert';
import { svelte, loadConfig, tryToLoadJson } from '../helpers.js';
describe('stats', () => {
fs.readdirSync('test/stats/samples').forEach(dir => {
if (dir[0] === '.') return;
// add .solo to a sample directory name to only run that test
const solo = /\.solo/.test(dir);
const skip = /\.skip/.test(dir);
if (solo && process.env.CI) {
throw new Error('Forgot to remove `solo: true` from test');
}
(solo ? it.only : skip ? it.skip : it)(dir, () => {
const config = loadConfig(`./stats/samples/${dir}/_config.js`);
const filename = `test/stats/samples/${dir}/input.html`;
const input = fs.readFileSync(filename, 'utf-8').replace(/\s+$/, '');
const expectedWarnings =
tryToLoadJson(`test/stats/samples/${dir}/warnings.json`) || [];
const expectedError = tryToLoadJson(
`test/stats/samples/${dir}/error.json`
);
let result;
let error;
try {
result = svelte.compile(input, config.options);
} catch (e) {
error = e;
}
config.test(assert, result.stats);
if (result.stats.warnings.length || expectedWarnings.length) {
// TODO check warnings are added to stats.warnings
}
if (error || expectedError) {
if (error && !expectedError) {
throw error;
}
if (expectedError && !error) {
throw new Error(`Expected an error: ${expectedError.message}`);
}
assert.equal(error.message, expectedError.message);
assert.deepEqual(error.loc, expectedError.loc);
assert.deepEqual(error.end, expectedError.end);
assert.equal(error.pos, expectedError.pos);
}
});
});
});

@ -0,0 +1,6 @@
export default {
test(assert, stats) {
assert.equal(typeof stats.timings, 'object');
assert.equal(typeof stats.timings.total, 'number');
}
};

@ -0,0 +1,18 @@
export default {
test(assert, stats) {
assert.deepEqual(stats.imports, [
{
source: 'x',
specifiers: [{ name: 'default', as: 'x' }]
},
{
source: 'y',
specifiers: [{ name: 'y', as: 'y' }]
},
{
source: 'z',
specifiers: [{ name: '*', as: 'z' }]
}
]);
}
};

@ -0,0 +1,5 @@
<script>
import x from 'x';
import { y } from 'y';
import * as z from 'z';
</script>
Loading…
Cancel
Save