Skip to content

fix: preserve scriptlet blocks and fix comments #83

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

Merged
LuLaValva merged 3 commits into from
Aug 15, 2025
Merged

fix: preserve scriptlet blocks and fix comments #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15ac6ef
fix: preserve scriptlet blocks and fix comments
LuLaValva Jul 31, 2025
409318b
fix: scriptlets with empty statements
LuLaValva Aug 14, 2025
9726ef5
fix: update packages
LuLaValva Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,658 changes: 804 additions & 854 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@
"author": "Dylan Piercey <dpiercey@ebay.com>",
"bugs": "https://github.com/marko-js/prettier/issues",
"devDependencies": {
"@babel/generator": "^7.26.3",
"@babel/generator": "^7.28.3",
"@commitlint/cli": "^17.7.2",
"@commitlint/config-conventional": "^17.7.0",
"@istanbuljs/nyc-config-typescript": "^1.0.2",
"@types/babel__generator": "^7.6.8",
"@types/babel__generator": "^7.27.0",
"@types/mocha": "^10.0.10",
"@types/node": "^22.10.2",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"esbuild": "^0.24.0",
"esbuild": "^0.25.9",
"esbuild-register": "^3.6.0",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"fast-glob": "^3.3.2",
"fast-glob": "^3.3.3",
"fixpack": "^4.0.0",
"husky": "^8.0.3",
"lint-staged": "^14.0.1",
"marko": "^5.36.3",
"marko": "^5.37.43",
"mocha": "^10.7.3",
"mocha-snap": "^5.0.0",
"nyc": "^15.1.0",
"prettier": "^3.4.2",
"prettier": "^3.6.2",
"semantic-release": "^22.0.5",
"typescript": "^5.7.2"
"typescript": "^5.9.2"
},
"exports": {
".": {
Expand Down
6 changes: 4 additions & 2 deletions src/__tests__/__snapshots__/js-block.expected/auto.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
$ var name = "Frank";
$ console.log(`Hello ${name}!`);
$ {
var name = "Frank";
console.log(`Hello ${name}!`);
}

<div/>
6 changes: 4 additions & 2 deletions src/__tests__/__snapshots__/js-block.expected/concise.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
$ var name = "Frank";
$ console.log(`Hello ${name}!`);
$ {
var name = "Frank";
console.log(`Hello ${name}!`);
}

div
6 changes: 4 additions & 2 deletions src/__tests__/__snapshots__/js-block.expected/html.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
$ var name = "Frank";
$ console.log(`Hello ${name}!`);
$ {
var name = "Frank";
console.log(`Hello ${name}!`);
}

<div/>
6 changes: 4 additions & 2 deletions src/__tests__/__snapshots__/js-block.expected/with-parens.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
$ var name = "Frank";
$ console.log(`Hello ${name}!`);
$ {
var name = "Frank";
console.log(`Hello ${name}!`);
}

<div/>
16 changes: 8 additions & 8 deletions src/__tests__/__snapshots__/mixed-shorthand-and-longhand-class.expected/auto.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<div class="string blue"/>
<div class=["blue", "string_list"]/>
<div class=`${"string"} ${"blue"}`/>
<div class=["string_list", "blue"]/>

<div class=["templatestring", `${blue}`]/>
<div class=[`${blue}`, "templatestring_list"]/>
<div class=["templatestring_list", `${blue}`]/>

<div class=["dynamic", blue]/>
<div class=[blue, "dynamic_list"]/>
<div class=["dynamic_list", blue]/>

<div class=["red", blue, "green", yellow, "mixed_list"]/>
<div class=["mixed_list", "red", blue, "green", yellow]/>
<div class=[
"long_list",
red,
yellow,
(() => "blue")(),
orange,
...colorList.map((item) => item.color),
green,
"long_list",
]/>
<div class=[
"long_item",
Expand All @@ -24,8 +24,8 @@
.map((color) => color.toUpperCase()),
]/>

<div class=["red", "multiple"] class="blue"/>
<div class="multiple red" class=["blue"]/>
<div class=["multiple", "red"] class="blue"/>
<div class=`${"multiple"} ${"red"}` class=["blue"]/>

<div class=[
"multiple",
Expand Down
16 changes: 8 additions & 8 deletions src/__tests__/__snapshots__/mixed-shorthand-and-longhand-class.expected/concise.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
div.string.blue
div class=["blue", "string_list"]
div class=`${"string"} ${"blue"}`
div class=["string_list", "blue"]

div class=["templatestring", `${blue}`]
div class=[`${blue}`, "templatestring_list"]
div class=["templatestring_list", `${blue}`]

div class=["dynamic", blue]
div class=[blue, "dynamic_list"]
div class=["dynamic_list", blue]

div class=["red", blue, "green", yellow, "mixed_list"]
div class=["mixed_list", "red", blue, "green", yellow]
div class=[
"long_list",
red,
yellow,
(() => "blue")(),
orange,
...colorList.map((item) => item.color),
green,
"long_list",
]
div class=[
"long_item",
Expand All @@ -24,8 +24,8 @@ div class=[
.map((color) => color.toUpperCase()),
]

div.blue class=["red", "multiple"]
div.multiple.red class=["blue"]
div.blue class=["multiple", "red"]
div class=`${"multiple"} ${"red"}` class=["blue"]

div class=[
"multiple",
Expand Down
16 changes: 8 additions & 8 deletions src/__tests__/__snapshots__/mixed-shorthand-and-longhand-class.expected/html.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<div class="string blue"/>
<div class=["blue", "string_list"]/>
<div class=`${"string"} ${"blue"}`/>
<div class=["string_list", "blue"]/>

<div class=["templatestring", `${blue}`]/>
<div class=[`${blue}`, "templatestring_list"]/>
<div class=["templatestring_list", `${blue}`]/>

<div class=["dynamic", blue]/>
<div class=[blue, "dynamic_list"]/>
<div class=["dynamic_list", blue]/>

<div class=["red", blue, "green", yellow, "mixed_list"]/>
<div class=["mixed_list", "red", blue, "green", yellow]/>
<div class=[
"long_list",
red,
yellow,
(() => "blue")(),
orange,
...colorList.map((item) => item.color),
green,
"long_list",
]/>
<div class=[
"long_item",
Expand All @@ -24,8 +24,8 @@
.map((color) => color.toUpperCase()),
]/>

<div class=["red", "multiple"] class="blue"/>
<div class="multiple red" class=["blue"]/>
<div class=["multiple", "red"] class="blue"/>
<div class=`${"multiple"} ${"red"}` class=["blue"]/>

<div class=[
"multiple",
Expand Down
16 changes: 8 additions & 8 deletions src/__tests__/__snapshots__/mixed-shorthand-and-longhand-class.expected/with-parens.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<div class="string blue"/>
<div class=["blue", "string_list"]/>
<div class=`${"string"} ${"blue"}`/>
<div class=["string_list", "blue"]/>

<div class=["templatestring", `${blue}`]/>
<div class=[`${blue}`, "templatestring_list"]/>
<div class=["templatestring_list", `${blue}`]/>

<div class=["dynamic", blue]/>
<div class=[blue, "dynamic_list"]/>
<div class=["dynamic_list", blue]/>

<div class=["red", blue, "green", yellow, "mixed_list"]/>
<div class=["mixed_list", "red", blue, "green", yellow]/>
<div class=[
"long_list",
red,
yellow,
(() => "blue")(),
orange,
...colorList.map((item) => item.color),
green,
"long_list",
]/>
<div class=[
"long_item",
Expand All @@ -24,8 +24,8 @@
.map((color) => color.toUpperCase()),
]/>

<div class=["red", "multiple"] class="blue"/>
<div class="multiple red" class=["blue"]/>
<div class=["multiple", "red"] class="blue"/>
<div class=`${"multiple"} ${"red"}` class=["blue"]/>

<div class=[
"multiple",
Expand Down
6 changes: 4 additions & 2 deletions src/__tests__/__snapshots__/scriptlet-block.expected/auto.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
$ var bgColor = getRandomColor();
$ var textColor = isLight(bgColor) ? "black" : "white";
$ {
var bgColor = getRandomColor();
var textColor = isLight(bgColor) ? "black" : "white";
}
6 changes: 4 additions & 2 deletions src/__tests__/__snapshots__/scriptlet-block.expected/concise.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
$ var bgColor = getRandomColor();
$ var textColor = isLight(bgColor) ? "black" : "white";
$ {
var bgColor = getRandomColor();
var textColor = isLight(bgColor) ? "black" : "white";
}
6 changes: 4 additions & 2 deletions src/__tests__/__snapshots__/scriptlet-block.expected/html.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
$ var bgColor = getRandomColor();
$ var textColor = isLight(bgColor) ? "black" : "white";
$ {
var bgColor = getRandomColor();
var textColor = isLight(bgColor) ? "black" : "white";
}
6 changes: 4 additions & 2 deletions src/__tests__/__snapshots__/scriptlet-block.expected/with-parens.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
$ var bgColor = getRandomColor();
$ var textColor = isLight(bgColor) ? "black" : "white";
$ {
var bgColor = getRandomColor();
var textColor = isLight(bgColor) ? "black" : "white";
}
17 changes: 17 additions & 0 deletions src/__tests__/__snapshots__/scriptlet-comments.expected/auto.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
$ {
before;
// middle
after;
//end
}
$ /* leading */ const x = foo;

<div>
$ {
// comment
/* other
comment */
/* third comment */
}
$ // just one
</div>
16 changes: 16 additions & 0 deletions src/__tests__/__snapshots__/scriptlet-comments.expected/concise.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
$ {
before;
// middle
after;
//end
}
$ /* leading */ const x = foo;

div
$ {
// comment
/* other
comment */
/* third comment */
}
$ // just one
17 changes: 17 additions & 0 deletions src/__tests__/__snapshots__/scriptlet-comments.expected/html.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
$ {
before;
// middle
after;
//end
}
$ /* leading */ const x = foo;

<div>
$ {
// comment
/* other
comment */
/* third comment */
}
$ // just one
</div>
17 changes: 17 additions & 0 deletions src/__tests__/__snapshots__/scriptlet-comments.expected/with-parens.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
$ {
before;
// middle
after;
//end
}
$ /* leading */ const x = foo;

<div>
$ {
// comment
/* other
comment */
/* third comment */
}
$ // just one
</div>
22 changes: 13 additions & 9 deletions src/__tests__/__snapshots__/scriptlets.expected/auto.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
$ console.log("hello");
$ console.log("a");
$ console.log("b");
$ console.log("a");
$ console.log("b");
$ console.log("c");
$ console.log("d");
$ console.log("e");
$ console.log("f");
$ console.log("g");
$ {
console.log("a");
console.log("b");
}
$ {
console.log("a");
console.log("b");
console.log("c");
console.log("d");
console.log("e");
console.log("f");
console.log("g");
}
$ console.log(
new Map([
["a", 1],
Expand Down
22 changes: 13 additions & 9 deletions src/__tests__/__snapshots__/scriptlets.expected/concise.marko
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
$ console.log("hello");
$ console.log("a");
$ console.log("b");
$ console.log("a");
$ console.log("b");
$ console.log("c");
$ console.log("d");
$ console.log("e");
$ console.log("f");
$ console.log("g");
$ {
console.log("a");
console.log("b");
}
$ {
console.log("a");
console.log("b");
console.log("c");
console.log("d");
console.log("e");
console.log("f");
console.log("g");
}
$ console.log(
new Map([
["a", 1],
Expand Down
Loading