Skip to content

Commit 122783f

Browse files
committed
Normalize errors
1 parent fe6a42c commit 122783f

1 file changed

Lines changed: 14 additions & 5 deletions

File tree

bin/handler.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { generateSVG, generateShape } from '../src/generate.js';
1111
export async function handleRender(source, options) {
1212
let { content, error } = await read(source);
1313
if (error) {
14-
console.log(error.message);
14+
console.error(error.message);
1515
process.exit(1);
1616
} else {
1717
let title = 'image';
@@ -34,7 +34,7 @@ export async function handleRender(source, options) {
3434
export async function handleParse(source) {
3535
let { content, error } = await read(source);
3636
if (error) {
37-
console.warn(error.message);
37+
console.error(error.message);
3838
process.exit(1);
3939
} else {
4040
try {
@@ -49,7 +49,7 @@ export async function handleParse(source) {
4949
export async function handlePreview(source, options) {
5050
let { content, error } = await read(source);
5151
if (error) {
52-
console.log(error.message);
52+
console.error(error.message);
5353
process.exit(1);
5454
} else {
5555
let title = path.basename(source);
@@ -67,15 +67,15 @@ export async function handleGenerateSVG(source) {
6767
if (/^svg\s*\{/i.test(content) || !content.length) {
6868
console.log(generateSVG(content));
6969
} else {
70-
console.warn('warn: invalid SVG format');
70+
console.error('error: invalid SVG format');
7171
}
7272
}
7373
}
7474

7575
export async function handleGenerateShape(source) {
7676
let { content, error } = await read(source);
7777
if (error) {
78-
console.log(error.message);
78+
console.error(error.message);
7979
process.exit(1);
8080
} else {
8181
console.log(generateShape(content));
@@ -151,6 +151,15 @@ async function read(path) {
151151
error = e;
152152
}
153153
}
154+
155+
if (content) {
156+
content = content.trim();
157+
}
158+
159+
if (!error && !content) {
160+
error = new Error('error: empty input');
161+
}
162+
154163
return { content, error };
155164
}
156165

0 commit comments

Comments
 (0)