Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

174 moustache #198

Merged
merged 17 commits into from
Dec 6, 2020
Merged

174 moustache #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ec58798
feat(svast): add SvelteDynamicContent
pngwn Dec 5, 2020
4f05215
feat(svelte-parse): expect DynamicContent node
pngwn Dec 5, 2020
36a32c1
feat(svast): add type to dynamic content
pngwn Dec 5, 2020
c5e19ca
feat(svelte-parse): match dynamic content interface
pngwn Dec 5, 2020
7c1f336
feat(svelte-parse): add maybe_dynamic_content and dynamic_content states
pngwn Dec 5, 2020
dff3657
feat(svelte-parse): move to expression from shorthand attr
pngwn Dec 5, 2020
eb55c7e
feat(svelte-parse): use dynamic content node for shorthand expressions
pngwn Dec 5, 2020
b3c7bc4
feat(svelte-parse): use dynamic content for unquoted attribute blocks
pngwn Dec 5, 2020
0065a41
chore: add global test filter script
pngwn Dec 5, 2020
17f9773
feat(svelte-parse): parse expressions correctly with dynamic content …
pngwn Dec 6, 2020
43352de
feat(svelte-parse): use dynamic content nodes in tests over bare expr…
pngwn Dec 6, 2020
afb9fdc
feat(svelte-parse): update tests and track positions correctly
pngwn Dec 6, 2020
6964dab
feat(svelte-parse): remove uneeded test
pngwn Dec 6, 2020
20eb938
feat(svast-stringify): update tests to use dynamic content nodes
pngwn Dec 6, 2020
b5f7106
feat(svast-stringify): correctly stringify dynamic content nodes
pngwn Dec 6, 2020
dbfa856
chore: cleanup rollup configs
pngwn Dec 6, 2020
fb6e124
docs: add changeset
pngwn Dec 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions .changeset/rich-experts-care.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'svast': minor
'svast-stringify': minor
'svelte-parse': minor
---

