fix: fix a bug when Node not found on report

acot-a11y · May 1, 2022 · 4e65658 · 4e65658
1 parent 8a2521a
commit 4e65658
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/packages/acot-reporter-dot/src/index.ts b/packages/acot-reporter-dot/src/index.ts
@@ -112,7 +112,9 @@ export default createReporterFactory(({ config, stdout }) => (runner) => {
               const selector = res.selector;
               const code = pickup(html, selector, { color: false });
 
-              meta.push(code, `at "${selector}"`);
+              if (code != null) {
+                meta.push(code, `at "${selector}"`);
+              }
             }
 
             if (res.help) {

diff --git a/packages/acot-reporter-pretty/src/index.ts b/packages/acot-reporter-pretty/src/index.ts
@@ -298,7 +298,9 @@ export default createReporterFactory(
                   const selector = res.selector;
                   const code = pickup(html, selector, { color: false });
 
-                  meta.push(code, `at "${selector}"`);
+                  if (code != null) {
+                    meta.push(code, `at "${selector}"`);
+                  }
                 }
 
                 if (res.help) {

diff --git a/packages/document/src/doc-result-reporter.ts b/packages/document/src/doc-result-reporter.ts
@@ -64,8 +64,10 @@ export class DocResultReporter {
               color: false,
             });
 
-            meta.push(html);
-            meta.push(`at "${result.selector}"`);
+            if (html != null) {
+              meta.push(html);
+              meta.push(`at "${result.selector}"`);
+            }
           }
 
           meta.push(origin + generateDocPath(error.code));

diff --git a/packages/html-pickup/src/__tests__/index.test.ts b/packages/html-pickup/src/__tests__/index.test.ts
@@ -27,14 +27,20 @@ const html = `
 
 describe('pickup', () => {
   test('basic', () => {
-    const output = pickup(html, '#element');
+    const output = pickup(html, '#element') as string;
 
     expect(output).not.toBe(stripAnsi(output));
     expect(stripAnsi(output)).toMatchSnapshot();
   });
 
+  test('not found', () => {
+    const output = pickup('', '#element');
+
+    expect(output).toBe(null);
+  });
+
   test('disable color', () => {
-    const output = pickup(html, '#element', { color: false });
+    const output = pickup(html, '#element', { color: false }) as string;
 
     expect(output).toBe(stripAnsi(output));
   });

diff --git a/packages/html-pickup/src/index.ts b/packages/html-pickup/src/index.ts
@@ -112,7 +112,7 @@ export const pickup = (
   html: string,
   selector: string,
   options: Partial<PickupOptions> = {},
-): string => {
+): string | null => {
   const opts = {
     truncate: 120,
     color: true,
@@ -127,6 +127,10 @@ export const pickup = (
     adapter,
   }) as Node[];
 
+  if (node == null) {
+    return null;
+  }
+
   const output = stringify(node, chk);
 
   return truncate(output, opts.truncate);