Merge pull request #82 from oleast/fix/deps-prettier-3

package.json

@@ -39,6 +39,7 @@
   ],
   "scripts": {
     "lint": "prettier --check ./src",
+    "lint:fix": "prettier --write ./src",
     "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.module.json",
     "test": "vitest run",
     "test:watch": "vitest watch"
@@ -51,7 +52,7 @@
     "@semantic-release/npm": "^10.0.2",
     "@semantic-release/release-notes-generator": "^11.0.1",
     "conventional-changelog-conventionalcommits": "^6.1.0",
-    "prettier": "^2.8.1",
+    "prettier": "^3.0.0",
     "semantic-release": "^21.0.0",
     "typescript": "^5.0.2",
     "vitest": "^0.33.0"

src/converters.ts

@@ -42,7 +42,7 @@ const DEFAULT_NODE_TYPE_FOR_HTML_TAG: Partial<
 };
 
 const getDefaultNodeTypeForHtmlTag = (
-  tagName: HTMLTagName
+  tagName: HTMLTagName,
 ): BLOCKS | MARKS | INLINES | undefined => {
   return DEFAULT_NODE_TYPE_FOR_HTML_TAG[tagName];
 };

src/htmlStringToDocument.ts

@@ -56,7 +56,7 @@ const DEFAULT_TAG_CONVERTERS: Partial<
 const mapHtmlNodeToRichTextNode = (
   node: HTMLNode,
   marks: Mark[],
-  options: OptionsWithDefaults
+  options: OptionsWithDefaults,
 ) => {
   const { convertText, convertTag } = options;
   if (node.type === "text") {
@@ -68,7 +68,7 @@ const mapHtmlNodeToRichTextNode = (
     const allMarks = newMarks.concat(marks);
     if (node.type === "element") {
       return node.children.flatMap((child) =>
-        mapHtmlNodeToRichTextNode(child, allMarks, options)
+        mapHtmlNodeToRichTextNode(child, allMarks, options),
       );
     }
     return getAsList(mapHtmlNodeToRichTextNode(node, allMarks, options));
@@ -85,7 +85,7 @@ const mapHtmlNodeToRichTextNode = (
 
 export const htmlStringToDocument = (
   htmlString: string,
-  options: Options = {}
+  options: Options = {},
 ): Document => {
   const optionsWithDefaults: OptionsWithDefaults = {
     convertTag: {
@@ -96,7 +96,7 @@ export const htmlStringToDocument = (
   };
   const parsedHtml = parseHtml(htmlString);
   const richTextNodes = parsedHtml.flatMap((node) =>
-    mapHtmlNodeToRichTextNode(node, [], optionsWithDefaults)
+    mapHtmlNodeToRichTextNode(node, [], optionsWithDefaults),
   );
   return createDocumentNode(richTextNodes as TopLevelBlock[]);
 };

src/parseHtml.ts

@@ -23,7 +23,7 @@ const isChildNodeTemplate = (childNode: ChildNode): childNode is Template => {
 };
 
 const isChildNodeDocumentType = (
-  childNode: ChildNode
+  childNode: ChildNode,
 ): childNode is DocumentType => {
   return childNode.nodeName === "#documentType";
 };
@@ -50,7 +50,7 @@ const mapChildNodeToHtmlNode = (childNode: ChildNode): HTMLNode | null => {
       .map((c) => mapChildNodeToHtmlNode(c))
       .filter(isNotNull),
     attrs: Object.fromEntries(
-      childNode.attrs.map((attr) => [attr.name, attr.value])
+      childNode.attrs.map((attr) => [attr.name, attr.value]),
     ),
   };
 };

src/test/helpers.ts

@@ -12,7 +12,7 @@ export const createText = (value: string, marks?: Mark | Mark[]): Text => {
 
 export const createBlock = (
   nodeType: BLOCKS,
-  content: Text | Block | Inline | Array<Text | Block | Inline>
+  content: Text | Block | Inline | Array<Text | Block | Inline>,
 ): Block => {
   return {
     nodeType,

src/test/index.test.ts

@@ -72,18 +72,18 @@ describe("Parse HTML string to Contentful Document", () => {
 
     const matchNode = helpers.createBlock(
       BLOCKS.PARAGRAPH,
-      helpers.createText(matchText)
+      helpers.createText(matchText),
     );
 
     expect(htmlNodes).toMatchObject(
-      createDocumentNode([matchNode as TopLevelBlock])
+      createDocumentNode([matchNode as TopLevelBlock]),
     );
   });
 
   it("Handles a complex convert option from 'span' with bold class to 'paragraph' and 'bold' mark", () => {
     const styledSpanToMarkedParagraphConverter: TagConverter<Block> = (
       node,
-      next
+      next,
     ) => {
       const isBold = node.attrs.class === "bold";
       const marks = isBold ? ({ type: "bold" } satisfies Mark) : undefined;
@@ -100,13 +100,13 @@ describe("Parse HTML string to Contentful Document", () => {
         convertTag: {
           span: styledSpanToMarkedParagraphConverter,
         },
-      }
+      },
     );
 
     const matchNode = createDocumentNode([
       helpers.createBlock(
         BLOCKS.PARAGRAPH,
-        helpers.createText(matchText, { type: "bold" })
+        helpers.createText(matchText, { type: "bold" }),
       ),
     ] as TopLevelBlock[]);
 

src/types.ts

@@ -41,16 +41,16 @@ export type ConverterResult<TNodeType extends AnyContentfulNode> =
 export type Next<TNodeType extends AnyContentfulNode = Block | Inline | Text> =
   (
     node: HTMLNode,
-    marks?: Mark | Mark[]
+    marks?: Mark | Mark[],
   ) => Array<ContentfulNodeContent<TNodeType>>;
 
 export type TextConverter = (node: HTMLTextNode, marks: Mark[]) => Text;
 
 export type TagConverter<
-  TNodeType extends AnyContentfulNode = Block | Inline | Text
+  TNodeType extends AnyContentfulNode = Block | Inline | Text,
 > = (
   node: HTMLElementNode,
-  next: Next<TNodeType>
+  next: Next<TNodeType>,
 ) => ConverterResult<TNodeType>;
 
 export type ConvertTagOptions = Record<HTMLTagName | string, TagConverter>;

src/utils.ts

@@ -22,13 +22,13 @@ export const getAsList = <T>(value: T | T[]): T[] => {
 };
 
 export const isBlockType = (
-  nodeType: BLOCKS | MARKS | INLINES
+  nodeType: BLOCKS | MARKS | INLINES,
 ): nodeType is BLOCKS => BLOCK_TYPES.includes(nodeType as BLOCKS);
 export const isInlineType = (
-  nodeType: BLOCKS | MARKS | INLINES
+  nodeType: BLOCKS | MARKS | INLINES,
 ): nodeType is INLINES => INLINE_TYPES.includes(nodeType as INLINES);
 export const isMarkType = (
-  nodeType: BLOCKS | MARKS | INLINES
+  nodeType: BLOCKS | MARKS | INLINES,
 ): nodeType is MARKS => MARK_TYPES.includes(nodeType as MARKS);
 
 export const isNodeTypeMark = (node: Node | Text | Mark): node is Mark => {
@@ -47,7 +47,7 @@ export const isNodeTypeText = (node: Node | Text | Mark): node is Text => {
 
 export const createDocumentNode = (
   content: TopLevelBlock[],
-  data: NodeData = {}
+  data: NodeData = {},
 ): Document => ({
   nodeType: BLOCKS.DOCUMENT,
   data,