refactor: ♻️ RenderItem type function

RenderItem type function parameter update to return item and metadata

Author: uttamukkoji

src/Models/metadata-model.ts

@@ -9,8 +9,6 @@ export interface Metadata {
   itemType: 'entry' | 'asset' | undefined
   styleType: StyleType | undefined
   contentTypeUid: string | undefined
-
-  item: EmbeddedItem | undefined
 }
 
 export interface Attributes {
@@ -40,7 +38,6 @@ export function createMetadata(attribute: Attributes): Metadata {
     styleType: attribute["sys-style-type"] as StyleType,
     attributes: attribute,
     contentTypeUid: attribute["data-sys-content-type-uid"],
-    item: undefined
   }
 }
 
@@ -52,7 +49,6 @@ export function nodeToMetadata(attribute: Attributes, textNode: TextNode): Metad
   styleType: attribute["display-type"] as StyleType,
   attributes: attribute,
   contentTypeUid: attribute["content-type-uid"],
-  item: undefined
  }
 }
 

src/helper/find-embeded-object.ts

@@ -45,18 +45,14 @@ export function findEmbeddedItems(object: Metadata, entry: EntryEmbedable): (Emb
 }
 
 export function findRenderString(
+  item: EmbeddedItem,
   metadata: Metadata,
   renderOptions?: RenderOption,
 ): string {
-  if ((!metadata.item && metadata.item === undefined) || (!metadata && metadata === undefined)) {
+  if ((!item && item === undefined) || (!metadata && metadata === undefined)) {
     return '';
   }
 
-  if (!metadata.styleType) {
-    return '';
-  }
-
-  
   if (renderOptions && renderOptions[metadata.styleType] !== undefined) {
     const renderFunction = renderOptions[metadata.styleType] as RenderItem;
 
@@ -65,29 +61,29 @@ export function findRenderString(
       typeof renderFunction !== 'function' &&
       renderFunction[(metadata.attributes as EntryAttributes)['data-sys-content-type-uid']] !== undefined
     ) {
-      return (renderFunction as RenderContentType)[(metadata.attributes as EntryAttributes)['data-sys-content-type-uid']](metadata);
+      return (renderFunction as RenderContentType)[(metadata.attributes as EntryAttributes)['data-sys-content-type-uid']](item, metadata);
     } else if (
       (metadata.attributes as EntryAttributes)['data-sys-content-type-uid'] !== undefined &&
       typeof renderFunction !== 'function' &&
       (renderFunction as RenderContentType).$default !== undefined
     ) {
-      return (renderFunction as RenderContentType).$default(metadata);
+      return (renderFunction as RenderContentType).$default(item, metadata);
     } else if (
       metadata.contentTypeUid !== undefined &&
       typeof renderFunction !== 'function' &&
       renderFunction[metadata.contentTypeUid] !== undefined
     ) {
-      return (renderFunction as RenderContentType)[metadata.contentTypeUid](metadata)
+      return (renderFunction as RenderContentType)[metadata.contentTypeUid](item, metadata)
     } else if (
       metadata.contentTypeUid !== undefined &&
       typeof renderFunction !== 'function' &&
       (renderFunction as RenderContentType).$default !== undefined
     ) {
-      return (renderFunction as RenderContentType).$default(metadata);
+      return (renderFunction as RenderContentType).$default(item, metadata);
     }  else if (typeof renderFunction === 'function') {
-      return renderFunction(metadata);
+      return renderFunction(item, metadata);
     }
   }
   const defaultRenderFunction = defaultOptions[metadata.styleType] as RenderItem;  
-  return defaultRenderFunction(metadata);
+  return defaultRenderFunction(item, metadata);
 }

src/json-to-html.ts

@@ -109,8 +109,8 @@ export function referenceToHTML(node: Node,
         return ''
     }
     const metadata = nodeToMetadata(node.attrs, ((node.children && node.children.length > 0) ? node.children[0]: {}) as unknown as TextNode)
-    metadata.item = findEmbeddedItems(metadata, entry)[0]
-    return findRenderString(metadata, renderOption)
+    const item = findEmbeddedItems(metadata, entry)[0]
+    return findRenderString(item, metadata, renderOption)
 }
 
 function nodeChildrenToHTML(nodes: AnyNode[], 

src/options/default-options.ts

@@ -1,12 +1,13 @@
 import StyleType from '../embedded-types/style-type';
 import { RenderOption } from '.';
 import { Metadata } from '../Models/metadata-model';
+import { EmbeddedItem } from '../Models/embedded-object';
 
 export const defaultOptions: RenderOption = {
-  [StyleType.BLOCK]: (metadata: Metadata) =>
-    `<div><p>${metadata.item.title || metadata.item.uid}</p><p>Content type: <span>${metadata.item._content_type_uid}</span></p></div>`,
-  [StyleType.INLINE]: (metadata: Metadata) => `<span>${metadata.item.title || metadata.item.uid}</span>`,
-  [StyleType.LINK]: (metadata: Metadata) => `<a href="${metadata.item.url}">${metadata.text || metadata.item.title || metadata.item.uid}</a>`,
-  [StyleType.DISPLAY]: (metadata: Metadata) => `<img src="${metadata.item.url}" alt="${metadata.attributes.alt || metadata.item.title || metadata.item.filename || metadata.item.uid}" />`,
-  [StyleType.DOWNLOAD]: (metadata: Metadata) => `<a href="${metadata.item.url}">${metadata.text || metadata.item.title || metadata.item.uid}</a>`,
+  [StyleType.BLOCK]: (item: EmbeddedItem) =>
+    `<div><p>${item.title || item.uid}</p><p>Content type: <span>${item._content_type_uid}</span></p></div>`,
+  [StyleType.INLINE]: (item: EmbeddedItem) => `<span>${item.title || item.uid}</span>`,
+  [StyleType.LINK]: (item: EmbeddedItem, metadata: Metadata) => `<a href="${item.url}">${metadata.text || item.title || item.uid}</a>`,
+  [StyleType.DISPLAY]: (item: EmbeddedItem, metadata: Metadata) => `<img src="${item.url}" alt="${metadata.attributes.alt || item.title || item.filename || item.uid}" />`,
+  [StyleType.DOWNLOAD]: (item: EmbeddedItem, metadata: Metadata) => `<a href="${item.url}">${metadata.text || item.title || item.uid}</a>`,
 };

src/options/index.ts

@@ -7,7 +7,7 @@ import TextNode from '../nodes/text';
 export type Next = (nodes: AnyNode[]) => string
 export type RenderNode = (node: Node, next: Next) => string;
 export type RenderMark = (text: string) => string;
-export type RenderItem = (metadata: Metadata) => string;
+export type RenderItem = (item: EmbeddedItem, metadata: Metadata) => string;
 export interface RenderOption {
   [embedType: string]: RenderNode | RenderMark | RenderItem | RenderContentType;
 }

src/render-embedded-objects.ts

@@ -80,7 +80,6 @@ export function renderContent(content: (string | string[]), option: Option): (st
 
 function findAndReplaceEmbeddedItem(content:string, embededObjectTag: string, metadata: Metadata, option: Option): string {    
     const embeddedObjects = findEmbeddedItems(metadata, option.entry)
-    metadata.item = embeddedObjects[0]
-    const renderString = findRenderString(metadata, option.renderOption)
+    const renderString = findRenderString(embeddedObjects[0], metadata, option.renderOption)
     return content.replace(embededObjectTag, renderString)
 }