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

tag_source -> tag, since it applies to deriveds as well

Browse Source
pull/16060/head
Rich Harris 4 months ago
parent 245283d8ff
commit d4ac394fac
6 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File

8
packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js
Unescape View File

@ -59,9 +59,7 @@ export function CallExpression(node, context) {
source_tag = `${constructor?.id?.name ?? '[class]'}.${property}`;
}
const call = b.call('$.state', value);
return dev
? b.call('$.tag_source', call, b.literal(/** @type {string} */ (source_tag)))
: call;
return dev ? b.call('$.tag', call, b.literal(/** @type {string} */ (source_tag))) : call;
}
case '$derived':
@ -88,9 +86,7 @@ export function CallExpression(node, context) {
source_tag = `${constructor?.id?.name ?? '[class]'}.${property}`;
}
const call = b.call('$.derived', fn);
return dev
? b.call('$.tag_source', call, b.literal(/** @type {string} */ (source_tag)))
: call;
return dev ? b.call('$.tag', call, b.literal(/** @type {string} */ (source_tag))) : call;
}
case '$state.snapshot':

2
packages/svelte/src/compiler/phases/3-transform/client/visitors/ClassBody.js
Unescape View File

@ -80,7 +80,7 @@ export function ClassBody(node, context) {
field.key,
dev
? b.call(
'$.tag_source',
'$.tag',
call,
b.literal(
`${/** @type {ClassDeclaration | ClassExpression} */ (context.path.at(-1))?.id?.name ?? '[class]'}.${field.key.name}`

22
packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js
Unescape View File

@ -148,7 +148,7 @@ export function VariableDeclaration(node, context) {
value = b.call('$.state', value);
}
if (dev && is_state) {
value = b.call('$.tag_source', value, b.literal(id.name));
value = b.call('$.tag', value, b.literal(id.name));
}
return value;
};
@ -173,7 +173,7 @@ export function VariableDeclaration(node, context) {
const call = b.call('$.derived', expression);
return b.declarator(
id,
dev ? b.call('$.tag_source', call, b.literal('[$state iterable]')) : call
dev ? b.call('$.tag', call, b.literal('[$state iterable]')) : call
);
}),
...paths.map((path) => {
@ -200,7 +200,7 @@ export function VariableDeclaration(node, context) {
declarations.push(
b.declarator(
declarator.id,
dev ? b.call('$.tag_source', call, b.literal(declarator.id.name)) : call
dev ? b.call('$.tag', call, b.literal(declarator.id.name)) : call
)
);
} else {
@ -216,10 +216,7 @@ export function VariableDeclaration(node, context) {
if (rune === '$derived') expression = b.thunk(expression);
const call = b.call('$.derived', expression);
declarations.push(
b.declarator(
id,
dev ? b.call('$.tag_source', call, b.literal('[$derived iterable]')) : call
)
b.declarator(id, dev ? b.call('$.tag', call, b.literal('[$derived iterable]')) : call)
);
}
@ -232,10 +229,7 @@ export function VariableDeclaration(node, context) {
const expression = /** @type {Expression} */ (context.visit(b.thunk(value)));
const call = b.call('$.derived', expression);
declarations.push(
b.declarator(
id,
dev ? b.call('$.tag_source', call, b.literal('[$derived iterable]')) : call
)
b.declarator(id, dev ? b.call('$.tag', call, b.literal('[$derived iterable]')) : call)
);
}
@ -246,11 +240,7 @@ export function VariableDeclaration(node, context) {
b.declarator(
path.node,
dev
? b.call(
'$.tag_source',
call,
b.literal(/** @type {Identifier} */ (path.node).name)
)
? b.call('$.tag', call, b.literal(/** @type {Identifier} */ (path.node).name))
: call
)
);

4
packages/svelte/src/internal/client/dev/tracing.js
Unescape View File

@ -46,7 +46,7 @@ function log_entry(signal, entry) {
const { trace_name: name } = signal;
const style = dirty
? 'color: CornflowerBlue; font-weight: bold'
: 'color: grey; font-weight: bold';
: 'color: grey; font-weight: normal';
// eslint-disable-next-line no-console
console.groupCollapsed(
typeof name === 'string' ? `%c${name} — ${type}` : `%c${type}`,
@ -185,7 +185,7 @@ export function get_stack(label) {
* @param {Value} source
* @param {string} name
*/
export function tag_source(source, name) {
export function tag(source, name) {
source.trace_name = name;
return source;
}

2
packages/svelte/src/internal/client/index.js
Unescape View File

@ -7,7 +7,7 @@ export { add_locations } from './dev/elements.js';
export { hmr } from './dev/hmr.js';
export { create_ownership_validator } from './dev/ownership.js';
export { check_target, legacy_api } from './dev/legacy.js';
export { trace, tag_source } from './dev/tracing.js';
export { trace, tag } from './dev/tracing.js';
export { inspect } from './dev/inspect.js';
export { validate_snippet_args } from './dev/validation.js';
export { await_block as await } from './dom/blocks/await.js';

23
packages/svelte/src/internal/client/proxy.js
Unescape View File

@ -18,7 +18,7 @@ import {
} from '#client/constants';
import { UNINITIALIZED } from '../../constants.js';
import * as e from './errors.js';
import { get_stack, tag_source } from './dev/tracing.js';
import { get_stack, tag } from './dev/tracing.js';
import { tracing_mode_flag } from '../flags/index.js';
/**
@ -55,7 +55,8 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) {
/** @type {Map<any, Source<any>>} */
var sources = new Map();
var is_proxied_array = is_array(value);
var version = tag_source(source(0), `${path} version`);
// var version = tag(source(0), `${path} version`);
var version = source(0);
var stack = DEV && tracing_mode_flag ? get_stack('CreatedAt') : null;
var reaction = active_reaction;
@ -89,7 +90,7 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) {
// We need to create the length source eagerly to ensure that
// mutations to the array are properly synced with our proxy
const length_source = source(/** @type {any[]} */ (value).length, stack);
sources.set('length', DEV ? tag_source(length_source, to_trace_name('length')) : length_source);
sources.set('length', DEV ? tag(length_source, to_trace_name('length')) : length_source);
}
return new Proxy(/** @type {any} */ (value), {
@ -111,7 +112,7 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) {
if (s === undefined) {
s = with_parent(() => source(descriptor.value, stack));
s = DEV && typeof prop === 'string' ? tag_source(s, to_trace_name(prop)) : s;
s = DEV && typeof prop === 'string' ? tag(s, to_trace_name(prop)) : s;
sources.set(prop, s);
} else {
set(
@ -129,7 +130,7 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) {
if (s === undefined) {
if (prop in target) {
const s = with_parent(() => source(UNINITIALIZED, stack));
sources.set(prop, DEV ? tag_source(s, to_trace_name(prop)) : s);
sources.set(prop, DEV ? tag(s, to_trace_name(prop)) : s);
update_version(version);
}
} else {
@ -166,7 +167,7 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) {
s = with_parent(() =>
source(proxy(exists ? target[prop] : UNINITIALIZED, to_trace_name(prop)), stack)
);
s = DEV ? tag_source(s, to_trace_name(prop)) : s;
s = DEV ? tag(s, to_trace_name(prop)) : s;
sources.set(prop, s);
}
@ -217,7 +218,7 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) {
s = with_parent(() =>
source(has ? proxy(target[prop], to_trace_name(prop)) : UNINITIALIZED, stack)
);
s = DEV ? tag_source(s, to_trace_name(prop)) : s;
s = DEV ? tag(s, to_trace_name(prop)) : s;
sources.set(prop, s);
}
@ -233,10 +234,10 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) {
set(target, prop, value, receiver) {
if (DEV && prop === PROXY_PATH_SYMBOL) {
path = value;
tag_source(version, `${path} version`);
// tag(version, `${path} version`);
// rename all child sources and child proxies
for (const [prop, source] of sources) {
tag_source(source, to_trace_name(prop));
tag(source, to_trace_name(prop));
if (typeof source.v === 'object' && source.v !== null && PROXY_PATH_SYMBOL in source.v) {
source.v[PROXY_PATH_SYMBOL] = to_trace_name(prop);
}
@ -256,7 +257,7 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) {
// else a later read of the property would result in a source being created with
// the value of the original item at that index.
other_s = with_parent(() => source(UNINITIALIZED, stack));
other_s = DEV ? tag_source(other_s, to_trace_name(i)) : other_s;
other_s = DEV ? tag(other_s, to_trace_name(i)) : other_s;
sources.set(i + '', other_s);
}
}
@ -269,7 +270,7 @@ export function proxy(value, path, path_preservation = PROXY_PRESERVE_PATH) {
if (s === undefined) {
if (!has || get_descriptor(target, prop)?.writable) {
s = with_parent(() => source(undefined, stack));
s = DEV ? tag_source(s, to_trace_name(prop)) : s;
s = DEV ? tag(s, to_trace_name(prop)) : s;
set(
s,
with_parent(() => proxy(value, to_trace_name(prop), PROXY_CHANGE_PATH))

Write Preview
Loading…
Cancel
Save