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

remove some stuff we wont need

Browse Source
pull/1289/head
Rich-Harris 8 years ago
parent 3f32be8c04
commit f6f8f66c90
5 changed files with 8 additions and 222 deletions
Show Stats Download Patch File Download Diff File

19
src/generators/nodes/Component.ts
Unescape View File

@ -48,10 +48,6 @@ export default class Component extends Node {
} }
}); });
if (this.spread) {
block.addDependencies(this.spread.metadata.dependencies);
}
this.var = block.getUniqueName( this.var = block.getUniqueName(
( (
this.name === ':Self' ? this.generator.name : this.name === ':Self' ? this.generator.name :
@ -230,7 +226,7 @@ export default class Component extends Node {
} }
}); });
componentInitialData = name_initial_data; componentInitProperties.push(`data: ${name_initial_data}`);
const initialisers = [ const initialisers = [
'state = #component.get()', 'state = #component.get()',
@ -254,21 +250,10 @@ export default class Component extends Node {
}); });
`; `;
} else if (initialProps.length) { } else if (initialProps.length) {
componentInitialData = initialPropString; componentInitProperties.push(`data: ${initialPropString}`);
} }
} }
if (this.spread) {
const initialData = this.spread.renderForComponent(block, updates);
componentInitialData = componentInitialData ?
`@assign({}, ${initialData}, ${componentInitialData})` :
initialData;
}
if (componentInitialData) {
componentInitProperties.push(`data: ${componentInitialData}`);
}
const isDynamicComponent = this.name === ':Component'; const isDynamicComponent = this.name === ':Component';
const switch_vars = isDynamicComponent && { const switch_vars = isDynamicComponent && {

7
src/generators/nodes/Element.ts
Unescape View File

@ -242,14 +242,15 @@ export default class Element extends Node {
} }
this.addBindings(block, allUsedContexts); this.addBindings(block, allUsedContexts);
this.addAttributes(block);
const eventHandlerUsesComponent = this.addEventHandlers(block, allUsedContexts); const eventHandlerUsesComponent = this.addEventHandlers(block, allUsedContexts);
this.addRefs(block); this.addRefs(block);
this.addTransitions(block); this.addTransitions(block);
this.addActions(block); this.addActions(block);
if (this.spread) { if (this.attributes.find(attr => attr.type === 'Spread')) {
this.spread.renderForElement(block); this.addSpreadAttributes(block);
} else {
this.addAttributes(block);
} }
if (allUsedContexts.size || eventHandlerUsesComponent) { if (allUsedContexts.size || eventHandlerUsesComponent) {

200
src/generators/nodes/Spread.ts
Unescape View File

@ -1,200 +0,0 @@
import deindent from '../../utils/deindent';
import { DomGenerator } from '../dom/index';
import Node from './shared/Node';
import Element from './Element';
import Block from '../dom/Block';
export default class Spread {
type: 'Spread';
start: number;
end: number;
generator: DomGenerator;
parent: Element;
expression: Node;
metadata: {
dependencies: string[];
snippet: string;
};
constructor({
generator,
expression,
parent
}: {
generator: DomGenerator,
expression: Node,
parent: Element
}) {
this.type = 'Spread';
this.generator = generator;
this.parent = parent;
this.expression = expression;
}
renderForElement(block: Block) {
const node = this.parent;
const { expression } = this;
const { indexes } = block.contextualise(expression);
const { dependencies, snippet } = this.metadata;
const value = snippet;
const hasChangeableIndex = Array.from(indexes).some(index => block.changeableIndexes.get(index));
const shouldCache = (
expression.type !== 'Identifier' ||
block.contexts.has(expression.name) ||
hasChangeableIndex
);
const last = shouldCache && block.getUniqueName(`${node.var}_spread_value`);
if (shouldCache) block.addVariable(last);
const init = shouldCache ? `${last} = ${value}` : value;
const activeKeys = block.getUniqueName(`${node.var}_spread_keys`);
block.addVariable(activeKeys, '{}');
const changes = block.getUniqueName(`${node.var}_spread_changes`);
const hasNamedAttributes = node.attributes.length;
const namedAttributes = block.getUniqueName(`${node.var}_attributes`);
if (hasNamedAttributes) {
block.builders.init.addBlock(deindent`
var ${namedAttributes} = [${node.attributes.map(attr => `'${attr.name}'`).join(', ')}];
`)
}
block.builders.hydrate.addBlock(deindent`
var ${changes} = ${init};
for (var key in ${changes}) {
${hasNamedAttributes ? `if (${namedAttributes}.indexOf(key) !== -1) continue;` : ''}
@setAttribute(${node.var}, key, ${changes}[key]);
${activeKeys}[key] = true;
}
`);
if (dependencies.length || hasChangeableIndex) {
const changedCheck = (
( block.hasOutroMethod ? `#outroing || ` : '' ) +
dependencies.map(dependency => `changed.${dependency}`).join(' || ')
);
const updateCachedValue = `${last} !== (${last} = ${value})`;
const condition = shouldCache ?
( dependencies.length ? `(${changedCheck}) && ${updateCachedValue}` : updateCachedValue ) :
changedCheck;
const oldKeys = block.getUniqueName(`${node.var}_spread_keys_old`);
const updater = deindent`
var ${oldKeys} = ${activeKeys};
${activeKeys} = {};
var ${changes} = ${shouldCache ? last : value};
for (var key in ${changes}) {
${hasNamedAttributes ? `if (${namedAttributes}.indexOf(key) !== -1) continue;` : ''}
@setAttribute(${node.var}, key, ${changes}[key]);
${activeKeys}[key] = true;
delete ${oldKeys}[key];
}
for (var key in ${oldKeys}) {
@removeAttribute(${node.var}, key);
}
`;
block.builders.update.addConditional(
condition,
updater
);
}
}
renderForComponent(block: Block, updates: string[]) {
const node = this.parent;
const { expression } = this;
const { indexes } = block.contextualise(expression);
const { dependencies, snippet } = this.metadata;
const value = snippet;
const hasChangeableIndex = Array.from(indexes).some(index => block.changeableIndexes.get(index));
const shouldCache = (
expression.type !== 'Identifier' ||
block.contexts.has(expression.name) ||
hasChangeableIndex
);
const last = shouldCache && block.getUniqueName(`${node.var}_spread_value`);
if (shouldCache) block.addVariable(last);
const init = shouldCache ? `${last} = ${value}` : value;
const activeKeys = block.getUniqueName(`${node.var}_spread_keys`);
block.addVariable(activeKeys, '{}');
const changes = block.getUniqueName(`${node.var}_spread_changes`);
const hasNamedAttributes = node.attributes.length;
const namedAttributes = block.getUniqueName(`${node.var}_attributes`);
if (hasNamedAttributes) {
block.builders.init.addBlock(deindent`
var ${namedAttributes} = [${node.attributes.map(attr => `'${attr.name}'`).join(', ')}];
`)
}
if (dependencies.length || hasChangeableIndex) {
const changedCheck = (
( block.hasOutroMethod ? `#outroing || ` : '' ) +
dependencies.map(dependency => `changed.${dependency}`).join(' || ')
);
const updateCachedValue = `${last} !== (${last} = ${value})`;
const condition = shouldCache ?
( dependencies.length ? `(${changedCheck}) && ${updateCachedValue}` : updateCachedValue ) :
changedCheck;
const oldKeys = block.getUniqueName(`${node.var}_spread_keys_old`);
updates.push(deindent`
if (${condition}) {
var ${oldKeys} = ${activeKeys};
${activeKeys} = {};
var ${changes} = ${shouldCache ? last : value};
for (var key in ${changes}) {
${hasNamedAttributes ? `if (${namedAttributes}.indexOf(key) !== -1) continue;` : ''}
${node.var}_changes[key] = ${changes}[key];
${activeKeys}[key] = true;
delete ${oldKeys}[key];
}
for (var key in ${oldKeys}) {
${node.var}_changes[key] = undefined;
}
}
`);
}
return value;
}
}

2
src/generators/nodes/index.ts
Unescape View File

@ -18,7 +18,6 @@ import PendingBlock from './PendingBlock';
import RawMustacheTag from './RawMustacheTag'; import RawMustacheTag from './RawMustacheTag';
import Ref from './Ref'; import Ref from './Ref';
import Slot from './Slot'; import Slot from './Slot';
import Spread from './Spread';
import Text from './Text'; import Text from './Text';
import ThenBlock from './ThenBlock'; import ThenBlock from './ThenBlock';
import Title from './Title'; import Title from './Title';
@ -45,7 +44,6 @@ const nodes: Record<string, any> = {
RawMustacheTag, RawMustacheTag,
Ref, Ref,
Slot, Slot,
Spread,
Text, Text,
ThenBlock, ThenBlock,
Title, Title,

2
src/validate/html/a11y.ts
Unescape View File

@ -27,6 +27,8 @@ export default function a11y(
const attributeMap = new Map(); const attributeMap = new Map();
node.attributes.forEach((attribute: Node) => { node.attributes.forEach((attribute: Node) => {
if (attribute.type === 'Spread') return;
const name = attribute.name.toLowerCase(); const name = attribute.name.toLowerCase();
// aria-props // aria-props

Write Preview
Loading…
Cancel
Save