svelte 3.43.1 → 3.44.2

package/compiler.mjs

@@ -6492,7 +6492,7 @@ const handlers = {
 	}),
 
 	EmptyStatement(node, state) {
-		return [];
+		return [c(';')];
 	},
 
 	ParenthesizedExpression(node, state) {
@@ -6598,10 +6598,11 @@ const handlers = {
 
 	ReturnStatement(node, state) {
 		if (node.argument) {
+			const contains_comment = node.argument.leadingComments && node.argument.leadingComments.some((/** @type import('../utils/comments.js').CommentWithLocation */ comment) => comment.has_trailing_newline);
 			return [
-				c('return '),
+				c(contains_comment ? 'return (' : 'return '),
 				...handle(node.argument, state),
-				c(';')
+				c(contains_comment ? ');' : ';')
 			];
 		} else {
 			return [c('return;')];
@@ -7955,7 +7956,7 @@ const inject = (raw, node, values, comments) => {
 
 	const { enter, leave } = get_comment_handlers(comments, raw);
 
-	walk(node, {
+	return walk(node, {
 		enter,
 
 		/** @param {any} node */
@@ -8057,7 +8058,6 @@ const inject = (raw, node, values, comments) => {
 				node.update = node.update === EMPTY ? null : node.update;
 			}
 
-			// @ts-ignore
 			leave(node);
 		}
 	});
@@ -8076,11 +8076,11 @@ function b(strings, ...values) {
 	const comments = [];
 
 	try {
-		const ast = /** @type {any} */ (
+		let ast = /** @type {any} */ (
 			parse(str, acorn_opts(comments, str))
 		);
 
-		inject(str, ast, values, comments);
+		ast = inject(str, ast, values, comments);
 
 		return ast.body;
 	} catch (err) {
@@ -8101,7 +8101,7 @@ function x(strings, ...values) {
 	const comments = [];
 
 	try {
-		const expression =
+		let expression =
 			/** @type {Expression & { start: Number, end: number }} */ (
 				parseExpressionAt(str, 0, acorn_opts(comments, str))
 			);
@@ -8110,7 +8110,9 @@ function x(strings, ...values) {
 			throw new Error(`Unexpected token '${match[0]}'`);
 		}
 
-		inject(str, expression, values, comments);
+		expression = /** @type {Expression & { start: Number, end: number }} */ (
+			inject(str, expression, values, comments)
+		);
 
 		return expression;
 	} catch (err) {
@@ -8131,11 +8133,11 @@ function p(strings, ...values) {
 	const comments = [];
 
 	try {
-		const expression = /** @type {any} */ (
+		let expression = /** @type {any} */ (
 			parseExpressionAt(str, 0, acorn_opts(comments, str))
 		);
 
-		inject(str, expression, values, comments);
+		expression = inject(str, expression, values, comments);
 
 		return expression.properties[0];
 	} catch (err) {
@@ -8204,6 +8206,8 @@ const parse_expression_at = (source, index) => parseExpressionAt$1(source, index
 });
 
 const whitespace = /[ \t\r\n]/;
+const start_whitespace = /^[ \t\r\n]*/;
+const end_whitespace = /[ \t\r\n]*$/;
 const dimensions = /^(?:offset|client)(?:Width|Height)$/;
 
 function list(items, conjunction = 'or') {
@@ -16390,6 +16394,7 @@ const globals = new Set([
     'undefined',
     'URIError',
     'URL',
+    'URLSearchParams',
     'window'
 ]);
 const reserved = new Set([
@@ -17218,16 +17223,10 @@ function read_context(parser) {
 }
 
 function trim_start(str) {
-    let i = 0;
-    while (whitespace.test(str[i]))
-        i += 1;
-    return str.slice(i);
+    return str.replace(start_whitespace, '');
 }
 function trim_end(str) {
-    let i = str.length;
-    while (whitespace.test(str[i - 1]))
-        i -= 1;
-    return str.slice(0, i);
+    return str.replace(end_whitespace, '');
 }
 
 function to_string(node) {
@@ -24924,6 +24923,12 @@ function parse_attached_sourcemap(processed, tag_name) {
     });
 }
 
+function check_enable_sourcemap(enable_sourcemap, namespace) {
+    return typeof enable_sourcemap === 'boolean'
+        ? enable_sourcemap
+        : enable_sourcemap[namespace];
+}
+
 function dom(component, options) {
     const { name } = component;
     const renderer = new Renderer(component, options);
@@ -24938,8 +24943,14 @@ function dom(component, options) {
         body.push(b `const ${renderer.file_var} = ${file};`);
     }
     const css = component.stylesheet.render(options.filename, !options.customElement);
-    css.map = apply_preprocessor_sourcemap(options.filename, css.map, options.sourcemap);
-    const styles = component.stylesheet.has_styles && options.dev
+    const css_sourcemap_enabled = check_enable_sourcemap(options.enableSourcemap, 'css');
+    if (css_sourcemap_enabled) {
+        css.map = apply_preprocessor_sourcemap(options.filename, css.map, options.sourcemap);
+    }
+    else {
+        css.map = null;
+    }
+    const styles = css_sourcemap_enabled && component.stylesheet.has_styles && options.dev
         ? `${css.code}\n/*# sourceMappingURL=${css.map.toUrl()} */`
         : css.code;
     const add_css = component.get_unique_name('add_css');
@@ -25345,7 +25356,7 @@ function dom(component, options) {
 				constructor(options) {
 					super();
 
-					${css.code && b `this.shadowRoot.innerHTML = \`<style>${css.code.replace(/\\/g, '\\\\')}${options.dev ? `\n/*# sourceMappingURL=${css.map.toUrl()} */` : ''}</style>\`;`}
+					${css.code && b `this.shadowRoot.innerHTML = \`<style>${css.code.replace(/\\/g, '\\\\')}${css_sourcemap_enabled && options.dev ? `\n/*# sourceMappingURL=${css.map.toUrl()} */` : ''}</style>\`;`}
 
 					@init(this, { target: this.shadowRoot, props: ${init_props}, customElement: true }, ${definition}, ${has_create_fragment ? 'create_fragment' : 'null'}, ${not_equal}, ${prop_indexes}, null, ${dirty});
 
@@ -27747,11 +27758,12 @@ function ssr(component, options) {
         css.code && b `$$result.css.add(#css);`,
         main
     ].filter(Boolean);
+    const css_sourcemap_enabled = check_enable_sourcemap(options.enableSourcemap, 'css');
     const js = b `
 		${css.code ? b `
 		const #css = {
 			code: "${css.code}",
-			map: ${css.map ? string_literal(css.map.toString()) : 'null'}
+			map: ${css_sourcemap_enabled && css.map ? string_literal(css.map.toString()) : 'null'}
 		};` : null}
 
 		${component.extract_javascript(component.ast.module)}
@@ -27836,12 +27848,15 @@ function esm(program, name, banner, sveltePath, internal_path, helpers, globals,
     };
     const internal_globals = get_internal_globals(globals, helpers);
     // edit user imports
-    imports.forEach(node => {
-        node.source.value = edit_source(node.source.value, sveltePath);
-    });
-    exports_from.forEach(node => {
-        node.source.value = edit_source(node.source.value, sveltePath);
-    });
+    function rewrite_import(node) {
+        const value = edit_source(node.source.value, sveltePath);
+        if (node.source.value !== value) {
+            node.source.value = value;
+            node.source.raw = null;
+        }
+    }
+    imports.forEach(rewrite_import);
+    exports_from.forEach(rewrite_import);
     const exports = module_exports.length > 0 && {
         type: 'ExportNamedDeclaration',
         specifiers: module_exports.map(x => ({
@@ -30120,7 +30135,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.43.1'}`;
+            const banner = `${this.file ? `${this.file} ` : ''}generated by Svelte v${'3.44.2'}`;
             const program = { type: 'Program', body: result.js };
             walk(program, {
                 enter: (node, parent, key) => {
@@ -30184,17 +30199,24 @@ class Component {
             css = compile_options.customElement
                 ? { code: null, map: null }
                 : result.css;
-            const sourcemap_source_filename = get_sourcemap_source_filename(compile_options);
-            js = print(program, {
-                sourceMapSource: sourcemap_source_filename
-            });
-            js.map.sources = [
-                sourcemap_source_filename
-            ];
-            js.map.sourcesContent = [
-                this.source
-            ];
-            js.map = apply_preprocessor_sourcemap(sourcemap_source_filename, js.map, compile_options.sourcemap);
+            const js_sourcemap_enabled = check_enable_sourcemap(compile_options.enableSourcemap, 'js');
+            if (!js_sourcemap_enabled) {
+                js = print(program);
+                js.map = null;
+            }
+            else {
+                const sourcemap_source_filename = get_sourcemap_source_filename(compile_options);
+                js = print(program, {
+                    sourceMapSource: sourcemap_source_filename
+                });
+                js.map.sources = [
+                    sourcemap_source_filename
+                ];
+                js.map.sourcesContent = [
+                    this.source
+                ];
+                js.map = apply_preprocessor_sourcemap(sourcemap_source_filename, js.map, compile_options.sourcemap);
+            }
         }
         return {
             js,
@@ -31242,6 +31264,7 @@ const valid_options = [
     'name',
     'filename',
     'sourcemap',
+    'enableSourcemap',
     'generate',
     'errorMode',
     'varsReport',
@@ -31305,7 +31328,7 @@ function validate_options(options, warnings) {
     }
 }
 function compile(source, options = {}) {
-    options = Object.assign({ generate: 'dom', dev: false }, options);
+    options = Object.assign({ generate: 'dom', dev: false, enableSourcemap: true }, options);
     const stats = new Stats();
     const warnings = [];
     validate_options(options, warnings);
@@ -31559,10 +31582,10 @@ async function process_tag(tag_name, preprocessor, source) {
     const { string, map } = await replace_in_code(tag_regex, process_single_tag, source);
     return { string, map, dependencies };
 }
-async function process_markup(filename, process, source) {
+async function process_markup(process, source) {
     const processed = await process({
         content: source.source,
-        filename
+        filename: source.filename
     });
     if (processed) {
         return {
@@ -31581,7 +31604,6 @@ async function process_markup(filename, process, source) {
     }
 }
 async function preprocess(source, preprocessor, options) {
-    // @ts-ignore todo: doublecheck
     const filename = (options && options.filename) || preprocessor.filename; // legacy
     const preprocessors = preprocessor ? (Array.isArray(preprocessor) ? preprocessor : [preprocessor]) : [];
     const markup = preprocessors.map(p => p.markup).filter(Boolean);
@@ -31591,7 +31613,7 @@ async function preprocess(source, preprocessor, options) {
     // TODO keep track: what preprocessor generated what sourcemap?
     // to make debugging easier = detect low-resolution sourcemaps in fn combine_mappings
     for (const process of markup) {
-        result.update_source(await process_markup(filename, process, result));
+        result.update_source(await process_markup(process, result));
     }
     for (const process of script) {
         result.update_source(await process_tag('script', process, result));
@@ -31602,7 +31624,7 @@ async function preprocess(source, preprocessor, options) {
     return result.to_processed();
 }
 
-const VERSION = '3.43.1';
+const VERSION = '3.44.2';
 
 export { VERSION, compile, parse$3 as parse, preprocess, walk };
 //# sourceMappingURL=compiler.mjs.map