diff --git a/pages/[...slug].tsx b/pages/[...slug].tsx index 9959d30a..463b2bf0 100644 --- a/pages/[...slug].tsx +++ b/pages/[...slug].tsx @@ -9,7 +9,6 @@ import { MetaBuilder } from 'src/lib/meta' import { apiGet } from '@/next-lib' import { GetStaticProps, NextPage } from 'next' import { IBreadcumbsPart, IMeta, ITag, FileTokenData, Token } from '@/types' -import { joinTokens } from 'src/lib/tokens' import { size, ext } from 'src/lib/file' import { Html } from 'src/components/Html' import { Youtube } from '@/components/Youtube' @@ -71,7 +70,7 @@ type Props = { date: string breadcrumb: IBreadcumbsPart[] meta?: IMeta - tokens?: Token[] + tokens: Token[] } const Index: NextPage = props => ( @@ -94,7 +93,7 @@ const Index: NextPage = props => ( date={props.date ? new Date(props.date) : null} >
- {joinTokens(props.tokens ?? []).map((x, i) => { + {props.tokens.map((x, i) => { switch (x.token) { case 'text': return ( diff --git a/src/lib/tokens.ts b/src/lib/tokens.ts deleted file mode 100644 index fedd2cd8..00000000 --- a/src/lib/tokens.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { TextToken, Token } from 'src/types' - -export function joinTextTokens(tokens: TextToken[]): TextToken { - return { - token: 'text', - data: tokens - .map(x => x.data) - .join('\n\n'), - } -} - -export function joinTokens(tokens: Token[]): Token[] { - let buffer: TextToken[] = [] - const result: Token[] = [] - - for (const token of tokens) { - if (token.token === 'text') { - buffer.push(token) - continue - } - - const compiledToken = joinTextTokens(buffer) - buffer = [] - - result.push(compiledToken) - result.push(token) - } - - if (buffer.length) { - result.push( - joinTextTokens(buffer) - ) - } - - return result -}