securemark 0.238.0 → 0.240.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 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.
+
 ## 0.238.0
 
 - Revert signature syntax not to require leading whitespace.

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.238.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.240.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -4037,21 +4037,10 @@ require = function () {
             const union_1 = _dereq_('./union');
             const inits_1 = _dereq_('./inits');
             function subsequence(parsers) {
-                switch (parsers.length) {
-                case 0:
-                case 1:
-                    return (0, union_1.union)(parsers);
-                case 2:
-                    return (0, union_1.union)([
-                        (0, inits_1.inits)(parsers),
-                        parsers[1]
-                    ]);
-                default:
-                    return subsequence([
-                        parsers[0],
-                        subsequence(parsers.slice(1))
-                    ]);
-                }
+                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]));
             }
             exports.subsequence = subsequence;
         },
@@ -4095,7 +4084,7 @@ require = function () {
                         'return (source, context) =>',
                         '0',
                         ...parsers.map((_, i) => `|| parsers[${ i }](source, context)`)
-                    ].join(''))(parsers);
+                    ].join('\n'))(parsers);
                 }
             }
             exports.union = union;
@@ -4426,13 +4415,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)
                 ] : [];
@@ -5159,8 +5148,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];
@@ -5168,6 +5157,7 @@ require = function () {
                 switch (type || content.tagName) {
                 case 'UL':
                 case 'OL':
+                case 'checklist':
                     type = 'list';
                     break;
                 case 'TABLE':
@@ -5193,15 +5183,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
@@ -6206,13 +6220,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',
@@ -6232,7 +6243,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),
@@ -6662,7 +6673,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) => [
@@ -6672,7 +6683,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
@@ -7048,12 +7059,13 @@ require = function () {
             function text(source, optional = false) {
                 var _a;
                 const indexer = source.querySelector(':scope > .indexer');
-                if (indexer)
-                    return indexer.getAttribute('data-index');
-                if (optional)
+                if (!indexer && optional)
                     return '';
+                const index = indexer === null || indexer === void 0 ? void 0 : indexer.getAttribute('data-index');
+                if (index)
+                    return index;
                 const target = source.cloneNode(true);
-                for (let es = target.querySelectorAll('code[data-src], .math[data-src], .comment, rt, rp, .reference'), i = 0, len = es.length; i < len; ++i) {
+                for (let es = target.querySelectorAll('code[data-src], .math[data-src], .comment, rt, rp, .reference, .checkbox, ul, ol'), i = 0, len = es.length; i < len; ++i) {
                     const el = es[i];
                     switch (el.tagName) {
                     case 'CODE':
@@ -7061,6 +7073,8 @@ require = function () {
                         continue;
                     case 'RT':
                     case 'RP':
+                    case 'UL':
+                    case 'OL':
                         el.remove();
                         continue;
                     }
@@ -7069,6 +7083,7 @@ require = function () {
                         (0, typed_dom_1.define)(el, el.getAttribute('data-src'));
                         continue;
                     case 'comment':
+                    case 'checkbox':
                         el.remove();
                         continue;
                     case 'reference':
@@ -7094,7 +7109,13 @@ require = function () {
             const combinator_1 = _dereq_('../../../combinator');
             const index_1 = _dereq_('./index');
             const typed_dom_1 = _dereq_('typed-dom');
-            exports.indexer = (0, combinator_1.creator)((0, combinator_1.fmap)((0, combinator_1.verify)((0, combinator_1.surround)(/^\s+(?=\[#[^\s\]])/, (0, combinator_1.context)({ syntax: { inline: { index: true } } }, (0, combinator_1.union)([index_1.index])), /^\s*$/), ([el]) => el.getElementsByClassName('invalid').length === 0), ([el]) => [(0, typed_dom_1.html)('span', {
+            exports.indexer = (0, combinator_1.creator)((0, combinator_1.fmap)((0, combinator_1.verify)((0, combinator_1.surround)(/^\s+(?=\[#\S)/, (0, combinator_1.context)({ syntax: { inline: { index: true } } }, (0, combinator_1.union)([
+                (0, combinator_1.focus)('[#]', () => [
+                    [(0, typed_dom_1.html)('a', { href: '#' })],
+                    ''
+                ]),
+                index_1.index
+            ])), /^\s*$/), ([el]) => el.getElementsByClassName('invalid').length === 0), ([el]) => [(0, typed_dom_1.html)('span', {
                     class: 'indexer',
                     'data-index': el.getAttribute('href').slice(7)
                 })]));
@@ -7837,7 +7858,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',
@@ -8219,11 +8240,11 @@ require = function () {
                                 class: void def.classList.add('invalid'),
                                 'data-invalid-syntax': 'figure',
                                 'data-invalid-type': 'position',
-                                'data-invalid-message': 'Base index declarations must be after level 1 to 6 headings',
+                                'data-invalid-message': messages.declaration,
                                 hidden: null
                             });
                             continue;
-                        } else if (def.getAttribute('data-invalid-message') === 'Base index declarations must be after level 1 to 6 headings') {
+                        } else if (def.getAttribute('data-invalid-message') === messages.declaration) {
                             (0, typed_dom_1.define)(def, {
                                 class: void def.classList.remove('invalid'),
                                 'data-invalid-syntax': null,
@@ -8260,10 +8281,10 @@ require = function () {
                             class: void def.classList.add('invalid'),
                             'data-invalid-syntax': 'figure',
                             'data-invalid-type': 'argument',
-                            'data-invalid-message': 'Duplicate label'
+                            'data-invalid-message': messages.duplicate
                         });
                         continue;
-                    } else if (def.getAttribute('data-invalid-message') === 'Duplicate label') {
+                    } else if (def.getAttribute('data-invalid-message') === messages.duplicate) {
                         (0, typed_dom_1.define)(def, {
                             class: void def.classList.remove('invalid'),
                             'data-invalid-syntax': null,
@@ -8274,7 +8295,7 @@ require = function () {
                     labels.add(label);
                     opts.id !== '' && def.setAttribute('id', `label:${ opts.id ? `${ opts.id }:` : '' }${ label }`);
                     for (const ref of refs.take(label, global_1.Infinity)) {
-                        if (ref.getAttribute('data-invalid-message') === 'Missing the target figure') {
+                        if (ref.getAttribute('data-invalid-message') === messages.reference) {
                             (0, typed_dom_1.define)(ref, {
                                 class: void ref.classList.remove('invalid'),
                                 'data-invalid-syntax': null,
@@ -8293,7 +8314,7 @@ require = function () {
                             class: void ref.classList.add('invalid'),
                             'data-invalid-syntax': 'label',
                             'data-invalid-type': 'reference',
-                            'data-invalid-message': 'Missing the target figure'
+                            'data-invalid-message': messages.reference
                         });
                     }
                     yield ref;
@@ -8301,6 +8322,11 @@ require = function () {
                 return;
             }
             exports.figure = figure;
+            const messages = {
+                declaration: 'Base index declarations must be after level 1 to 6 headings',
+                duplicate: 'Duplicate label',
+                reference: 'Missing the target figure'
+            };
             function increment(bases, el) {
                 const index = (+el.tagName[1] - 1 || 1) - 1;
                 return index + 1 < bases.length ? (0, array_1.join)(bases.slice(0, index + 2).map((v, i) => {

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, []>,
@@ -768,9 +768,11 @@ export namespace MarkdownParser {
         }
       }
       export interface IndexerParser extends
+        // [#]
         // [#index]
         Inline<'extension/indexer'>,
         Parser<HTMLElement, Context, [
+          Parser<HTMLAnchorElement, Context, []>,
           IndexParser,
         ]> {
       }