msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

Merge pull request #719 from sveltejs/gh-712

Browse Source 
Fix escaping bugs
pull/723/head
Rich Harris 8 years ago committed by GitHub
parent 94037f1eca 815c17cbe7
commit 5f09421a18
9 changed files with 308 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
src/generators/dom/Block.ts
Unescape View File

@ -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);
});
}
}

10
src/generators/dom/index.ts
Unescape View File

@ -134,15 +134,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 );
}
`);
@ -269,8 +269,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`;

2
src/generators/server-side-rendering/visitors/Text.ts
Unescape View File

@ -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'));
}

2
src/utils/stringify.ts
Unescape View File

@ -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'));
}

206
test/js/samples/css-media-query/expected-bundle.js
Unescape View File

@ -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;

80
test/js/samples/css-media-query/expected.js
Unescape View File

@ -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;

9
test/js/samples/css-media-query/input.html
Unescape View File

@ -0,0 +1,9 @@
<div></div>
<style>
@media (min-width: 1px) {
div {
color: red;
}
}
</style>

3
test/runtime/samples/escaped-text/_config.js
Unescape View File

@ -0,0 +1,3 @@
export default {
html: `@@x`
};

1
test/runtime/samples/escaped-text/main.html
Unescape View File

@ -0,0 +1 @@
@@x
Write Preview
Loading…
Cancel
Save