keith/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey synced 2024-11-23 03:45:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge plainParser into mfm

Browse source
This commit is contained in:
Aya Morisawa 2019-01-30 15:12:48 +09:00
parent ca26edbfce
commit 98795aad9a
No known key found for this signature in database
GPG key ID: 3E64865D70D579F2
3 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mfm/parse.ts
View file

@ -1,4 +1,4 @@
import parser, { plainParser } from './parser';
import parser from './parser';
import { MfmForest } from './types';
import { normalize } from './normalize';
@ -7,6 +7,6 @@ export default (source: string, plainText = false): MfmForest => {
return null;
}
const raw = plainText ? plainParser.root.tryParse(source) : parser.root.tryParse(source) as MfmForest;
const raw = plainText ? parser.plain.tryParse(source) : parser.root.tryParse(source) as MfmForest;
return normalize(raw);
};

28
src/mfm/parser.ts
View file

@ -28,29 +28,6 @@ const newline = P((input, i) => {
}
});
export const plainParser = P.createLanguage({
root: r => P.alt(
r.emoji,
r.text
).atLeast(1),
text: () => P.any.map(x => createLeaf('text', { text: x })),
//#region Emoji
emoji: r =>
P.alt(
P.regexp(/:([a-z0-9_+-]+):/i, 1)
.map(x => createLeaf('emoji', {
name: x
})),
P.regexp(emojiRegex)
.map(x => createLeaf('emoji', {
emoji: x
})),
),
//#endregion
});
const mfm = P.createLanguage({
root: r => P.alt(
r.big,
@ -78,6 +55,11 @@ const mfm = P.createLanguage({
r.text
).atLeast(1),
plain: r => P.alt(
r.emoji,
r.text
).atLeast(1),
text: () => P.any.map(x => createLeaf('text', { text: x })),
//#region Big

32
test/mfm.ts
View file

@ -1091,6 +1091,38 @@ describe('MFM', () => {
});
});
describe('plainText', () => {
it('text', () => {
const tokens = analyze('foo', true);
assert.deepStrictEqual(tokens, [
text('foo'),
]);
});
it('emoji', () => {
const tokens = analyze(':foo:', true);
assert.deepStrictEqual(tokens, [
leaf('emoji', { name: 'foo' })
]);
});
it('emoji in text', () => {
const tokens = analyze('foo:bar:baz', true);
assert.deepStrictEqual(tokens, [
text('foo'),
leaf('emoji', { name: 'bar' }),
text('baz'),
]);
});
it('disallow other syntax', () => {
const tokens = analyze('foo **bar** baz', true);
assert.deepStrictEqual(tokens, [
text('foo **bar** baz'),
]);
});
});
describe('toHtml', () => {
it('br', () => {
const input = 'foo\nbar\nbaz';