securemark 0.239.0 → 0.240.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.240.2
+
+- Refactoring.
+
+## 0.240.1
+
+- Refactoring.
+
+## 0.240.0
+
+- Extend reference syntax not to require leading whitespace after abbr syntax.
+
 ## 0.239.0
 
 - Extend indexer syntax to make its own index optional.

package/design.md

@@ -102,14 +102,14 @@
 ##### インプットサイズ
 
 パーサーは上限を超えるサイズの入力をパースしない。
-またこれを超えない入力は1秒以下でセグメントに分割され非同期で逐次パースすることが可能となる。
+また上限を超えない入力は1秒以下でセグメントに分割され非同期での逐次パースが可能である。
 
 ゆえに入力はパーサーの実行環境を応答不能にすることはない。
 
 ##### セグメントサイズ
 
 パーサーは上限を超えるサイズのセグメントをパースしない。
-またこれを超えないセグメントのパースも規定のパースコストの上限を超えない。
+また上限を超えないセグメントのパースも規定のパースコストの上限を超えない。
 
 ゆえに入力はパーサーの実行環境を応答不能にすることはない。
 なお1セグメントは1ブロックに対応する。

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.239.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.240.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -500,7 +500,7 @@ require = function () {
                         case LFU.length > this.capacity * this.ratio / 100:
                             target = LFU.last !== skip ? LFU.last : LFU.length >= 2 ? LFU.last.prev : skip;
                             if (target !== skip) {
-                                if (this.ratio > 50)
+                                if (this.ratio >= 50)
                                     break;
                                 LRU.unshiftNode(target);
                                 LRU.head.value.node = LRU.head;
@@ -697,17 +697,16 @@ require = function () {
             const global_1 = _dereq_('./global');
             const alias_1 = _dereq_('./alias');
             const exception_1 = _dereq_('./exception');
-            let now_;
+            let mem;
             let count = 0;
-            function now() {
-                if (now_ === void 0) {
-                    tick(() => now_ = void 0);
-                } else {
-                    if (++count !== 100)
-                        return now_;
-                    count = 0;
+            function now(nocache = false) {
+                if (mem === void 0) {
+                    tick(() => mem = void 0);
+                } else if (!nocache && ++count !== 100) {
+                    return mem;
                 }
-                return now_ = global_1.Date.now();
+                count = 0;
+                return mem = global_1.Date.now();
             }
             exports.now = now;
             exports.clock = Promise.resolve(void 0);
@@ -1112,12 +1111,29 @@ require = function () {
             Object.defineProperty(exports, '__esModule', { value: true });
             exports.reduce = exports.memoize = void 0;
             const global_1 = _dereq_('./global');
+            const alias_1 = _dereq_('./alias');
             const compare_1 = _dereq_('./compare');
             function memoize(f, identify = (...as) => as[0], memory) {
                 if (typeof identify === 'object')
                     return memoize(f, void 0, identify);
                 if (memory === void 0)
                     return memoize(f, identify, new global_1.Map());
+                if ((0, alias_1.isArray)(memory))
+                    return memoize(f, identify, {
+                        has(key) {
+                            return memory[key] !== void 0;
+                        },
+                        get(key) {
+                            return memory[key];
+                        },
+                        set(key, value) {
+                            memory[key] = value;
+                            return this;
+                        },
+                        delete() {
+                            throw 0;
+                        }
+                    });
                 let nullish = false;
                 return (...as) => {
                     const b = identify(...as);
@@ -1146,6 +1162,7 @@ require = function () {
             exports.reduce = reduce;
         },
         {
+            './alias': 5,
             './compare': 12,
             './global': 15
         }
@@ -1196,12 +1213,14 @@ require = function () {
         function (_dereq_, module, exports) {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
-            exports.unique = exports.rnd0Z = exports.rnd0z = exports.rnd0f = exports.rnd64 = exports.rnd62 = exports.rnd36 = exports.rnd32 = exports.rnd16 = void 0;
+            exports.unique = exports.rnd0_ = exports.rnd0Z = exports.rnd0z = exports.rnd0f = exports.rnd64 = exports.rnd62 = exports.rnd36 = exports.rnd32 = exports.rnd16 = void 0;
             const global_1 = _dereq_('./global');
             const bases = [...Array(7)].map((_, i) => 1 << i);
             const dict = [
                 ...[...Array(36)].map((_, i) => i.toString(36)),
-                ...[...Array(36)].map((_, i) => i.toString(36).toUpperCase()).slice(-26)
+                ...[...Array(36)].map((_, i) => i.toString(36).toUpperCase()).slice(-26),
+                '-',
+                '_'
             ];
             exports.rnd16 = cons(16);
             exports.rnd32 = cons(32);
@@ -1211,6 +1230,7 @@ require = function () {
             exports.rnd0f = conv(exports.rnd16);
             exports.rnd0z = conv(exports.rnd36);
             exports.rnd0Z = conv(exports.rnd62);
+            exports.rnd0_ = conv(exports.rnd64);
             function unique(rnd, len, mem) {
                 const clear = !mem;
                 mem !== null && mem !== void 0 ? mem : mem = new global_1.Set();
@@ -3830,29 +3850,30 @@ require = function () {
             exports.check = exports.exec = exports.eval = exports.Delimiters = void 0;
             class Delimiters {
                 constructor() {
-                    this.stack = [];
-                    this.matchers = {};
+                    this.matchers = [];
+                    this.record = {};
                 }
                 push(delimiter) {
-                    var _a;
-                    var _b;
-                    const {signature, matcher} = delimiter;
-                    this.stack.push(signature);
-                    (_a = (_b = this.matchers)[signature]) !== null && _a !== void 0 ? _a : _b[signature] = matcher;
+                    const {signature, matcher, escape} = delimiter;
+                    if (this.record[signature] === !escape) {
+                        this.matchers.unshift(() => undefined);
+                    } else {
+                        this.matchers.unshift(matcher);
+                        this.record[signature] = !escape;
+                    }
                 }
                 pop() {
-                    this.stack.pop();
+                    this.matchers.shift();
                 }
                 match(source) {
-                    const {stack, matchers} = this;
-                    const log = {};
-                    for (let i = 0; i < stack.length; ++i) {
-                        const sig = stack[i];
-                        if (sig in log)
-                            continue;
-                        if (matchers[sig](source))
+                    const {matchers} = this;
+                    for (let i = 0; i < matchers.length; ++i) {
+                        switch (matchers[i](source)) {
+                        case true:
                             return true;
-                        log[sig] = false;
+                        case false:
+                            return false;
+                        }
                     }
                     return false;
                 }
@@ -3953,7 +3974,7 @@ require = function () {
         function (_dereq_, module, exports) {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
-            exports.some = void 0;
+            exports.escape = exports.some = void 0;
             const global_1 = _dereq_('spica/global');
             const parser_1 = _dereq_('../parser');
             const memoize_1 = _dereq_('spica/memoize');
@@ -3971,11 +3992,11 @@ require = function () {
             const matcher = (0, memoize_1.memoize)(pattern => {
                 switch (typeof pattern) {
                 case 'undefined':
-                    return () => false;
+                    return () => global_1.undefined;
                 case 'string':
-                    return source => source.slice(0, pattern.length) === pattern;
+                    return source => source.slice(0, pattern.length) === pattern || global_1.undefined;
                 case 'object':
-                    return (0, memoize_1.reduce)(source => pattern.test(source));
+                    return (0, memoize_1.reduce)(source => pattern.test(source) || global_1.undefined);
                 }
             }, signature);
             function some(parser, until, deep, limit = -1) {
@@ -4021,6 +4042,28 @@ require = function () {
                 };
             }
             exports.some = some;
+            function escape(parser, delim) {
+                const delimiter = {
+                    signature: signature(delim),
+                    matcher: source => source.slice(0, delim.length) !== delim && global_1.undefined,
+                    escape: true
+                };
+                return (source, context) => {
+                    var _a;
+                    if (source === '')
+                        return;
+                    if (context) {
+                        (_a = context.delimiters) !== null && _a !== void 0 ? _a : context.delimiters = new parser_1.Delimiters();
+                        context.delimiters.push(delimiter);
+                    }
+                    const result = parser(source, context);
+                    if (context.delimiters) {
+                        context.delimiters.pop();
+                    }
+                    return result;
+                };
+            }
+            exports.escape = escape;
         },
         {
             '../parser': 47,
@@ -4037,7 +4080,7 @@ require = function () {
             const union_1 = _dereq_('./union');
             const inits_1 = _dereq_('./inits');
             function subsequence(parsers) {
-                return (0, union_1.union)(parsers.map((_, i) => i < parsers.length - 1 ? (0, inits_1.inits)([
+                return (0, union_1.union)(parsers.map((_, i) => i + 1 < parsers.length ? (0, inits_1.inits)([
                     parsers[i],
                     subsequence(parsers.slice(i + 1))
                 ]) : parsers[i]));
@@ -4415,13 +4458,13 @@ require = function () {
             function headers(source) {
                 var _a;
                 const [el] = parse(source);
-                return (_a = el === null || el === void 0 ? void 0 : el.textContent.trimEnd().slice(el.firstChild.textContent.length).split('\n')) !== null && _a !== void 0 ? _a : [];
+                return (_a = el === null || el === void 0 ? void 0 : el.textContent.trimEnd().slice(el.firstChild.firstChild.textContent.length).split('\n')) !== null && _a !== void 0 ? _a : [];
             }
             exports.headers = headers;
             function parse(source) {
                 const result = (0, header_1.header)(source, {});
                 const [el] = (0, parser_1.eval)(result, []);
-                return el instanceof HTMLDetailsElement ? [
+                return (el === null || el === void 0 ? void 0 : el.tagName) === 'ASIDE' ? [
                     el,
                     (0, parser_1.exec)(result)
                 ] : [];
@@ -5124,7 +5167,7 @@ require = function () {
                         (0, combinator_1.some)(source_1.contentline, closer)
                     ])
                 ])
-            ]), closer), ([, fence]) => fence.length)));
+            ]), closer), ([, fence]) => fence.length, [])));
             exports.figure = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segment, (0, combinator_1.fmap)((0, combinator_1.convert)(source => source.slice(source.search(/[[$]/), source.trimEnd().lastIndexOf('\n')), (0, combinator_1.sequence)([
                 (0, combinator_1.line)((0, combinator_1.sequence)([
                     label_1.label,
@@ -5148,8 +5191,8 @@ require = function () {
                     (0, combinator_1.block)((0, locale_1.localize)((0, combinator_1.context)({ syntax: { inline: { media: false } } }, (0, combinator_1.trim)((0, util_1.visualize)((0, combinator_1.some)(inline_1.inline))))))
                 ])
             ])), ([label, param, content, ...caption]) => [(0, typed_dom_1.html)('figure', attributes(label.getAttribute('data-label'), param, content, caption), [
-                    (0, typed_dom_1.html)('div', [content]),
-                    (0, typed_dom_1.html)('figcaption', (0, array_1.unshift)([(0, typed_dom_1.html)('span', { class: 'figindex' })], (0, typed_dom_1.defrag)(caption)))
+                    (0, typed_dom_1.html)('figcaption', (0, array_1.unshift)([(0, typed_dom_1.html)('span', { class: 'figindex' })], (0, typed_dom_1.defrag)(caption))),
+                    (0, typed_dom_1.html)('div', [content])
                 ])])));
             function attributes(label, param, content, caption) {
                 const group = label.split('-', 1)[0];
@@ -5157,6 +5200,7 @@ require = function () {
                 switch (type || content.tagName) {
                 case 'UL':
                 case 'OL':
+                case 'checklist':
                     type = 'list';
                     break;
                 case 'TABLE':
@@ -5182,15 +5226,39 @@ require = function () {
                 } || param.trimStart() !== '' && {
                     'data-invalid-type': 'argument',
                     'data-invalid-message': 'Invalid argument'
-                } || group === '$' && (!content.classList.contains('math') || caption.length > 0) && {
-                    'data-invalid-type': 'content',
-                    'data-invalid-message': 'A figure labeled to define a formula number can contain only a math formula and no caption'
+                } || group === '$' && (type !== 'math' || caption.length > 0) && {
+                    'data-invalid-type': 'label',
+                    'data-invalid-message': '"$" label group must be used to math formulas with no caption'
+                } || type === 'media' && {} || [
+                    'fig',
+                    'figure'
+                ].includes(group) && {
+                    'data-invalid-type': 'label',
+                    'data-invalid-message': '"fig" and "figure" label groups must be used to media'
+                } || group === 'table' && type !== group && {
+                    'data-invalid-type': 'label',
+                    'data-invalid-message': '"table" label group must be used to tables'
+                } || group === 'list' && type !== group && {
+                    'data-invalid-type': 'label',
+                    'data-invalid-message': '"list" label group must be used to lists'
+                } || group === 'quote' && type !== group && {
+                    'data-invalid-type': 'label',
+                    'data-invalid-message': '"quote" label group must be used to blockquotes'
+                } || group === 'text' && type !== group && {
+                    'data-invalid-type': 'label',
+                    'data-invalid-message': '"text" label group must be used to codeblocks with no language'
+                } || group === 'code' && type !== group && {
+                    'data-invalid-type': 'label',
+                    'data-invalid-message': '"code" label group must be used to codeblocks with any language'
+                } || group === 'example' && type !== group && {
+                    'data-invalid-type': 'label',
+                    'data-invalid-message': '"example" label group must be used to examples'
                 } || global_1.undefined;
                 return {
                     'data-type': type,
                     'data-label': label,
                     'data-group': group,
-                    ...invalid && {
+                    ...(invalid === null || invalid === void 0 ? void 0 : invalid['data-invalid-type']) && {
                         class: 'invalid',
                         'data-invalid-syntax': 'figure',
                         ...invalid
@@ -5755,8 +5823,8 @@ require = function () {
                 /^\(([0-9]+|[a-z]+)\)(?:-[0-9]+)*(?=[^\S\n]|\n[^\S\n]*\S)/
             ], (0, combinator_1.context)({ syntax: { inline: { media: false } } }, exports.olist_))));
             exports.olist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.union)([
-                (0, combinator_1.match)(new RegExp(`^(?=${ openers['.'].source.replace('?:', '') })`), (0, memoize_1.memoize)(ms => list(type(ms[1]), '.'), ms => type(ms[1]))),
-                (0, combinator_1.match)(new RegExp(`^(?=${ openers['('].source.replace('?:', '') })`), (0, memoize_1.memoize)(ms => list(type(ms[1]), '('), ms => type(ms[1])))
+                (0, combinator_1.match)(new RegExp(`^(?=${ openers['.'].source.replace('?:', '') })`), (0, memoize_1.memoize)(ms => list(type(ms[1]), '.'), ms => type(ms[1]).charCodeAt(0) || 0, [])),
+                (0, combinator_1.match)(new RegExp(`^(?=${ openers['('].source.replace('?:', '') })`), (0, memoize_1.memoize)(ms => list(type(ms[1]), '('), ms => type(ms[1]).charCodeAt(0) || 0, []))
             ])));
             const list = (type, delim) => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([
                     (0, combinator_1.line)((0, combinator_1.open)(heads[delim], (0, combinator_1.trim)((0, combinator_1.subsequence)([
@@ -6195,13 +6263,10 @@ require = function () {
                     (0, combinator_1.guard)(context => {
                         var _a;
                         return (_a = context.header) !== null && _a !== void 0 ? _a : true;
-                    }, (0, combinator_1.focus)(/^---[^\S\v\f\r\n]*\r?\n(?:[A-Za-z][0-9A-Za-z]*(?:-[A-Za-z][0-9A-Za-z]*)*:[ \t]+\S[^\v\f\r\n]*\r?\n){1,100}---[^\S\v\f\r\n]*(?:$|\r?\n)/, (0, combinator_1.convert)(source => (0, normalize_1.normalize)(source.slice(source.indexOf('\n') + 1, source.trimEnd().lastIndexOf('\n'))).replace(/(\S)\s+$/mg, '$1'), (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.union)([field])), es => [(0, typed_dom_1.html)('details', {
-                            class: 'header',
-                            open: ''
-                        }, (0, typed_dom_1.defrag)([
-                            (0, typed_dom_1.html)('summary', 'Header'),
-                            ...es
-                        ]))])))),
+                    }, (0, combinator_1.focus)(/^---[^\S\v\f\r\n]*\r?\n(?:[A-Za-z][0-9A-Za-z]*(?:-[A-Za-z][0-9A-Za-z]*)*:[ \t]+\S[^\v\f\r\n]*\r?\n){1,100}---[^\S\v\f\r\n]*(?:$|\r?\n)/, (0, combinator_1.convert)(source => (0, normalize_1.normalize)(source.slice(source.indexOf('\n') + 1, source.trimEnd().lastIndexOf('\n'))).replace(/(\S)\s+$/mg, '$1'), (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.union)([field])), es => [(0, typed_dom_1.html)('aside', { class: 'header' }, [(0, typed_dom_1.html)('details', { open: '' }, (0, typed_dom_1.defrag)([
+                                (0, typed_dom_1.html)('summary', 'Header'),
+                                ...es
+                            ]))])])))),
                     source => [
                         [(0, typed_dom_1.html)('pre', {
                                 class: 'invalid',
@@ -6221,7 +6286,7 @@ require = function () {
                 return [
                     [(0, typed_dom_1.html)('span', {
                             class: 'field',
-                            'data-name': name,
+                            'data-name': name.toLowerCase(),
                             'data-value': value
                         }, [
                             (0, typed_dom_1.html)('span', { class: 'field-name' }, name),
@@ -6373,7 +6438,8 @@ require = function () {
                         media: false
                     }
                 },
-                state: global_1.undefined
+                state: global_1.undefined,
+                delimiters: global_1.undefined
             }, (0, util_1.trimSpaceStart)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, ')', /^\\?\n/)]))))), '))'), ns => [(0, typed_dom_1.html)('sup', { class: 'annotation' }, (0, util_1.trimNodeEnd)((0, typed_dom_1.defrag)(ns)))]))));
         },
         {
@@ -6651,7 +6717,7 @@ require = function () {
             const source_1 = _dereq_('../source');
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
-            const index = /^(?:[0-9]+(?:\.[0-9]+)*|[A-Za-z])/;
+            const index = /^(?:[0-9]+(?:(?:[.-]|, )[0-9]+)*|[A-Za-z])/;
             exports.bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.union)([
                 (0, combinator_1.surround)((0, source_1.str)('('), (0, source_1.str)(index), (0, source_1.str)(')')),
                 (0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)(inline_1.inline, ')'), (0, source_1.str)(')'), true, ([as, bs = [], cs], rest) => [
@@ -6661,7 +6727,7 @@ require = function () {
                     (0, array_1.unshift)(as, bs),
                     rest
                 ]),
-                (0, combinator_1.surround)((0, source_1.str)('\uFF08'), (0, source_1.str)(new RegExp(index.source.replace(/[09AZaz.]/g, c => String.fromCharCode(c.charCodeAt(0) + 65248)))), (0, source_1.str)('\uFF09')),
+                (0, combinator_1.surround)((0, source_1.str)('\uFF08'), (0, source_1.str)(new RegExp(index.source.replace(/[09AZaz., ]|\-(?!\w)/g, c => c.trimStart() && String.fromCharCode(c.charCodeAt(0) + 65248)))), (0, source_1.str)('\uFF09')),
                 (0, combinator_1.surround)((0, source_1.str)('\uFF08'), (0, combinator_1.some)(inline_1.inline, '\uFF09'), (0, source_1.str)('\uFF09'), true, ([as, bs = [], cs], rest) => [
                     [(0, typed_dom_1.html)('span', { class: 'paren' }, (0, typed_dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))],
                     rest
@@ -6732,7 +6798,7 @@ require = function () {
             ], ([as, bs = []], rest) => [
                 (0, array_1.unshift)(as, bs),
                 rest
-            ]), ([, fence]) => fence.length)))));
+            ]), ([, fence]) => fence.length, [])))));
         },
         {
             '../../combinator': 27,
@@ -7824,7 +7890,8 @@ require = function () {
                         media: false
                     }
                 },
