mirrors/svelte
mirrors/svelte
0
0
Fork 0
mirror of https://github.com/sveltejs/svelte.git synced 2024-11-29 08:32:05 +01:00
Code Issues Releases Wiki Activity

Merge pull request #2065 from sveltejs/gh-2061

Browse Source 
enclose text/compound slot attributes in backticks
This commit is contained in:
Rich Harris 2019-02-07 13:14:53 -05:00 committed by GitHub
commit da11d75558
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compile/render-dom/wrappers/Slot.ts
View File

@ -63,7 +63,7 @@ export default class SlotWrapper extends Wrapper {
get_slot_changes = renderer.component.getUniqueName(`get_${slot_name}_slot_changes`);
get_slot_context = renderer.component.getUniqueName(`get_${slot_name}_slot_context`);
const context_props = get_slot_data(attributes);
const context_props = get_slot_data(attributes, false);
const changes_props = [];
const dependencies = new Set();

10
src/compile/render-ssr/handlers/Element.ts
View File

@ -78,7 +78,7 @@ export default function(node, renderer, options) {
args.push(snip(attribute.expression));
} else {
if (attribute.name === 'value' && node.name === 'textarea') {
textareaContents = stringify_attribute(attribute);
textareaContents = stringify_attribute(attribute, true);
} else if (attribute.isTrue) {
args.push(`{ ${quoteNameIfNecessary(attribute.name)}: true }`);
} else if (
@ -89,7 +89,7 @@ export default function(node, renderer, options) {
// a boolean attribute with one non-Text chunk
args.push(`{ ${quoteNameIfNecessary(attribute.name)}: ${snip(attribute.chunks[0])} }`);
} else {
args.push(`{ ${quoteNameIfNecessary(attribute.name)}: \`${stringify_attribute(attribute)}\` }`);
args.push(`{ ${quoteNameIfNecessary(attribute.name)}: \`${stringify_attribute(attribute, true)}\` }`);
}
}
});
@ -100,7 +100,7 @@ export default function(node, renderer, options) {
if (attribute.type !== 'Attribute') return;
if (attribute.name === 'value' && node.name === 'textarea') {
textareaContents = stringify_attribute(attribute);
textareaContents = stringify_attribute(attribute, true);
} else if (attribute.isTrue) {
openingTag += ` ${attribute.name}`;
} else if (
@ -112,14 +112,14 @@ export default function(node, renderer, options) {
openingTag += '${' + snip(attribute.chunks[0]) + ' ? " ' + attribute.name + '" : "" }';
} else if (attribute.name === 'class' && classExpr) {
addClassAttribute = false;
openingTag += ` class="\${[\`${stringify_attribute(attribute)}\`, ${classExpr}].join(' ').trim() }"`;
openingTag += ` class="\${[\`${stringify_attribute(attribute, true)}\`, ${classExpr}].join(' ').trim() }"`;
} else if (attribute.chunks.length === 1 && attribute.chunks[0].type !== 'Text') {
const { name } = attribute;
const snippet = snip(attribute.chunks[0]);
openingTag += '${(v => v == null ? "" : ` ' + name + '="${@escape(' + snippet + ')}"`)(' + snippet + ')}';
} else {
openingTag += ` ${attribute.name}="${stringify_attribute(attribute)}"`;
openingTag += ` ${attribute.name}="${stringify_attribute(attribute, true)}"`;
}
});
}

2
src/compile/render-ssr/handlers/Slot.ts
View File

@ -7,7 +7,7 @@ export default function(node, renderer, options) {
const slot_name = name && name.chunks[0].data || 'default';
const prop = quotePropIfNecessary(slot_name);
const slot_data = get_slot_data(node.attributes);
const slot_data = get_slot_data(node.attributes, true);
const arg = slot_data.length > 0 ? `{ ${slot_data.join(', ')} }` : '';

4
src/utils/get_slot_data.ts
View File

@ -1,7 +1,7 @@
import { snip } from './snip';
import { stringify_attribute } from './stringify_attribute';
export default function(attributes) {
export default function get_slot_data(attributes, is_ssr: boolean) {
return attributes
.filter(attribute => attribute.name !== 'name')
.map(attribute => {
@ -11,7 +11,7 @@ export default function(attributes) {
? '""'
: attribute.chunks.length === 1 && attribute.chunks[0].type !== 'Text'
? snip(attribute.chunks[0])
: stringify_attribute(attribute);
: '`' + stringify_attribute(attribute, is_ssr) + '`';
return `${attribute.name}: ${value}`;
});

6
src/utils/stringify_attribute.ts
View File

@ -3,14 +3,16 @@ import Node from '../compile/nodes/shared/Node';
import { escapeTemplate, escape } from './stringify';
import { snip } from './snip';
export function stringify_attribute(attribute: Attribute) {
export function stringify_attribute(attribute: Attribute, is_ssr: boolean) {
return attribute.chunks
.map((chunk: Node) => {
if (chunk.type === 'Text') {
return escapeTemplate(escape(chunk.data).replace(/"/g, '"'));
}
return '${@escape(' + snip(chunk) + ')}';
return is_ssr
? '${@escape(' + snip(chunk) + ')}'
: '${' + snip(chunk) + '}';
})
.join('');
}

1
test/runtime/samples/component-slot-let-static/Nested.html Normal file
View File

@ -0,0 +1 @@
<slot value="Hi" />

3
test/runtime/samples/component-slot-let-static/_config.js Normal file
View File

@ -0,0 +1,3 @@
export default {
html: `<p>Hi</p>`
};

7
test/runtime/samples/component-slot-let-static/main.html Normal file
View File

@ -0,0 +1,7 @@
<script>
import Nested from './Nested.html';
</script>
<Nested let:value>
<p>{value}</p>
</Nested>