Embed object key change to _embedded_items

Author: uttamukkoji

src/Models/embedded-object.ts

@@ -1,17 +1,15 @@
 export interface EmbeddedObject {
   uid: string;
+  _content_type_uid: string;
   [propName: string]: any;
 }
 
 export interface EmbedModel<T> {
   [path: string]: T[]
 }
 
-export interface EmbeddedContentTypeUid extends EmbeddedObject {
-  _content_type_uid: string;
-}
-
-export interface EntryEmbedable extends EmbeddedObject {
-  _embedded_assets?: EmbedModel<EmbeddedObject>;
-  _embedded_entries?: EmbedModel<EmbeddedContentTypeUid>;
+export interface EntryEmbedable {
+  uid: string;
+  _embedded_items?: EmbedModel<EmbeddedObject>
+  [propName: string]: any;
 }

src/Models/metadata-model.ts

@@ -12,7 +12,7 @@ export interface Attributes {
   type: 'entry' | 'asset',
   class: string,
   [key: string]: any,
-  'sys-style-type': StyleType
+  'sys-style-type': string
 }
 
 export interface EntryAttributes extends Attributes {
@@ -32,7 +32,7 @@ export function createMetadata(attribute: Attributes): Metadata {
     text: attribute['#text'],
     itemUid: attribute["data-sys-entry-uid"] || attribute["data-sys-asset-uid"],
     itemType: attribute.type,
-    styleType: attribute["sys-style-type"],
+    styleType: attribute["sys-style-type"] as StyleType,
     attributes: attribute,
     contentTypeUid: attribute["data-sys-content-type-uid"]
   }

src/helper/find-embeded-object.ts

@@ -1,4 +1,4 @@
-import { EmbeddedContentTypeUid, EntryEmbedable, EmbeddedObject } from '../Models/embedded-object';
+import { EntryEmbedable, EmbeddedObject } from '../Models/embedded-object';
 import { RenderOption, RenderObject, RenderContentType } from '../options/index';
 import { AssetAttributes, EntryAttributes, Metadata } from '../Models/metadata-model';
 import { defaultOptions } from '../options/default-options';
@@ -7,9 +7,9 @@ import { defaultOptions } from '../options/default-options';
 export function findEmbeddedEntry(
   uid: string,
   contentTypeUid: string,
-  embeddedEntries: EmbeddedContentTypeUid[] = [],
-): EmbeddedContentTypeUid[] {
-  return embeddedEntries.filter((entry) => {
+  embeddeditems: EmbeddedObject[] = [],
+): EmbeddedObject[] {
+  return embeddeditems.filter((entry) => {
     if (entry.uid === uid && entry._content_type_uid === contentTypeUid) {
       return entry;
     }
@@ -24,26 +24,26 @@ export function findEmbeddedAsset(uid: string, embeddedAssets: EmbeddedObject[]
   });
 }
 
-export function findEmbeddedObjects(object: Metadata, entry: EntryEmbedable): (EmbeddedContentTypeUid | EmbeddedObject)[] {
+export function findEmbeddedObjects(object: Metadata, entry: EntryEmbedable): (EmbeddedObject)[] {
   if (object && object !== undefined && entry && entry !== undefined) {
     if (object.itemType === 'entry') {
       const embeddedEntry = object.attributes as EntryAttributes;
       return findEmbeddedEntry(
         object.itemUid,
         object.contentTypeUid,
-        Object.values(entry._embedded_entries || []).reduce((accumulator, value) => accumulator.concat(value), []),
+        Object.values(entry._embedded_items || []).reduce((accumulator, value) => accumulator.concat(value), []),
       );
     } else {
       const embeddedAsset = object.attributes as AssetAttributes;
-      return findEmbeddedAsset(object.itemUid, Object.values(entry._embedded_assets || []).reduce((accumulator, value) => accumulator.concat(value), []),);
+      return findEmbeddedAsset(object.itemUid, Object.values(entry._embedded_items|| []).reduce((accumulator, value) => accumulator.concat(value), []),);
     }
   }
   return [];
 }
 
 export function findRenderString(
   metadata: Metadata,
-  renderModel: EmbeddedContentTypeUid | EmbeddedObject,
+  renderModel: EmbeddedObject,
   renderOptions?: RenderOption,
 ): string {
   if ((!renderModel && renderModel === undefined) || (!metadata && metadata === undefined)) {

src/index.ts

@@ -1,5 +1,5 @@
 export { Option, RenderContentType, RenderOption, RenderObject } from './options/index';
-export { EntryEmbedable, EmbeddedObject as EntryModel, EmbeddedContentTypeUid as ContentTypeEntry } from './Models/embedded-object';
+export { EntryEmbedable, EmbeddedObject as EntryModel } from './Models/embedded-object';
 export { Metadata } from './Models/metadata-model';
 export { default as StyleType } from './embedded-types/style-type';
 export { render, renderContent } from './render-embedded-objects';

src/options/index.ts

@@ -1,7 +1,7 @@
-import { EntryEmbedable, EmbeddedContentTypeUid, EmbeddedObject } from '../Models/embedded-object';
+import { EntryEmbedable, EmbeddedObject } from '../Models/embedded-object';
 import { Metadata } from '../Models/metadata-model';
 
-export type RenderObject = (object: EmbeddedContentTypeUid | EmbeddedObject, metadata: Metadata) => string;
+export type RenderObject = (object: EmbeddedObject, metadata: Metadata) => string;
 
 export interface RenderOption {
   [embedType: string]: RenderObject | RenderContentType;

src/render-embedded-objects.ts

@@ -25,8 +25,7 @@ export function render(option: {
     function findAndRender (entry: EntryEmbedable) {
         if (!option.paths || option.paths.length === 0) {
             Object.keys({ 
-                ...entry._embedded_assets,
-                ...entry._embedded_entries
+                ...entry._embedded_items,
             }).forEach((path) => {
                 findContent(path, entry)
             })