@herb-tools/printer 0.8.9 → 0.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js.map +1 -0
- package/dist/{src/erb-to-ruby-string-printer.js → erb-to-ruby-string-printer.js} +20 -22
- package/dist/erb-to-ruby-string-printer.js.map +1 -0
- package/dist/herb-print.js +54344 -14956
- package/dist/herb-print.js.map +1 -1
- package/dist/{src/identity-printer.js → identity-printer.js} +33 -0
- package/dist/identity-printer.js.map +1 -0
- package/dist/indent-printer.js +256 -0
- package/dist/indent-printer.js.map +1 -0
- package/dist/index.cjs +309 -22
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +310 -24
- package/dist/index.js.map +1 -1
- package/dist/print-context.js.map +1 -0
- package/dist/{src/printer.js → printer.js} +3 -1
- package/dist/printer.js.map +1 -0
- package/dist/types/identity-printer.d.ts +6 -0
- package/dist/types/indent-printer.d.ts +41 -0
- package/dist/types/index.d.ts +1 -0
- package/dist/types/printer.d.ts +1 -1
- package/package.json +2 -2
- package/src/erb-to-ruby-string-printer.ts +25 -27
- package/src/identity-printer.ts +44 -0
- package/src/indent-printer.ts +313 -0
- package/src/index.ts +1 -0
- package/src/printer.ts +6 -6
- package/dist/package.json +0 -50
- package/dist/src/cli.js.map +0 -1
- package/dist/src/erb-to-ruby-string-printer.js.map +0 -1
- package/dist/src/herb-print.js +0 -5
- package/dist/src/herb-print.js.map +0 -1
- package/dist/src/identity-printer.js.map +0 -1
- package/dist/src/index.js +0 -5
- package/dist/src/index.js.map +0 -1
- package/dist/src/print-context.js.map +0 -1
- package/dist/src/printer.js.map +0 -1
- package/dist/tsconfig.tsbuildinfo +0 -1
- package/dist/types/src/cli.d.ts +0 -6
- package/dist/types/src/erb-to-ruby-string-printer.d.ts +0 -42
- package/dist/types/src/herb-print.d.ts +0 -2
- package/dist/types/src/identity-printer.d.ts +0 -48
- package/dist/types/src/index.d.ts +0 -5
- package/dist/types/src/print-context.d.ts +0 -54
- package/dist/types/src/printer.d.ts +0 -39
- /package/dist/{src/cli.js → cli.js} +0 -0
- /package/dist/{src/print-context.js → print-context.js} +0 -0
package/dist/cli.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IdentityPrinter } from "./identity-printer.js";
|
|
2
2
|
import { DEFAULT_PRINT_OPTIONS } from "./printer.js";
|
|
3
|
-
import { isERBOutputNode, filterNodes, ERBContentNode, } from "@herb-tools/core";
|
|
3
|
+
import { isERBOutputNode, filterNodes, ERBContentNode, isERBIfNode, isERBUnlessNode, isERBElseNode, isHTMLTextNode } from "@herb-tools/core";
|
|
4
4
|
export const DEFAULT_ERB_TO_RUBY_STRING_OPTIONS = {
|
|
5
5
|
...DEFAULT_PRINT_OPTIONS,
|
|
6
6
|
forceQuotes: false
|
|
@@ -22,7 +22,6 @@ export const DEFAULT_ERB_TO_RUBY_STRING_OPTIONS = {
|
|
|
22
22
|
* - `<% if logged_in? %>Welcome<% else %>Login<% end %>!` => `"#{logged_in? ? "Welcome" : "Login"}!"`
|
|
23
23
|
*/
|
|
24
24
|
export class ERBToRubyStringPrinter extends IdentityPrinter {
|
|
25
|
-
// TODO: cleanup `.type === "AST_*" checks`
|
|
26
25
|
static print(node, options = DEFAULT_ERB_TO_RUBY_STRING_OPTIONS) {
|
|
27
26
|
const erbNodes = filterNodes([node], ERBContentNode);
|
|
28
27
|
if (erbNodes.length === 1 && isERBOutputNode(erbNodes[0]) && !options.forceQuotes) {
|
|
@@ -34,19 +33,18 @@ export class ERBToRubyStringPrinter extends IdentityPrinter {
|
|
|
34
33
|
if (hasOnlyERBContent && childErbNodes.length === 1 && isERBOutputNode(childErbNodes[0]) && !options.forceQuotes) {
|
|
35
34
|
return (childErbNodes[0].content?.value || "").trim();
|
|
36
35
|
}
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
const firstChild = node.children[0];
|
|
37
|
+
if (node.children.length === 1 && isERBIfNode(firstChild) && !options.forceQuotes) {
|
|
39
38
|
const printer = new ERBToRubyStringPrinter();
|
|
40
|
-
if (printer.canConvertToTernary(
|
|
41
|
-
printer.convertToTernaryWithoutWrapper(
|
|
39
|
+
if (printer.canConvertToTernary(firstChild)) {
|
|
40
|
+
printer.convertToTernaryWithoutWrapper(firstChild);
|
|
42
41
|
return printer.context.getOutput();
|
|
43
42
|
}
|
|
44
43
|
}
|
|
45
|
-
if (node.children.length === 1 &&
|
|
46
|
-
const unlessNode = node.children[0];
|
|
44
|
+
if (node.children.length === 1 && isERBUnlessNode(firstChild) && !options.forceQuotes) {
|
|
47
45
|
const printer = new ERBToRubyStringPrinter();
|
|
48
|
-
if (printer.canConvertUnlessToTernary(
|
|
49
|
-
printer.convertUnlessToTernaryWithoutWrapper(
|
|
46
|
+
if (printer.canConvertUnlessToTernary(firstChild)) {
|
|
47
|
+
printer.convertUnlessToTernaryWithoutWrapper(firstChild);
|
|
50
48
|
return printer.context.getOutput();
|
|
51
49
|
}
|
|
52
50
|
}
|
|
@@ -86,15 +84,15 @@ export class ERBToRubyStringPrinter extends IdentityPrinter {
|
|
|
86
84
|
this.visitChildNodes(node);
|
|
87
85
|
}
|
|
88
86
|
canConvertToTernary(node) {
|
|
89
|
-
if (node.subsequent && node.subsequent
|
|
87
|
+
if (node.subsequent && !isERBElseNode(node.subsequent)) {
|
|
90
88
|
return false;
|
|
91
89
|
}
|
|
92
|
-
const ifOnlyText = node.statements ? node.statements.every(
|
|
90
|
+
const ifOnlyText = node.statements ? node.statements.every(isHTMLTextNode) : true;
|
|
93
91
|
if (!ifOnlyText)
|
|
94
92
|
return false;
|
|
95
|
-
if (node.subsequent
|
|
93
|
+
if (isERBElseNode(node.subsequent)) {
|
|
96
94
|
return node.subsequent.statements
|
|
97
|
-
? node.subsequent.statements.every(
|
|
95
|
+
? node.subsequent.statements.every(isHTMLTextNode)
|
|
98
96
|
: true;
|
|
99
97
|
}
|
|
100
98
|
return true;
|
|
@@ -121,14 +119,14 @@ export class ERBToRubyStringPrinter extends IdentityPrinter {
|
|
|
121
119
|
this.context.write('"');
|
|
122
120
|
this.context.write(" : ");
|
|
123
121
|
this.context.write('"');
|
|
124
|
-
if (node.subsequent && node.subsequent.
|
|
122
|
+
if (isERBElseNode(node.subsequent) && node.subsequent.statements) {
|
|
125
123
|
node.subsequent.statements.forEach(statement => this.visit(statement));
|
|
126
124
|
}
|
|
127
125
|
this.context.write('"');
|
|
128
126
|
this.context.write("}");
|
|
129
127
|
}
|
|
130
128
|
convertToTernaryWithoutWrapper(node) {
|
|
131
|
-
if (node.subsequent && node.subsequent
|
|
129
|
+
if (node.subsequent && !isERBElseNode(node.subsequent)) {
|
|
132
130
|
return false;
|
|
133
131
|
}
|
|
134
132
|
if (node.content?.value) {
|
|
@@ -151,18 +149,18 @@ export class ERBToRubyStringPrinter extends IdentityPrinter {
|
|
|
151
149
|
this.context.write('"');
|
|
152
150
|
this.context.write(" : ");
|
|
153
151
|
this.context.write('"');
|
|
154
|
-
if (node.subsequent && node.subsequent.
|
|
152
|
+
if (isERBElseNode(node.subsequent) && node.subsequent.statements) {
|
|
155
153
|
node.subsequent.statements.forEach(statement => this.visit(statement));
|
|
156
154
|
}
|
|
157
155
|
this.context.write('"');
|
|
158
156
|
}
|
|
159
157
|
canConvertUnlessToTernary(node) {
|
|
160
|
-
const unlessOnlyText = node.statements ? node.statements.every(
|
|
158
|
+
const unlessOnlyText = node.statements ? node.statements.every(isHTMLTextNode) : true;
|
|
161
159
|
if (!unlessOnlyText)
|
|
162
160
|
return false;
|
|
163
|
-
if (node.else_clause
|
|
161
|
+
if (isERBElseNode(node.else_clause)) {
|
|
164
162
|
return node.else_clause.statements
|
|
165
|
-
? node.else_clause.statements.every(
|
|
163
|
+
? node.else_clause.statements.every(isHTMLTextNode)
|
|
166
164
|
: true;
|
|
167
165
|
}
|
|
168
166
|
return true;
|
|
@@ -191,7 +189,7 @@ export class ERBToRubyStringPrinter extends IdentityPrinter {
|
|
|
191
189
|
this.context.write('"');
|
|
192
190
|
this.context.write(" : ");
|
|
193
191
|
this.context.write('"');
|
|
194
|
-
if (node.else_clause
|
|
192
|
+
if (isERBElseNode(node.else_clause)) {
|
|
195
193
|
node.else_clause.statements.forEach(statement => this.visit(statement));
|
|
196
194
|
}
|
|
197
195
|
this.context.write('"');
|
|
@@ -220,7 +218,7 @@ export class ERBToRubyStringPrinter extends IdentityPrinter {
|
|
|
220
218
|
this.context.write('"');
|
|
221
219
|
this.context.write(" : ");
|
|
222
220
|
this.context.write('"');
|
|
223
|
-
if (node.else_clause
|
|
221
|
+
if (isERBElseNode(node.else_clause)) {
|
|
224
222
|
node.else_clause.statements.forEach(statement => this.visit(statement));
|
|
225
223
|
}
|
|
226
224
|
this.context.write('"');
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"erb-to-ruby-string-printer.js","sourceRoot":"","sources":["../src/erb-to-ruby-string-printer.ts"],"names":[],"mappings":"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"}
|