diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts index c6a762db7c..46a3e346b4 100644 --- a/src/generators/Generator.ts +++ b/src/generators/Generator.ts @@ -731,21 +731,21 @@ export default class Generator { if (node.type === 'Element' && (node.name === ':Component' || node.name === ':Self' || generator.components.has(node.name))) { node.type = 'Component'; - node.__proto__ = nodes.Component.prototype; + Object.setPrototypeOf(node, nodes.Component.prototype); } else if (node.name === ':Window') { // TODO do this in parse? node.type = 'Window'; - node.__proto__ = nodes.Window.prototype; + Object.setPrototypeOf(node, nodes.Window.prototype); } else if (node.name === ':Head') { // TODO do this in parse? node.type = 'Head'; - node.__proto__ = nodes.Head.prototype; + Object.setPrototypeOf(node, nodes.Head.prototype); } else if (node.type === 'Element' && node.name === 'title') { // TODO do this in parse? node.type = 'Title'; - node.__proto__ = nodes.Title.prototype; + Object.setPrototypeOf(node, nodes.Title.prototype); } else if (node.type === 'Element' && node.name === 'slot' && !generator.customElement) { node.type = 'Slot'; - node.__proto__ = nodes.Slot.prototype; + Object.setPrototypeOf(node, nodes.Slot.prototype); } else if (node.type in nodes) { - node.__proto__ = nodes[node.type].prototype; + Object.setPrototypeOf(node, nodes[node.type].prototype); } if (node.type === 'Element') { diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts index b8fb36f801..487006ad53 100644 --- a/src/generators/dom/index.ts +++ b/src/generators/dom/index.ts @@ -212,10 +212,12 @@ export default function dom( ${generator.metaBindings} ${computations.length && `this._recompute({ ${Array.from(computationDeps).map(dep => `${dep}: 1`).join(', ')} }, this._state);`} ${options.dev && - Array.from(generator.expectedProperties).map( - prop => - `if (!('${prop}' in this._state)) console.warn("${debugName} was created without expected data property '${prop}'");` - )} + Array.from(generator.expectedProperties).map(prop => { + const message = generator.components.has(prop) ? + `${debugName} expected to find '${prop}' in \`data\`, but found it in \`components\` instead` : + `${debugName} was created without expected data property '${prop}'`; + return `if (!('${prop}' in this._state)) console.warn("${message}");` + })} ${generator.bindingGroups.length && `this._bindingGroups = [${Array(generator.bindingGroups.length).fill('[]').join(', ')}];`} diff --git a/src/generators/nodes/Text.ts b/src/generators/nodes/Text.ts index c00b00f4fe..b0e5a823c2 100644 --- a/src/generators/nodes/Text.ts +++ b/src/generators/nodes/Text.ts @@ -19,9 +19,10 @@ const elementsWithoutText = new Set([ function shouldSkip(node: Text) { if (/\S/.test(node.data)) return false; - const parentElement = node.findNearest(/(?:Element|Component)/); + const parentElement = node.findNearest(/(?:Element|Component|Head)/); if (!parentElement) return false; + if (parentElement.type === 'Head') return true; if (parentElement.type === 'Component') return parentElement.children.length === 1 && node === parentElement.children[0]; return parentElement.namespace || elementsWithoutText.has(parentElement.name); diff --git a/src/generators/server-side-rendering/index.ts b/src/generators/server-side-rendering/index.ts index 85118ef5fb..37bf859da7 100644 --- a/src/generators/server-side-rendering/index.ts +++ b/src/generators/server-side-rendering/index.ts @@ -232,7 +232,7 @@ export default function ssr( ${ /__missingComponent/.test(generator.renderCode) && deindent` var __missingComponent = { - render: () => '' + _render: () => '' }; ` } diff --git a/src/validate/html/validateElement.ts b/src/validate/html/validateElement.ts index a39e1a6fbb..2572fd29d4 100644 --- a/src/validate/html/validateElement.ts +++ b/src/validate/html/validateElement.ts @@ -16,6 +16,10 @@ export default function validateElement( const isComponent = node.name === ':Self' || node.name === ':Component' || validator.components.has(node.name); + if (isComponent) { + validator.used.components.add(node.name); + } + if (!isComponent && /^[A-Z]/.test(node.name[0])) { // TODO upgrade to validator.error in v2 validator.warn(`${node.name} component is not defined`, node.start); @@ -152,12 +156,15 @@ export default function validateElement( ); } } else if (attribute.type === 'EventHandler') { + validator.used.events.add(attribute.name); validateEventHandler(validator, attribute, refCallees); } else if (attribute.type === 'Transition') { if (isComponent) { validator.error(`Transitions can only be applied to DOM elements, not components`, attribute.start); } + validator.used.transitions.add(attribute.name); + const bidi = attribute.intro && attribute.outro; if (hasTransition) { diff --git a/src/validate/index.ts b/src/validate/index.ts index 5ed4d58bd9..b57f2b0c2a 100644 --- a/src/validate/index.ts +++ b/src/validate/index.ts @@ -35,6 +35,13 @@ export class Validator { transitions: Map; slots: Set; + used: { + components: Set; + helpers: Set; + events: Set; + transitions: Set; + }; + constructor(parsed: Parsed, source: string, options: CompileOptions) { this.source = source; this.filename = options.filename; @@ -50,6 +57,13 @@ export class Validator { this.helpers = new Map(); this.transitions = new Map(); this.slots = new Set(); + + this.used = { + components: new Set(), + helpers: new Set(), + events: new Set(), + transitions: new Set() + }; } error(message: string, pos: number) { @@ -114,6 +128,32 @@ export default function validate( if (parsed.html) { validateHtml(validator, parsed.html); } + + // need to do a second pass of the JS, now that we've analysed the markup + if (parsed.js && validator.defaultExport) { + const categories = { + components: 'component', + // TODO helpers require a bit more work — need to analyse all expressions + // helpers: 'helper', + events: 'event definition', + transitions: 'transition' + }; + + Object.keys(categories).forEach(category => { + const definitions = validator.defaultExport.declaration.properties.find(prop => prop.key.name === category); + if (definitions) { + definitions.value.properties.forEach(prop => { + const { name } = prop.key; + if (!validator.used[category].has(name)) { + validator.warn( + `The '${name}' ${categories[category]} is unused`, + prop.start + ); + } + }); + } + }); + } } catch (err) { if (onerror) { onerror(err); diff --git a/src/validate/js/propValidators/data.ts b/src/validate/js/propValidators/data.ts index b49931cf21..009e336b66 100644 --- a/src/validate/js/propValidators/data.ts +++ b/src/validate/js/propValidators/data.ts @@ -6,8 +6,6 @@ const disallowed = new Set(['Literal', 'ObjectExpression', 'ArrayExpression']); export default function data(validator: Validator, prop: Node) { while (prop.type === 'ParenthesizedExpression') prop = prop.expression; - // TODO should we disallow references and expressions as well? - if (disallowed.has(prop.value.type)) { validator.error(`'data' must be a function`, prop.value.start); } diff --git a/test/js/samples/head-no-whitespace/expected-bundle.js b/test/js/samples/head-no-whitespace/expected-bundle.js new file mode 100644 index 0000000000..f6e4968c9e --- /dev/null +++ b/test/js/samples/head-no-whitespace/expected-bundle.js @@ -0,0 +1,231 @@ +function noop() {} + +function assign(target) { + var k, + source, + i = 1, + len = arguments.length; + for (; i < len; i++) { + source = arguments[i]; + for (k in source) target[k] = source[k]; + } + + return target; +} + +function appendNode(node, target) { + target.appendChild(node); +} + +function detachNode(node) { + node.parentNode.removeChild(node); +} + +function createElement(name) { + return document.createElement(name); +} + +function blankObject() { + return Object.create(null); +} + +function destroy(detach) { + this.destroy = noop; + this.fire('destroy'); + this.set = this.get = noop; + + if (detach !== false) this._fragment.u(); + this._fragment.d(); + this._fragment = this._state = null; +} + +function differs(a, b) { + return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); +} + +function dispatchObservers(component, group, changed, newState, oldState) { + for (var key in group) { + if (!changed[key]) continue; + + var newValue = newState[key]; + var oldValue = oldState[key]; + + var callbacks = group[key]; + if (!callbacks) continue; + + for (var i = 0; i < callbacks.length; i += 1) { + var callback = callbacks[i]; + if (callback.__calling) continue; + + callback.__calling = true; + callback.call(component, newValue, oldValue); + callback.__calling = false; + } + } +} + +function fire(eventName, data) { + var handlers = + eventName in this._handlers && this._handlers[eventName].slice(); + if (!handlers) return; + + for (var i = 0; i < handlers.length; i += 1) { + handlers[i].call(this, data); + } +} + +function get(key) { + return key ? this._state[key] : this._state; +} + +function init(component, options) { + component._observers = { pre: blankObject(), post: blankObject() }; + component._handlers = blankObject(); + component._bind = options._bind; + + component.options = options; + component.root = options.root || component; + component.store = component.root.store || options.store; +} + +function observe(key, callback, options) { + var group = options && options.defer + ? this._observers.post + : this._observers.pre; + + (group[key] || (group[key] = [])).push(callback); + + if (!options || options.init !== false) { + callback.__calling = true; + callback.call(this, this._state[key]); + callback.__calling = false; + } + + return { + cancel: function() { + var index = group[key].indexOf(callback); + if (~index) group[key].splice(index, 1); + } + }; +} + +function on(eventName, handler) { + if (eventName === 'teardown') return this.on('destroy', handler); + + var handlers = this._handlers[eventName] || (this._handlers[eventName] = []); + handlers.push(handler); + + return { + cancel: function() { + var index = handlers.indexOf(handler); + if (~index) handlers.splice(index, 1); + } + }; +} + +function set(newState) { + this._set(assign({}, newState)); + if (this.root._lock) return; + this.root._lock = true; + callAll(this.root._beforecreate); + callAll(this.root._oncreate); + callAll(this.root._aftercreate); + this.root._lock = false; +} + +function _set(newState) { + var oldState = this._state, + changed = {}, + dirty = false; + + for (var key in newState) { + if (differs(newState[key], oldState[key])) changed[key] = dirty = true; + } + if (!dirty) return; + + this._state = assign({}, oldState, newState); + this._recompute(changed, this._state); + if (this._bind) this._bind(changed, this._state); + + if (this._fragment) { + dispatchObservers(this, this._observers.pre, changed, this._state, oldState); + this._fragment.p(changed, this._state); + dispatchObservers(this, this._observers.post, changed, this._state, oldState); + } +} + +function callAll(fns) { + while (fns && fns.length) fns.pop()(); +} + +function _mount(target, anchor) { + this._fragment.m(target, anchor); +} + +function _unmount() { + if (this._fragment) this._fragment.u(); +} + +var proto = { + destroy: destroy, + get: get, + fire: fire, + observe: observe, + on: on, + set: set, + teardown: destroy, + _recompute: noop, + _set: _set, + _mount: _mount, + _unmount: _unmount +}; + +/* generated by Svelte vX.Y.Z */ +function create_main_fragment(state, component) { + var meta, meta_1; + + return { + c: function create() { + meta = createElement("meta"); + meta_1 = createElement("meta"); + this.h(); + }, + + h: function hydrate() { + meta.name = "twitter:creator"; + meta.content = "@sveltejs"; + meta_1.name = "twitter:title"; + meta_1.content = "Svelte"; + }, + + m: function mount(target, anchor) { + appendNode(meta, document.head); + appendNode(meta_1, document.head); + }, + + p: noop, + + u: function unmount() { + detachNode(meta); + detachNode(meta_1); + }, + + d: noop + }; +} + +function SvelteComponent(options) { + init(this, options); + this._state = assign({}, options.data); + + this._fragment = create_main_fragment(this._state, this); + + if (options.target) { + this._fragment.c(); + this._fragment.m(options.target, options.anchor || null); + } +} + +assign(SvelteComponent.prototype, proto); + +export default SvelteComponent; diff --git a/test/js/samples/head-no-whitespace/expected.js b/test/js/samples/head-no-whitespace/expected.js new file mode 100644 index 0000000000..32a1a5da88 --- /dev/null +++ b/test/js/samples/head-no-whitespace/expected.js @@ -0,0 +1,50 @@ +/* generated by Svelte vX.Y.Z */ +import { appendNode, assign, createElement, detachNode, init, noop, proto } from "svelte/shared.js"; + +function create_main_fragment(state, component) { + var meta, meta_1; + + return { + c: function create() { + meta = createElement("meta"); + meta_1 = createElement("meta"); + this.h(); + }, + + h: function hydrate() { + meta.name = "twitter:creator"; + meta.content = "@sveltejs"; + meta_1.name = "twitter:title"; + meta_1.content = "Svelte"; + }, + + m: function mount(target, anchor) { + appendNode(meta, document.head); + appendNode(meta_1, document.head); + }, + + p: noop, + + u: function unmount() { + detachNode(meta); + detachNode(meta_1); + }, + + d: noop + }; +} + +function SvelteComponent(options) { + init(this, options); + this._state = assign({}, options.data); + + this._fragment = create_main_fragment(this._state, this); + + if (options.target) { + this._fragment.c(); + this._fragment.m(options.target, options.anchor || null); + } +} + +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/head-no-whitespace/input.html b/test/js/samples/head-no-whitespace/input.html new file mode 100644 index 0000000000..37c387083d --- /dev/null +++ b/test/js/samples/head-no-whitespace/input.html @@ -0,0 +1,4 @@ +<:Head> + + + \ No newline at end of file diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/Bar.html b/test/runtime/samples/dev-warning-dynamic-components-misplaced/Bar.html new file mode 100644 index 0000000000..d9d3a9a899 --- /dev/null +++ b/test/runtime/samples/dev-warning-dynamic-components-misplaced/Bar.html @@ -0,0 +1 @@ +Bar \ No newline at end of file diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/Foo.html b/test/runtime/samples/dev-warning-dynamic-components-misplaced/Foo.html new file mode 100644 index 0000000000..9f26b637f0 --- /dev/null +++ b/test/runtime/samples/dev-warning-dynamic-components-misplaced/Foo.html @@ -0,0 +1 @@ +Foo \ No newline at end of file diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/_config.js b/test/runtime/samples/dev-warning-dynamic-components-misplaced/_config.js new file mode 100644 index 0000000000..28a38333e8 --- /dev/null +++ b/test/runtime/samples/dev-warning-dynamic-components-misplaced/_config.js @@ -0,0 +1,14 @@ +export default { + dev: true, + + data: { + x: true + }, + + html: '', + + warnings: [ + ` expected to find 'Foo' in \`data\`, but found it in \`components\` instead`, + ` expected to find 'Bar' in \`data\`, but found it in \`components\` instead` + ] +}; \ No newline at end of file diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html b/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html new file mode 100644 index 0000000000..37392f27e6 --- /dev/null +++ b/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html @@ -0,0 +1,13 @@ +<:Component {x ? Foo : Bar}/> + + \ No newline at end of file diff --git a/test/validator/samples/properties-components-should-be-capitalised/input.html b/test/validator/samples/properties-components-should-be-capitalised/input.html index 3052ff968e..627a614cff 100644 --- a/test/validator/samples/properties-components-should-be-capitalised/input.html +++ b/test/validator/samples/properties-components-should-be-capitalised/input.html @@ -1,4 +1,4 @@ -
+ \ No newline at end of file diff --git a/test/validator/samples/unused-components/warnings.json b/test/validator/samples/unused-components/warnings.json new file mode 100644 index 0000000000..48e3d80bc9 --- /dev/null +++ b/test/validator/samples/unused-components/warnings.json @@ -0,0 +1,18 @@ +[ + { + "message": "The 'Foo' component is unused", + "loc": { + "line": 7, + "column": 3 + }, + "pos": 109 + }, + { + "message": "The 'Bar' component is unused", + "loc": { + "line": 8, + "column": 3 + }, + "pos": 117 + } +] diff --git a/test/validator/samples/unused-event/input.html b/test/validator/samples/unused-event/input.html new file mode 100644 index 0000000000..b759d37749 --- /dev/null +++ b/test/validator/samples/unused-event/input.html @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/test/validator/samples/unused-event/warnings.json b/test/validator/samples/unused-event/warnings.json new file mode 100644 index 0000000000..88a47fbf86 --- /dev/null +++ b/test/validator/samples/unused-event/warnings.json @@ -0,0 +1,8 @@ +[{ + "message": "The 'drag' event definition is unused", + "loc": { + "line": 4, + "column": 3 + }, + "pos": 42 +}] diff --git a/test/validator/samples/unused-helper.skip/input.html b/test/validator/samples/unused-helper.skip/input.html new file mode 100644 index 0000000000..f948e195a3 --- /dev/null +++ b/test/validator/samples/unused-helper.skip/input.html @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/test/validator/samples/unused-helper.skip/warnings.json b/test/validator/samples/unused-helper.skip/warnings.json new file mode 100644 index 0000000000..fda70ebc0c --- /dev/null +++ b/test/validator/samples/unused-helper.skip/warnings.json @@ -0,0 +1,8 @@ +[{ + "message": "The 'uppercase' helper is unused", + "loc": { + "line": 4, + "column": 3 + }, + "pos": 43 +}] diff --git a/test/validator/samples/unused-transition/input.html b/test/validator/samples/unused-transition/input.html new file mode 100644 index 0000000000..4ddbc200e8 --- /dev/null +++ b/test/validator/samples/unused-transition/input.html @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/test/validator/samples/unused-transition/warnings.json b/test/validator/samples/unused-transition/warnings.json new file mode 100644 index 0000000000..da1952b060 --- /dev/null +++ b/test/validator/samples/unused-transition/warnings.json @@ -0,0 +1,8 @@ +[{ + "message": "The 'spin' transition is unused", + "loc": { + "line": 4, + "column": 3 + }, + "pos": 47 +}]