Add group function (#3175)

This commit is contained in:
Aya Morisawa
2018-11-09 13:03:46 +09:00
committed by syuilo
parent 276edd7cc2
commit 500fc47618
3 changed files with 29 additions and 12 deletions

View File

@@ -15,6 +15,9 @@ import { TextElementSearch } from './elements/search';
import { TextElementTitle } from './elements/title';
import { TextElementUrl } from './elements/url';
import { TextElementMotion } from './elements/motion';
import { groupOn } from '../../prelude/array';
import * as A from '../../prelude/array';
import * as S from '../../prelude/string';
const elements = [
require('./elements/big'),
@@ -89,16 +92,10 @@ export default (source: string): TextElement[] => {
i++;
}
// テキストを纏める
return tokens.reduce((a, b) => {
if (a.length && a[a.length - 1].type == 'text' && b.type == 'text') {
const tail = a.pop();
return a.concat({
type: 'text',
content: tail.content + b.content
});
} else {
return a.concat(b);
}
}, [] as TextElement[]);
const combineText = (es: TextElement[]): TextElement =>
({ type: 'text', content: S.concat(es.map(e => e.content)) });
return A.concat(groupOn(x => x.type, tokens).map(es =>
es[0].type === 'text' ? [combineText(es)] : es
));
};