Add a new SVAST node `SvelteDynamicContent` in order to disambiguate positions of expressions due to them not always having opening and closing braces(#174).

Ensure that unquoted attribute values are correctly parsed as separate values where appropriate(#178).
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"scripts": {
"lint": "eslint . --ext .js,.ts",
"test": "uvu -r ts-node/register packages test.ts$",
"test:filter": "uvu -r ts-node/register",
"release": "pnpm -r build && changeset publish",
"changeset:add": "changeset add",
"changeset:version": "changeset version && pnpm i --lockfile-only"
Expand Down
4 changes: 0 additions & 4 deletions packages/svast-stringify/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
import resolve from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
import json from 'rollup-plugin-json';
// import sucrase from '@rollup/plugin-sucrase';
import ts from '@rollup/plugin-typescript';
import dts from 'rollup-plugin-dts';

Expand Down
13 changes: 7 additions & 6 deletions packages/svast-stringify/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,23 @@ import {
Property,
SvelteElement,
Directive,
SvelteExpression,
Literal,
SvelteParent,
BranchingBlock,
SvelteDynamicContent,
} from 'svast';

function render_attr_values(values: (Text | SvelteExpression)[]): string {
function render_attr_values(values: (Text | SvelteDynamicContent)[]): string {
let value = '';

for (let index = 0; index < values.length; index++) {
if (values[index].type === 'text') {
value += values[index].value;
}

if (values[index].type === 'svelteExpression') {
value += '{' + values[index].value + '}';
if (values[index].type === 'svelteDynamicContent') {
value +=
'{' + (values[index] as SvelteDynamicContent).expression.value + '}';
}
}

Expand Down Expand Up @@ -76,8 +77,8 @@ const handlers: Record<string, Handler> = {
text(node) {
return (node as Text).value;
},
svelteExpression(node) {
return '{' + node.value + '}';
svelteDynamicContent(node) {
return '{' + (node as SvelteDynamicContent).expression.value + '}';
},
svelteVoidBlock(node) {
return '{@' + node.name + ' ' + (node as VoidBlock).expression.value + '}';
Expand Down
112 changes: 80 additions & 32 deletions packages/svast-stringify/test/compile.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@ svast_stringify('compiles a expression node', () => {
type: 'root',
children: [
{
type: 'svelteExpression',
value: 'console.log("boo")',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'console.log("boo")',
},
},
],
};
Expand Down Expand Up @@ -231,8 +234,11 @@ svast_stringify(
value: 'value',
},
{
type: 'svelteExpression',
value: 'value',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'value',
},
},
],
shorthand: 'none',
Expand Down Expand Up @@ -285,8 +291,11 @@ svast_stringify(
value: ' ',
},
{
type: 'svelteExpression',
value: 'value',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'value',
},
},
],
shorthand: 'none',
Expand Down Expand Up @@ -327,16 +336,25 @@ svast_stringify(
value: 'value',
},
{
type: 'svelteExpression',
value: 'value',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'value',
},
},
{
type: 'svelteExpression',
value: 'value',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'value',
},
},
{
type: 'svelteExpression',
value: 'value',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'value',
},
},
],
shorthand: 'none',
Expand Down Expand Up @@ -377,8 +395,11 @@ svast_stringify('handle a realword set of attrs', () => {
value: ' ',
},
{
type: 'svelteExpression',
value: 'color',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'color',
},
},
{
type: 'text',
Expand Down Expand Up @@ -424,8 +445,11 @@ svast_stringify('handle a realword set of attrs: more whitespace', () => {
value: ' ',
},
{
type: 'svelteExpression',
value: 'color',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'color',
},
},
{
type: 'text',
Expand Down Expand Up @@ -571,8 +595,11 @@ svast_stringify('compiles directive with a value', () => {
value: ' ',
},
{
type: 'svelteExpression',
value: 'color',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'color',
},
},
{
type: 'text',
Expand Down Expand Up @@ -642,8 +669,11 @@ svast_stringify('compiles svelte meta tags', () => {
name: 'tag',
value: [
{
type: 'svelteExpression',
value: 'null',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'null',
},
},
],
shorthand: 'none',
Expand Down Expand Up @@ -677,8 +707,11 @@ svast_stringify('compiles sibling nodes', () => {
name: 'tag',
value: [
{
type: 'svelteExpression',
value: 'null',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'null',
},
},
],
shorthand: 'none',
Expand All @@ -698,8 +731,11 @@ svast_stringify('compiles sibling nodes', () => {
name: 'tag',
value: [
{
type: 'svelteExpression',
value: 'null',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'null',
},
},
],
shorthand: 'none',
Expand Down Expand Up @@ -744,8 +780,11 @@ svast_stringify('compiles child nodes: svelteMeta', () => {
name: 'tag',
value: [
{
type: 'svelteExpression',
value: 'null',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'null',
},
},
],
shorthand: 'none',
Expand All @@ -765,8 +804,11 @@ svast_stringify('compiles child nodes: svelteMeta', () => {
name: 'tag',
value: [
{
type: 'svelteExpression',
value: 'null',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'null',
},
},
],
shorthand: 'none',
Expand Down Expand Up @@ -814,8 +856,11 @@ svast_stringify('compiles child nodes: svelteElement', () => {
name: 'tag',
value: [
{
type: 'svelteExpression',
value: 'null',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'null',
},
},
],
shorthand: 'none',
Expand All @@ -835,8 +880,11 @@ svast_stringify('compiles child nodes: svelteElement', () => {
name: 'tag',
value: [
{
type: 'svelteExpression',
value: 'null',
type: 'svelteDynamicContent',
expression: {
type: 'svelteExpression',
value: 'null',
},
},
],
shorthand: 'none',
Expand Down
2 changes: 1 addition & 1 deletion packages/svast-stringify/test/fixtures/table_output.ts
View file
Open in desktop

Large diffs are not rendered by default.

Loading