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

rename pattern variables

Browse Source
pull/7716/head
Ivan Hofer 4 years ago committed by tanhauhau
parent f80e85f79f
commit 595e6a773e
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

4
src/compiler/compile/nodes/Binding.ts
Unescape View File

@ -3,7 +3,7 @@ import get_object from '../utils/get_object';
import Expression from './shared/Expression'; import Expression from './shared/Expression';
import Component from '../Component'; import Component from '../Component';
import TemplateScope from './shared/TemplateScope'; import TemplateScope from './shared/TemplateScope';
import {dimensions} from '../../utils/patterns'; import { regex_dimensions } from '../../utils/patterns';
import { Node as ESTreeNode } from 'estree'; import { Node as ESTreeNode } from 'estree';
import { TemplateNode } from '../../interfaces'; import { TemplateNode } from '../../interfaces';
import Element from './Element'; import Element from './Element';
@ -88,7 +88,7 @@ export default class Binding extends Node {
const type = parent.get_static_attribute_value('type'); const type = parent.get_static_attribute_value('type');
this.is_readonly = this.is_readonly =
dimensions.test(this.name) || regex_dimensions.test(this.name) ||
(isElement(parent) && (isElement(parent) &&
((parent.is_media_node() && read_only_media_attributes.has(this.name)) || ((parent.is_media_node() && read_only_media_attributes.has(this.name)) ||
(parent.name === 'input' && type === 'file')) /* TODO others? */); (parent.name === 'input' && type === 'file')) /* TODO others? */);

6
src/compiler/compile/nodes/Element.ts
Unescape View File

@ -11,7 +11,7 @@ import StyleDirective from './StyleDirective';
import Text from './Text'; import Text from './Text';
import { namespaces } from '../../utils/namespaces'; import { namespaces } from '../../utils/namespaces';
import map_children from './shared/map_children'; import map_children from './shared/map_children';
import { dimensions, start_newline } from '../../utils/patterns'; import { regex_dimensions, regex_start_newline } from '../../utils/patterns';
import fuzzymatch from '../../utils/fuzzymatch'; import fuzzymatch from '../../utils/fuzzymatch';
import list from '../../utils/list'; import list from '../../utils/list';
import Let from './Let'; import Let from './Let';
@ -258,7 +258,7 @@ export default class Element extends Node {
// places if there's another newline afterwards. // places if there's another newline afterwards.
// see https://html.spec.whatwg.org/multipage/syntax.html#element-restrictions // see https://html.spec.whatwg.org/multipage/syntax.html#element-restrictions
// see https://html.spec.whatwg.org/multipage/grouping-content.html#the-pre-element // see https://html.spec.whatwg.org/multipage/grouping-content.html#the-pre-element
first.data = first.data.replace(start_newline, ''); first.data = first.data.replace(regex_start_newline, '');
} }
} }
@ -866,7 +866,7 @@ export default class Element extends Node {
if (this.name !== 'video') { if (this.name !== 'video') {
return component.error(binding, compiler_errors.invalid_binding_element_with('<video>', name)); return component.error(binding, compiler_errors.invalid_binding_element_with('<video>', name));
} }
} else if (dimensions.test(name)) { } else if (regex_dimensions.test(name)) {
if (this.name === 'svg' && (name === 'offsetWidth' || name === 'offsetHeight')) { if (this.name === 'svg' && (name === 'offsetWidth' || name === 'offsetHeight')) {
return component.error(binding, compiler_errors.invalid_binding_on(binding.name, `<svg>. Use '${name.replace('offset', 'client')}' instead`)); return component.error(binding, compiler_errors.invalid_binding_on(binding.name, `<svg>. Use '${name.replace('offset', 'client')}' instead`));
} else if (is_svg(this.name)) { } else if (is_svg(this.name)) {

8
src/compiler/compile/render_dom/wrappers/Element/index.ts
Unescape View File

@ -12,7 +12,7 @@ import { namespaces } from '../../../../utils/namespaces';
import AttributeWrapper from './Attribute'; import AttributeWrapper from './Attribute';
import StyleAttributeWrapper from './StyleAttribute'; import StyleAttributeWrapper from './StyleAttribute';
import SpreadAttributeWrapper from './SpreadAttribute'; import SpreadAttributeWrapper from './SpreadAttribute';
import { dimensions, start_newline } from '../../../../utils/patterns'; import { regex_dimensions, regex_start_newline } from '../../../../utils/patterns';
import Binding from './Binding'; import Binding from './Binding';
import add_to_set from '../../../utils/add_to_set'; import add_to_set from '../../../utils/add_to_set';
import { add_event_handler } from '../shared/add_event_handlers'; import { add_event_handler } from '../shared/add_event_handlers';
@ -67,7 +67,7 @@ const events = [
{ {
event_names: ['elementresize'], event_names: ['elementresize'],
filter: (_node: Element, name: string) => filter: (_node: Element, name: string) =>
dimensions.test(name) regex_dimensions.test(name)
}, },
// media events // media events
@ -1203,7 +1203,7 @@ function to_html(wrappers: Array<ElementWrapper | TextWrapper | MustacheTagWrapp
// Two or more leading newlines are required to restore the leading newline immediately after `<pre>`. // Two or more leading newlines are required to restore the leading newline immediately after `<pre>`.
// see https://html.spec.whatwg.org/multipage/grouping-content.html#the-pre-element // see https://html.spec.whatwg.org/multipage/grouping-content.html#the-pre-element
const first = wrapper.fragment.nodes[0]; const first = wrapper.fragment.nodes[0];
if (first && first.node.type === 'Text' && start_newline.test(first.node.data)) { if (first && first.node.type === 'Text' && regex_start_newline.test(first.node.data)) {
state.quasi.value.raw += '\n'; state.quasi.value.raw += '\n';
} }
} }
@ -1215,7 +1215,7 @@ function to_html(wrappers: Array<ElementWrapper | TextWrapper | MustacheTagWrapp
// Two or more leading newlines are required to restore the leading newline immediately after `<textarea>`. // Two or more leading newlines are required to restore the leading newline immediately after `<textarea>`.
// see https://html.spec.whatwg.org/multipage/syntax.html#element-restrictions // see https://html.spec.whatwg.org/multipage/syntax.html#element-restrictions
const first = value_attribute.node.chunks[0]; const first = value_attribute.node.chunks[0];
if (first && first.type === 'Text' && start_newline.test(first.data)) { if (first && first.type === 'Text' && regex_start_newline.test(first.data)) {
state.quasi.value.raw += '\n'; state.quasi.value.raw += '\n';
} }
to_html_for_attr_value(value_attribute, block, literal, state); to_html_for_attr_value(value_attribute, block, literal, state);

6
src/compiler/compile/render_ssr/handlers/Element.ts
Unescape View File

@ -8,7 +8,7 @@ import Expression from '../../nodes/shared/Expression';
import remove_whitespace_children from './utils/remove_whitespace_children'; import remove_whitespace_children from './utils/remove_whitespace_children';
import fix_attribute_casing from '../../render_dom/wrappers/Element/fix_attribute_casing'; import fix_attribute_casing from '../../render_dom/wrappers/Element/fix_attribute_casing';
import { namespaces } from '../../../utils/namespaces'; import { namespaces } from '../../../utils/namespaces';
import { start_newline } from '../../../utils/patterns'; import { regex_start_newline } from '../../../utils/patterns';
import { Node, Expression as ESExpression } from 'estree'; import { Node, Expression as ESExpression } from 'estree';
export default function (node: Element, renderer: Renderer, options: RenderOptions) { export default function (node: Element, renderer: Renderer, options: RenderOptions) {
@ -173,7 +173,7 @@ export default function (node: Element, renderer: Renderer, options: RenderOptio
const value_attribute = node.attributes.find(({ name }) => name === 'value'); const value_attribute = node.attributes.find(({ name }) => name === 'value');
if (value_attribute) { if (value_attribute) {
const first = value_attribute.chunks[0]; const first = value_attribute.chunks[0];
if (first && first.type === 'Text' && start_newline.test(first.data)) { if (first && first.type === 'Text' && regex_start_newline.test(first.data)) {
renderer.add_string('\n'); renderer.add_string('\n');
} }
} }
@ -188,7 +188,7 @@ export default function (node: Element, renderer: Renderer, options: RenderOptio
// see https://html.spec.whatwg.org/multipage/grouping-content.html#the-pre-element // see https://html.spec.whatwg.org/multipage/grouping-content.html#the-pre-element
// see https://html.spec.whatwg.org/multipage/syntax.html#element-restrictions // see https://html.spec.whatwg.org/multipage/syntax.html#element-restrictions
const first = children[0]; const first = children[0];
if (first && first.type === 'Text' && start_newline.test(first.data)) { if (first && first.type === 'Text' && regex_start_newline.test(first.data)) {
renderer.add_string('\n'); renderer.add_string('\n');
} }
} }

10
src/compiler/parse/index.ts
Unescape View File

@ -1,6 +1,6 @@
import { isIdentifierStart, isIdentifierChar } from 'acorn'; import { isIdentifierStart, isIdentifierChar } from 'acorn';
import fragment from './state/fragment'; import fragment from './state/fragment';
import { whitespace } from '../utils/patterns'; import { regex_whitespace } from '../utils/patterns';
import { reserved } from '../utils/names'; import { reserved } from '../utils/names';
import full_char_code_at from '../utils/full_char_code_at'; import full_char_code_at from '../utils/full_char_code_at';
import { TemplateNode, Ast, ParserOptions, Fragment, Style, Script } from '../interfaces'; import { TemplateNode, Ast, ParserOptions, Fragment, Style, Script } from '../interfaces';
@ -76,10 +76,10 @@ export class Parser {
if (this.html.children.length) { if (this.html.children.length) {
let start = this.html.children[0].start; let start = this.html.children[0].start;
while (whitespace.test(template[start])) start += 1; while (regex_whitespace.test(template[start])) start += 1;
let end = this.html.children[this.html.children.length - 1].end; let end = this.html.children[this.html.children.length - 1].end;
while (whitespace.test(template[end - 1])) end -= 1; while (regex_whitespace.test(template[end - 1])) end -= 1;
this.html.start = start; this.html.start = start;
this.html.end = end; this.html.end = end;
@ -140,7 +140,7 @@ export class Parser {
allow_whitespace() { allow_whitespace() {
while ( while (
this.index < this.template.length && this.index < this.template.length &&
whitespace.test(this.template[this.index]) regex_whitespace.test(this.template[this.index])
) { ) {
this.index++; this.index++;
} }
@ -202,7 +202,7 @@ export class Parser {
} }
require_whitespace() { require_whitespace() {
if (!whitespace.test(this.template[this.index])) { if (!regex_whitespace.test(this.template[this.index])) {
this.error({ this.error({
code: 'missing-whitespace', code: 'missing-whitespace',
message: 'Expected whitespace' message: 'Expected whitespace'

4
src/compiler/parse/read/expression.ts
Unescape View File

@ -1,7 +1,7 @@
import { parse_expression_at } from '../acorn'; import { parse_expression_at } from '../acorn';
import { Parser } from '../index'; import { Parser } from '../index';
import { Node } from 'estree'; import { Node } from 'estree';
import { whitespace } from '../../utils/patterns'; import { regex_whitespace } from '../../utils/patterns';
import parser_errors from '../errors'; import parser_errors from '../errors';
export default function read_expression(parser: Parser): Node { export default function read_expression(parser: Parser): Node {
@ -20,7 +20,7 @@ export default function read_expression(parser: Parser): Node {
if (char === ')') { if (char === ')') {
num_parens -= 1; num_parens -= 1;
} else if (!whitespace.test(char)) { } else if (!regex_whitespace.test(char)) {
parser.error(parser_errors.unexpected_token(')'), index); parser.error(parser_errors.unexpected_token(')'), index);
} }

6
src/compiler/parse/state/mustache.ts
Unescape View File

@ -1,7 +1,7 @@
import read_context from '../read/context'; import read_context from '../read/context';
import read_expression from '../read/expression'; import read_expression from '../read/expression';
import { closing_tag_omitted } from '../utils/html'; import { closing_tag_omitted } from '../utils/html';
import { whitespace } from '../../utils/patterns'; import { regex_whitespace } from '../../utils/patterns';
import { trim_start, trim_end } from '../../utils/trim'; import { trim_start, trim_end } from '../../utils/trim';
import { to_string } from '../utils/node'; import { to_string } from '../utils/node';
import { Parser } from '../index'; import { Parser } from '../index';
@ -89,8 +89,8 @@ export default function mustache(parser: Parser) {
// strip leading/trailing whitespace as necessary // strip leading/trailing whitespace as necessary
const char_before = parser.template[block.start - 1]; const char_before = parser.template[block.start - 1];
const char_after = parser.template[parser.index]; const char_after = parser.template[parser.index];
const trim_before = !char_before || whitespace.test(char_before); const trim_before = !char_before || regex_whitespace.test(char_before);
const trim_after = !char_after || whitespace.test(char_after); const trim_after = !char_after || regex_whitespace.test(char_after);
trim_whitespace(block, trim_before, trim_after); trim_whitespace(block, trim_before, trim_after);

10
src/compiler/utils/patterns.ts
Unescape View File

@ -1,6 +1,6 @@
export const whitespace = /[ \t\r\n]/; export const regex_whitespace = /[ \t\r\n]/;
export const start_whitespace = /^[ \t\r\n]*/; export const regex_start_whitespace = /^[ \t\r\n]*/;
export const end_whitespace = /[ \t\r\n]*$/; export const regex_end_whitespace = /[ \t\r\n]*$/;
export const start_newline = /^\r?\n/; export const regex_start_newline = /^\r?\n/;
export const dimensions = /^(?:offset|client)(?:Width|Height)$/; export const regex_dimensions = /^(?:offset|client)(?:Width|Height)$/;

6
src/compiler/utils/trim.ts
Unescape View File

@ -1,9 +1,9 @@
import { start_whitespace, end_whitespace } from './patterns'; import { regex_start_whitespace, regex_end_whitespace } from './patterns';
export function trim_start(str: string) { export function trim_start(str: string) {
return str.replace(start_whitespace, ''); return str.replace(regex_start_whitespace, '');
} }
export function trim_end(str: string) { export function trim_end(str: string) {
return str.replace(end_whitespace, ''); return str.replace(regex_end_whitespace, '');
} }

Write Preview
Loading…
Cancel
Save