svelte2tsx 0.7.45 → 0.7.46

package/index.js

@@ -2753,7 +2753,7 @@ function attributeValueIsOfType(value, type) {
  * transformation this way.
  */
 function handleAwait(str, awaitBlock) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const transforms = ['{ '];
     if (!awaitBlock.pending.skip) {
         transforms.push([awaitBlock.pending.start, awaitBlock.pending.end]);
@@ -2767,13 +2767,14 @@ function handleAwait(str, awaitBlock) {
     const expressionEnd = withTrailingPropertyAccess(str.original, awaitBlock.expression.end);
     transforms.push('await (', [awaitBlock.expression.start, expressionEnd], ');');
     if (awaitBlock.value) {
-        transforms.push('{ const ', [awaitBlock.value.start, awaitBlock.value.end], ' = $$_value; ');
+        const end = (_b = (_a = awaitBlock.value.typeAnnotation) === null || _a === void 0 ? void 0 : _a.end) !== null && _b !== void 0 ? _b : awaitBlock.value.end;
+        transforms.push('{ const ', [awaitBlock.value.start, end], ' = $$_value; ');
     }
     if (!awaitBlock.then.skip) {
         if (awaitBlock.pending.skip) {
             transforms.push([awaitBlock.then.start, awaitBlock.then.end]);
         }
-        else if ((_a = awaitBlock.then.children) === null || _a === void 0 ? void 0 : _a.length) {
+        else if ((_c = awaitBlock.then.children) === null || _c === void 0 ? void 0 : _c.length) {
             transforms.push([
                 awaitBlock.then.children[0].start,
                 awaitBlock.then.children[awaitBlock.then.children.length - 1].end
@@ -2785,10 +2786,11 @@ function handleAwait(str, awaitBlock) {
     }
     if (awaitBlock.error || !awaitBlock.catch.skip) {
         transforms.push('} catch($$_e) { ');
+        const end = (_f = (_e = (_d = awaitBlock.error) === null || _d === void 0 ? void 0 : _d.typeAnnotation) === null || _e === void 0 ? void 0 : _e.end) !== null && _f !== void 0 ? _f : (_g = awaitBlock.error) === null || _g === void 0 ? void 0 : _g.end;
         if (awaitBlock.error) {
-            transforms.push('const ', [awaitBlock.error.start, awaitBlock.error.end], ' = __sveltets_2_any();');
+            transforms.push('const ', [awaitBlock.error.start, end], ' = __sveltets_2_any();');
         }
-        if (!awaitBlock.catch.skip && ((_b = awaitBlock.catch.children) === null || _b === void 0 ? void 0 : _b.length)) {
+        if (!awaitBlock.catch.skip && ((_h = awaitBlock.catch.children) === null || _h === void 0 ? void 0 : _h.length)) {
             transforms.push([
                 awaitBlock.catch.children[0].start,
                 awaitBlock.catch.children[awaitBlock.catch.children.length - 1].end

package/index.mjs

@@ -2733,7 +2733,7 @@ function attributeValueIsOfType(value, type) {
  * transformation this way.
  */
 function handleAwait(str, awaitBlock) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const transforms = ['{ '];
     if (!awaitBlock.pending.skip) {
         transforms.push([awaitBlock.pending.start, awaitBlock.pending.end]);
@@ -2747,13 +2747,14 @@ function handleAwait(str, awaitBlock) {
     const expressionEnd = withTrailingPropertyAccess(str.original, awaitBlock.expression.end);
     transforms.push('await (', [awaitBlock.expression.start, expressionEnd], ');');
     if (awaitBlock.value) {
-        transforms.push('{ const ', [awaitBlock.value.start, awaitBlock.value.end], ' = $$_value; ');
+        const end = (_b = (_a = awaitBlock.value.typeAnnotation) === null || _a === void 0 ? void 0 : _a.end) !== null && _b !== void 0 ? _b : awaitBlock.value.end;
+        transforms.push('{ const ', [awaitBlock.value.start, end], ' = $$_value; ');
     }
     if (!awaitBlock.then.skip) {
         if (awaitBlock.pending.skip) {
             transforms.push([awaitBlock.then.start, awaitBlock.then.end]);
         }
-        else if ((_a = awaitBlock.then.children) === null || _a === void 0 ? void 0 : _a.length) {
+        else if ((_c = awaitBlock.then.children) === null || _c === void 0 ? void 0 : _c.length) {
             transforms.push([
                 awaitBlock.then.children[0].start,
                 awaitBlock.then.children[awaitBlock.then.children.length - 1].end
@@ -2765,10 +2766,11 @@ function handleAwait(str, awaitBlock) {
     }
     if (awaitBlock.error || !awaitBlock.catch.skip) {
         transforms.push('} catch($$_e) { ');
+        const end = (_f = (_e = (_d = awaitBlock.error) === null || _d === void 0 ? void 0 : _d.typeAnnotation) === null || _e === void 0 ? void 0 : _e.end) !== null && _f !== void 0 ? _f : (_g = awaitBlock.error) === null || _g === void 0 ? void 0 : _g.end;
         if (awaitBlock.error) {
-            transforms.push('const ', [awaitBlock.error.start, awaitBlock.error.end], ' = __sveltets_2_any();');
+            transforms.push('const ', [awaitBlock.error.start, end], ' = __sveltets_2_any();');
         }
-        if (!awaitBlock.catch.skip && ((_b = awaitBlock.catch.children) === null || _b === void 0 ? void 0 : _b.length)) {
+        if (!awaitBlock.catch.skip && ((_h = awaitBlock.catch.children) === null || _h === void 0 ? void 0 : _h.length)) {
             transforms.push([
                 awaitBlock.catch.children[0].start,
                 awaitBlock.catch.children[awaitBlock.catch.children.length - 1].end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte2tsx",
-  "version": "0.7.45",
+  "version": "0.7.46",
   "description": "Convert Svelte components to TSX for type checking",
   "author": "The Svelte Community",
   "license": "MIT",
@@ -65,6 +65,6 @@
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c -w",
-    "test": "mocha test/test.ts"
+    "test": "mocha test/test.ts --no-experimental-strip-types"
   }
 }