remove unnecessary TEMPLATE_EFFECT distinction

aa-coordination
Rich Harris 9 months ago
parent 5f61b08849
commit a405d477f7

@ -5,7 +5,6 @@ export const BLOCK_EFFECT = 1 << 4;
export const BRANCH_EFFECT = 1 << 5; export const BRANCH_EFFECT = 1 << 5;
export const ROOT_EFFECT = 1 << 6; export const ROOT_EFFECT = 1 << 6;
export const BOUNDARY_EFFECT = 1 << 7; export const BOUNDARY_EFFECT = 1 << 7;
export const TEMPLATE_EFFECT = 1 << 8;
export const UNOWNED = 1 << 9; export const UNOWNED = 1 << 9;
export const DISCONNECTED = 1 << 10; export const DISCONNECTED = 1 << 10;
export const CLEAN = 1 << 11; export const CLEAN = 1 << 11;

@ -9,8 +9,7 @@ import {
EFFECT, EFFECT,
MAYBE_DIRTY, MAYBE_DIRTY,
RENDER_EFFECT, RENDER_EFFECT,
ROOT_EFFECT, ROOT_EFFECT
TEMPLATE_EFFECT
} from '../constants.js'; } from '../constants.js';
/** /**
@ -38,8 +37,6 @@ export function log_effect_tree(effect) {
label = 'root'; label = 'root';
} else if ((flags & BOUNDARY_EFFECT) !== 0) { } else if ((flags & BOUNDARY_EFFECT) !== 0) {
label = 'boundary'; label = 'boundary';
} else if ((flags & TEMPLATE_EFFECT) !== 0) {
label = 'template';
} else if ((flags & BLOCK_EFFECT) !== 0) { } else if ((flags & BLOCK_EFFECT) !== 0) {
label = 'block'; label = 'block';
} else if ((flags & BRANCH_EFFECT) !== 0) { } else if ((flags & BRANCH_EFFECT) !== 0) {

@ -35,8 +35,7 @@ import {
HEAD_EFFECT, HEAD_EFFECT,
MAYBE_DIRTY, MAYBE_DIRTY,
EFFECT_HAS_DERIVED, EFFECT_HAS_DERIVED,
BOUNDARY_EFFECT, BOUNDARY_EFFECT
TEMPLATE_EFFECT
} from '../constants.js'; } from '../constants.js';
import { set } from './sources.js'; import { set } from './sources.js';
import * as e from '../errors.js'; import * as e from '../errors.js';
@ -388,7 +387,7 @@ function create_template_effect(fn, deriveds) {
}); });
} }
create_effect(RENDER_EFFECT | TEMPLATE_EFFECT, effect, true); create_effect(RENDER_EFFECT, effect, true);
} }
/** /**

@ -25,7 +25,6 @@ import {
DISCONNECTED, DISCONNECTED,
BOUNDARY_EFFECT, BOUNDARY_EFFECT,
REACTION_IS_UPDATING, REACTION_IS_UPDATING,
TEMPLATE_EFFECT,
BOUNDARY_SUSPENDED BOUNDARY_SUSPENDED
} from './constants.js'; } from './constants.js';
import { import {
@ -823,10 +822,7 @@ function process_effects(effect, collected_effects, boundary) {
if (!is_skippable_branch && (flags & INERT) === 0) { if (!is_skippable_branch && (flags & INERT) === 0) {
// Inside a boundary, defer everything except block/branch effects // Inside a boundary, defer everything except block/branch effects
var defer = var defer = boundary !== undefined && !is_branch && (flags & BLOCK_EFFECT) === 0;
boundary !== undefined &&
!is_branch &&
((flags & BLOCK_EFFECT) === 0 || (flags & TEMPLATE_EFFECT) !== 0);
if (defer) { if (defer) {
add_boundary_effect(/** @type {Effect} */ (boundary), current_effect); add_boundary_effect(/** @type {Effect} */ (boundary), current_effect);

Loading…
Cancel
Save