securemark 0.266.0 → 0.268.0

package/src/parser/source/str.ts

@@ -31,7 +31,7 @@ export function stropt(pattern: string | RegExp): Parser<string, Context<StrPars
         if (source === '') return;
         return source.slice(0, pattern.length) === pattern
           ? [[pattern], source.slice(pattern.length)]
-          : undefined;
+          : [[''], source];
       })
     : creation(1, false, ({ source }) => {
         if (source === '') return;

package/src/parser/util.ts

@@ -1,3 +1,13 @@
+import { Parser } from '../combinator/data/parser';
+import { convert } from '../combinator';
+
+export function format<P extends Parser<HTMLElement | string>>(parser: P): P;
+export function format<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
+  return convert(
+    source => source.replace(/(?<=^!?)https?:\/\/(?:[[]|[^\p{C}\p{S}\p{P}\s])\S*(?=[^\S\n]*(?:$|\n))/gm, '{ $& }'),
+    parser);
+}
+
 export function stringify(nodes: readonly (HTMLElement | string)[]): string {
   let acc = '';
   for (let i = 0; i < nodes.length; ++i) {

package/src/parser/visibility.ts

@@ -4,6 +4,7 @@ import { union, some, verify, convert, fmap } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { linebreak, unescsource } from './source';
 import { State } from './context';
+import { format } from './util';
 import { invisibleHTMLEntityNames } from './api/normalize';
 import { reduce } from 'spica/memoize';
 import { push } from 'spica/array';
@@ -16,7 +17,7 @@ export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Pa
   return union([
     convert(
       source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')),
-      verify(parser, (ns, rest, context) => !rest && hasVisible(ns, context))),
+      verify(format(parser), (ns, rest, context) => !rest && hasVisible(ns, context))),
     some(union([linebreak, unescsource])),
   ]);
 }

package/src/util/quote.ts

@@ -1,6 +1,6 @@
 import { exec } from '../combinator/data/parser';
 import { cite } from '../parser/block/reply/cite';
-import { define } from 'typed-dom/dom';
+//import { url } from '../parser/inline/autolink/url';
 
 export function quote(anchor: string, range: Range): string {
   if (exec(cite({ source: `>>${anchor}`, context: {} })) !== '') throw new Error(`Invalid anchor: ${anchor}`);
@@ -13,8 +13,15 @@ export function quote(anchor: string, range: Range): string {
     switch (true) {
       case el.matches('code'):
       case el.matches('.math'):
-        define(el, el.getAttribute('data-src')!);
+        el.replaceWith(el.getAttribute('data-src')!);
         continue;
+      //case el.matches('.url'):
+      //  if (exec(url({ source: el.getAttribute('href')!, context: {} })) === '') continue;
+      //  el.replaceWith(
+      //    /[\s{}]/.test(el.getAttribute('href')!)
+      //      ? `{ ${el.getAttribute('href')} }`
+      //      : `{${el.getAttribute('href')}}`);
+      //  continue;
       case el.matches('.media'):
         el.replaceWith(
           /[\s{}]/.test(el.getAttribute('data-src')!)

package/src/parser/block/horizontalrule.test.ts

@@ -1,31 +0,0 @@
-import { horizontalrule } from './horizontalrule';
-import { some } from '../../combinator';
-import { inspect } from '../../debug.test';
-
-describe('Unit: parser/block/horizontalrule', () => {
-  describe('horizontalrule', () => {
-    const parser = (source: string) => some(horizontalrule)({ source, context: {} });
-
-    it('invalid', () => {
-      assert.deepStrictEqual(inspect(parser('')), undefined);
-      assert.deepStrictEqual(inspect(parser('\n')), undefined);
-      assert.deepStrictEqual(inspect(parser('-')), undefined);
-      assert.deepStrictEqual(inspect(parser('--')), undefined);
-      assert.deepStrictEqual(inspect(parser('--\n-')), undefined);
-      assert.deepStrictEqual(inspect(parser('---a')), undefined);
-      assert.deepStrictEqual(inspect(parser('---\na')), undefined);
-      assert.deepStrictEqual(inspect(parser('- - -')), undefined);
-      assert.deepStrictEqual(inspect(parser(' ---')), undefined);
-      assert.deepStrictEqual(inspect(parser('***')), undefined);
-    });
-
-    it('valid', () => {
-      assert.deepStrictEqual(inspect(parser('---')), [['<hr>'], '']);
-      assert.deepStrictEqual(inspect(parser('--- ')), [['<hr>'], '']);
-      assert.deepStrictEqual(inspect(parser('---\n')), [['<hr>'], '']);
-      assert.deepStrictEqual(inspect(parser('----')), [['<hr>'], '']);
-    });
-
-  });
-
-});

package/src/parser/block/horizontalrule.ts

@@ -1,7 +0,0 @@
-import { HorizontalRuleParser } from '../block';
-import { block, line, focus } from '../../combinator';
-import { html } from 'typed-dom/dom';
-
-export const horizontalrule: HorizontalRuleParser = block(line(focus(
-  /^-{3,}[^\S\n]*(?:$|\n)/,
-  () => [[html('hr')], ''])));