Skip to content

Commit

Permalink
add a stats object with timings (#1257)
Browse files Browse the repository at this point in the history
  • Loading branch information
Rich-Harris committed Apr 1, 2018
1 parent 0f5912f commit 75c1fbc
Show file tree
Hide file tree
Showing 6 changed files with 108 additions and 10 deletions.
73 changes: 73 additions & 0 deletions src/Stats.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
const now = (typeof process !== 'undefined' && process.hrtime)
? () => {
const t = process.hrtime();
return t[0] * 1e3 + t[1] / 1e6;
}
: () => window.performance.now();

type Timing = {
label: string;
start: number;
end: number;
children: Timing[];
}

function collapseTimings(timings) {
const result = {};
timings.forEach(timing => {
result[timing.label] = Object.assign({
total: timing.end - timing.start
}, timing.children && collapseTimings(timing.children));
});
return result;
}

export default class Stats {
startTime: number;
currentTiming: Timing;
currentChildren: Timing[];
timings: Timing[];
stack: Timing[];

constructor() {
this.startTime = now();
this.stack = [];
this.currentChildren = this.timings = [];
}

start(label) {
const timing = {
label,
start: now(),
end: null,
children: []
};

this.currentChildren.push(timing);
this.stack.push(timing);

this.currentTiming = timing;
this.currentChildren = timing.children;
}

stop(label) {
if (label !== this.currentTiming.label) {
throw new Error(`Mismatched timing labels`);
}

this.currentTiming.end = now();
this.stack.pop();
this.currentTiming = this.stack[this.stack.length - 1];
this.currentChildren = this.currentTiming ? this.currentTiming.children : this.timings;
}

toJSON() {
const timings = Object.assign({
total: now() - this.startTime
}, collapseTimings(this.timings));

return {
timings
};
}
}
10 changes: 10 additions & 0 deletions src/generators/Generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import MagicString, { Bundle } from 'magic-string';
import isReference from 'is-reference';
import { walk, childKeys } from 'estree-walker';
import { getLocator } from 'locate-character';
import Stats from '../Stats';
import deindent from '../utils/deindent';
import CodeBuilder from '../utils/CodeBuilder';
import getCodeFrame from '../utils/getCodeFrame';
Expand Down Expand Up @@ -76,6 +77,8 @@ childKeys.EachBlock = childKeys.IfBlock = ['children', 'else'];
childKeys.Attribute = ['value'];

export default class Generator {
stats: Stats;

ast: Parsed;
parsed: Parsed;
source: string;
Expand Down Expand Up @@ -123,8 +126,12 @@ export default class Generator {
name: string,
stylesheet: Stylesheet,
options: CompileOptions,
stats: Stats,
dom: boolean
) {
stats.start('compile');
this.stats = stats;

this.ast = clone(parsed);

this.parsed = parsed;
Expand Down Expand Up @@ -372,10 +379,13 @@ export default class Generator {
}
});

this.stats.stop('compile');

return {
ast: this.ast,
js,
css,
stats: this.stats.toJSON(),

// TODO deprecate
code: js.code,
Expand Down
11 changes: 7 additions & 4 deletions src/generators/dom/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import reservedNames from '../../utils/reservedNames';
import shared from './shared';
import Generator from '../Generator';
import Stylesheet from '../../css/Stylesheet';
import Stats from '../../Stats';
import Block from './Block';
import { test } from '../../config';
import { Parsed, CompileOptions, Node } from '../../interfaces';
Expand All @@ -34,9 +35,10 @@ export class DomGenerator extends Generator {
source: string,
name: string,
stylesheet: Stylesheet,
options: CompileOptions
options: CompileOptions,
stats: Stats
) {
super(parsed, source, name, stylesheet, options, true);
super(parsed, source, name, stylesheet, options, stats, true);
this.blocks = [];

this.readonly = new Set();
Expand Down Expand Up @@ -81,11 +83,12 @@ export default function dom(
parsed: Parsed,
source: string,
stylesheet: Stylesheet,
options: CompileOptions
options: CompileOptions,
stats: Stats
) {
const format = options.format || 'es';

const generator = new DomGenerator(parsed, source, options.name || 'SvelteComponent', stylesheet, options);
const generator = new DomGenerator(parsed, source, options.name || 'SvelteComponent', stylesheet, options, stats);

const {
computations,
Expand Down
11 changes: 7 additions & 4 deletions src/generators/server-side-rendering/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import deindent from '../../utils/deindent';
import Generator from '../Generator';
import Stats from '../../Stats';
import Stylesheet from '../../css/Stylesheet';
import Block from './Block';
import visit from './visit';
Expand All @@ -20,9 +21,10 @@ export class SsrGenerator extends Generator {
source: string,
name: string,
stylesheet: Stylesheet,
options: CompileOptions
options: CompileOptions,
stats: Stats
) {
super(parsed, source, name, stylesheet, options, false);
super(parsed, source, name, stylesheet, options, stats, false);
this.bindings = [];
this.renderCode = '';
this.appendTargets = [];
Expand All @@ -45,11 +47,12 @@ export default function ssr(
parsed: Parsed,
source: string,
stylesheet: Stylesheet,
options: CompileOptions
options: CompileOptions,
stats: Stats
) {
const format = options.format || 'cjs';

const generator = new SsrGenerator(parsed, source, options.name || 'SvelteComponent', stylesheet, options);
const generator = new SsrGenerator(parsed, source, options.name || 'SvelteComponent', stylesheet, options, stats);

const { computations, name, templateProperties } = generator;

Expand Down
11 changes: 10 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import parse from './parse/index';
import validate from './validate/index';
import generate from './generators/dom/index';
import generateSSR from './generators/server-side-rendering/index';
import Stats from './Stats';
import { assign } from './shared/index.js';
import Stylesheet from './css/Stylesheet';
import { Parsed, CompileOptions, Warning, PreprocessOptions, Preprocessor } from './interfaces';
Expand Down Expand Up @@ -109,20 +110,28 @@ export function compile(source: string, _options: CompileOptions) {
const options = normalizeOptions(_options);
let parsed: Parsed;

const stats = new Stats();

try {
stats.start('parse');
parsed = parse(source, options);
stats.stop('parse');
} catch (err) {
options.onerror(err);
return;
}

stats.start('stylesheet');
const stylesheet = new Stylesheet(source, parsed, options.filename, options.cascade !== false, options.dev);
stats.stop('stylesheet');

stats.start('validate');
validate(parsed, source, stylesheet, options);
stats.stop('validate');

const compiler = options.generate === 'ssr' ? generateSSR : generate;

return compiler(parsed, source, stylesheet, options);
return compiler(parsed, source, stylesheet, options, stats);
};

export function create(source: string, _options: CompileOptions = {}) {
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ export interface PreprocessOptions {
filename?: string
}

export type Preprocessor = (options: {content: string, attributes: Record<string, string | boolean>, filename?: string}) => { code: string, map?: SourceMap | string };
export type Preprocessor = (options: {content: string, attributes: Record<string, string | boolean>, filename?: string}) => { code: string, map?: SourceMap | string };

0 comments on commit 75c1fbc

Please sign in to comment.