add a few type annotations

pull/573/head
Rich-Harris 8 years ago
parent 13b87acfb9
commit e85bec00a2

@ -14,7 +14,11 @@ import annotateWithScopes from '../utils/annotateWithScopes';
const test = typeof global !== 'undefined' && global.__svelte_test; const test = typeof global !== 'undefined' && global.__svelte_test;
export default class Generator { export default class Generator {
constructor ( parsed, source, name, options ) { source: string
name: string
// TODO all the rest...
constructor ( parsed, source: string, name: string, options ) {
this.parsed = parsed; this.parsed = parsed;
this.source = source; this.source = source;
this.name = name; this.name = name;

@ -55,7 +55,7 @@ export default class Block {
}); });
} }
addElement ( name, renderStatement, parentNode, needsIdentifier = false ) { addElement ( name: string, renderStatement: string, parentNode, needsIdentifier = false ) {
const isToplevel = !parentNode; const isToplevel = !parentNode;
if ( needsIdentifier || isToplevel ) { if ( needsIdentifier || isToplevel ) {
this.builders.create.addLine( this.builders.create.addLine(
@ -72,7 +72,7 @@ export default class Block {
} }
} }
addVariable ( name, init ) { addVariable ( name: string, init ) {
if ( this.variables.has( name ) && this.variables.get( name ) !== init ) { if ( this.variables.has( name ) && this.variables.get( name ) !== init ) {
throw new Error( `Variable '${name}' already initialised with a different value` ); throw new Error( `Variable '${name}' already initialised with a different value` );
} }
@ -80,7 +80,7 @@ export default class Block {
this.variables.set( name, init ); this.variables.set( name, init );
} }
alias ( name ) { alias ( name: string ) {
if ( !this.aliases.has( name ) ) { if ( !this.aliases.has( name ) ) {
this.aliases.set( name, this.getUniqueName( name ) ); this.aliases.set( name, this.getUniqueName( name ) );
} }
@ -100,7 +100,7 @@ export default class Block {
return this.generator.findDependencies( this.contextDependencies, this.indexes, expression ); return this.generator.findDependencies( this.contextDependencies, this.indexes, expression );
} }
mount ( name, parentNode ) { mount ( name: string, parentNode: string ) {
if ( parentNode ) { if ( parentNode ) {
this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${name}, ${parentNode} );` ); this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${name}, ${parentNode} );` );
} else { } else {

@ -1,7 +1,7 @@
import deindent from '../../../utils/deindent.js'; import deindent from '../../../utils/deindent.js';
import getGlobals from './getGlobals'; import getGlobals from './getGlobals';
export default function getIntro ( format, options, imports ) { export default function getIntro ( format: string, options, imports ) {
if ( format === 'es' ) return ''; if ( format === 'es' ) return '';
if ( format === 'amd' ) return getAmdIntro( options, imports ); if ( format === 'amd' ) return getAmdIntro( options, imports );
if ( format === 'cjs' ) return getCjsIntro( options, imports ); if ( format === 'cjs' ) return getCjsIntro( options, imports );
@ -69,7 +69,7 @@ function paramString ( imports ) {
return imports.length ? ` ${imports.map( dep => dep.name ).join( ', ' )} ` : ''; return imports.length ? ` ${imports.map( dep => dep.name ).join( ', ' )} ` : '';
} }
function removeExtension ( file ) { function removeExtension ( file: string ) {
const index = file.lastIndexOf( '.' ); const index = file.lastIndexOf( '.' );
return ~index ? file.slice( 0, index ) : file; return ~index ? file.slice( 0, index ) : file;
} }

@ -1,6 +1,6 @@
import getGlobals from './getGlobals'; import getGlobals from './getGlobals';
export default function getOutro ( format, name, options, imports ) { export default function getOutro ( format: string, name: string, options, imports ) {
if ( format === 'es' ) { if ( format === 'es' ) {
return `export default ${name};`; return `export default ${name};`;
} }

@ -1,7 +1,7 @@
import { parseExpressionAt } from 'acorn'; import { parseExpressionAt } from 'acorn';
import spaces from '../../utils/spaces.js'; import spaces from '../../utils/spaces.js';
function readExpression ( parser, start, quoteMark ) { function readExpression ( parser, start: number, quoteMark ) {
let str = ''; let str = '';
let escaped = false; let escaped = false;
@ -43,7 +43,7 @@ function readExpression ( parser, start, quoteMark ) {
return expression; return expression;
} }
export function readEventHandlerDirective ( parser, start, name ) { export function readEventHandlerDirective ( parser, start: number, name: string ) {
const quoteMark = ( const quoteMark = (
parser.eat( `'` ) ? `'` : parser.eat( `'` ) ? `'` :
parser.eat( `"` ) ? `"` : parser.eat( `"` ) ? `"` :
@ -67,7 +67,7 @@ export function readEventHandlerDirective ( parser, start, name ) {
}; };
} }
export function readBindingDirective ( parser, start, name ) { export function readBindingDirective ( parser, start: number, name: string ) {
let value; let value;
if ( parser.eat( '=' ) ) { if ( parser.eat( '=' ) ) {
@ -130,7 +130,7 @@ export function readBindingDirective ( parser, start, name ) {
}; };
} }
export function readTransitionDirective ( parser, start, name, type ) { export function readTransitionDirective ( parser, start: number, name: string, type: string ) {
let expression = null; let expression = null;
if ( parser.eat( '=' ) ) { if ( parser.eat( '=' ) ) {

@ -3,7 +3,7 @@ import spaces from '../../utils/spaces.js';
const scriptClosingTag = '<\/script>'; const scriptClosingTag = '<\/script>';
export default function readScript ( parser, start, attributes ) { export default function readScript ( parser, start: number, attributes ) {
const scriptStart = parser.index; const scriptStart = parser.index;
const scriptEnd = parser.template.indexOf( scriptClosingTag, scriptStart ); const scriptEnd = parser.template.indexOf( scriptClosingTag, scriptStart );

@ -1,7 +1,7 @@
import parse from 'css-tree/lib/parser/index.js'; import parse from 'css-tree/lib/parser/index.js';
import walk from 'css-tree/lib/utils/walk.js'; import walk from 'css-tree/lib/utils/walk.js';
export default function readStyle ( parser, start, attributes ) { export default function readStyle ( parser, start: number, attributes ) {
const contentStart = parser.index; const contentStart = parser.index;
const styles = parser.readUntil( /<\/style>/ ); const styles = parser.readUntil( /<\/style>/ );
const contentEnd = parser.index; const contentEnd = parser.index;

@ -1,5 +1,5 @@
// https://github.com/darkskyapp/string-hash/blob/master/index.js // https://github.com/darkskyapp/string-hash/blob/master/index.js
export default function hash ( str ) { export default function hash ( str: string ) {
let hash = 5381; let hash = 5381;
let i = str.length; let i = str.length;

@ -3,7 +3,7 @@ import htmlEntities from './entities';
const windows1252 = [ 8364, 129, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 352, 8249, 338, 141, 381, 143, 144, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 353, 8250, 339, 157, 382, 376 ]; const windows1252 = [ 8364, 129, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 352, 8249, 338, 141, 381, 143, 144, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 353, 8250, 339, 157, 382, 376 ];
const entityPattern = new RegExp( `&(#?(?:x[\\w\\d]+|\\d+|${Object.keys( htmlEntities ).join( '|' )}));?`, 'g' ); const entityPattern = new RegExp( `&(#?(?:x[\\w\\d]+|\\d+|${Object.keys( htmlEntities ).join( '|' )}));?`, 'g' );
export function decodeCharacterReferences ( html ) { export function decodeCharacterReferences ( html: string ) {
return html.replace( entityPattern, ( match, entity ) => { return html.replace( entityPattern, ( match, entity ) => {
let code; let code;
@ -31,7 +31,7 @@ const NUL = 0;
// to replace them ourselves // to replace them ourselves
// //
// Source: http://en.wikipedia.org/wiki/Character_encodings_in_HTML#Illegal_characters // Source: http://en.wikipedia.org/wiki/Character_encodings_in_HTML#Illegal_characters
function validateCode ( code ) { function validateCode ( code: number ) {
// line feed becomes generic whitespace // line feed becomes generic whitespace
if ( code === 10 ) { if ( code === 10 ) {
return 32; return 32;

@ -31,5 +31,5 @@ fs.readdirSync( __dirname ).forEach( file => {
}); });
}); });
fs.writeFileSync( 'src/generators/dom/shared.js', `// this file is auto-generated, do not edit it fs.writeFileSync( 'src/generators/dom/shared.ts', `// this file is auto-generated, do not edit it
export default ${JSON.stringify( declarations, null, '\t' )};` ); export default ${JSON.stringify( declarations, null, '\t' )};` );

@ -1,18 +1,25 @@
const LINE = {}; enum ChunkType {
const BLOCK = {}; Line,
Block
}
export default class CodeBuilder { export default class CodeBuilder {
result: string
first: ChunkType
last: ChunkType
lastCondition: string
constructor ( str = '' ) { constructor ( str = '' ) {
this.result = str; this.result = str;
const initial = str ? ( /\n/.test( str ) ? BLOCK : LINE ) : null; const initial = str ? ( /\n/.test( str ) ? ChunkType.Block : ChunkType.Line ) : null;
this.first = initial; this.first = initial;
this.last = initial; this.last = initial;
this.lastCondition = null; this.lastCondition = null;
} }
addConditionalLine ( condition, line ) { addConditionalLine ( condition: string, line: string ) {
if ( condition === this.lastCondition ) { if ( condition === this.lastCondition ) {
this.result += `\n\t${line}`; this.result += `\n\t${line}`;
} else { } else {
@ -24,41 +31,41 @@ export default class CodeBuilder {
this.lastCondition = condition; this.lastCondition = condition;
} }
this.last = BLOCK; this.last = ChunkType.Block;
} }
addLine ( line ) { addLine ( line: string ) {
if ( this.lastCondition ) { if ( this.lastCondition ) {
this.result += `\n}`; this.result += `\n}`;
this.lastCondition = null; this.lastCondition = null;
} }
if ( this.last === BLOCK ) { if ( this.last === ChunkType.Block ) {
this.result += `\n\n${line}`; this.result += `\n\n${line}`;
} else if ( this.last === LINE ) { } else if ( this.last === ChunkType.Line ) {
this.result += `\n${line}`; this.result += `\n${line}`;
} else { } else {
this.result += line; this.result += line;
} }
this.last = LINE; this.last = ChunkType.Line;
if ( !this.first ) this.first = LINE; if ( !this.first ) this.first = ChunkType.Line;
} }
addLineAtStart ( line ) { addLineAtStart ( line: string ) {
if ( this.first === BLOCK ) { if ( this.first === ChunkType.Block ) {
this.result = `${line}\n\n${this.result}`; this.result = `${line}\n\n${this.result}`;
} else if ( this.first === LINE ) { } else if ( this.first === ChunkType.Line ) {
this.result = `${line}\n${this.result}`; this.result = `${line}\n${this.result}`;
} else { } else {
this.result += line; this.result += line;
} }
this.first = LINE; this.first = ChunkType.Line;
if ( !this.last ) this.last = LINE; if ( !this.last ) this.last = ChunkType.Line;
} }
addBlock ( block ) { addBlock ( block: string ) {
if ( this.lastCondition ) { if ( this.lastCondition ) {
this.result += `\n}`; this.result += `\n}`;
this.lastCondition = null; this.lastCondition = null;
@ -70,19 +77,19 @@ export default class CodeBuilder {
this.result += block; this.result += block;
} }
this.last = BLOCK; this.last = ChunkType.Block;
if ( !this.first ) this.first = BLOCK; if ( !this.first ) this.first = ChunkType.Block;
} }
addBlockAtStart ( block ) { addBlockAtStart ( block: string ) {
if ( this.result ) { if ( this.result ) {
this.result = `${block}\n\n${this.result}`; this.result = `${block}\n\n${this.result}`;
} else { } else {
this.result += block; this.result += block;
} }
this.first = BLOCK; this.first = ChunkType.Block;
if ( !this.last ) this.last = BLOCK; if ( !this.last ) this.last = ChunkType.Block;
} }
isEmpty () { isEmpty () {

@ -1,10 +1,10 @@
import spaces from './spaces.js'; import spaces from './spaces.js';
function tabsToSpaces ( str ) { function tabsToSpaces ( str: string ) {
return str.replace( /^\t+/, match => match.split( '\t' ).join( ' ' ) ); return str.replace( /^\t+/, match => match.split( '\t' ).join( ' ' ) );
} }
export default function getCodeFrame ( source, line, column ) { export default function getCodeFrame ( source: string, line: number, column: number ) {
const lines = source.split( '\n' ); const lines = source.split( '\n' );
const frameStart = Math.max( 0, line - 2 ); const frameStart = Math.max( 0, line - 2 );

@ -1,4 +1,4 @@
export default function isReference ( node, parent ) { export default function isReference ( node, parent ): boolean {
if ( node.type === 'MemberExpression' ) { if ( node.type === 'MemberExpression' ) {
return !node.computed && isReference( node.object, node ); return !node.computed && isReference( node.object, node );
} }

@ -1,5 +1,5 @@
const voidElementNames = /^(?:area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/; const voidElementNames = /^(?:area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/;
export default function isVoidElementName ( name ) { export default function isVoidElementName ( name: string ) {
return voidElementNames.test( name ) || name.toLowerCase() === '!doctype'; return voidElementNames.test( name ) || name.toLowerCase() === '!doctype';
} }

@ -1,6 +1,6 @@
import deindent from './deindent.js'; import deindent from './deindent.js';
export default function toSource ( thing ) { export default function toSource ( thing: any ) :string {
if ( typeof thing === 'function' ) { if ( typeof thing === 'function' ) {
return normaliseIndentation( thing.toString() ); return normaliseIndentation( thing.toString() );
} }
@ -25,7 +25,7 @@ export default function toSource ( thing ) {
return JSON.stringify( thing ); return JSON.stringify( thing );
} }
function normaliseIndentation ( str ) { function normaliseIndentation ( str: string ) {
const lines = str.split( '\n' ).slice( 1, -1 ); const lines = str.split( '\n' ).slice( 1, -1 );
let minIndentation = Infinity; let minIndentation = Infinity;

@ -1,13 +1,13 @@
import { whitespace } from './patterns'; import { whitespace } from './patterns';
export function trimStart ( str ) { export function trimStart ( str: string ) {
let i = 0; let i = 0;
while ( whitespace.test( str[i] ) ) i += 1; while ( whitespace.test( str[i] ) ) i += 1;
return str.slice( i ); return str.slice( i );
} }
export function trimEnd ( str ) { export function trimEnd ( str: string ) {
let i = str.length; let i = str.length;
while ( whitespace.test( str[ i - 1 ] ) ) i -= 1; while ( whitespace.test( str[ i - 1 ] ) ) i -= 1;

@ -4,7 +4,9 @@
"noImplicitAny": true, "noImplicitAny": true,
"diagnostics": true, "diagnostics": true,
"noImplicitThis": true, "noImplicitThis": true,
"noEmitOnError": true "noEmitOnError": true,
"allowJs": true,
"lib": ["es5", "es6", "dom"]
}, },
"target": "ES5", "target": "ES5",
"include": [ "include": [

Loading…
Cancel
Save