-                state: global_1.undefined
+                state: global_1.undefined,
+                delimiters: global_1.undefined
             }, (0, combinator_1.subsequence)([
                 abbr,
                 (0, combinator_1.focus)(/^\^[^\S\n]*/, source => [
@@ -7836,7 +7903,7 @@ require = function () {
                 ]),
                 (0, util_1.trimSpaceStart)((0, combinator_1.some)(inline_1.inline, ']', /^\\?\n/))
             ])))), ']]'), ns => [(0, typed_dom_1.html)('sup', attributes(ns), (0, util_1.trimNodeEnd)((0, typed_dom_1.defrag)(ns)))]))));
-            const abbr = (0, combinator_1.creator)((0, combinator_1.fmap)((0, combinator_1.verify)((0, combinator_1.surround)('^', (0, combinator_1.union)([(0, source_1.str)(/^(?![0-9]+\s?[|\]])[0-9A-Za-z]+(?:(?:-|(?=\W)(?!'\d)'?(?!\.\d)\.?(?!,\S),? ?)[0-9A-Za-z]+)*(?:-|'?\.?,? ?)?/)]), /^\|?(?=]])|^\|[^\S\n]+/), (_, rest, context) => (0, util_1.isStartLoose)(rest, context)), ([source]) => [(0, typed_dom_1.html)('abbr', source)]));
+            const abbr = (0, combinator_1.creator)((0, combinator_1.fmap)((0, combinator_1.verify)((0, combinator_1.surround)('^', (0, combinator_1.union)([(0, source_1.str)(/^(?![0-9]+\s?[|\]])[0-9A-Za-z]+(?:(?:-|(?=\W)(?!'\d)'?(?!\.\d)\.?(?!,\S),? ?)[0-9A-Za-z]+)*(?:-|'?\.?,? ?)?/)]), /^\|?(?=]])|^\|[^\S\n]*/), (_, rest, context) => (0, util_1.isStartLoose)(rest, context)), ([source]) => [(0, typed_dom_1.html)('abbr', source)]));
             function attributes(ns) {
                 return typeof ns[0] === 'object' && ns[0].tagName === 'ABBR' ? {
                     class: 'reference',

package/gulpfile.js

@@ -128,7 +128,7 @@ gulp.task('ts:dist', () =>
     .pipe(gulp.dest(config.ts.dist.dest)));
 
 gulp.task('ts:view', () =>
-  gulp.watch(config.ts.dist.src, { ignoreInitial: false }, () =>
+  gulp.watch(config.ts.test.src, { ignoreInitial: false }, () =>
     compile(config.ts.dist.src, true)
       .pipe($.unassert())
       .pipe($.header(config.banner))

package/markdown.d.ts

@@ -56,9 +56,9 @@ export namespace MarkdownParser {
     // url: https://host/path
     // ---
     Markdown<'header'>,
-    Parser<HTMLDetailsElement | HTMLPreElement, Context, [
-      Parser<HTMLDetailsElement | HTMLPreElement, Context, [
-        Parser<HTMLDetailsElement, Context, [
+    Parser<HTMLElement | HTMLPreElement, Context, [
+      Parser<HTMLElement | HTMLPreElement, Context, [
+        Parser<HTMLElement, Context, [
           HeaderParser.FieldParser,
         ]>,
         Parser<HTMLPreElement, Context, []>,