securemark 0.291.1 → 0.292.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (164) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/design.md +13 -2
  3. package/dist/index.js +1093 -756
  4. package/markdown.d.ts +17 -17
  5. package/package.json +1 -1
  6. package/src/combinator/control/constraint/block.test.ts +8 -5
  7. package/src/combinator/control/constraint/block.ts +9 -9
  8. package/src/combinator/control/constraint/contract.ts +20 -28
  9. package/src/combinator/control/constraint/line.test.ts +9 -6
  10. package/src/combinator/control/constraint/line.ts +21 -22
  11. package/src/combinator/control/manipulation/convert.ts +29 -13
  12. package/src/combinator/control/manipulation/fence.ts +18 -15
  13. package/src/combinator/control/manipulation/indent.test.ts +17 -14
  14. package/src/combinator/control/manipulation/indent.ts +15 -8
  15. package/src/combinator/control/manipulation/match.ts +11 -10
  16. package/src/combinator/control/manipulation/recovery.ts +6 -2
  17. package/src/combinator/control/manipulation/scope.ts +37 -38
  18. package/src/combinator/control/manipulation/surround.ts +78 -60
  19. package/src/combinator/control/manipulation/trim.test.ts +12 -9
  20. package/src/combinator/control/monad/bind.ts +16 -16
  21. package/src/combinator/control/monad/fmap.ts +6 -6
  22. package/src/combinator/data/parser/context/delimiter.ts +8 -7
  23. package/src/combinator/data/parser/context.test.ts +19 -14
  24. package/src/combinator/data/parser/context.ts +20 -16
  25. package/src/combinator/data/parser/inits.ts +13 -14
  26. package/src/combinator/data/parser/sequence.test.ts +16 -15
  27. package/src/combinator/data/parser/sequence.ts +13 -14
  28. package/src/combinator/data/parser/some.test.ts +19 -18
  29. package/src/combinator/data/parser/some.ts +13 -15
  30. package/src/combinator/data/parser/subsequence.test.ts +22 -21
  31. package/src/combinator/data/parser/subsequence.ts +3 -3
  32. package/src/combinator/data/parser/tails.ts +3 -3
  33. package/src/combinator/data/parser/union.test.ts +16 -15
  34. package/src/combinator/data/parser/union.ts +2 -2
  35. package/src/combinator/data/parser.ts +66 -28
  36. package/src/debug.test.ts +3 -3
  37. package/src/parser/api/bind.ts +3 -3
  38. package/src/parser/api/header.ts +7 -6
  39. package/src/parser/api/normalize.ts +2 -2
  40. package/src/parser/api/parse.test.ts +14 -15
  41. package/src/parser/api/parse.ts +3 -3
  42. package/src/parser/autolink.test.ts +19 -17
  43. package/src/parser/block/blockquote.test.ts +86 -84
  44. package/src/parser/block/blockquote.ts +4 -2
  45. package/src/parser/block/codeblock.test.ts +58 -56
  46. package/src/parser/block/codeblock.ts +3 -3
  47. package/src/parser/block/dlist.test.ts +58 -56
  48. package/src/parser/block/extension/aside.test.ts +10 -8
  49. package/src/parser/block/extension/aside.ts +1 -1
  50. package/src/parser/block/extension/example.test.ts +20 -18
  51. package/src/parser/block/extension/example.ts +3 -3
  52. package/src/parser/block/extension/fig.test.ts +38 -36
  53. package/src/parser/block/extension/fig.ts +1 -1
  54. package/src/parser/block/extension/figbase.test.ts +17 -15
  55. package/src/parser/block/extension/figure.test.ts +64 -62
  56. package/src/parser/block/extension/figure.ts +3 -2
  57. package/src/parser/block/extension/message.test.ts +15 -13
  58. package/src/parser/block/extension/message.ts +3 -3
  59. package/src/parser/block/extension/placeholder.test.ts +3 -1
  60. package/src/parser/block/extension/table.test.ts +73 -71
  61. package/src/parser/block/extension/table.ts +5 -5
  62. package/src/parser/block/extension.test.ts +3 -1
  63. package/src/parser/block/heading.test.ts +65 -64
  64. package/src/parser/block/heading.ts +3 -3
  65. package/src/parser/block/ilist.test.ts +3 -1
  66. package/src/parser/block/ilist.ts +3 -3
  67. package/src/parser/block/mathblock.test.ts +33 -31
  68. package/src/parser/block/mathblock.ts +1 -1
  69. package/src/parser/block/mediablock.ts +2 -2
  70. package/src/parser/block/olist.test.ts +99 -97
  71. package/src/parser/block/olist.ts +2 -2
  72. package/src/parser/block/pagebreak.test.ts +17 -15
  73. package/src/parser/block/pagebreak.ts +1 -1
  74. package/src/parser/block/paragraph.test.ts +60 -57
  75. package/src/parser/block/reply/cite.test.ts +41 -39
  76. package/src/parser/block/reply/cite.ts +3 -3
  77. package/src/parser/block/reply/quote.test.ts +52 -50
  78. package/src/parser/block/reply.test.ts +21 -19
  79. package/src/parser/block/sidefence.test.ts +51 -49
  80. package/src/parser/block/table.test.ts +51 -50
  81. package/src/parser/block/table.ts +6 -6
  82. package/src/parser/block/ulist.test.ts +52 -50
  83. package/src/parser/block/ulist.ts +2 -2
  84. package/src/parser/block.ts +6 -5
  85. package/src/parser/context.ts +1 -0
  86. package/src/parser/header.test.ts +22 -21
  87. package/src/parser/header.ts +25 -13
  88. package/src/parser/inline/annotation.test.ts +44 -42
  89. package/src/parser/inline/annotation.ts +2 -2
  90. package/src/parser/inline/autolink/account.test.ts +32 -30
  91. package/src/parser/inline/autolink/account.ts +1 -1
  92. package/src/parser/inline/autolink/anchor.test.ts +23 -21
  93. package/src/parser/inline/autolink/anchor.ts +1 -1
  94. package/src/parser/inline/autolink/channel.test.ts +16 -14
  95. package/src/parser/inline/autolink/channel.ts +2 -2
  96. package/src/parser/inline/autolink/email.test.ts +38 -36
  97. package/src/parser/inline/autolink/email.ts +2 -2
  98. package/src/parser/inline/autolink/hashnum.test.ts +39 -37
  99. package/src/parser/inline/autolink/hashnum.ts +1 -1
  100. package/src/parser/inline/autolink/hashtag.test.ts +58 -56
  101. package/src/parser/inline/autolink/hashtag.ts +1 -1
  102. package/src/parser/inline/autolink/url.test.ts +76 -74
  103. package/src/parser/inline/autolink/url.ts +6 -6
  104. package/src/parser/inline/bracket.test.ts +69 -67
  105. package/src/parser/inline/bracket.ts +32 -32
  106. package/src/parser/inline/code.test.ts +32 -29
  107. package/src/parser/inline/code.ts +20 -13
  108. package/src/parser/inline/deletion.test.ts +29 -27
  109. package/src/parser/inline/deletion.ts +2 -2
  110. package/src/parser/inline/emphasis.test.ts +40 -36
  111. package/src/parser/inline/emphasis.ts +2 -2
  112. package/src/parser/inline/emstrong.test.ts +102 -96
  113. package/src/parser/inline/emstrong.ts +96 -36
  114. package/src/parser/inline/extension/index.test.ts +91 -89
  115. package/src/parser/inline/extension/index.ts +18 -30
  116. package/src/parser/inline/extension/indexee.ts +1 -1
  117. package/src/parser/inline/extension/indexer.test.ts +26 -24
  118. package/src/parser/inline/extension/indexer.ts +1 -1
  119. package/src/parser/inline/extension/label.test.ts +34 -32
  120. package/src/parser/inline/extension/placeholder.test.ts +44 -42
  121. package/src/parser/inline/extension/placeholder.ts +11 -8
  122. package/src/parser/inline/html.test.ts +108 -106
  123. package/src/parser/inline/html.ts +24 -23
  124. package/src/parser/inline/htmlentity.test.ts +39 -37
  125. package/src/parser/inline/htmlentity.ts +9 -3
  126. package/src/parser/inline/insertion.test.ts +29 -27
  127. package/src/parser/inline/insertion.ts +2 -2
  128. package/src/parser/inline/italic.test.ts +55 -53
  129. package/src/parser/inline/italic.ts +2 -2
  130. package/src/parser/inline/link.test.ts +187 -185
  131. package/src/parser/inline/link.ts +30 -12
  132. package/src/parser/inline/mark.test.ts +31 -29
  133. package/src/parser/inline/mark.ts +3 -3
  134. package/src/parser/inline/math.test.ts +133 -131
  135. package/src/parser/inline/math.ts +2 -2
  136. package/src/parser/inline/media.test.ts +93 -91
  137. package/src/parser/inline/media.ts +41 -17
  138. package/src/parser/inline/reference.test.ts +110 -108
  139. package/src/parser/inline/reference.ts +48 -39
  140. package/src/parser/inline/remark.test.ts +53 -51
  141. package/src/parser/inline/remark.ts +3 -3
  142. package/src/parser/inline/ruby.test.ts +46 -44
  143. package/src/parser/inline/ruby.ts +24 -27
  144. package/src/parser/inline/shortmedia.test.ts +11 -9
  145. package/src/parser/inline/strong.test.ts +37 -33
  146. package/src/parser/inline/strong.ts +6 -3
  147. package/src/parser/inline/template.test.ts +24 -22
  148. package/src/parser/inline/template.ts +20 -11
  149. package/src/parser/inline.test.ts +221 -220
  150. package/src/parser/inline.ts +13 -8
  151. package/src/parser/segment.ts +13 -8
  152. package/src/parser/source/escapable.test.ts +24 -22
  153. package/src/parser/source/escapable.ts +26 -41
  154. package/src/parser/source/line.test.ts +19 -17
  155. package/src/parser/source/line.ts +3 -3
  156. package/src/parser/source/str.ts +28 -11
  157. package/src/parser/source/text.test.ts +85 -83
  158. package/src/parser/source/text.ts +26 -54
  159. package/src/parser/source/unescapable.test.ts +24 -22
  160. package/src/parser/source/unescapable.ts +18 -33
  161. package/src/parser/source.ts +1 -1
  162. package/src/parser/util.ts +36 -33
  163. package/src/parser/visibility.ts +19 -15
  164. package/src/util/quote.ts +4 -2
