svelte 3.46.2 → 3.46.3

package/compiler.mjs

@@ -19038,6 +19038,10 @@ var compiler_errors = {
         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(' → ')}`
@@ -19180,7 +19184,7 @@ class Expression {
                         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();
@@ -19212,7 +19216,7 @@ class Expression {
                             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;
@@ -19273,7 +19277,7 @@ class Expression {
                         }
                         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)) {
@@ -19297,11 +19301,20 @@ class Expression {
                 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,
@@ -19566,7 +19579,7 @@ function mark_referenced(node, scope, component) {
             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);
                 }
             }
         }
@@ -19718,7 +19731,7 @@ class Action extends Node$1 {
         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;
@@ -19785,6 +19798,7 @@ class EachBlock extends AbstractBlock {
         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);
@@ -19797,6 +19811,9 @@ class EachBlock extends AbstractBlock {
             : null;
     }
 }
+function isEmptyNode(node) {
+    return node.type === 'Text' && node.data.trim() === '';
+}
 
 function string_literal(data) {
     return {
@@ -19979,7 +19996,7 @@ class Transition extends Node$1 {
         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)) {
@@ -19998,7 +20015,7 @@ class Animation extends Node$1 {
         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;
@@ -20941,7 +20958,7 @@ class InlineComponent extends Node$1 {
         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'
@@ -25947,7 +25964,7 @@ class Renderer {
         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}]`;
@@ -30611,26 +30628,32 @@ class Component {
             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,
@@ -30646,7 +30669,7 @@ class Component {
         }
         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);
         }
@@ -30671,7 +30694,7 @@ class Component {
         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) => {
@@ -30945,11 +30968,13 @@ class Component {
                 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) => {
@@ -30957,7 +30982,7 @@ class Component {
                 return this.error(node, compiler_errors.illegal_subscription);
             }
             else {
-                this.add_var({
+                this.add_var(node, {
                     name,
                     global: true,
                     hoistable: true
@@ -31013,7 +31038,7 @@ class Component {
             }
             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,
@@ -31033,7 +31058,7 @@ class Component {
                 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,
@@ -31042,7 +31067,7 @@ class Component {
                 });
             }
             else if (is_reserved_keyword(name)) {
-                this.add_var({
+                this.add_var(node, {
                     name,
                     injected: true
                 });
@@ -31051,13 +31076,13 @@ class Component {
                 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;
@@ -31065,7 +31090,7 @@ class Component {
                 }
             }
             else {
-                this.add_var({
+                this.add_var(node, {
                     name,
                     global: true,
                     hoistable: true
@@ -32162,7 +32187,7 @@ async function preprocess(source, preprocessor, options) {
     return result.to_processed();
 }
 
-const VERSION = '3.46.2';
+const VERSION = '3.46.3';
 
 export { VERSION, compile, parse$3 as parse, preprocess, walk };
 //# sourceMappingURL=compiler.mjs.map