Skip to content

Commit 5522c38

Browse files
committed
Renamed EmbedAttributes to Attributes
1 parent dbc5d64 commit 5522c38

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

src/Models/embed-attributes-model.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import ENTRY from '../embedded-types/entry';
22
import ASSET from '../embedded-types/asset';
3-
export interface EmbedAttributes {
3+
export interface Attributes {
44
class: string,
55
type: 'entry' | 'asset';
66
'sys-style-type': ENTRY.BLOCK | ENTRY.INLINE | ENTRY.LINK | ASSET.DISPLAYABLE | ASSET.DOWNLOADABLE;
77
[key: string]: any;
88
}
99

10-
export interface EmbeddedEntry extends EmbedAttributes {
10+
export interface EmbeddedEntry extends Attributes {
1111
'data-sys-entry-uid': string;
1212
'data-sys-content-type-uid': string;
1313
'data-sys-entry-local': string;
1414
}
1515

16-
export interface EmbeddedAsset extends EmbedAttributes {
16+
export interface EmbeddedAsset extends Attributes {
1717
'data-sys-asset-contenttype': string;
1818
'data-sys-asset-filelink': string;
1919
'data-sys-asset-uid': string;

src/extensions/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
import { elementToJson } from '../helper/html-to-json';
2-
import { EmbedAttributes } from '../Models/embed-attributes-model';
2+
import { Attributes } from '../Models/embed-attributes-model';
33
import { parse } from 'node-html-parser';
44
const frameflag = 'documentfragmentcontainer';
55

66
declare global {
77
interface String {
8-
forEachEmbeddedObject(callbackfn: (embededObjectTag: string, object: EmbedAttributes) => void): void;
8+
forEachEmbeddedObject(callbackfn: (embededObjectTag: string, object: Attributes) => void): void;
99
}
1010
}
1111

1212
String.prototype.forEachEmbeddedObject = function (
13-
callbackfn: (embededObjectTag: string, object: EmbedAttributes) => void,
13+
callbackfn: (embededObjectTag: string, object: Attributes) => void,
1414
): void {
1515

1616
const str = `<${frameflag}>${this.toString()}</${frameflag}>`;
1717
const root = parse(str)
1818
const embeddedEntries = root.querySelectorAll(".embedded-entry")
1919

2020
embeddedEntries.forEach((element) => {
21-
callbackfn(element.outerHTML, elementToJson(element) as EmbedAttributes)
21+
callbackfn(element.outerHTML, elementToJson(element) as Attributes)
2222
})
2323
const embeddedAsset = root.querySelectorAll(".embedded-asset")
2424
embeddedAsset.forEach((element) => {
25-
callbackfn(element.outerHTML, elementToJson(element) as EmbedAttributes)
25+
callbackfn(element.outerHTML, elementToJson(element) as Attributes)
2626
})
2727
};

src/helper/find-embeded-object.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ContentTypeEntry, Entry } from '../Models/entry-model';
22
import { AssetModel } from '../Models/asset-model';
33
import { RenderOption, RenderObject, RenderContentType } from '../options/index';
4-
import { EmbeddedAsset, EmbeddedEntry, EmbedAttributes } from '../Models/embed-attributes-model';
4+
import { EmbeddedAsset, EmbeddedEntry, Attributes } from '../Models/embed-attributes-model';
55
import { defaultOptions } from '../options/default-options';
66
import ASSET from '../embedded-types/asset';
77

@@ -26,7 +26,7 @@ export function findEmbeddedAsset(uid: string, embeddedAssets: AssetModel[] = []
2626
});
2727
}
2828

29-
export function findEmbeddedObjects(object: EmbedAttributes, entry: Entry): (ContentTypeEntry | AssetModel)[] {
29+
export function findEmbeddedObjects(object: Attributes, entry: Entry): (ContentTypeEntry | AssetModel)[] {
3030
if (object && object !== undefined && entry && entry !== undefined) {
3131
if (object.type === 'entry') {
3232
const embeddedEntry = object as EmbeddedEntry;
@@ -44,7 +44,7 @@ export function findEmbeddedObjects(object: EmbedAttributes, entry: Entry): (Con
4444
}
4545

4646
export function findRenderString(
47-
object: EmbedAttributes,
47+
object: Attributes,
4848
renderModel: ContentTypeEntry | AssetModel,
4949
renderOptions?: RenderOption,
5050
): string {

src/options/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Entry, ContentTypeEntry } from '../Models/entry-model';
22
import { AssetModel } from '../Models/asset-model';
3-
import { EmbedAttributes } from '../Models/embed-attributes-model';
3+
import { Attributes } from '../Models/embed-attributes-model';
44

5-
export type RenderObject = (object: ContentTypeEntry | AssetModel, embedAttributes: EmbedAttributes) => string;
5+
export type RenderObject = (object: ContentTypeEntry | AssetModel, embedAttributes: Attributes) => string;
66

77
export interface RenderOption {
88
[embedType: string]: RenderObject | RenderContentType;

src/render-embedded-objects.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import './extensions'
22
import { Options } from './options';
3-
import { EmbedAttributes } from './Models/embed-attributes-model';
3+
import { Attributes } from './Models/embed-attributes-model';
44
import { findEmbeddedObjects, findRenderString } from './helper/find-embeded-object';
55
import { HTMLElement } from 'node-html-parser';
66

@@ -13,7 +13,7 @@ export function renderContent(content: (string | string[]), options: Options): (
1313
// render content of type string
1414
if (typeof content === 'string') {
1515
let contentToReplace = content
16-
content.forEachEmbeddedObject((embededObjectTag: string, object: EmbedAttributes) => {
16+
content.forEachEmbeddedObject((embededObjectTag: string, object: Attributes) => {
1717
contentToReplace = findAndReplaceEmbeddedObject(
1818
contentToReplace,
1919
embededObjectTag,
@@ -30,7 +30,7 @@ export function renderContent(content: (string | string[]), options: Options): (
3030
resultContent.push('')
3131
}else {
3232
let contentToReplace = element
33-
element.forEachEmbeddedObject((embededObjectTag: string, object: EmbedAttributes) => {
33+
element.forEachEmbeddedObject((embededObjectTag: string, object: Attributes) => {
3434
contentToReplace = findAndReplaceEmbeddedObject(
3535
contentToReplace,
3636
embededObjectTag,
@@ -43,7 +43,7 @@ export function renderContent(content: (string | string[]), options: Options): (
4343
return resultContent
4444
}
4545

46-
function findAndReplaceEmbeddedObject(content:string, embededObjectTag: string, object: EmbedAttributes, option: Options): string {
46+
function findAndReplaceEmbeddedObject(content:string, embededObjectTag: string, object: Attributes, option: Options): string {
4747
const embeddedObjects = findEmbeddedObjects(object, option.entry)
4848
const renderString = findRenderString(object, embeddedObjects[0], option.renderOption)
4949
return content.replace(embededObjectTag, renderString)

0 commit comments

Comments
 (0)