svelte 3.46.2 → 3.46.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Svelte changelog
 
+## 3.46.3
+
+* Ignore whitespace in `{#each}` blocks when containing elements with `animate:` ([#5477](https://github.com/sveltejs/svelte/pull/5477))
+* Throw compiler error when variable in `context="instance"` collides with import in `context="module"` ([#7090](https://github.com/sveltejs/svelte/issues/7090))
+* Fix compiler crash when `{@const}` contains arrow functions ([#7134](https://github.com/sveltejs/svelte/issues/7134))
+
 ## 3.46.2
 
 * Export `FlipParams` interface from `svelte/animate` ([#7103](https://github.com/sveltejs/svelte/issues/7103))

package/compiler.js

@@ -19044,6 +19044,10 @@
 	        code: 'illegal-global',
 	        message: `${name} is an illegal variable name`
 	    }),
+	    illegal_variable_declaration: {
+	        code: 'illegal-variable-declaration',
+	        message: 'Cannot declare same variable name which is imported inside <script context="module">'
+	    },
 	    cyclical_reactive_declaration: (cycle) => ({
 	        code: 'cyclical-reactive-declaration',
 	        message: `Cyclical dependency detected: ${cycle.join(' → ')}`
@@ -19186,7 +19190,7 @@
 	                        if (!lazy) {
 	                            dependencies.add(name);
 	                        }
-	                        component.add_reference(name);
+	                        component.add_reference(node, name);
 	                        component.warn_if_undefined(name, nodes[0], template_scope);
 	                    }
 	                    this.skip();
@@ -19218,7 +19222,7 @@
 	                            each_block.has_binding = true;
 	                        }
 	                        else {
-	                            component.add_reference(name);
+	                            component.add_reference(node, name);
 	                            const variable = component.var_lookup.get(name);
 	                            if (variable)
 	                                variable[deep ? 'mutated' : 'reassigned'] = true;
@@ -19279,7 +19283,7 @@
 	                        }
 	                        else {
 	                            dependencies.add(name);
-	                            component.add_reference(name); // TODO is this redundant/misplaced?
+	                            component.add_reference(node, name); // TODO is this redundant/misplaced?
 	                        }
 	                    }
 	                    else if (is_contextual(component, template_scope, name)) {
@@ -19303,11 +19307,20 @@
 	                if (node === function_expression) {
 	                    const id = component.get_unique_name(sanitize(get_function_name(node, owner)));
 	                    const declaration = b `const ${id} = ${node}`;
-	                    if (dependencies.size === 0 && contextual_dependencies.size === 0) {
+	                    if (owner.type === 'ConstTag') {
+	                        walk(node, {
+	                            enter(node) {
+	                                if (node.type === 'Identifier') {
+	                                    this.replace(block.renderer.reference(node, ctx));
+	                                }
+	                            }
+	                        });
+	                    }
+	                    else if (dependencies.size === 0 && contextual_dependencies.size === 0) {
 	                        // we can hoist this out of the component completely
 	                        component.fully_hoisted.push(declaration);
 	                        this.replace(id);
-	                        component.add_var({
+	                        component.add_var(node, {
 	                            name: id.name,
 	                            internal: true,
 	                            hoistable: true,
@@ -19572,7 +19585,7 @@
 	            if (is_reference(node, parent)) {
 	                const { name } = flatten_reference(node);
 	                if (!scope.is_let(name) && !scope.names.has(name)) {
-	                    component.add_reference(name);
+	                    component.add_reference(node, name);
 	                }
 	            }
 	        }
@@ -19724,7 +19737,7 @@
 	        const object = info.name.split('.')[0];
 	        component.warn_if_undefined(object, info, scope);
 	        this.name = info.name;
-	        component.add_reference(object);
+	        component.add_reference(this, object);
 	        this.expression = info.expression
 	            ? new Expression(component, this, scope, info.expression)
 	            : null;
@@ -19791,6 +19804,7 @@
 	        this.has_animation = false;
 	        ([this.const_tags, this.children] = get_const_tags(info.children, component, this, this));
 	        if (this.has_animation) {
+	            this.children = this.children.filter(child => !isEmptyNode(child));
 	            if (this.children.length !== 1) {
 	                const child = this.children.find(child => !!child.animation);
 	                component.error(child.animation, compiler_errors.invalid_animation_sole);
@@ -19803,6 +19817,9 @@
 	            : null;
 	    }
 	}
+	function isEmptyNode(node) {
+	    return node.type === 'Text' && node.data.trim() === '';
+	}
 
 	function string_literal(data) {
 	    return {
@@ -19985,7 +20002,7 @@
 	        super(component, parent, scope, info);
 	        component.warn_if_undefined(info.name, info, scope);
 	        this.name = info.name;
-	        component.add_reference(info.name.split('.')[0]);
+	        component.add_reference(this, info.name.split('.')[0]);
 	        this.directive = info.intro && info.outro ? 'transition' : info.intro ? 'in' : 'out';
 	        this.is_local = info.modifiers.includes('local');
 	        if ((info.intro && parent.intro) || (info.outro && parent.outro)) {
@@ -20004,7 +20021,7 @@
 	        super(component, parent, scope, info);
 	        component.warn_if_undefined(info.name, info, scope);
 	        this.name = info.name;
-	        component.add_reference(info.name.split('.')[0]);
+	        component.add_reference(this, info.name.split('.')[0]);
 	        if (parent.animation) {
 	            component.error(this, compiler_errors.duplicate_animation);
 	            return;
@@ -20947,7 +20964,7 @@
 	        if (info.name !== 'svelte:component' && info.name !== 'svelte:self') {
 	            const name = info.name.split('.')[0]; // accommodate namespaces
 	            component.warn_if_undefined(name, info, scope);
-	            component.add_reference(name);
+	            component.add_reference(this, name);
 	        }
 	        this.name = info.name;
 	        this.expression = this.name === 'svelte:component'
@@ -25953,7 +25970,7 @@
 	        const member = this.context_lookup.get(name);
 	        // TODO is this correct?
 	        if (this.component.var_lookup.get(name)) {
-	            this.component.add_reference(name);
+	            this.component.add_reference(node, name);
 	        }
 	        if (member !== undefined) {
 	            const replacement = x `/*${member.name}*/ ${ctx}[${member.index}]`;
@@ -30617,26 +30634,32 @@
 	            this.stylesheet.reify();
 	        this.stylesheet.warn_on_unused_selectors(this);
 	    }
-	    add_var(variable, add_to_lookup = true) {
+	    add_var(node, variable, add_to_lookup = true) {
 	        this.vars.push(variable);
 	        if (add_to_lookup) {
+	            if (this.var_lookup.has(variable.name)) {
+	                const exists_var = this.var_lookup.get(variable.name);
+	                if (exists_var.module && exists_var.imported) {
+	                    this.error(node, compiler_errors.illegal_variable_declaration);
+	                }
+	            }
 	            this.var_lookup.set(variable.name, variable);
 	        }
 	    }
-	    add_reference(name) {
+	    add_reference(node, name) {
 	        const variable = this.var_lookup.get(name);
 	        if (variable) {
 	            variable.referenced = true;
 	        }
 	        else if (is_reserved_keyword(name)) {
-	            this.add_var({
+	            this.add_var(node, {
 	                name,
 	                injected: true,
 	                referenced: true
 	            });
 	        }
 	        else if (name[0] === '$') {
-	            this.add_var({
+	            this.add_var(node, {
 	                name,
 	                injected: true,
 	                referenced: true,
@@ -30652,7 +30675,7 @@
 	        }
 	        else {
 	            if (this.compile_options.varsReport === 'full') {
-	                this.add_var({ name, referenced: true }, false);
+	                this.add_var(node, { name, referenced: true }, false);
 	            }
 	            this.used_names.add(name);
 	        }
@@ -30677,7 +30700,7 @@
 	        if (result) {
 	            const { compile_options, name } = this;
 	            const { format = 'esm' } = compile_options;
-	            const banner = `${this.file ? `${this.file} ` : ''}generated by Svelte v${'3.46.2'}`;
+	            const banner = `${this.file ? `${this.file} ` : ''}generated by Svelte v${'3.46.3'}`;
 	            const program = { type: 'Program', body: result.js };
 	            walk(program, {
 	                enter: (node, parent, key) => {
@@ -30951,11 +30974,13 @@
 	                return this.error(node, compiler_errors.illegal_declaration);
 	            }
 	            const writable = node.type === 'VariableDeclaration' && (node.kind === 'var' || node.kind === 'let');
-	            this.add_var({
+	            const imported = node.type.startsWith('Import');
+	            this.add_var(node, {
 	                name,
 	                module: true,
 	                hoistable: true,
-	                writable
+	                writable,
+	                imported
 	            });
 	        });
 	        globals.forEach((node, name) => {
@@ -30963,7 +30988,7 @@
 	                return this.error(node, compiler_errors.illegal_subscription);
 	            }
 	            else {
-	                this.add_var({
+	                this.add_var(node, {
 	                    name,
 	                    global: true,
 	                    hoistable: true
@@ -31019,7 +31044,7 @@
 	            }
 	            const writable = node.type === 'VariableDeclaration' && (node.kind === 'var' || node.kind === 'let');
 	            const imported = node.type.startsWith('Import');
-	            this.add_var({
+	            this.add_var(node, {
 	                name,
 	                initialised: instance_scope.initialised_declarations.has(name),
 	                writable,
@@ -31039,7 +31064,7 @@
 	                return;
 	            const node = globals.get(name);
 	            if (this.injected_reactive_declaration_vars.has(name)) {
-	                this.add_var({
+	                this.add_var(node, {
 	                    name,
 	                    injected: true,
 	                    writable: true,
@@ -31048,7 +31073,7 @@
 	                });
 	            }
 	            else if (is_reserved_keyword(name)) {
-	                this.add_var({
+	                this.add_var(node, {
 	                    name,
 	                    injected: true
 	                });
@@ -31057,13 +31082,13 @@
 	                if (name === '$' || name[1] === '$') {
 	                    return this.error(node, compiler_errors.illegal_global(name));
 	                }
-	                this.add_var({
+	                this.add_var(node, {
 	                    name,
 	                    injected: true,
 	                    mutated: true,
 	                    writable: true
 	                });
-	                this.add_reference(name.slice(1));
+	                this.add_reference(node, name.slice(1));
 	                const variable = this.var_lookup.get(name.slice(1));
 	                if (variable) {
 	                    variable.subscribable = true;
@@ -31071,7 +31096,7 @@
 	                }
 	            }
 	            else {
-	                this.add_var({
+	                this.add_var(node, {
 	                    name,
 	                    global: true,
 	                    hoistable: true
@@ -32168,7 +32193,7 @@
 	    return result.to_processed();
 	}
 
-	const VERSION = '3.46.2';
+	const VERSION = '3.46.3';
 
 	exports.VERSION = VERSION;
 	exports.compile = compile;