@@ -20,7 +20,7 @@ import { code } from './inline/code';
20
20
  import { htmlentity } from './inline/htmlentity';
21
21
  import { bracket } from './inline/bracket';
22
22
  import { autolink } from './inline/autolink';
23
- import { text } from './source';
23
+ import { text, strs } from './source';
24
24
 
25
25
  export import InlineParser = MarkdownParser.InlineParser;
26
26
  export import AnnotationParser = InlineParser.AnnotationParser;
@@ -47,11 +47,13 @@ export import ShortMediaParser = InlineParser.ShortMediaParser;
47
47
  export import BracketParser = InlineParser.BracketParser;
48
48
  export import AutolinkParser = InlineParser.AutolinkParser;
49
49
 
50
+ const stars = strs('*');
51
+
50
52
  export const inline: InlineParser = lazy(() => union([
51
53
  input => {
52
- const { source } = input;
53
- if (source === '') return;
54
- switch (source.slice(0, 2)) {
54
+ const { context: { source, position } } = input;
55
+ if (position === source.length) return;
56
+ switch (source.slice(position, position + 2)) {
55
57
  case '((':
56
58
  return annotation(input);
57
59
  case '[[':
@@ -79,8 +81,12 @@ export const inline: InlineParser = lazy(() => union([
79
81
  return mark(input);
80
82
  case '//':
81
83
  return italic(input);
84
+ case '**':
85
+ return emstrong(input)
86
+ || strong(input)
87
+ || stars(input);
82
88
  }
83
- switch (source[0]) {
89
+ switch (source[position]) {
84
90
  case '[':
85
91
  return textlink(input)
86
92
  || ruby(input);
@@ -94,9 +100,8 @@ export const inline: InlineParser = lazy(() => union([
94
100
  case '`':
95
101
  return code(input);
96
102
  case '*':
97
- return emstrong(input)
98
- || strong(input)
99
- || emphasis(input);
103
+ return emphasis(input)
104
+ || stars(input);
100
105
  case '&':
101
106
  return htmlentity(input);
102
107
  }
@@ -1,6 +1,6 @@
1
1
  import { MarkdownParser } from '../../markdown';
2
2
  import { Command } from './context';
3
- import { eval, exec } from '../combinator/data/parser';
3
+ import { clean, eval } from '../combinator/data/parser';
4
4
  import { union, some } from '../combinator';
5
5
  import { segment as heading } from './block/heading';
6
6
  import { segment as codeblock } from './block/codeblock';
@@ -25,20 +25,25 @@ const parser: SegmentParser = union([
25
25
  export function* segment(source: string): Generator<string, undefined, undefined> {
26
26
  if (!validate(source, MAX_INPUT_SIZE)) return yield `${Command.Error}Too large input over ${MAX_INPUT_SIZE.toLocaleString('en')} bytes.\n${source.slice(0, 1001)}`;
27
27
  assert(source.length < Number.MAX_SAFE_INTEGER);
28
- while (source !== '') {
29
- const result = parser({ source, context: {} })!;
28
+ const context = {
29
+ source,
30
+ position: 0,
31
+ };
32
+ const input = { context };
33
+ while (context.position < source.length) {
34
+ const { position } = context;
35
+ const result = parser(input)!;
30
36
  assert(result);
31
- const rest = exec(result);
32
- const segs = eval(result).length ? eval(result) : [source.slice(0, source.length - rest.length)];
33
- assert(source.slice(1).endsWith(rest));
34
- assert(segs.join('') === source.slice(0, source.length - rest.length));
37
+ assert(context.position > position);
38
+ const segs = eval(result).length ? eval(result) : [source.slice(position, context.position)];
39
+ assert(segs.join('') === source.slice(position, context.position));
35
40
  for (let i = 0; i < segs.length; ++i) {
36
41
  const seg = segs[i];
37
42
  validate(seg, MAX_SEGMENT_SIZE)
38
43
  ? yield seg
39
44
  : yield `${Command.Error}Too large segment over ${MAX_SEGMENT_SIZE.toLocaleString('en')} bytes.\n${seg}`
40
45
  }
41
- source = rest;
46
+ clean(context);
42
47
  }
43
48
  }
44
49
 
@@ -1,45 +1,47 @@
1
1
  import { escsource } from './escapable';
2
2
  import { some } from '../../combinator';
3
+ import { input } from '../../combinator/data/parser';
3
4
  import { inspect } from '../../debug.test';
4
5
 
5
6
  describe('Unit: parser/source/escsource', () => {
6
7
  describe('escsource', () => {
7
- const parser = (source: string) => some(escsource)({ source, context: {} });
8
+ const parser = (source: string) => some(escsource)(input(source, ctx));
9
+ const { context: ctx } = input('', {});
8
10
 
9
11
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('')), undefined);
12
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
11
13
  });
12
14
 
13
15
  it('basic', () => {
14
- assert.deepStrictEqual(inspect(parser('a')), [['a'], '']);
15
- assert.deepStrictEqual(inspect(parser('ab')), [['ab'], '']);
16
- assert.deepStrictEqual(inspect(parser('09あいAZaz')), [['09あいAZaz'], '']);
16
+ assert.deepStrictEqual(inspect(parser('a'), ctx), [['a'], '']);
17
+ assert.deepStrictEqual(inspect(parser('ab'), ctx), [['a', 'b'], '']);
18
+ assert.deepStrictEqual(inspect(parser('09あいAZaz'), ctx), [['0', '9', 'あ', 'い', 'A', 'Z', 'a', 'z'], '']);
17
19
  });
18
20
 
19
21
  it('space', () => {
20
- assert.deepStrictEqual(inspect(parser(' ')), [[' '], '']);
21
- assert.deepStrictEqual(inspect(parser(' ')), [[' ', ' '], '']);
22
- assert.deepStrictEqual(inspect(parser(' ')), [[' ', ' '], '']);
23
- assert.deepStrictEqual(inspect(parser(' \n')), [[' ', '<br>'], '']);
24
- assert.deepStrictEqual(inspect(parser(' \n')), [[' ', ' ', '<br>'], '']);
25
- assert.deepStrictEqual(inspect(parser(' \n')), [[' ', ' ', '<br>'], '']);
22
+ assert.deepStrictEqual(inspect(parser(' '), ctx), [[' '], '']);
23
+ assert.deepStrictEqual(inspect(parser(' '), ctx), [[' ', ' '], '']);
24
+ assert.deepStrictEqual(inspect(parser(' '), ctx), [[' ', ' ', ' '], '']);
25
+ assert.deepStrictEqual(inspect(parser(' \n'), ctx), [[' ', '<br>'], '']);
26
+ assert.deepStrictEqual(inspect(parser(' \n'), ctx), [[' ', ' ', '<br>'], '']);
27
+ assert.deepStrictEqual(inspect(parser(' \n'), ctx), [[' ', ' ', ' ', '<br>'], '']);
26
28
  });
27
29
 
28
30
  it('linebreak', () => {
29
- assert.deepStrictEqual(inspect(parser('\n\n')), [['<br>', '<br>'], '']);
31
+ assert.deepStrictEqual(inspect(parser('\n\n'), ctx), [['<br>', '<br>'], '']);
30
32
  });
31
33
 
32
34
  it('\\', () => {
33
- assert.deepStrictEqual(inspect(parser('\\')), [['\\'], '']);
34
- assert.deepStrictEqual(inspect(parser('\\\\')), [['\\\\'], '']);
35
- assert.deepStrictEqual(inspect(parser('\\\\\\')), [['\\\\', '\\'], '']);
36
- assert.deepStrictEqual(inspect(parser('\\ ')), [['\\ '], '']);
37
- assert.deepStrictEqual(inspect(parser('\\_')), [['\\_'], '']);
38
- assert.deepStrictEqual(inspect(parser('\\0')), [['\\0'], '']);
39
- assert.deepStrictEqual(inspect(parser('\\a')), [['\\a'], '']);
40
- assert.deepStrictEqual(inspect(parser('\\$')), [['\\$'], '']);
41
- assert.deepStrictEqual(inspect(parser('\\ ')), [['\\ '], '']);
42
- assert.deepStrictEqual(inspect(parser('\\\n')), [['\\', '<br>'], '']);
35
+ assert.deepStrictEqual(inspect(parser('\\'), ctx), [['\\'], '']);
36
+ assert.deepStrictEqual(inspect(parser('\\\\'), ctx), [['\\\\'], '']);
37
+ assert.deepStrictEqual(inspect(parser('\\\\\\'), ctx), [['\\\\', '\\'], '']);
38
+ assert.deepStrictEqual(inspect(parser('\\ '), ctx), [['\\ '], '']);
39
+ assert.deepStrictEqual(inspect(parser('\\_'), ctx), [['\\_'], '']);
40
+ assert.deepStrictEqual(inspect(parser('\\0'), ctx), [['\\0'], '']);
41
+ assert.deepStrictEqual(inspect(parser('\\a'), ctx), [['\\a'], '']);
42
+ assert.deepStrictEqual(inspect(parser('\\$'), ctx), [['\\$'], '']);
43
+ assert.deepStrictEqual(inspect(parser('\\ '), ctx), [['\\ '], '']);
44
+ assert.deepStrictEqual(inspect(parser('\\\n'), ctx), [['\\', '<br>'], '']);
43
45
  });
44
46
 
45
47
  });
@@ -1,53 +1,38 @@
1
1
  import { EscapableSourceParser } from '../source';
2
2
  import { Command } from '../context';
3
3
  import { consume } from '../../combinator';
4
- import { nonWhitespace } from './text';
5
4
  import { html } from 'typed-dom/dom';
6
5
 
7
- const delimiter = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
8
-
9
- export const escsource: EscapableSourceParser = ({ source, context }) => {
10
- if (source === '') return;
11
- const i = source.search(delimiter);
12
- switch (i) {
13
- case -1:
14
- consume(source.length, context);
15
- return [[source], ''];
16
- case 0:
6
+ export const escsource: EscapableSourceParser = ({ context }) => {
7
+ const { source, position } = context;
8
+ if (position === source.length) return;
9
+ consume(1, context);
10
+ context.position += 1;
11
+ switch (source[position]) {
12
+ case '\r':
13
+ assert(!source.includes('\r', position + 1));
14
+ consume(-1, context);
15
+ return [[]];
16
+ case Command.Escape:
17
17
  consume(1, context);
18
- switch (source[0]) {
19
- case '\r':
20
- assert(!source.includes('\r', 1));
21
- consume(-1, context);
22
- return [[], source.slice(1)];
23
- case Command.Escape:
24
- consume(1, context);
25
- return [[source.slice(1, 2)], source.slice(2)];
26
- case '\\':
27
- switch (source[1]) {
28
- case undefined:
29
- return [[source[0]], ''];
30
- case '\n':
31
- return [[source[0]], source.slice(1)];
32
- default:
33
- consume(1, context);
34
- return [[source.slice(0, 2)], source.slice(2)];
35
- }
18
+ context.position += 1;
19
+ return [[source.slice(position + 1, position + 2)]];
20
+ case '\\':
21
+ switch (source[position + 1]) {
22
+ case undefined:
23
+ return [[source[position]]];
36
24
  case '\n':
37
- context.linebreak ||= source.length;
38
- return [[html('br')], source.slice(1)];
25
+ return [[source[position]]];
39
26
  default:
40
- assert(source[0] !== '\n');
41
- const b = source[0].trimStart() === '';
42
- const i = b
43
- ? source.search(nonWhitespace)
44
- : 1;
45
- assert(i > 0);
46
- consume(i - 1, context);
47
- return [[source.slice(0, i - +b || 1)], source.slice(i - +b || 1)];
27
+ consume(1, context);
28
+ context.position += 1;
29
+ return [[source.slice(position, position + 2)]];
48
30
  }
31
+ case '\n':
32
+ context.linebreak ||= source.length - position;
33
+ return [[html('br')]];
49
34
  default:
50
- consume(i, context);
51
- return [[source.slice(0, i)], source.slice(i)];
35
+ assert(source[position] !== '\n');
36
+ return [[source[position]]];
52
37
  }
53
38
  };
@@ -1,30 +1,32 @@
1
1
  import { contentline } from './line';
2
+ import { input } from '../../combinator/data/parser';
2
3
  import { inspect } from '../../debug.test';
3
4
 
4
5
  describe('Unit: parser/source/line', () => {
5
6
  describe('contentline', () => {
6
- const parser = (source: string) => contentline({ source, context: {} });
7
+ const parser = (source: string) => contentline(input(source, ctx));
8
+ const { context: ctx } = input('', {});
7
9
 
8
10
  it('invalid', () => {
9
- assert.deepStrictEqual(inspect(parser('')), undefined);
10
- assert.deepStrictEqual(inspect(parser(' ')), undefined);
11
- assert.deepStrictEqual(inspect(parser('\n')), undefined);
12
- assert.deepStrictEqual(inspect(parser(' \n')), undefined);
13
- assert.deepStrictEqual(inspect(parser('\n\n')), undefined);
11
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
12
+ assert.deepStrictEqual(inspect(parser(' '), ctx), undefined);
13
+ assert.deepStrictEqual(inspect(parser('\n'), ctx), undefined);
14
+ assert.deepStrictEqual(inspect(parser(' \n'), ctx), undefined);
15
+ assert.deepStrictEqual(inspect(parser('\n\n'), ctx), undefined);
14
16
  });
15
17
 
16
18
  it('valid', () => {
17
- assert.deepStrictEqual(inspect(parser('a')), [[], '']);
18
- assert.deepStrictEqual(inspect(parser('a ')), [[], '']);
19
- assert.deepStrictEqual(inspect(parser(' a')), [[], '']);
20
- assert.deepStrictEqual(inspect(parser(' a ')), [[], '']);
21
- assert.deepStrictEqual(inspect(parser(' a\n')), [[], '']);
22
- assert.deepStrictEqual(inspect(parser(' a \n')), [[], '']);
23
- assert.deepStrictEqual(inspect(parser('ab')), [[], '']);
24
- assert.deepStrictEqual(inspect(parser('a\nb')), [[], 'b']);
25
- assert.deepStrictEqual(inspect(parser('\\\n')), [[], '']);
26
- assert.deepStrictEqual(inspect(parser('\\ \\\n')), [[], '']);
27
- assert.deepStrictEqual(inspect(parser('\\ \\ \\\n')), [[], '']);
19
+ assert.deepStrictEqual(inspect(parser('a'), ctx), [[], '']);
20
+ assert.deepStrictEqual(inspect(parser('a '), ctx), [[], '']);
21
+ assert.deepStrictEqual(inspect(parser(' a'), ctx), [[], '']);
22
+ assert.deepStrictEqual(inspect(parser(' a '), ctx), [[], '']);
23
+ assert.deepStrictEqual(inspect(parser(' a\n'), ctx), [[], '']);
24
+ assert.deepStrictEqual(inspect(parser(' a \n'), ctx), [[], '']);
25
+ assert.deepStrictEqual(inspect(parser('ab'), ctx), [[], '']);
26
+ assert.deepStrictEqual(inspect(parser('a\nb'), ctx), [[], 'b']);
27
+ assert.deepStrictEqual(inspect(parser('\\\n'), ctx), [[], '']);
28
+ assert.deepStrictEqual(inspect(parser('\\ \\\n'), ctx), [[], '']);
29
+ assert.deepStrictEqual(inspect(parser('\\ \\ \\\n'), ctx), [[], '']);
28
30
  });
29
31
 
30
32
  });
@@ -1,6 +1,6 @@
1
1
  import { AnyLineParser, EmptyLineParser, ContentLineParser } from '../source';
2
2
  import { line, isBlank } from '../../combinator';
3
3
 
4
- export const anyline: AnyLineParser = line(() => [[], '']);
5
- export const emptyline: EmptyLineParser = line(i => isBlank(i.source) ? [[], ''] : undefined);
6
- export const contentline: ContentLineParser = line(i => !isBlank(i.source) ? [[], ''] : undefined);
4
+ export const anyline: AnyLineParser = line(() => [[]]);
5
+ export const emptyline: EmptyLineParser = line(({ context: { source } }) => isBlank(source) ? [[]] : undefined);
6
+ export const contentline: ContentLineParser = line(({ context: { source } }) => !isBlank(source) ? [[]] : undefined);
@@ -9,19 +9,36 @@ export function str(pattern: string | RegExp, not?: string): Parser<string, Cont
9
9
  ? /[^^\\*+][*+]/.test(pattern.source)
10
10
  : false;
11
11
  return typeof pattern === 'string'
12
- ? ({ source }) => {
13
- if (source === '') return;
14
- if (not && source.slice(pattern.length, pattern.length + not.length) === not) return;
15
- return source.slice(0, pattern.length) === pattern
16
- ? [[pattern], source.slice(pattern.length)]
17
- : undefined;
12
+ ? ({ context }) => {
13
+ const { source, position } = context;
14
+ if (position === source.length) return;
15
+ if (!source.startsWith(pattern, position)) return;
16
+ if (not && source.startsWith(not, position + pattern.length)) return;
17
+ context.position += pattern.length;
18
+ return [[pattern]];
18
19
  }
19
- : ({ source, context }) => {
20
- if (source === '') return;
21
- const m = source.match(pattern);
20
+ : ({ context }) => {
21
+ const { source, position } = context;
22
+ if (position === source.length) return;
23
+ const m = source.slice(position).match(pattern);
22
24
  if (m === null) return;
23
25
  count && consume(m[0].length, context);
24
- if (not && source.slice(m[0].length, m[0].length + not.length) === not) return;
25
- return [[m[0]], source.slice(m[0].length)];
26
+ if (not && source.slice(position + m[0].length, position + m[0].length + not.length) === not) return;
27
+ context.position += m[0].length;
28
+ return [[m[0]]];
26
29
  };
27
30
  }
31
+
32
+ export function strs(pattern: string): StrParser;
33
+ export function strs(pattern: string): Parser<string> {
34
+ assert(pattern);
35
+ return ({ context }) => {
36
+ const { source } = context;
37
+ let acc = '';
38
+ while (context.position < source.length && source.startsWith(pattern, context.position)) {
39
+ acc += pattern;
40
+ context.position += pattern.length;
41
+ }
42
+ return [[acc]];
43
+ };
44
+ }
@@ -1,118 +1,120 @@
1
1
  import { text } from './text';
2
2
  import { some } from '../../combinator';
3
+ import { input } from '../../combinator/data/parser';
3
4
  import { inspect } from '../../debug.test';
4
5
 
5
6
  describe('Unit: parser/source/text', () => {
6
7
  describe('text', () => {
7
- const parser = (source: string) => some(text)({ source, context: {} });
8
+ const parser = (source: string) => some(text)(input(source, ctx));
9
+ const { context: ctx } = input('', {});
8
10
 
9
11
  it('invalid', () => {
10
- assert.deepStrictEqual(inspect(parser('')), undefined);
12
+ assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
11
13
  });
12
14
 
13
15
  it('basic', () => {
14
- assert.deepStrictEqual(inspect(parser('a')), [['a'], '']);
15
- assert.deepStrictEqual(inspect(parser('ab')), [['ab'], '']);
16
- assert.deepStrictEqual(inspect(parser('09あいAZaz')), [['09', 'あい', 'AZaz'], '']);
17
- assert.deepStrictEqual(inspect(parser('a\nb')), [['a', '<br>', 'b'], '']);
16
+ assert.deepStrictEqual(inspect(parser('a'), ctx), [['a'], '']);
17
+ assert.deepStrictEqual(inspect(parser('ab'), ctx), [['a', 'b'], '']);
18
+ assert.deepStrictEqual(inspect(parser('09あいAZaz'), ctx), [['0', '9', '', 'い', 'A', 'Z', 'a', 'z'], '']);
19
+ assert.deepStrictEqual(inspect(parser('a\nb'), ctx), [['a', '<br>', 'b'], '']);
18
20
  });
19
21
 
20
22
  it('escape', () => {
21
- assert.deepStrictEqual(inspect(parser('\\')), [[], '']);
22
- assert.deepStrictEqual(inspect(parser('\\\\')), [['\\'], '']);
23
- assert.deepStrictEqual(inspect(parser('\\\\\\')), [['\\'], '']);
24
- assert.deepStrictEqual(inspect(parser('\\\\\\\\')), [['\\', '\\'], '']);
25
- assert.deepStrictEqual(inspect(parser('\\ ')), [[' '], '']);
26
- assert.deepStrictEqual(inspect(parser('\\_')), [['_'], '']);
27
- assert.deepStrictEqual(inspect(parser('\\0')), [['0'], '']);
28
- assert.deepStrictEqual(inspect(parser('\\a')), [['a'], '']);
29
- assert.deepStrictEqual(inspect(parser('\\\\a')), [['\\', 'a'], '']);
30
- assert.deepStrictEqual(inspect(parser('\\ ')), [[' '], '']);
31
- assert.deepStrictEqual(inspect(parser('\\。')), [['。'], '']);
23
+ assert.deepStrictEqual(inspect(parser('\\'), ctx), [[], '']);
24
+ assert.deepStrictEqual(inspect(parser('\\\\'), ctx), [['\\'], '']);
25
+ assert.deepStrictEqual(inspect(parser('\\\\\\'), ctx), [['\\'], '']);
26
+ assert.deepStrictEqual(inspect(parser('\\\\\\\\'), ctx), [['\\', '\\'], '']);
27
+ assert.deepStrictEqual(inspect(parser('\\ '), ctx), [[' '], '']);
28
+ assert.deepStrictEqual(inspect(parser('\\_'), ctx), [['_'], '']);
29
+ assert.deepStrictEqual(inspect(parser('\\0'), ctx), [['0'], '']);
30
+ assert.deepStrictEqual(inspect(parser('\\a'), ctx), [['a'], '']);
31
+ assert.deepStrictEqual(inspect(parser('\\\\a'), ctx), [['\\', 'a'], '']);
32
+ assert.deepStrictEqual(inspect(parser('\\ '), ctx), [[' '], '']);
33
+ assert.deepStrictEqual(inspect(parser('\\。'), ctx), [['。'], '']);
32
34
  });
33
35
 
34
36
  it('space', () => {
35
- assert.deepStrictEqual(inspect(parser(' ')), [[], '']);
36
- assert.deepStrictEqual(inspect(parser(' ')), [[], '']);
37
- assert.deepStrictEqual(inspect(parser(' ')), [[], '']);
38
- assert.deepStrictEqual(inspect(parser(' \n')), [['<br>'], '']);
39
- assert.deepStrictEqual(inspect(parser(' \n')), [['<br>'], '']);
40
- assert.deepStrictEqual(inspect(parser(' \\\n')), [['<br>'], '']);
41
- assert.deepStrictEqual(inspect(parser(' \\\n')), [['<br>'], '']);
42
- assert.deepStrictEqual(inspect(parser(' a')), [[' ', 'a'], '']);
43
- assert.deepStrictEqual(inspect(parser(' a')), [[' ', ' ', 'a'], '']);
44
- assert.deepStrictEqual(inspect(parser(' a')), [[' ', ' ', 'a'], '']);
45
- assert.deepStrictEqual(inspect(parser('a ')), [['a'], '']);
46
- assert.deepStrictEqual(inspect(parser('a ')), [['a'], '']);
47
- assert.deepStrictEqual(inspect(parser('a \n')), [['a', '<br>'], '']);
48
- assert.deepStrictEqual(inspect(parser('a \n')), [['a', '<br>'], '']);
49
- assert.deepStrictEqual(inspect(parser('a \\\n')), [['a', '<br>'], '']);
50
- assert.deepStrictEqual(inspect(parser('a \\\n')), [['a', '<br>'], '']);
51
- assert.deepStrictEqual(inspect(parser('a b')), [['a', ' ', 'b'], '']);
52
- assert.deepStrictEqual(inspect(parser('a b')), [['a', ' ', ' ', 'b'], '']);
53
- assert.deepStrictEqual(inspect(parser('a b')), [['a', ' ', ' ', 'b'], '']);
37
+ assert.deepStrictEqual(inspect(parser(' '), ctx), [[' '], '']);
38
+ assert.deepStrictEqual(inspect(parser(' '), ctx), [[' ', ' '], '']);
39
+ assert.deepStrictEqual(inspect(parser(' '), ctx), [[' ', ' ', ' '], '']);
40
+ assert.deepStrictEqual(inspect(parser(' \n'), ctx), [[' ', '<br>'], '']);
41
+ assert.deepStrictEqual(inspect(parser(' \n'), ctx), [[' ', ' ', '<br>'], '']);
42
+ assert.deepStrictEqual(inspect(parser(' \\\n'), ctx), [[' ', '<br>'], '']);
43
+ assert.deepStrictEqual(inspect(parser(' \\\n'), ctx), [[' ', ' ', '<br>'], '']);
44
+ assert.deepStrictEqual(inspect(parser(' a'), ctx), [[' ', 'a'], '']);
45
+ assert.deepStrictEqual(inspect(parser(' a'), ctx), [[' ', ' ', 'a'], '']);
46
+ assert.deepStrictEqual(inspect(parser(' a'), ctx), [[' ', ' ', ' ', 'a'], '']);
47
+ assert.deepStrictEqual(inspect(parser('a '), ctx), [['a', ' '], '']);
48
+ assert.deepStrictEqual(inspect(parser('a '), ctx), [['a', ' ', ' '], '']);
49
+ assert.deepStrictEqual(inspect(parser('a \n'), ctx), [['a', ' ', '<br>'], '']);
50
+ assert.deepStrictEqual(inspect(parser('a \n'), ctx), [['a', ' ', ' ', '<br>'], '']);
51
+ assert.deepStrictEqual(inspect(parser('a \\\n'), ctx), [['a', ' ', '<br>'], '']);
52
+ assert.deepStrictEqual(inspect(parser('a \\\n'), ctx), [['a', ' ', ' ', '<br>'], '']);
53
+ assert.deepStrictEqual(inspect(parser('a b'), ctx), [['a', ' ', 'b'], '']);
54
+ assert.deepStrictEqual(inspect(parser('a b'), ctx), [['a', ' ', ' ', 'b'], '']);
55
+ assert.deepStrictEqual(inspect(parser('a b'), ctx), [['a', ' ', ' ', ' ', 'b'], '']);
54
56
  });
55
57
 
56
58
  it('hardbreak', () => {
57
- assert.deepStrictEqual(inspect(parser('\n')), [['<br>'], '']);
58
- assert.deepStrictEqual(inspect(parser('\n ')), [['<br>'], '']);
59
- assert.deepStrictEqual(inspect(parser(' \n')), [['<br>'], '']);
60
- assert.deepStrictEqual(inspect(parser('\n\n')), [['<br>', '<br>'], '']);
61
- assert.deepStrictEqual(inspect(parser(' \n\n')), [['<br>', '<br>'], '']);
62
- assert.deepStrictEqual(inspect(parser('\n \n')), [['<br>', '<br>'], '']);
63
- assert.deepStrictEqual(inspect(parser('\n\n ')), [['<br>', '<br>'], '']);
64
- assert.deepStrictEqual(inspect(parser('。\n')), [['。', '<br>'], '']);
59
+ assert.deepStrictEqual(inspect(parser('\n'), ctx), [['<br>'], '']);
60
+ assert.deepStrictEqual(inspect(parser('\n '), ctx), [['<br>', ' '], '']);
61
+ assert.deepStrictEqual(inspect(parser(' \n'), ctx), [[' ', '<br>'], '']);
62
+ assert.deepStrictEqual(inspect(parser('\n\n'), ctx), [['<br>', '<br>'], '']);
63
+ assert.deepStrictEqual(inspect(parser(' \n\n'), ctx), [[' ', '<br>', '<br>'], '']);
64
+ assert.deepStrictEqual(inspect(parser('\n \n'), ctx), [['<br>', ' ', '<br>'], '']);
65
+ assert.deepStrictEqual(inspect(parser('\n\n '), ctx), [['<br>', '<br>', ' '], '']);
66
+ assert.deepStrictEqual(inspect(parser('。\n'), ctx), [['。', '<br>'], '']);
65
67
  });
66
68
 
67
69
  it('softbreak', () => {
68
- assert.deepStrictEqual(inspect(parser('\\\n')), [['<br>'], '']);
69
- assert.deepStrictEqual(inspect(parser('\\\n ')), [['<br>'], '']);
70
- assert.deepStrictEqual(inspect(parser('\\\na')), [['<br>', 'a'], '']);
71
- assert.deepStrictEqual(inspect(parser('a\\\n')), [['a', '<br>'], '']);
72
- assert.deepStrictEqual(inspect(parser('a\\\nb\\\n')), [['a', '<br>', 'b', '<br>'], '']);
73
- assert.deepStrictEqual(inspect(parser('\\\\\\\n')), [['\\', '<br>'], '']);
70
+ assert.deepStrictEqual(inspect(parser('\\\n'), ctx), [['<br>'], '']);
71
+ assert.deepStrictEqual(inspect(parser('\\\n '), ctx), [['<br>', ' '], '']);
72
+ assert.deepStrictEqual(inspect(parser('\\\na'), ctx), [['<br>', 'a'], '']);
73
+ assert.deepStrictEqual(inspect(parser('a\\\n'), ctx), [['a', '<br>'], '']);
74
+ assert.deepStrictEqual(inspect(parser('a\\\nb\\\n'), ctx), [['a', '<br>', 'b', '<br>'], '']);
75
+ assert.deepStrictEqual(inspect(parser('\\\\\\\n'), ctx), [['\\', '<br>'], '']);
74
76
  });
75
77
 
76
78
  it('account', () => {
77
- assert.deepStrictEqual(inspect(parser('@0')), [['@', '0'], '']);
78
- assert.deepStrictEqual(inspect(parser('_@0')), [['_', '@', '0'], '']);
79
- assert.deepStrictEqual(inspect(parser('$@0')), [['$', '@', '0'], '']);
80
- assert.deepStrictEqual(inspect(parser('+@0')), [['+', '@', '0'], '']);
81
- assert.deepStrictEqual(inspect(parser('-@0')), [['-', '@', '0'], '']);
82
- assert.deepStrictEqual(inspect(parser('0@0')), [['0', '@', '0'], '']);
83
- assert.deepStrictEqual(inspect(parser('a@0')), [['a', '@', '0'], '']);
84
- assert.deepStrictEqual(inspect(parser('A@0')), [['A', '@', '0'], '']);
85
- assert.deepStrictEqual(inspect(parser('aA@0')), [['aA', '@', '0'], '']);
86
- assert.deepStrictEqual(inspect(parser(' @0')), [[' ', '@', '0'], '']);
87
- assert.deepStrictEqual(inspect(parser('@@0')), [['@', '@', '0'], '']);
79
+ assert.deepStrictEqual(inspect(parser('@0'), ctx), [['@', '0'], '']);
80
+ assert.deepStrictEqual(inspect(parser('_@0'), ctx), [['_', '@', '0'], '']);
81
+ assert.deepStrictEqual(inspect(parser('$@0'), ctx), [['$', '@', '0'], '']);
82
+ assert.deepStrictEqual(inspect(parser('+@0'), ctx), [['+', '@', '0'], '']);
83
+ assert.deepStrictEqual(inspect(parser('-@0'), ctx), [['-', '@', '0'], '']);
84
+ assert.deepStrictEqual(inspect(parser('0@0'), ctx), [['0', '@', '0'], '']);
85
+ assert.deepStrictEqual(inspect(parser('a@0'), ctx), [['a', '@', '0'], '']);
86
+ assert.deepStrictEqual(inspect(parser('A@0'), ctx), [['A', '@', '0'], '']);
87
+ assert.deepStrictEqual(inspect(parser('aA@0'), ctx), [['a', 'A', '@', '0'], '']);
88
+ assert.deepStrictEqual(inspect(parser(' @0'), ctx), [[' ', '@', '0'], '']);
89
+ assert.deepStrictEqual(inspect(parser('@@0'), ctx), [['@', '@', '0'], '']);
88
90
  });
89
91
 
90
92
  it('hashtag', () => {
91
- assert.deepStrictEqual(inspect(parser('#0')), [['#', '0'], '']);
92
- assert.deepStrictEqual(inspect(parser('_#0')), [['_', '#', '0'], '']);
93
- assert.deepStrictEqual(inspect(parser('$#0')), [['$', '#', '0'], '']);
94
- assert.deepStrictEqual(inspect(parser('+#0')), [['+', '#', '0'], '']);
95
- assert.deepStrictEqual(inspect(parser('-#0')), [['-', '#', '0'], '']);
96
- assert.deepStrictEqual(inspect(parser('0#0')), [['0', '#', '0'], '']);
97
- assert.deepStrictEqual(inspect(parser('a#0')), [['a', '#', '0'], '']);
98
- assert.deepStrictEqual(inspect(parser('A#0')), [['A', '#', '0'], '']);
99
- assert.deepStrictEqual(inspect(parser('aA#0')), [['a', 'A', '#', '0'], '']);
100
- assert.deepStrictEqual(inspect(parser(' #0')), [[' ', '#', '0'], '']);
101
- assert.deepStrictEqual(inspect(parser('##0')), [['#', '#', '0'], '']);
93
+ assert.deepStrictEqual(inspect(parser('#0'), ctx), [['#', '0'], '']);
94
+ assert.deepStrictEqual(inspect(parser('_#0'), ctx), [['_', '#', '0'], '']);
95
+ assert.deepStrictEqual(inspect(parser('$#0'), ctx), [['$', '#', '0'], '']);
96
+ assert.deepStrictEqual(inspect(parser('+#0'), ctx), [['+', '#', '0'], '']);
97
+ assert.deepStrictEqual(inspect(parser('-#0'), ctx), [['-', '#', '0'], '']);
98
+ assert.deepStrictEqual(inspect(parser('0#0'), ctx), [['0', '#', '0'], '']);
99
+ assert.deepStrictEqual(inspect(parser('a#0'), ctx), [['a', '#', '0'], '']);
100
+ assert.deepStrictEqual(inspect(parser('A#0'), ctx), [['A', '#', '0'], '']);
101
+ assert.deepStrictEqual(inspect(parser('aA#0'), ctx), [['a', 'A', '#', '0'], '']);
102
+ assert.deepStrictEqual(inspect(parser(' #0'), ctx), [[' ', '#', '0'], '']);
103
+ assert.deepStrictEqual(inspect(parser('##0'), ctx), [['#', '#', '0'], '']);
102
104
  });
103
105
 
104
106
  it('anchor', () => {
105
- assert.deepStrictEqual(inspect(parser('>>0')), [['>', '>', '0'], '']);
106
- assert.deepStrictEqual(inspect(parser('_>>0')), [['_', '>', '>', '0'], '']);
107
- assert.deepStrictEqual(inspect(parser('$>>0')), [['$', '>', '>', '0'], '']);
108
- assert.deepStrictEqual(inspect(parser('+>>0')), [['+', '>', '>', '0'], '']);
109
- assert.deepStrictEqual(inspect(parser('->>0')), [['-', '>', '>', '0'], '']);
110
- assert.deepStrictEqual(inspect(parser('0>>0')), [['0', '>', '>', '0'], '']);
111
- assert.deepStrictEqual(inspect(parser('a>>0')), [['a', '>', '>', '0'], '']);
112
- assert.deepStrictEqual(inspect(parser('A>>0')), [['A', '>', '>', '0'], '']);
113
- assert.deepStrictEqual(inspect(parser('aA>>0')), [['a', 'A', '>', '>', '0'], '']);
114
- assert.deepStrictEqual(inspect(parser(' >>0')), [[' ', '>', '>', '0'], '']);
115
- assert.deepStrictEqual(inspect(parser('>>>>0')), [['>', '>', '>', '>', '0'], '']);
107
+ assert.deepStrictEqual(inspect(parser('>>0'), ctx), [['>', '>', '0'], '']);
108
+ assert.deepStrictEqual(inspect(parser('_>>0'), ctx), [['_', '>', '>', '0'], '']);
109
+ assert.deepStrictEqual(inspect(parser('$>>0'), ctx), [['$', '>', '>', '0'], '']);
110
+ assert.deepStrictEqual(inspect(parser('+>>0'), ctx), [['+', '>', '>', '0'], '']);
111
+ assert.deepStrictEqual(inspect(parser('->>0'), ctx), [['-', '>', '>', '0'], '']);
112
+ assert.deepStrictEqual(inspect(parser('0>>0'), ctx), [['0', '>', '>', '0'], '']);
113
+ assert.deepStrictEqual(inspect(parser('a>>0'), ctx), [['a', '>', '>', '0'], '']);
114
+ assert.deepStrictEqual(inspect(parser('A>>0'), ctx), [['A', '>', '>', '0'], '']);
115
+ assert.deepStrictEqual(inspect(parser('aA>>0'), ctx), [['a', 'A', '>', '>', '0'], '']);
116
+ assert.deepStrictEqual(inspect(parser(' >>0'), ctx), [[' ', '>', '>', '0'], '']);
117
+ assert.deepStrictEqual(inspect(parser('>>>>0'), ctx), [['>', '>', '>', '>', '0'], '']);
116
118
  });
117
119
 
118
120
  });