svelte2tsx 0.5.5 → 0.5.6

package/index.js

@@ -119,7 +119,7 @@ var Chunk = function Chunk(start, end, content) {
 	// we make these non-enumerable, for sanity while debugging
 	Object.defineProperties(this, {
 		previous: { writable: true, value: null },
-		next:     { writable: true, value: null }
+		next: { writable: true, value: null },
 	});
 };
 
@@ -229,7 +229,6 @@ Chunk.prototype.trimEnd = function trimEnd (rx) {
 			this.split(this.start + trimmed.length).edit('', undefined, true);
 		}
 		return true;
-
 	} else {
 		this.edit('', undefined, true);
 
@@ -250,7 +249,6 @@ Chunk.prototype.trimStart = function trimStart (rx) {
 			this.edit('', undefined, true);
 		}
 		return true;
-
 	} else {
 		this.edit('', undefined, true);
 
@@ -435,7 +433,7 @@ var n = '\n';
 var warned = {
 	insertLeft: false,
 	insertRight: false,
-	storeName: false
+	storeName: false,
 };
 
 var MagicString = function MagicString(string, options) {
@@ -444,19 +442,19 @@ var MagicString = function MagicString(string, options) {
 	var chunk = new Chunk(0, string.length, string);
 
 	Object.defineProperties(this, {
-		original:              { writable: true, value: string },
-		outro:                 { writable: true, value: '' },
-		intro:                 { writable: true, value: '' },
-		firstChunk:            { writable: true, value: chunk },
-		lastChunk:             { writable: true, value: chunk },
-		lastSearchedChunk:     { writable: true, value: chunk },
-		byStart:               { writable: true, value: {} },
-		byEnd:                 { writable: true, value: {} },
-		filename:              { writable: true, value: options.filename },
+		original: { writable: true, value: string },
+		outro: { writable: true, value: '' },
+		intro: { writable: true, value: '' },
+		firstChunk: { writable: true, value: chunk },
+		lastChunk: { writable: true, value: chunk },
+		lastSearchedChunk: { writable: true, value: chunk },
+		byStart: { writable: true, value: {} },
+		byEnd: { writable: true, value: {} },
+		filename: { writable: true, value: options.filename },
 		indentExclusionRanges: { writable: true, value: options.indentExclusionRanges },
-		sourcemapLocations:    { writable: true, value: new BitSet() },
-		storedNames:           { writable: true, value: {} },
-		indentStr:             { writable: true, value: guessIndent(string) }
+		sourcemapLocations: { writable: true, value: new BitSet() },
+		storedNames: { writable: true, value: {} },
+		indentStr: { writable: true, value: guessIndent(string) },
 	});
 
 	this.byStart[0] = chunk;
@@ -580,7 +578,7 @@ MagicString.prototype.generateDecodedMap = function generateDecodedMap (options)
 		sources: [options.source ? getRelativePath(options.file || '', options.source) : null],
 		sourcesContent: options.includeContent ? [this.original] : [null],
 		names: names,
-		mappings: mappings.raw
+		mappings: mappings.raw,
 	};
 };
 
@@ -678,12 +676,16 @@ MagicString.prototype.indent = function indent (indentStr, options) {
 };
 
 MagicString.prototype.insert = function insert () {
-	throw new Error('magicString.insert(...) is deprecated. Use prependRight(...) or appendLeft(...)');
+	throw new Error(
+		'magicString.insert(...) is deprecated. Use prependRight(...) or appendLeft(...)'
+	);
 };
 
 MagicString.prototype.insertLeft = function insertLeft (index, content) {
 	if (!warned.insertLeft) {
-		console.warn('magicString.insertLeft(...) is deprecated. Use magicString.appendLeft(...) instead'); // eslint-disable-line no-console
+		console.warn(
+			'magicString.insertLeft(...) is deprecated. Use magicString.appendLeft(...) instead'
+		); // eslint-disable-line no-console
 		warned.insertLeft = true;
 	}
 
@@ -692,7 +694,9 @@ MagicString.prototype.insertLeft = function insertLeft (index, content) {
 
 MagicString.prototype.insertRight = function insertRight (index, content) {
 	if (!warned.insertRight) {
-		console.warn('magicString.insertRight(...) is deprecated. Use magicString.prependRight(...) instead'); // eslint-disable-line no-console
+		console.warn(
+			'magicString.insertRight(...) is deprecated. Use magicString.prependRight(...) instead'
+		); // eslint-disable-line no-console
 		warned.insertRight = true;
 	}
 
@@ -744,14 +748,18 @@ MagicString.prototype.overwrite = function overwrite (start, end, content, optio
 
 	if (end > this.original.length) { throw new Error('end is out of bounds'); }
 	if (start === end)
-		{ throw new Error('Cannot overwrite a zero-length range – use appendLeft or prependRight instead'); }
+		{ throw new Error(
+			'Cannot overwrite a zero-length range – use appendLeft or prependRight instead'
+		); }
 
 	this._split(start);
 	this._split(end);
 
 	if (options === true) {
 		if (!warned.storeName) {
-			console.warn('The final argument to magicString.overwrite(...) should be an options object. See https://github.com/rich-harris/magic-string'); // eslint-disable-line no-console
+			console.warn(
+				'The final argument to magicString.overwrite(...) should be an options object. See https://github.com/rich-harris/magic-string'
+			); // eslint-disable-line no-console
 			warned.storeName = true;
 		}
 
@@ -762,28 +770,23 @@ MagicString.prototype.overwrite = function overwrite (start, end, content, optio
 
 	if (storeName) {
 		var original = this.original.slice(start, end);
-		this.storedNames[original] = true;
+		Object.defineProperty(this.storedNames, original, { writable: true, value: true, enumerable: true });
 	}
 
 	var first = this.byStart[start];
 	var last = this.byEnd[end];
 
 	if (first) {
-		if (end > first.end && first.next !== this.byStart[first.end]) {
-			throw new Error('Cannot overwrite across a split point');
-		}
-
-		first.edit(content, storeName, contentOnly);
-
-		if (first !== last) {
-			var chunk = first.next;
-			while (chunk !== last) {
-				chunk.edit('', false);
-				chunk = chunk.next;
+		var chunk = first;
+		while (chunk !== last) {
+			if (chunk.next !== this.byStart[chunk.end]) {
+				throw new Error('Cannot overwrite across a split point');
 			}
-
+			chunk = chunk.next;
 			chunk.edit('', false);
 		}
+
+		first.edit(content, storeName, contentOnly);
 	} else {
 		// must be inserting at the end
 		var newChunk = new Chunk(start, end, '').edit(content, storeName);
@@ -857,53 +860,43 @@ MagicString.prototype.remove = function remove (start, end) {
 };
 
 MagicString.prototype.lastChar = function lastChar () {
-	if (this.outro.length)
-		{ return this.outro[this.outro.length - 1]; }
+	if (this.outro.length) { return this.outro[this.outro.length - 1]; }
 	var chunk = this.lastChunk;
 	do {
-		if (chunk.outro.length)
-			{ return chunk.outro[chunk.outro.length - 1]; }
-		if (chunk.content.length)
-			{ return chunk.content[chunk.content.length - 1]; }
-		if (chunk.intro.length)
-			{ return chunk.intro[chunk.intro.length - 1]; }
-	} while (chunk = chunk.previous);
-	if (this.intro.length)
-		{ return this.intro[this.intro.length - 1]; }
+		if (chunk.outro.length) { return chunk.outro[chunk.outro.length - 1]; }
+		if (chunk.content.length) { return chunk.content[chunk.content.length - 1]; }
+		if (chunk.intro.length) { return chunk.intro[chunk.intro.length - 1]; }
+	} while ((chunk = chunk.previous));
+	if (this.intro.length) { return this.intro[this.intro.length - 1]; }
 	return '';
 };
 
 MagicString.prototype.lastLine = function lastLine () {
 	var lineIndex = this.outro.lastIndexOf(n);
-	if (lineIndex !== -1)
-		{ return this.outro.substr(lineIndex + 1); }
+	if (lineIndex !== -1) { return this.outro.substr(lineIndex + 1); }
 	var lineStr = this.outro;
 	var chunk = this.lastChunk;
 	do {
 		if (chunk.outro.length > 0) {
 			lineIndex = chunk.outro.lastIndexOf(n);
-			if (lineIndex !== -1)
-				{ return chunk.outro.substr(lineIndex + 1) + lineStr; }
+			if (lineIndex !== -1) { return chunk.outro.substr(lineIndex + 1) + lineStr; }
 			lineStr = chunk.outro + lineStr;
 		}
 
 		if (chunk.content.length > 0) {
 			lineIndex = chunk.content.lastIndexOf(n);
-			if (lineIndex !== -1)
-				{ return chunk.content.substr(lineIndex + 1) + lineStr; }
+			if (lineIndex !== -1) { return chunk.content.substr(lineIndex + 1) + lineStr; }
 			lineStr = chunk.content + lineStr;
 		}
 
 		if (chunk.intro.length > 0) {
 			lineIndex = chunk.intro.lastIndexOf(n);
-			if (lineIndex !== -1)
-				{ return chunk.intro.substr(lineIndex + 1) + lineStr; }
+			if (lineIndex !== -1) { return chunk.intro.substr(lineIndex + 1) + lineStr; }
 			lineStr = chunk.intro + lineStr;
 		}
-	} while (chunk = chunk.previous);
+	} while ((chunk = chunk.previous));
 	lineIndex = this.intro.lastIndexOf(n);
-	if (lineIndex !== -1)
-		{ return this.intro.substr(lineIndex + 1) + lineStr; }
+	if (lineIndex !== -1) { return this.intro.substr(lineIndex + 1) + lineStr; }
 	return this.intro + lineStr;
 };
 
@@ -1017,11 +1010,13 @@ MagicString.prototype.toString = function toString () {
 MagicString.prototype.isEmpty = function isEmpty () {
 	var chunk = this.firstChunk;
 	do {
-		if (chunk.intro.length && chunk.intro.trim() ||
-				chunk.content.length && chunk.content.trim() ||
-				chunk.outro.length && chunk.outro.trim())
+		if (
+			(chunk.intro.length && chunk.intro.trim()) ||
+			(chunk.content.length && chunk.content.trim()) ||
+			(chunk.outro.length && chunk.outro.trim())
+		)
 			{ return false; }
-	} while (chunk = chunk.next);
+	} while ((chunk = chunk.next));
 	return true;
 };
 
@@ -1030,7 +1025,7 @@ MagicString.prototype.length = function length () {
 	var length = 0;
 	do {
 		length += chunk.intro.length + chunk.content.length + chunk.outro.length;
-	} while (chunk = chunk.next);
+	} while ((chunk = chunk.next));
 	return length;
 };
 
@@ -5321,21 +5316,24 @@ class ExportedNames {
             return;
         }
         const handleTypeAssertion = (declaration) => {
-            var _a;
             const identifier = declaration.name;
             const tsType = declaration.type;
             const jsDocType = ts__default['default'].getJSDocType(declaration);
             const type = tsType || jsDocType;
-            if (!ts__default['default'].isIdentifier(identifier) ||
-                (!type &&
+            if (ts__default['default'].isIdentifier(identifier) &&
+                // Ensure initialization for proper control flow and to avoid "possibly undefined" type errors.
+                // Also ensure prop is typed as any with a type annotation in TS strict mode
+                (!declaration.initializer ||
+                    // Widen the type, else it's narrowed to the initializer
+                    type ||
                     // Edge case: TS infers `export let bla = false` to type `false`.
                     // prevent that by adding the any-wrap in this case, too.
-                    ![ts__default['default'].SyntaxKind.FalseKeyword, ts__default['default'].SyntaxKind.TrueKeyword].includes((_a = declaration.initializer) === null || _a === void 0 ? void 0 : _a.kind))) {
-                return;
+                    (!type &&
+                        [ts__default['default'].SyntaxKind.FalseKeyword, ts__default['default'].SyntaxKind.TrueKeyword].includes(declaration.initializer.kind)))) {
+                const name = identifier.getText();
+                const end = declaration.end + this.astOffset;
+                preprendStr(this.str, end, surroundWithIgnoreComments(`;${name} = __sveltets_1_any(${name});`));
             }
-            const name = identifier.getText();
-            const end = declaration.end + this.astOffset;
-            preprendStr(this.str, end, surroundWithIgnoreComments(`;${name} = __sveltets_1_any(${name});`));
         };
         const findComma = (target) => target.getChildren().filter((child) => child.kind === ts__default['default'].SyntaxKind.CommaToken);
         const splitDeclaration = () => {
@@ -5962,7 +5960,7 @@ function handleStore(node, parent, str) {
         }
         if (simpleOperator) {
             const storename = node.name.slice(1); // drop the $
-            str.overwrite(parent.start, parent.end, `${storename}.set( $${storename} ${simpleOperator} 1)`);
+            str.overwrite(parent.start, parent.end, `(${storename}.set( $${storename} ${simpleOperator} 1), $${storename})`);
         }
         else {
             console.warn(`Warning - unrecognized UpdateExpression operator ${parent.operator}!
@@ -6426,7 +6424,7 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
                 simpleOperator = '-';
             }
             if (simpleOperator) {
-                str.overwrite(parent.getStart() + astOffset, parent.end + astOffset, `${storename}.set( $${storename} ${simpleOperator} 1)`);
+                str.overwrite(parent.getStart() + astOffset, parent.end + astOffset, `(${storename}.set( $${storename} ${simpleOperator} 1), $${storename})`);
                 return;
             }
             else {

package/index.mjs

@@ -89,7 +89,7 @@ var Chunk = function Chunk(start, end, content) {
 	// we make these non-enumerable, for sanity while debugging
 	Object.defineProperties(this, {
 		previous: { writable: true, value: null },
-		next:     { writable: true, value: null }
+		next: { writable: true, value: null },
 	});
 };
 
@@ -199,7 +199,6 @@ Chunk.prototype.trimEnd = function trimEnd (rx) {
 			this.split(this.start + trimmed.length).edit('', undefined, true);
 		}
 		return true;
-
 	} else {
 		this.edit('', undefined, true);
 
@@ -220,7 +219,6 @@ Chunk.prototype.trimStart = function trimStart (rx) {
 			this.edit('', undefined, true);
 		}
 		return true;
-
 	} else {
 		this.edit('', undefined, true);
 
@@ -405,7 +403,7 @@ var n = '\n';
 var warned = {
 	insertLeft: false,
 	insertRight: false,
-	storeName: false
+	storeName: false,
 };
 
 var MagicString = function MagicString(string, options) {
@@ -414,19 +412,19 @@ var MagicString = function MagicString(string, options) {
 	var chunk = new Chunk(0, string.length, string);
 
 	Object.defineProperties(this, {
-		original:              { writable: true, value: string },
-		outro:                 { writable: true, value: '' },
-		intro:                 { writable: true, value: '' },
-		firstChunk:            { writable: true, value: chunk },
-		lastChunk:             { writable: true, value: chunk },
-		lastSearchedChunk:     { writable: true, value: chunk },
-		byStart:               { writable: true, value: {} },
-		byEnd:                 { writable: true, value: {} },
-		filename:              { writable: true, value: options.filename },
+		original: { writable: true, value: string },
+		outro: { writable: true, value: '' },
+		intro: { writable: true, value: '' },
+		firstChunk: { writable: true, value: chunk },
+		lastChunk: { writable: true, value: chunk },
+		lastSearchedChunk: { writable: true, value: chunk },
+		byStart: { writable: true, value: {} },
+		byEnd: { writable: true, value: {} },
+		filename: { writable: true, value: options.filename },
 		indentExclusionRanges: { writable: true, value: options.indentExclusionRanges },
-		sourcemapLocations:    { writable: true, value: new BitSet() },
-		storedNames:           { writable: true, value: {} },
-		indentStr:             { writable: true, value: guessIndent(string) }
+		sourcemapLocations: { writable: true, value: new BitSet() },
+		storedNames: { writable: true, value: {} },
+		indentStr: { writable: true, value: guessIndent(string) },
 	});
 
 	this.byStart[0] = chunk;
@@ -550,7 +548,7 @@ MagicString.prototype.generateDecodedMap = function generateDecodedMap (options)
 		sources: [options.source ? getRelativePath(options.file || '', options.source) : null],
 		sourcesContent: options.includeContent ? [this.original] : [null],
 		names: names,
-		mappings: mappings.raw
+		mappings: mappings.raw,
 	};
 };
 
@@ -648,12 +646,16 @@ MagicString.prototype.indent = function indent (indentStr, options) {
 };
 
 MagicString.prototype.insert = function insert () {
-	throw new Error('magicString.insert(...) is deprecated. Use prependRight(...) or appendLeft(...)');
+	throw new Error(
+		'magicString.insert(...) is deprecated. Use prependRight(...) or appendLeft(...)'
+	);
 };
 
 MagicString.prototype.insertLeft = function insertLeft (index, content) {
 	if (!warned.insertLeft) {
-		console.warn('magicString.insertLeft(...) is deprecated. Use magicString.appendLeft(...) instead'); // eslint-disable-line no-console
+		console.warn(
+			'magicString.insertLeft(...) is deprecated. Use magicString.appendLeft(...) instead'
+		); // eslint-disable-line no-console
 		warned.insertLeft = true;
 	}
 
@@ -662,7 +664,9 @@ MagicString.prototype.insertLeft = function insertLeft (index, content) {
 
 MagicString.prototype.insertRight = function insertRight (index, content) {
 	if (!warned.insertRight) {
-		console.warn('magicString.insertRight(...) is deprecated. Use magicString.prependRight(...) instead'); // eslint-disable-line no-console
+		console.warn(
+			'magicString.insertRight(...) is deprecated. Use magicString.prependRight(...) instead'
+		); // eslint-disable-line no-console
 		warned.insertRight = true;
 	}
 
@@ -714,14 +718,18 @@ MagicString.prototype.overwrite = function overwrite (start, end, content, optio
 
 	if (end > this.original.length) { throw new Error('end is out of bounds'); }
 	if (start === end)
-		{ throw new Error('Cannot overwrite a zero-length range – use appendLeft or prependRight instead'); }
+		{ throw new Error(
+			'Cannot overwrite a zero-length range – use appendLeft or prependRight instead'
+		); }
 
 	this._split(start);
 	this._split(end);
 
 	if (options === true) {
 		if (!warned.storeName) {
-			console.warn('The final argument to magicString.overwrite(...) should be an options object. See https://github.com/rich-harris/magic-string'); // eslint-disable-line no-console
+			console.warn(
+				'The final argument to magicString.overwrite(...) should be an options object. See https://github.com/rich-harris/magic-string'
+			); // eslint-disable-line no-console
 			warned.storeName = true;
 		}
 
@@ -732,28 +740,23 @@ MagicString.prototype.overwrite = function overwrite (start, end, content, optio
 
 	if (storeName) {
 		var original = this.original.slice(start, end);
-		this.storedNames[original] = true;
+		Object.defineProperty(this.storedNames, original, { writable: true, value: true, enumerable: true });
 	}
 
 	var first = this.byStart[start];
 	var last = this.byEnd[end];
 
 	if (first) {
-		if (end > first.end && first.next !== this.byStart[first.end]) {
-			throw new Error('Cannot overwrite across a split point');
-		}
-
-		first.edit(content, storeName, contentOnly);
-
-		if (first !== last) {
-			var chunk = first.next;
-			while (chunk !== last) {
-				chunk.edit('', false);
-				chunk = chunk.next;
+		var chunk = first;
+		while (chunk !== last) {
+			if (chunk.next !== this.byStart[chunk.end]) {
+				throw new Error('Cannot overwrite across a split point');
 			}
-
+			chunk = chunk.next;
 			chunk.edit('', false);
 		}
+
+		first.edit(content, storeName, contentOnly);
 	} else {
 		// must be inserting at the end
 		var newChunk = new Chunk(start, end, '').edit(content, storeName);
@@ -827,53 +830,43 @@ MagicString.prototype.remove = function remove (start, end) {
 };
 
 MagicString.prototype.lastChar = function lastChar () {
-	if (this.outro.length)
-		{ return this.outro[this.outro.length - 1]; }
+	if (this.outro.length) { return this.outro[this.outro.length - 1]; }
 	var chunk = this.lastChunk;
 	do {
-		if (chunk.outro.length)
-			{ return chunk.outro[chunk.outro.length - 1]; }
-		if (chunk.content.length)
-			{ return chunk.content[chunk.content.length - 1]; }
-		if (chunk.intro.length)
-			{ return chunk.intro[chunk.intro.length - 1]; }
-	} while (chunk = chunk.previous);
-	if (this.intro.length)
-		{ return this.intro[this.intro.length - 1]; }
+		if (chunk.outro.length) { return chunk.outro[chunk.outro.length - 1]; }
+		if (chunk.content.length) { return chunk.content[chunk.content.length - 1]; }
+		if (chunk.intro.length) { return chunk.intro[chunk.intro.length - 1]; }
+	} while ((chunk = chunk.previous));
+	if (this.intro.length) { return this.intro[this.intro.length - 1]; }
 	return '';
 };
 
 MagicString.prototype.lastLine = function lastLine () {
 	var lineIndex = this.outro.lastIndexOf(n);
-	if (lineIndex !== -1)
-		{ return this.outro.substr(lineIndex + 1); }
+	if (lineIndex !== -1) { return this.outro.substr(lineIndex + 1); }
 	var lineStr = this.outro;
 	var chunk = this.lastChunk;
 	do {
 		if (chunk.outro.length > 0) {
 			lineIndex = chunk.outro.lastIndexOf(n);
-			if (lineIndex !== -1)
-				{ return chunk.outro.substr(lineIndex + 1) + lineStr; }
+			if (lineIndex !== -1) { return chunk.outro.substr(lineIndex + 1) + lineStr; }
 			lineStr = chunk.outro + lineStr;
 		}
 
 		if (chunk.content.length > 0) {
 			lineIndex = chunk.content.lastIndexOf(n);
-			if (lineIndex !== -1)
-				{ return chunk.content.substr(lineIndex + 1) + lineStr; }
+			if (lineIndex !== -1) { return chunk.content.substr(lineIndex + 1) + lineStr; }
 			lineStr = chunk.content + lineStr;
 		}
 
 		if (chunk.intro.length > 0) {
 			lineIndex = chunk.intro.lastIndexOf(n);
-			if (lineIndex !== -1)
-				{ return chunk.intro.substr(lineIndex + 1) + lineStr; }
+			if (lineIndex !== -1) { return chunk.intro.substr(lineIndex + 1) + lineStr; }
 			lineStr = chunk.intro + lineStr;
 		}
-	} while (chunk = chunk.previous);
+	} while ((chunk = chunk.previous));
 	lineIndex = this.intro.lastIndexOf(n);
-	if (lineIndex !== -1)
-		{ return this.intro.substr(lineIndex + 1) + lineStr; }
+	if (lineIndex !== -1) { return this.intro.substr(lineIndex + 1) + lineStr; }
 	return this.intro + lineStr;
 };
 
@@ -987,11 +980,13 @@ MagicString.prototype.toString = function toString () {
 MagicString.prototype.isEmpty = function isEmpty () {
 	var chunk = this.firstChunk;
 	do {
-		if (chunk.intro.length && chunk.intro.trim() ||
-				chunk.content.length && chunk.content.trim() ||
-				chunk.outro.length && chunk.outro.trim())
+		if (
+			(chunk.intro.length && chunk.intro.trim()) ||
+			(chunk.content.length && chunk.content.trim()) ||
+			(chunk.outro.length && chunk.outro.trim())
+		)
 			{ return false; }
-	} while (chunk = chunk.next);
+	} while ((chunk = chunk.next));
 	return true;
 };
 
@@ -1000,7 +995,7 @@ MagicString.prototype.length = function length () {
 	var length = 0;
 	do {
 		length += chunk.intro.length + chunk.content.length + chunk.outro.length;
-	} while (chunk = chunk.next);
+	} while ((chunk = chunk.next));
 	return length;
 };
 
@@ -5291,21 +5286,24 @@ class ExportedNames {
             return;
         }
         const handleTypeAssertion = (declaration) => {
-            var _a;
             const identifier = declaration.name;
             const tsType = declaration.type;
             const jsDocType = ts__default.getJSDocType(declaration);
             const type = tsType || jsDocType;
-            if (!ts__default.isIdentifier(identifier) ||
-                (!type &&
+            if (ts__default.isIdentifier(identifier) &&
+                // Ensure initialization for proper control flow and to avoid "possibly undefined" type errors.
+                // Also ensure prop is typed as any with a type annotation in TS strict mode
+                (!declaration.initializer ||
+                    // Widen the type, else it's narrowed to the initializer
+                    type ||
                     // Edge case: TS infers `export let bla = false` to type `false`.
                     // prevent that by adding the any-wrap in this case, too.
-                    ![ts__default.SyntaxKind.FalseKeyword, ts__default.SyntaxKind.TrueKeyword].includes((_a = declaration.initializer) === null || _a === void 0 ? void 0 : _a.kind))) {
-                return;
+                    (!type &&
+                        [ts__default.SyntaxKind.FalseKeyword, ts__default.SyntaxKind.TrueKeyword].includes(declaration.initializer.kind)))) {
+                const name = identifier.getText();
+                const end = declaration.end + this.astOffset;
+                preprendStr(this.str, end, surroundWithIgnoreComments(`;${name} = __sveltets_1_any(${name});`));
             }
-            const name = identifier.getText();
-            const end = declaration.end + this.astOffset;
-            preprendStr(this.str, end, surroundWithIgnoreComments(`;${name} = __sveltets_1_any(${name});`));
         };
         const findComma = (target) => target.getChildren().filter((child) => child.kind === ts__default.SyntaxKind.CommaToken);
         const splitDeclaration = () => {
@@ -5932,7 +5930,7 @@ function handleStore(node, parent, str) {
         }
         if (simpleOperator) {
             const storename = node.name.slice(1); // drop the $
-            str.overwrite(parent.start, parent.end, `${storename}.set( $${storename} ${simpleOperator} 1)`);
+            str.overwrite(parent.start, parent.end, `(${storename}.set( $${storename} ${simpleOperator} 1), $${storename})`);
         }
         else {
             console.warn(`Warning - unrecognized UpdateExpression operator ${parent.operator}!
@@ -6396,7 +6394,7 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
                 simpleOperator = '-';
             }
             if (simpleOperator) {
-                str.overwrite(parent.getStart() + astOffset, parent.end + astOffset, `${storename}.set( $${storename} ${simpleOperator} 1)`);
+                str.overwrite(parent.getStart() + astOffset, parent.end + astOffset, `(${storename}.set( $${storename} ${simpleOperator} 1), $${storename})`);
                 return;
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte2tsx",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "Convert Svelte components to TSX for type checking",
   "author": "David Pershouse",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "svelte": "~3.46.1",
     "tiny-glob": "^0.2.6",
     "tslib": "^1.10.0",
-    "typescript": "^4.5.3"
+    "typescript": "^4.6.2"
   },
   "peerDependencies": {
     "svelte": "^3.24",