-
-
Notifications
You must be signed in to change notification settings - Fork 189
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* (fix) await without then #427 * (refactor) move htmlxtojsx into own folder
- Loading branch information
1 parent
a032ff2
commit 7a732e7
Showing
7 changed files
with
151 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| import MagicString from 'magic-string'; | ||
| import { Node } from 'estree-walker'; | ||
|
|
||
| /** | ||
| * Transform {#await ...} into something JSX understands | ||
| */ | ||
| export function handleAwait(htmlx: string, str: MagicString, awaitBlock: Node): void { | ||
| // {#await somePromise then value} -> | ||
| // {() => {let _$$p = (somePromise); | ||
| str.overwrite(awaitBlock.start, awaitBlock.expression.start, '{() => {let _$$p = ('); | ||
|
|
||
| // then value } | {:then value} | {await ..} .. {/await} -> | ||
| // __sveltets_awaitThen(_$$p, (value) => {<> | ||
| let thenStart: number; | ||
| let thenEnd: number; | ||
| if (!awaitBlock.then.skip) { | ||
| // then value } | {:then value} | ||
| if (!awaitBlock.pending.skip) { | ||
| // {await ...} ... {:then ...} | ||
| // thenBlock includes the {:then} | ||
| thenStart = awaitBlock.then.start; | ||
| if (awaitBlock.value) { | ||
| thenEnd = htmlx.indexOf('}', awaitBlock.value.end) + 1; | ||
| } else { | ||
| thenEnd = htmlx.indexOf('}', awaitBlock.then.start) + 1; | ||
| } | ||
| str.prependLeft(thenStart, '</>; '); | ||
| // add the start tag too | ||
| const awaitEnd = htmlx.indexOf('}', awaitBlock.expression.end); | ||
|
|
||
| // somePromise} -> somePromise); | ||
| str.overwrite(awaitBlock.expression.end, awaitEnd + 1, ');'); | ||
| str.appendRight(awaitEnd + 1, ' <>'); | ||
| } else { | ||
| // {await ... then ...} | ||
| thenStart = htmlx.indexOf('then', awaitBlock.expression.end); | ||
| thenEnd = htmlx.lastIndexOf('}', awaitBlock.then.start) + 1; | ||
| // somePromise then -> somePromise); then | ||
| str.overwrite(awaitBlock.expression.end, thenStart, '); '); | ||
| } | ||
| } else { | ||
| // {await ..} ... ({:catch ..}) {/await} -> no then block, no value, but always a pending block | ||
| thenEnd = awaitBlock.catch.skip | ||
| ? htmlx.lastIndexOf('{', awaitBlock.end) | ||
| : awaitBlock.catch.start; | ||
| thenStart = Math.min(awaitBlock.pending.end + 1, thenEnd); | ||
|
|
||
| const awaitEnd = htmlx.indexOf('}', awaitBlock.expression.end); | ||
| str.overwrite(awaitBlock.expression.end, awaitEnd + 1, ');'); | ||
| str.appendRight(awaitEnd + 1, ' <>'); | ||
| str.appendLeft(thenEnd, '</>; '); | ||
| } | ||
|
|
||
| if (awaitBlock.value) { | ||
| str.overwrite(thenStart, awaitBlock.value.start, '__sveltets_awaitThen(_$$p, ('); | ||
| str.overwrite(awaitBlock.value.end, thenEnd, ') => {<>'); | ||
| } else { | ||
| const awaitThenFn = '__sveltets_awaitThen(_$$p, () => {<>'; | ||
| if (thenStart === thenEnd) { | ||
| str.appendLeft(thenStart, awaitThenFn); | ||
| } else { | ||
| str.overwrite(thenStart, thenEnd, awaitThenFn); | ||
| } | ||
| } | ||
|
|
||
| //{:catch error} -> | ||
| //</>}, (error) => {<> | ||
| if (!awaitBlock.catch.skip) { | ||
| //catch block includes the {:catch} | ||
| const catchStart = awaitBlock.catch.start; | ||
| const catchSymbolEnd = htmlx.indexOf(':catch', catchStart) + ':catch'.length; | ||
|
|
||
| const errorStart = awaitBlock.error ? awaitBlock.error.start : catchSymbolEnd; | ||
| const errorEnd = awaitBlock.error ? awaitBlock.error.end : errorStart; | ||
| const catchEnd = htmlx.indexOf('}', errorEnd) + 1; | ||
| str.overwrite(catchStart, errorStart, '</>}, ('); | ||
| str.overwrite(errorEnd, catchEnd, ') => {<>'); | ||
| } | ||
| // {/await} -> | ||
| // <>})} | ||
| const awaitEndStart = htmlx.lastIndexOf('{', awaitBlock.end); | ||
| str.overwrite(awaitEndStart, awaitBlock.end, '</>})}}'); | ||
| } |
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions
9
packages/svelte2tsx/test/htmlx2jsx/samples/await-block-no-then/expected.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <>{() => {let _$$p = (aPromise); <> | ||
| <div>Spinner...</div> | ||
| </>; __sveltets_awaitThen(_$$p, () => {<></>})}} | ||
|
|
||
| {() => {let _$$p = (aPromise); <> | ||
| <div>Spinner...</div> | ||
| </>; __sveltets_awaitThen(_$$p, () => {<></>}, (error) => {<> | ||
| <div>Ups: {error}</div> | ||
| </>})}}</> |
9 changes: 9 additions & 0 deletions
9
packages/svelte2tsx/test/htmlx2jsx/samples/await-block-no-then/input.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| {#await aPromise} | ||
| <div>Spinner...</div> | ||
| {/await} | ||
|
|
||
| {#await aPromise} | ||
| <div>Spinner...</div> | ||
| {:catch error} | ||
| <div>Ups: {error}</div> | ||
| {/await} |