From 343d66538b5d7fc6ea9daa7b64258e4c87452bac Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 24 Jul 2017 18:36:22 -0400 Subject: [PATCH 1/4] failing test for #712 --- .../css-media-query/expected-bundle.js | 206 ++++++++++++++++++ test/js/samples/css-media-query/expected.js | 80 +++++++ test/js/samples/css-media-query/input.html | 9 + 3 files changed, 295 insertions(+) create mode 100644 test/js/samples/css-media-query/expected-bundle.js create mode 100644 test/js/samples/css-media-query/expected.js create mode 100644 test/js/samples/css-media-query/input.html diff --git a/test/js/samples/css-media-query/expected-bundle.js b/test/js/samples/css-media-query/expected-bundle.js new file mode 100644 index 0000000000..eecf38afd1 --- /dev/null +++ b/test/js/samples/css-media-query/expected-bundle.js @@ -0,0 +1,206 @@ +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 insertNode(node, target, anchor) { + target.insertBefore(node, anchor); +} + +function detachNode(node) { + node.parentNode.removeChild(node); +} + +function createElement(name) { + return document.createElement(name); +} + +function setAttribute(node, attribute, value) { + node.setAttribute(attribute, value); +} + +function differs(a, b) { + return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); +} + +function dispatchObservers(component, group, newState, oldState) { + for (var key in group) { + if (!(key in newState)) continue; + + var newValue = newState[key]; + var oldValue = oldState[key]; + + if (differs(newValue, oldValue)) { + 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 get(key) { + return key ? this._state[key] : this._state; +} + +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 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)); + callAll(this._root._oncreate); +} + +function callAll(fns) { + while (fns && fns.length) fns.pop()(); +} + +var proto = { + get: get, + fire: fire, + observe: observe, + on: on, + set: set +}; + +function add_css () { + var style = createElement( 'style' ); + style.id = 'svelte-2363328337-style'; + style.textContent = "\n\t@media (min-width: 1px) {\n\t\tdiv[svelte-2363328337], [svelte-2363328337] div {\n\t\t\tcolor: red;\n\t\t}\n\t}\n"; + appendNode( style, document.head ); +} + +function create_main_fragment ( state, component ) { + var div; + + return { + create: function () { + div = createElement( 'div' ); + this.hydrate(); + }, + + hydrate: function ( nodes ) { + setAttribute( div, 'svelte-2363328337', '' ); + }, + + mount: function ( target, anchor ) { + insertNode( div, target, anchor ); + }, + + unmount: function () { + detachNode( div ); + }, + + destroy: noop + }; +} + +function SvelteComponent ( options ) { + options = options || {}; + this._state = options.data || {}; + + this._observers = { + pre: Object.create( null ), + post: Object.create( null ) + }; + + this._handlers = Object.create( null ); + + this._root = options._root || this; + this._yield = options._yield; + + this._torndown = false; + if ( !document.getElementById( 'svelte-2363328337-style' ) ) add_css(); + + this._fragment = create_main_fragment( this._state, this ); + + if ( options.target ) { + this._fragment.create(); + this._fragment.mount( options.target, null ); + } +} + +assign( SvelteComponent.prototype, proto ); + +SvelteComponent.prototype._set = function _set ( newState ) { + var oldState = this._state; + this._state = assign( {}, oldState, newState ); + dispatchObservers( this, this._observers.pre, newState, oldState ); + dispatchObservers( this, this._observers.post, newState, oldState ); +}; + +SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) { + this.fire( 'destroy' ); + + if ( detach !== false ) this._fragment.unmount(); + this._fragment.destroy(); + this._fragment = null; + + this._state = {}; + this._torndown = true; +}; + +export default SvelteComponent; diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js new file mode 100644 index 0000000000..e1c020aa8d --- /dev/null +++ b/test/js/samples/css-media-query/expected.js @@ -0,0 +1,80 @@ +import { appendNode, assign, createElement, detachNode, dispatchObservers, insertNode, noop, proto, setAttribute } from "svelte/shared.js"; + +function add_css () { + var style = createElement( 'style' ); + style.id = 'svelte-2363328337-style'; + style.textContent = "\n\t@media (min-width: 1px) {\n\t\tdiv[svelte-2363328337], [svelte-2363328337] div {\n\t\t\tcolor: red;\n\t\t}\n\t}\n"; + appendNode( style, document.head ); +} + +function create_main_fragment ( state, component ) { + var div; + + return { + create: function () { + div = createElement( 'div' ); + this.hydrate(); + }, + + hydrate: function ( nodes ) { + setAttribute( div, 'svelte-2363328337', '' ); + }, + + mount: function ( target, anchor ) { + insertNode( div, target, anchor ); + }, + + unmount: function () { + detachNode( div ); + }, + + destroy: noop + }; +} + +function SvelteComponent ( options ) { + options = options || {}; + this._state = options.data || {}; + + this._observers = { + pre: Object.create( null ), + post: Object.create( null ) + }; + + this._handlers = Object.create( null ); + + this._root = options._root || this; + this._yield = options._yield; + + this._torndown = false; + if ( !document.getElementById( 'svelte-2363328337-style' ) ) add_css(); + + this._fragment = create_main_fragment( this._state, this ); + + if ( options.target ) { + this._fragment.create(); + this._fragment.mount( options.target, null ); + } +} + +assign( SvelteComponent.prototype, proto ); + +SvelteComponent.prototype._set = function _set ( newState ) { + var oldState = this._state; + this._state = assign( {}, oldState, newState ); + dispatchObservers( this, this._observers.pre, newState, oldState ); + dispatchObservers( this, this._observers.post, newState, oldState ); +}; + +SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) { + this.fire( 'destroy' ); + + if ( detach !== false ) this._fragment.unmount(); + this._fragment.destroy(); + this._fragment = null; + + this._state = {}; + this._torndown = true; +}; + +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/css-media-query/input.html b/test/js/samples/css-media-query/input.html new file mode 100644 index 0000000000..cfaa709e0f --- /dev/null +++ b/test/js/samples/css-media-query/input.html @@ -0,0 +1,9 @@ +
+ + \ No newline at end of file From 7b3c69b34857324e8491a0f864112c6a57755655 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 24 Jul 2017 19:16:47 -0400 Subject: [PATCH 2/4] correctly unescape @ symbols (#712) --- src/generators/dom/Block.ts | 4 ++-- src/generators/dom/index.ts | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts index ff58a4e947..70323ae5cf 100644 --- a/src/generators/dom/Block.ts +++ b/src/generators/dom/Block.ts @@ -355,8 +355,8 @@ export default class Block { ${properties} }; } - `.replace(/(\\)?#(\w*)/g, (match, escaped, name) => { - return escaped ? match.slice(1) : this.alias(name); + `.replace(/(\\\\)?#(\w*)/g, (match, escaped, name) => { + return escaped ? match.slice(2) : this.alias(name); }); } } diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts index 55c6599cd7..17f2c8b482 100644 --- a/src/generators/dom/index.ts +++ b/src/generators/dom/index.ts @@ -137,15 +137,15 @@ export default function dom( if (generator.stylesheet.hasStyles && options.css !== false) { const { css, cssMap } = generator.stylesheet.render(options.filename); - const textContent = options.dev ? + const textContent = stringify(options.dev ? `${css}\n/*# sourceMappingURL=${cssMap.toUrl()} */` : - css; + css); builder.addBlock(deindent` function @add_css () { var style = @createElement( 'style' ); style.id = '${generator.stylesheet.id}-style'; - style.textContent = ${JSON.stringify(textContent)}; + style.textContent = ${textContent}; @appendNode( style, document.head ); } `); @@ -263,8 +263,8 @@ export default function dom( let result = builder .toString() - .replace(/(\\)?@(\w*)/g, (match: string, escaped: string, name: string) => { - if (escaped) return match.slice(1); + .replace(/(\\\\)?@(\w*)/g, (match: string, escaped: string, name: string) => { + if (escaped) return match.slice(2); if (name in shared) { if (options.dev && `${name}Dev` in shared) name = `${name}Dev`; From 2d39b25585e7188000f8874efab270827feb54fb Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 24 Jul 2017 19:18:43 -0400 Subject: [PATCH 3/4] second failing test for #712 --- test/runtime/samples/escaped-text/_config.js | 3 +++ test/runtime/samples/escaped-text/main.html | 1 + 2 files changed, 4 insertions(+) create mode 100644 test/runtime/samples/escaped-text/_config.js create mode 100644 test/runtime/samples/escaped-text/main.html diff --git a/test/runtime/samples/escaped-text/_config.js b/test/runtime/samples/escaped-text/_config.js new file mode 100644 index 0000000000..93a393d8cf --- /dev/null +++ b/test/runtime/samples/escaped-text/_config.js @@ -0,0 +1,3 @@ +export default { + html: `@@x` +}; \ No newline at end of file diff --git a/test/runtime/samples/escaped-text/main.html b/test/runtime/samples/escaped-text/main.html new file mode 100644 index 0000000000..6a173c026f --- /dev/null +++ b/test/runtime/samples/escaped-text/main.html @@ -0,0 +1 @@ +@@x \ No newline at end of file From 815c17cbe7939d9b72f5b7dc4e0fc445c3ada498 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 24 Jul 2017 19:38:08 -0400 Subject: [PATCH 4/4] fix unescaping edge case --- src/generators/server-side-rendering/visitors/Text.ts | 2 +- src/utils/stringify.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generators/server-side-rendering/visitors/Text.ts b/src/generators/server-side-rendering/visitors/Text.ts index b7aad398f2..493d32a936 100644 --- a/src/generators/server-side-rendering/visitors/Text.ts +++ b/src/generators/server-side-rendering/visitors/Text.ts @@ -7,5 +7,5 @@ export default function visitText( block: Block, node: Node ) { - generator.append(node.data.replace(/(\${|`|\\)/g, '\\$1').replace(/([^\\])?([@#])/g, '$1\\$2')); + generator.append(node.data.replace(/(\${|`|\\)/g, '\\$1').replace(/([^\\@#])?([@#])/g, '$1\\$2')); } diff --git a/src/utils/stringify.ts b/src/utils/stringify.ts index 7c63b45ce1..b4c65addfd 100644 --- a/src/utils/stringify.ts +++ b/src/utils/stringify.ts @@ -1,3 +1,3 @@ export default function stringify(data: string) { - return JSON.stringify(data.replace(/([^\\])?([@#])/g, '$1\\$2')); + return JSON.stringify(data.replace(/([^\\@#])?([@#])/g, '$1\\$2')); }