@ -8,7 +8,7 @@ import {
create_scopes ,
create_scopes ,
extract_names ,
extract_names ,
Scope ,
Scope ,
extract_identifiers ,
extract_identifiers
} from './utils/scope' ; } from './utils/scope' ;
import Stylesheet from './css/Stylesheet' ; import Stylesheet from './css/Stylesheet' ;
import { test } from '../config' ; import { test } from '../config' ;
@ -155,7 +155,7 @@ export default class Component {
) || { start : 0 , end : 0 } ;
) || { start : 0 , end : 0 } ;
this . warn ( svelteOptions , {
this . warn ( svelteOptions , {
code : 'custom-element-no-tag' ,
code : 'custom-element-no-tag' ,
message : ` No custom element 'tag' option was specified. To automatically register a custom element, specify a name with a hyphen in it, e.g. <svelte:options tag="my-thing"/>. To hide this warning, use <svelte:options tag={null}/> ` ,
message : ` No custom element 'tag' option was specified. To automatically register a custom element, specify a name with a hyphen in it, e.g. <svelte:options tag="my-thing"/>. To hide this warning, use <svelte:options tag={null}/> `
} ) ;
} ) ;
}
}
this . tag = this . component_options . tag || compile_options . tag ;
this . tag = this . component_options . tag || compile_options . tag ;
@ -190,7 +190,7 @@ export default class Component {
this . add_var ( {
this . add_var ( {
name ,
name ,
injected : true ,
injected : true ,
referenced : true ,
referenced : true
} ) ;
} ) ;
} else if ( name [ 0 ] === '$' ) {
} else if ( name [ 0 ] === '$' ) {
this . add_var ( {
this . add_var ( {
@ -198,7 +198,7 @@ export default class Component {
injected : true ,
injected : true ,
referenced : true ,
referenced : true ,
mutated : true ,
mutated : true ,
writable : true ,
writable : true
} ) ;
} ) ;
const subscribable_name = name . slice ( 1 ) ;
const subscribable_name = name . slice ( 1 ) ;
@ -289,7 +289,7 @@ export default class Component {
}
}
const imported_helpers = Array . from ( this . helpers , ( [ name , alias ] ) = > ( {
const imported_helpers = Array . from ( this . helpers , ( [ name , alias ] ) = > ( {
name ,
name ,
alias ,
alias
} ) ) ;
} ) ) ;
create_module (
create_module (
@ -305,7 +305,7 @@ export default class Component {
. filter ( variable = > variable . module && variable . export_name )
. filter ( variable = > variable . module && variable . export_name )
. map ( variable = > ( {
. map ( variable = > ( {
name : variable.name ,
name : variable.name ,
as : variable . export_name ,
as : variable . export_name
} ) )
} ) )
) ;
) ;
@ -342,9 +342,9 @@ export default class Component {
reassigned : v.reassigned || false ,
reassigned : v.reassigned || false ,
referenced : v.referenced || false ,
referenced : v.referenced || false ,
writable : v.writable || false ,
writable : v.writable || false ,
referenced_from_script : v.referenced_from_script || false ,
referenced_from_script : v.referenced_from_script || false
} ) ) ,
} ) ) ,
stats : this.stats.render ( ) ,
stats : this.stats.render ( )
} ;
} ;
}
}
@ -409,7 +409,7 @@ export default class Component {
source : this.source ,
source : this.source ,
start : pos.start ,
start : pos.start ,
end : pos.end ,
end : pos.end ,
filename : this.compile_options.filename ,
filename : this.compile_options.filename
} ) ;
} ) ;
}
}
@ -441,7 +441,7 @@ export default class Component {
pos : pos.start ,
pos : pos.start ,
filename : this.compile_options.filename ,
filename : this.compile_options.filename ,
toString : ( ) = >
toString : ( ) = >
` ${ warning . message } ( ${ start . line } : ${ start . column } ) \ n ${ frame } ` ,
` ${ warning . message } ( ${ start . line } : ${ start . column } ) \ n ${ frame } `
} ) ;
} ) ;
}
}
@ -453,7 +453,7 @@ export default class Component {
if ( node . type === 'ExportDefaultDeclaration' ) {
if ( node . type === 'ExportDefaultDeclaration' ) {
this . error ( node , {
this . error ( node , {
code : ` default-export ` ,
code : ` default-export ` ,
message : ` A component cannot have a default export ` ,
message : ` A component cannot have a default export `
} ) ;
} ) ;
}
}
@ -461,7 +461,7 @@ export default class Component {
if ( node . source ) {
if ( node . source ) {
this . error ( node , {
this . error ( node , {
code : ` not-implemented ` ,
code : ` not-implemented ` ,
message : ` A component currently cannot have an export ... from ` ,
message : ` A component currently cannot have an export ... from `
} ) ;
} ) ;
}
}
if ( node . declaration ) {
if ( node . declaration ) {
@ -531,10 +531,10 @@ export default class Component {
if ( node . type === 'LabeledStatement' && node . label . name === '$' ) {
if ( node . type === 'LabeledStatement' && node . label . name === '$' ) {
component . warn ( node as any , {
component . warn ( node as any , {
code : 'module-script-reactive-declaration' ,
code : 'module-script-reactive-declaration' ,
message : '$: has no effect in a module script' ,
message : '$: has no effect in a module script'
} ) ;
} ) ;
}
}
} ,
}
} ) ;
} ) ;
const { scope , globals } = create_scopes ( script . content ) ;
const { scope , globals } = create_scopes ( script . content ) ;
@ -544,7 +544,7 @@ export default class Component {
if ( name [ 0 ] === '$' ) {
if ( name [ 0 ] === '$' ) {
this . error ( node as any , {
this . error ( node as any , {
code : 'illegal-declaration' ,
code : 'illegal-declaration' ,
message : ` The $ prefix is reserved, and cannot be used for variable and import names ` ,
message : ` The $ prefix is reserved, and cannot be used for variable and import names `
} ) ;
} ) ;
}
}
@ -562,7 +562,7 @@ export default class Component {
if ( name [ 0 ] === '$' ) {
if ( name [ 0 ] === '$' ) {
this . error ( node as any , {
this . error ( node as any , {
code : 'illegal-subscription' ,
code : 'illegal-subscription' ,
message : ` Cannot reference store value inside <script context="module"> ` ,
message : ` Cannot reference store value inside <script context="module"> `
} ) ;
} ) ;
} else {
} else {
this . add_var ( {
this . add_var ( {
@ -623,7 +623,7 @@ export default class Component {
if ( name [ 0 ] === '$' ) {
if ( name [ 0 ] === '$' ) {
this . error ( node as any , {
this . error ( node as any , {
code : 'illegal-declaration' ,
code : 'illegal-declaration' ,
message : ` The $ prefix is reserved, and cannot be used for variable and import names ` ,
message : ` The $ prefix is reserved, and cannot be used for variable and import names `
} ) ;
} ) ;
}
}
@ -647,12 +647,12 @@ export default class Component {
injected : true ,
injected : true ,
writable : true ,
writable : true ,
reassigned : true ,
reassigned : true ,
initialised : true ,
initialised : true
} ) ;
} ) ;
} else if ( is_reserved_keyword ( name ) ) {
} else if ( is_reserved_keyword ( name ) ) {
this . add_var ( {
this . add_var ( {
name ,
name ,
injected : true ,
injected : true
} ) ;
} ) ;
} else if ( name [ 0 ] === '$' ) {
} else if ( name [ 0 ] === '$' ) {
if ( name === '$' || name [ 1 ] === '$' ) {
if ( name === '$' || name [ 1 ] === '$' ) {
@ -666,7 +666,7 @@ export default class Component {
name ,
name ,
injected : true ,
injected : true ,
mutated : true ,
mutated : true ,
writable : true ,
writable : true
} ) ;
} ) ;
this . add_reference ( name . slice ( 1 ) ) ;
this . add_reference ( name . slice ( 1 ) ) ;
@ -764,7 +764,7 @@ export default class Component {
if ( map . has ( node ) ) {
if ( map . has ( node ) ) {
scope = scope . parent ;
scope = scope . parent ;
}
}
} ,
}
} ) ;
} ) ;
for ( const [ parent , prop , index ] of to_remove ) {
for ( const [ parent , prop , index ] of to_remove ) {
@ -832,7 +832,7 @@ export default class Component {
if ( map . has ( node ) ) {
if ( map . has ( node ) ) {
scope = scope . parent ;
scope = scope . parent ;
}
}
} ,
}
} ) ;
} ) ;
}
}
@ -844,7 +844,7 @@ export default class Component {
) {
) {
this . warn ( node as any , {
this . warn ( node as any , {
code : 'non-top-level-reactive-declaration' ,
code : 'non-top-level-reactive-declaration' ,
message : '$: has no effect outside of the top-level' ,
message : '$: has no effect outside of the top-level'
} ) ;
} ) ;
}
}
@ -872,7 +872,7 @@ export default class Component {
if ( node . body . type !== 'BlockStatement' ) {
if ( node . body . type !== 'BlockStatement' ) {
node . body = {
node . body = {
type : 'BlockStatement' ,
type : 'BlockStatement' ,
body : [ node . body ] ,
body : [ node . body ]
} ;
} ;
}
}
node . body . body . push ( inside [ 0 ] ) ;
node . body . body . push ( inside [ 0 ] ) ;
@ -881,8 +881,8 @@ export default class Component {
type : 'BlockStatement' ,
type : 'BlockStatement' ,
body : [
body : [
before [ 0 ] ,
before [ 0 ] ,
node ,
node
] ,
]
} ;
} ;
}
}
return null ;
return null ;
@ -918,7 +918,7 @@ export default class Component {
// TODO is this still true post-#3539?
// TODO is this still true post-#3539?
component . error ( declarator as any , {
component . error ( declarator as any , {
code : 'destructured-prop' ,
code : 'destructured-prop' ,
message : ` Cannot declare props in destructured declaration ` ,
message : ` Cannot declare props in destructured declaration `
} ) ;
} ) ;
}
}
@ -981,7 +981,7 @@ export default class Component {
if ( node . type === 'ExportNamedDeclaration' && node . declaration ) {
if ( node . type === 'ExportNamedDeclaration' && node . declaration ) {
( parent as Program ) . body [ index ] = node . declaration ;
( parent as Program ) . body [ index ] = node . declaration ;
}
}
} ,
}
} ) ;
} ) ;
}
}
@ -995,7 +995,7 @@ export default class Component {
hoistable_nodes ,
hoistable_nodes ,
var_lookup ,
var_lookup ,
injected_reactive_declaration_vars ,
injected_reactive_declaration_vars ,
imports ,
imports
} = this ;
} = this ;
const top_level_function_declarations = new Map ( ) ;
const top_level_function_declarations = new Map ( ) ;
@ -1127,7 +1127,7 @@ export default class Component {
if ( map . has ( node ) ) {
if ( map . has ( node ) ) {
scope = scope . parent ;
scope = scope . parent ;
}
}
} ,
}
} ) ;
} ) ;
checked . add ( fn_declaration ) ;
checked . add ( fn_declaration ) ;
@ -1218,7 +1218,7 @@ export default class Component {
if ( map . has ( node ) ) {
if ( map . has ( node ) ) {
scope = scope . parent ;
scope = scope . parent ;
}
}
} ,
}
} ) ;
} ) ;
const { expression } = node . body as ExpressionStatement ;
const { expression } = node . body as ExpressionStatement ;
@ -1228,7 +1228,7 @@ export default class Component {
assignees ,
assignees ,
dependencies ,
dependencies ,
node ,
node ,
declaration ,
declaration
} ) ;
} ) ;
}
}
} ) ;
} ) ;
@ -1309,7 +1309,7 @@ export default class Component {
this . warn ( node , {
this . warn ( node , {
code : 'missing-declaration' ,
code : 'missing-declaration' ,
message ,
message
} ) ;
} ) ;
}
}
@ -1332,7 +1332,7 @@ function process_component_options(component: Component, nodes) {
'accessors' in component . compile_options
'accessors' in component . compile_options
? component . compile_options . accessors
? component . compile_options . accessors
: ! ! component . compile_options . customElement ,
: ! ! component . compile_options . customElement ,
preserveWhitespace : ! ! component . compile_options . preserveWhitespace ,
preserveWhitespace : ! ! component . compile_options . preserveWhitespace
} ;
} ;
const node = nodes . find ( node = > node . name === 'svelte:options' ) ;
const node = nodes . find ( node = > node . name === 'svelte:options' ) ;
@ -1362,83 +1362,83 @@ function process_component_options(component: Component, nodes) {
const { name } = attribute ;
const { name } = attribute ;
switch ( name ) {
switch ( name ) {
case 'tag' : {
case 'tag' : {
const code = 'invalid-tag-attribute' ;
const code = 'invalid-tag-attribute' ;
const message = ` 'tag' must be a string literal ` ;
const message = ` 'tag' must be a string literal ` ;
const tag = get_value ( attribute , code , message ) ;
const tag = get_value ( attribute , code , message ) ;
if ( typeof tag !== 'string' && tag !== null )
if ( typeof tag !== 'string' && tag !== null )
component . error ( attribute , { code , message } ) ;
component . error ( attribute , { code , message } ) ;
if ( tag && ! /^[a-zA-Z][a-zA-Z0-9]*-[a-zA-Z0-9-]+$/ . test ( tag ) ) {
if ( tag && ! /^[a-zA-Z][a-zA-Z0-9]*-[a-zA-Z0-9-]+$/ . test ( tag ) ) {
component . error ( attribute , {
component . error ( attribute , {
code : ` invalid-tag-property ` ,
code : ` invalid-tag-property ` ,
message : ` tag name must be two or more words joined by the '-' character ` ,
message : ` tag name must be two or more words joined by the '-' character `
} ) ;
} ) ;
}
}
if ( tag && ! component . compile_options . customElement ) {
component . warn ( attribute , {
code : 'missing-custom-element-compile-options' ,
message : ` The 'tag' option is used when generating a custom element. Did you forget the 'customElement: true' compile option? `
} ) ;
}
component_options . tag = tag ;
if ( tag && ! component . compile_options . customElement ) {
break ;
component . warn ( attribute , {
code : 'missing-custom-element-compile-options' ,
message : ` The 'tag' option is used when generating a custom element. Did you forget the 'customElement: true' compile option? `
} ) ;
}
}
case 'namespace' : {
component_options . tag = tag ;
const code = 'invalid-namespace-attribute' ;
break ;
const message = ` The 'namespace' attribute must be a string literal representing a valid namespace ` ;
}
const ns = get_value ( attribute , code , message ) ;
if ( typeof ns !== 'string' )
case 'namespace' : {
component . error ( attribute , { code , message } ) ;
const code = 'invalid-namespace-attribute' ;
const message = ` The 'namespace' attribute must be a string literal representing a valid namespace ` ;
const ns = get_value ( attribute , code , message ) ;
if ( valid_namespaces . indexOf ( ns ) === - 1 ) {
if ( typeof ns !== 'string' )
const match = fuzzymatch ( ns , valid_namespaces ) ;
component . error ( attribute , { code , message } ) ;
if ( match ) {
component . error ( attribute , {
code : ` invalid-namespace-property ` ,
message : ` Invalid namespace ' ${ ns } ' (did you mean ' ${ match } '?) ` ,
} ) ;
} else {
component . error ( attribute , {
code : ` invalid-namespace-property ` ,
message : ` Invalid namespace ' ${ ns } ' ` ,
} ) ;
}
}
component_options . namespace = ns ;
if ( valid_namespaces . indexOf ( ns ) === - 1 ) {
break ;
const match = fuzzymatch ( ns , valid_namespaces ) ;
if ( match ) {
component . error ( attribute , {
code : ` invalid-namespace-property ` ,
message : ` Invalid namespace ' ${ ns } ' (did you mean ' ${ match } '?) `
} ) ;
} else {
component . error ( attribute , {
code : ` invalid-namespace-property ` ,
message : ` Invalid namespace ' ${ ns } ' `
} ) ;
}
}
}
case 'accessors' :
component_options . namespace = ns ;
case 'immutable' :
break ;
case 'preserveWhitespace' : {
}
const code = ` invalid- ${ name } -value ` ;
const message = ` ${ name } attribute must be true or false ` ;
const value = get_value ( attribute , code , message ) ;
if ( typeof value !== 'boolean' )
case 'accessors' :
component . error ( attribute , { code , message } ) ;
case 'immutable' :
case 'preserveWhitespace' : {
const code = ` invalid- ${ name } -value ` ;
const message = ` ${ name } attribute must be true or false ` ;
const value = get_value ( attribute , code , message ) ;
component_options [ name ] = value ;
if ( typeof value !== 'boolean' )
break ;
component . error ( attribute , { code , message } ) ;
}
default :
component_options [ name ] = value ;
component . error ( attribute , {
break ;
code : ` invalid-options-attribute ` ,
}
message : ` <svelte:options> unknown attribute ` ,
} ) ;
default :
component . error ( attribute , {
code : ` invalid-options-attribute ` ,
message : ` <svelte:options> unknown attribute `
} ) ;
}
}
} else {
} else {
component . error ( attribute , {
component . error ( attribute , {
code : ` invalid-options-attribute ` ,
code : ` invalid-options-attribute ` ,
message : ` <svelte:options> can only have static 'tag', 'namespace', 'accessors', 'immutable' and 'preserveWhitespace' attributes ` ,
message : ` <svelte:options> can only have static 'tag', 'namespace', 'accessors', 'immutable' and 'preserveWhitespace' attributes `
} ) ;
} ) ;
}
}
} ) ;
} ) ;
john gravois
5 years ago