Get tests working

aimee-gm · aimee-gm · commit 50aa8922ece7 · 2023-11-14T08:58:25.000Z
diff --git a/src/helpers/authorship.ts b/src/helpers/authorship.ts
@@ -6,6 +6,18 @@ import {
   Rels,
 } from "../types";
 
+type DraftAuthor = Partial<Author>;
+
+function isAuthor(value: DraftAuthor): value is Author {
+  return value.value !== undefined;
+}
+
+function isMicroformatRoot(
+  value: MicroformatProperty,
+): value is MicroformatRoot {
+  return typeof value !== "object" || !("id" in value);
+}
+
 function getPlainText(values: MicroformatProperty[]): string | null {
   if (values.length === 0) {
     return null;
@@ -24,11 +36,10 @@ function getPlainText(values: MicroformatProperty[]): string | null {
   return plainText && plainText.trim();
 }
 
-const parseAuthor = (hCard: MicroformatRoot) => {
-  // TODO: Figure out how to stop TypeScript complaining about missing `value`
-  const result: Author = {};
+const parseAuthor = (hCard: MicroformatRoot): Author | undefined => {
+  const result: DraftAuthor = {};
 
-  if (hCard.properties !== undefined) {
+  if (hCard.properties) {
     // Use first (or only) name
     const names = hCard.properties.name as string[];
     if (names?.length > 0) {
@@ -57,25 +68,29 @@ const parseAuthor = (hCard: MicroformatRoot) => {
     }
   }
 
-  return result as Author;
+  if (isAuthor(result)) {
+    return result;
+  }
+
+  return undefined;
 };
 
-const findEntryAuthor = (hEntry: MicroformatRoot) => {
-  const values = hEntry.properties.author || [];
+const findEntryAuthor = (hEntry: MicroformatRoot): Author | undefined => {
+  const [value] = hEntry.properties.author || [];
 
-  if (Object.keys(values).length === 0) {
-    return;
+  if (!isMicroformatRoot(value)) {
+    return undefined;
   }
 
-  return parseAuthor(values[0] as MicroformatRoot);
+  return parseAuthor(value);
 };
 
-const findFeedAuthor = () => false;
+const findFeedAuthor = () => undefined;
 
-export const findAuthor = async (item: MicroformatRoot, rels: Rels) => {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const findAuthor = (item: MicroformatRoot, _rels: Rels) => {
   // 1. If no `h-entry` then there’s no post to find authorship for.
-  const itemIsEntry = item.type && item.type[0] === "h-entry";
-  if (!itemIsEntry) {
+  if (item.type?.[0] !== "h-entry") {
     return false;
   }
 
@@ -84,20 +99,20 @@ export const findAuthor = async (item: MicroformatRoot, rels: Rels) => {
   const feedAuthor = findFeedAuthor(); // TODO
 
   // 3 & 4. Return author in `h-entry`, else find author in parent `h-feed`
-  const author = entryAuthor ? entryAuthor : feedAuthor;
+  const author = entryAuthor || feedAuthor;
 
   // 5. Return `author` if `h-card`
-  const authorIsCard = author && author.type[0] === "h-card";
-  if (authorIsCard) {
-    return author;
-  }
+  // const authorIsCard = author && author.type[0] === "h-card";
+  // if (authorIsCard) {
+  //   return author;
+  // }
 
   // 6. Use `h-card` fetched from rel=author
-  const authorPage = author.properties?.url || rels.author;
-  if (authorPage) {
-    // Fetch `authorPage` and parse result using `parseMicroformat`
-    // This is an async function, which would bubble up to the parent function
-  }
+  // const authorPage = author.properties?.url || rels.author;
+  // if (authorPage) {
+  // Fetch `authorPage` and parse result using `parseMicroformat`
+  // This is an async function, which would bubble up to the parent function
+  // }
 
   // 7. From the parsed `authorPage`, return the first `h-card` that either:
   //    * Has a value for `u-url` (or `u-uid`) that matches the `authorPage` URL
diff --git a/src/microformats/parse.ts b/src/microformats/parse.ts
@@ -71,8 +71,7 @@ export const parseMicroformat = (
     const author = findAuthor(item, options.rels);
 
     if (author) {
-      console.log("author", author);
-      // item.properties.author = author;
+      item.properties.author = [author];
     }
   }
 
diff --git a/test/suites/experimental/authorship-h-card-with-rel-author-to-rel-me.html b/test/suites/experimental/authorship-h-card-with-rel-author-to-rel-me.html
@@ -7,7 +7,10 @@
   </head>
   <body class="h-entry">
     <div class="e-content">
-      <p>A woman must have money and a room of her own if she is to write fiction.</p>
+      <p>
+        A woman must have money and a room of her own if she is to write
+        fiction.
+      </p>
     </div>
     <footer>
       <a href="https://virginia.woolf" rel="author">About Virginia Woolf</a>
diff --git a/test/suites/experimental/authorship-h-card-with-rel-author-to-rel-me.json b/test/suites/experimental/authorship-h-card-with-rel-author-to-rel-me.json
@@ -20,7 +20,7 @@
           {
             "value": "A woman must have money and a room of her own if she is to write fiction.",
             "lang": "en",
-            "html": "<p>A woman must have money and a room of her own if she is to write fiction.</p>"
+            "html": "<p>\n        A woman must have money and a room of her own if she is to write\n        fiction.\n      </p>"
           }
         ]
       }
diff --git a/test/suites/experimental/authorship-h-card-with-rel-author.html b/test/suites/experimental/authorship-h-card-with-rel-author.html
@@ -7,7 +7,10 @@
   </head>
   <body class="h-entry">
     <div class="e-content">
-      <p>For one who sees the distinction, there is no further confusing of the mind with the self.</p>
+      <p>
+        For one who sees the distinction, there is no further confusing of the
+        mind with the self.
+      </p>
     </div>
     <p class="p-author h-card">
       <a href="https://patanjali.example" class="u-url">
diff --git a/test/suites/experimental/authorship-h-card-with-rel-author.json b/test/suites/experimental/authorship-h-card-with-rel-author.json
@@ -19,7 +19,7 @@
           {
             "value": "For one who sees the distinction, there is no further confusing of the mind with the self.",
             "lang": "en",
-            "html": "<p>For one who sees the distinction, there is no further confusing of the mind with the self.</p>"
+            "html": "<p>\n        For one who sees the distinction, there is no further confusing of the\n        mind with the self.\n      </p>"
           }
         ]
       }
diff --git a/test/suites/experimental/authorship-h-card.html b/test/suites/experimental/authorship-h-card.html
@@ -7,7 +7,10 @@
   </head>
   <body class="h-entry">
     <div class="e-content">
-      <p>Even in the house of Hades there is left something, a soul and an image, but there is no real heart of life in it.</p>
+      <p>
+        Even in the house of Hades there is left something, a soul and an image,
+        but there is no real heart of life in it.
+      </p>
     </div>
     <footer class="p-author h-card">
       <a href="https://homer.example" class="u-url">
diff --git a/test/suites/experimental/authorship-h-card.json b/test/suites/experimental/authorship-h-card.json
@@ -20,7 +20,7 @@
           {
             "value": "Even in the house of Hades there is left something, a soul and an image, but there is no real heart of life in it.",
             "lang": "en",
-            "html": "<p>Even in the house of Hades there is left something, a soul and an image, but there is no real heart of life in it.</p>"
+            "html": "<p>\n        Even in the house of Hades there is left something, a soul and an image,\n        but there is no real heart of life in it.\n      </p>"
           }
         ]
       }
diff --git a/test/suites/experimental/authorship-h-feed.html b/test/suites/experimental/authorship-h-feed.html
@@ -13,7 +13,9 @@
     </article>
     <article class="h-entry">
       <div class="e-content">
-        <p>Whosoever is delighted in solitude is either a wild beast or a god.</p>
+        <p>
+          Whosoever is delighted in solitude is either a wild beast or a god.
+        </p>
       </div>
     </article>
     <footer class="p-author h-card">
diff --git a/test/suites/experimental/authorship-h-feed.json b/test/suites/experimental/authorship-h-feed.json
@@ -61,7 +61,7 @@
             ],
             "content": [
               {
-                "html": "<p>Whosoever is delighted in solitude is either a wild beast or a god.</p>",
+                "html": "<p>\n          Whosoever is delighted in solitude is either a wild beast or a god.\n        </p>",
                 "lang": "en",
                 "value": "Whosoever is delighted in solitude is either a wild beast or a god."
               }

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,7 @@ export const parseMicroformat = (`
`71`	`71`	`const author = findAuthor(item, options.rels);`
`72`	`72`
`73`	`73`	`if (author) {`
`74`		`- console.log("author", author);`
`75`		`- // item.properties.author = author;`
	`74`	`+ item.properties.author = [author];`
`76`	`75`	`}`
`77`	`76`	`}`
`78`	`77`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`{`
`21`	`21`	`"value": "A woman must have money and a room of her own if she is to write fiction.",`
`22`	`22`	`"lang": "en",`
`23`		`- "html": "<p>A woman must have money and a room of her own if she is to write fiction.</p>"`
	`23`	`+ "html": "<p>\n A woman must have money and a room of her own if she is to write\n fiction.\n </p>"`
`24`	`24`	`}`
`25`	`25`	`]`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`{`
`20`	`20`	`"value": "For one who sees the distinction, there is no further confusing of the mind with the self.",`
`21`	`21`	`"lang": "en",`
`22`		`- "html": "<p>For one who sees the distinction, there is no further confusing of the mind with the self.</p>"`
	`22`	`+ "html": "<p>\n For one who sees the distinction, there is no further confusing of the\n mind with the self.\n </p>"`
`23`	`23`	`}`
`24`	`24`	`]`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`],`
`62`	`62`	`"content": [`
`63`	`63`	`{`
`64`		`- "html": "<p>Whosoever is delighted in solitude is either a wild beast or a god.</p>",`
	`64`	`+ "html": "<p>\n Whosoever is delighted in solitude is either a wild beast or a god.\n </p>",`
`65`	`65`	`"lang": "en",`
`66`	`66`	`"value": "Whosoever is delighted in solitude is either a wild beast or a god."`
`67`	`67`	`}`