uniorg-parse 0.4.3 → 0.5.0

package/lib/parser.js

@@ -1,15 +1,9 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = void 0;
-const vfile_1 = __importDefault(require("vfile"));
-const unist_builder_1 = __importDefault(require("unist-builder"));
-const entities_1 = require("./entities");
-const utils_1 = require("./utils");
-const parse_options_1 = require("./parse-options");
-const reader_1 = require("./reader");
+import { VFile } from 'vfile';
+import { u } from 'unist-builder';
+import { getOrgEntity } from './entities.js';
+import { restrictionFor, greaterElements, unescapeCodeInString, escapeRegExp, OrgRegexUtils, } from './utils.js';
+import { defaultOptions } from './parse-options.js';
+import { Reader } from './reader.js';
 /*
 (defun rasen/org-debug ()
   "Show org AST for the current buffer."
@@ -50,20 +44,19 @@ var ParseMode;
     /** Default parsing mode. */
     ParseMode[ParseMode["Default"] = 7] = "Default";
 })(ParseMode || (ParseMode = {}));
-function parse(file, options) {
-    return new Parser(vfile_1.default(file), options).parse();
+export function parse(file, options) {
+    return new Parser(new VFile(file), options).parse();
 }
-exports.parse = parse;
 class Parser {
     constructor(file, options = {}) {
-        this.r = new reader_1.Reader(file);
-        this.options = Object.assign(Object.assign({}, parse_options_1.defaultOptions), options);
-        this.re = new utils_1.OrgRegexUtils(this.options);
+        this.r = new Reader(file);
+        this.options = { ...defaultOptions, ...options };
+        this.re = new OrgRegexUtils(this.options);
     }
     parse() {
         this.parseEmptyLines();
         const children = this.parseElements(ParseMode.TopComment);
-        return unist_builder_1.default('org-data', { contentsBegin: 0, contentsEnd: this.r.endOffset() }, children);
+        return u('org-data', { contentsBegin: 0, contentsEnd: this.r.endOffset() }, children);
     }
     // General parsing structure
     parseElements(mode, structure) {
@@ -78,25 +71,31 @@ class Parser {
             prevOffset = offset;
             const element = this.parseElement(mode, structure);
             const type = element.type;
+            // @ts-expect-error contentsBegin is not defined for "literals"
             const cbeg = element.contentsBegin;
+            // @ts-expect-error contentsBegin is not defined for "literals"
             const cend = element.contentsEnd;
             if (cbeg === undefined || cend === undefined) {
                 // do nothing
             }
-            else if (utils_1.greaterElements.has(type)) {
-                const elementStructure = element.structure;
+            else if (greaterElements.has(type)) {
                 this.r.narrow(cbeg, cend);
-                appendChildren(element, this.parseElements(Parser.nextMode(mode, type, true), structure !== null && structure !== void 0 ? structure : elementStructure));
+                appendChildren(element, this.parseElements(Parser.nextMode(mode, type, true), element.type === 'plain-list' || element.type === 'list-item'
+                    ? // @ts-expect-error Property 'structure' does not exist on type 'OrgData'
+                        element.structure
+                    : undefined));
                 this.r.widen();
                 // Delete structure from lists. It’s only here to facilitate
                 // parsing and should not be exposed to the user.
-                if (elementStructure) {
+                // @ts-expect-error Property 'structure' does not exist on type 'OrgData'
+                if (element.structure) {
+                    // @ts-expect-error Property 'structure' does not exist on type 'OrgData'
                     delete element.structure;
                 }
             }
             else {
                 this.r.narrow(cbeg, cend);
-                appendChildren(element, this.parseObjects(utils_1.restrictionFor(element.type)));
+                appendChildren(element, this.parseObjects(restrictionFor(element.type)));
                 this.r.widen();
             }
             elements.push(element);
@@ -134,7 +133,6 @@ class Parser {
         return ParseMode.Default;
     }
     parseElement(mode, structure) {
-        var _a, _b;
         // List Item.
         if (mode === ParseMode.ListItem)
             return this.parseListItem(structure);
@@ -166,7 +164,7 @@ class Parser {
             // && TODO: check previous line is headline
             ((mode === ParseMode.PropertyDrawer || mode === ParseMode.TopComment) &&
                 !this.r.lookingAt(/\s*$/m))) &&
-            this.r.lookingAt(/^[ \t]*:PROPERTIES:[ \t]*\n(?:[ \t]*:\S+:(?: .*)?[ \t]*\n)*?[ \t]*:END:[ \t]*$/m)) {
+            this.r.lookingAt(/^[ \t]*:PROPERTIES:[ \t]*\n(?:[ \t]*:\S+:(?: .*)?[ \t]*\n)*?[ \t]*:END:[ \t]*$/im)) {
             return this.parsePropertyDrawer();
         }
         // When not at beginning of line, point is at the beginning of an
@@ -255,7 +253,7 @@ class Parser {
             const offset = this.r.offset();
             this.r.advance(this.r.line());
             const nextLineOffset = this.r.offset();
-            const firstNonTable = (_b = (_a = this.r.match(/^[ \t]*($|[^|])/m)) === null || _a === void 0 ? void 0 : _a.index) !== null && _b !== void 0 ? _b : null;
+            const firstNonTable = this.r.match(/^[ \t]*($|[^|])/m)?.index ?? null;
             this.r.advance(firstNonTable);
             const isTable = this.r.offset() > nextLineOffset && this.r.lookingAt(ruleRe);
             this.r.resetOffset(offset);
@@ -295,13 +293,15 @@ class Parser {
             if (objectBegin !== prevEnd) {
                 // parse text before object
                 const value = this.r.substring(prevEnd, objectBegin);
-                objects.push(unist_builder_1.default('text', { value }));
+                objects.push(u('text', { value }));
             }
+            // @ts-expect-error contentsBegin is not defined for "literals"
             const cbeg = o.contentsBegin;
+            // @ts-expect-error contentsBegin is not defined for "literals"
             const cend = o.contentsEnd;
             if (cbeg !== undefined && cend !== undefined) {
                 this.r.narrow(cbeg, cend);
-                appendChildren(o, this.parseObjects(utils_1.restrictionFor(o.type)));
+                appendChildren(o, this.parseObjects(restrictionFor(o.type)));
                 this.r.widen();
             }
             objects.push(o);
@@ -312,7 +312,7 @@ class Parser {
         const text = this.r.rest();
         this.r.advance(text.length);
         if (text.trim().length) {
-            objects.push(unist_builder_1.default('text', { value: text }));
+            objects.push(u('text', { value: text }));
         }
         return objects;
     }
@@ -467,26 +467,25 @@ class Parser {
             ? this.r.offset() + endOfSubtree.index
             : this.r.endOffset();
         this.r.resetOffset(contentsEnd);
-        return unist_builder_1.default('section', { contentsBegin, contentsEnd }, []);
+        return u('section', { contentsBegin, contentsEnd }, []);
     }
     parseHeadline() {
-        var _a, _b, _c;
         const begin = this.r.offset();
         this.r.advance(this.r.line());
         this.r.narrow(begin, this.r.offset());
         const stars = this.r.advance(this.r.forceLookingAt(/^(\*+)[ \t]+/));
         const level = stars[1].length;
         const todoM = this.r.advance(this.r.lookingAt(new RegExp('^' + this.options.todoKeywords.join('|'))));
-        const todoKeyword = (_a = todoM === null || todoM === void 0 ? void 0 : todoM[0]) !== null && _a !== void 0 ? _a : null;
+        const todoKeyword = todoM?.[0] ?? null;
         this.r.advance(this.r.lookingAt(/^[ \t]*/));
         const priorityM = this.r.advance(this.r.lookingAt(/^\[#.\]/));
-        const priority = (_b = priorityM === null || priorityM === void 0 ? void 0 : priorityM[0][2]) !== null && _b !== void 0 ? _b : null;
+        const priority = priorityM?.[0][2] ?? null;
         this.r.advance(this.r.lookingAt(/^[ \t]*/));
         const commented = !!this.r.advance(this.r.lookingAt(/^COMMENT/));
         this.r.advance(this.r.lookingAt(/^[ \t]*/));
         const titleStart = this.r.offset();
         const tagsM = this.r.lookingAt(/^(.*?)[ \t]+:([\w@#%:]+):[ \t]*$/m);
-        const tags = (_c = tagsM === null || tagsM === void 0 ? void 0 : tagsM[2].split(':')) !== null && _c !== void 0 ? _c : [];
+        const tags = tagsM?.[2].split(':') ?? [];
         const titleEnd = tagsM
             ? titleStart + tagsM.index + tagsM[1].length
             : titleStart + this.r.forceLookingAt(/.*/)[0].length;
@@ -496,7 +495,7 @@ class Parser {
         // Reset line restriction.
         this.r.widen();
         this.parseEmptyLines();
-        return unist_builder_1.default('headline', {
+        return u('headline', {
             level,
             todoKeyword,
             priority,
@@ -530,17 +529,17 @@ class Parser {
         this.r.widen();
         this.r.advance(this.r.line());
         this.parseEmptyLines();
-        return unist_builder_1.default('planning', { scheduled, deadline, closed });
+        return u('planning', { scheduled, deadline, closed });
     }
     parsePropertyDrawer() {
         this.r.advance(this.r.line());
         const contentsBegin = this.r.offset();
-        const endM = this.r.forceMatch(/^[ \t]*:END:[ \t]*$/m);
+        const endM = this.r.forceMatch(/^[ \t]*:END:[ \t]*$/im);
         this.r.advance(endM.index);
         const contentsEnd = this.r.offset();
         this.r.advance(this.r.line());
         this.parseEmptyLines();
-        return unist_builder_1.default('property-drawer', { contentsBegin, contentsEnd }, []);
+        return u('property-drawer', { contentsBegin, contentsEnd }, []);
     }
     parseBlock(type, pattern, affiliated) {
         const endM = this.r.match(new RegExp(`^[ \\t]*#\\+end_${pattern}[ \\t]*$`, 'im'));
@@ -555,7 +554,7 @@ class Parser {
         this.r.advance(this.r.line());
         this.parseEmptyLines();
         const _end = this.r.offset();
-        return unist_builder_1.default(type, { affiliated, contentsBegin, contentsEnd }, []);
+        return u(type, { affiliated, contentsBegin, contentsEnd }, []);
     }
     parseComment() {
         let valueLines = [];
@@ -571,7 +570,7 @@ class Parser {
         if (value[value.length - 1] === '\n') {
             value = value.substring(0, value.length - 1);
         }
-        return unist_builder_1.default('comment', { value: value });
+        return u('comment', { value: value });
     }
     parseFixedWidth(affiliated) {
         let valueLines = [];
@@ -583,7 +582,7 @@ class Parser {
             valueLines.push(m[1]);
         }
         const value = valueLines.join('\n');
-        return unist_builder_1.default('fixed-width', { affiliated, value });
+        return u('fixed-width', { affiliated, value });
     }
     parseCommentBlock(affiliated) {
         const comment = this.parseBlock('comment-block', 'comment', affiliated);
@@ -592,7 +591,7 @@ class Parser {
             return comment;
         }
         const value = this.r.substring(comment.contentsBegin, comment.contentsEnd);
-        return unist_builder_1.default('comment-block', { affiliated, value });
+        return u('comment-block', { affiliated, value });
     }
     parseSrcBlock(affiliated) {
         const endM = this.r.match(/^[ \t]*#\+end_src[ \t]*$/im);
@@ -605,12 +604,12 @@ class Parser {
         const begin = this.r.offset();
         const contentsBegin = begin + this.r.line().length;
         const contentsEnd = begin + endM.index;
-        const value = utils_1.unescapeCodeInString(this.r.substring(contentsBegin, contentsEnd));
+        const value = unescapeCodeInString(this.r.substring(contentsBegin, contentsEnd));
         this.r.resetOffset(contentsEnd);
         this.r.advance(this.r.line());
         this.parseEmptyLines();
         const _end = this.r.offset();
-        return unist_builder_1.default('src-block', { affiliated, language, value });
+        return u('src-block', { affiliated, language, value });
     }
     parseExampleBlock(affiliated) {
         // TODO: parse switches
@@ -620,30 +619,29 @@ class Parser {
             return block;
         }
         const value = this.r.substring(block.contentsBegin, block.contentsEnd);
-        return unist_builder_1.default('example-block', { affiliated, value });
+        return u('example-block', { affiliated, value });
     }
     parseExportBlock(affiliated) {
-        var _a;
         const endM = this.r.match(/^[ \t]*#\+end_export[ \t]*$/im);
         if (!endM) {
             // Incomplete block: parse it as a paragraph.
             return this.parseParagraph(affiliated);
         }
         const headerM = this.r.forceMatch(/^[ \t]*#\+begin_export(?:[ \t]+(\S+))?[ \t]*$/im);
-        const backend = (_a = headerM[1]) !== null && _a !== void 0 ? _a : null;
+        const backend = headerM[1] ?? null;
         const begin = this.r.offset();
         const contentsBegin = begin + this.r.line().length;
         const contentsEnd = begin + endM.index;
-        const value = utils_1.unescapeCodeInString(this.r.substring(contentsBegin, contentsEnd));
+        const value = unescapeCodeInString(this.r.substring(contentsBegin, contentsEnd));
         this.r.resetOffset(contentsEnd);
         this.r.advance(this.r.line());
         this.parseEmptyLines();
         const _end = this.r.offset();
-        return unist_builder_1.default('export-block', { affiliated, backend, value });
+        return u('export-block', { affiliated, backend, value });
     }
     parseSpecialBlock(affiliated) {
         const blockType = this.r.forceLookingAt(/[ \t]*#\+begin_(\S+)/i)[1];
-        const endM = this.r.match(new RegExp(`^[ \\t]*#\\+end_${utils_1.escapeRegExp(blockType)}[ \\t]*$`, 'im'));
+        const endM = this.r.match(new RegExp(`^[ \\t]*#\\+end_${escapeRegExp(blockType)}[ \\t]*$`, 'im'));
         if (!endM) {
             this.r.message('incomplete block', this.r.offset(), 'uniorg');
             // Incomplete block: parse it as a paragraph.
@@ -656,29 +654,30 @@ class Parser {
         this.r.advance(this.r.line());
         this.parseEmptyLines();
         const _end = this.r.offset();
-        return unist_builder_1.default('special-block', { affiliated, blockType, contentsBegin, contentsEnd }, []);
+        return u('special-block', { affiliated, blockType, contentsBegin, contentsEnd }, []);
     }
     parseAffiliatedKeywords() {
-        var _a, _b, _c, _d;
         const offset = this.r.offset();
         const result = {};
         while (!this.r.eof()) {
             const keywordM = this.r.lookingAt(affiliatedRe);
             if (!keywordM)
                 break;
-            const rawKeyword = ((_b = (_a = keywordM.groups.dualKeyword) !== null && _a !== void 0 ? _a : keywordM.groups.regularKeyword) !== null && _b !== void 0 ? _b : keywordM.groups.attributeKeyword).toUpperCase();
-            const keyword = (_c = keywordTranslationTable[rawKeyword]) !== null && _c !== void 0 ? _c : rawKeyword;
+            const rawKeyword = (keywordM.groups.dualKeyword ??
+                keywordM.groups.regularKeyword ??
+                keywordM.groups.attributeKeyword).toUpperCase();
+            const keyword = keywordTranslationTable[rawKeyword] ?? rawKeyword;
             // true if keyword should have its value parsed
             const isParsed = parsedKeywords.has(keyword);
             this.r.advance(keywordM);
             this.r.narrow(this.r.offset(), this.r.offset() + this.r.line().length);
             const mainValue = isParsed
-                ? this.parseObjects(utils_1.restrictionFor('keyword'))
+                ? this.parseObjects(restrictionFor('keyword'))
                 : this.r.rest().trim();
             this.r.widen();
             this.r.advance(this.r.line());
             const isDual = dualKeywords.has(keyword);
-            const dualValue = isDual ? (_d = keywordM.groups.dualValue) !== null && _d !== void 0 ? _d : null : null;
+            const dualValue = isDual ? keywordM.groups.dualValue ?? null : null;
             const value = dualValue === null ? mainValue : [mainValue, dualValue];
             if (multipleKeywords.has(keyword) ||
                 // Attributes can always appear on multiple lines.
@@ -704,7 +703,7 @@ class Parser {
         const value = m[2].trim();
         this.r.advance(this.r.line());
         this.parseEmptyLines();
-        return unist_builder_1.default('keyword', { affiliated, key, value });
+        return u('keyword', { affiliated, key, value });
     }
     parseLatexEnvironment(affiliated) {
         const beginOffset = this.r.offset();
@@ -720,10 +719,10 @@ class Parser {
         const endOffset = this.r.offset();
         this.parseEmptyLines();
         const value = this.r.substring(beginOffset, endOffset);
-        return unist_builder_1.default('latex-environment', { affiliated, value });
+        return u('latex-environment', { affiliated, value });
     }
     parseDrawer(affiliated) {
-        const endM = this.r.match(/^[ \t]*:END:[ \t]*$/m);
+        const endM = this.r.match(/^[ \t]*:END:[ \t]*$/im);
         if (!endM) {
             this.r.message('incomplete drawer', this.r.offset(), 'uniorg');
             // Incomplete drawer: parse it as a paragraph.
@@ -736,7 +735,7 @@ class Parser {
         this.r.resetOffset(contentsEnd);
         this.r.advance(this.r.line());
         this.parseEmptyLines();
-        return unist_builder_1.default('drawer', { affiliated, name, contentsBegin, contentsEnd }, []);
+        return u('drawer', { affiliated, name, contentsBegin, contentsEnd }, []);
     }
     parseClock() {
         this.r.advance(this.r.forceMatch(/^[ \t]*CLOCK:[ \t]*/));
@@ -746,16 +745,15 @@ class Parser {
         const duration = durationM ? durationM[1] : null;
         const status = duration ? 'closed' : 'running';
         this.parseEmptyLines();
-        return unist_builder_1.default('clock', { value, duration, status });
+        return u('clock', { value, duration, status });
     }
     parseNodeProperty() {
-        var _a;
         const propertyRe = /^[ \t]*:(?<key>\S+):(?:(?<value1>$)|[ \t]+(?<value2>.*?))[ \t]*$/m;
         const m = this.r.forceLookingAt(propertyRe);
         const key = m.groups['key'];
-        const value = (_a = m.groups['value1']) !== null && _a !== void 0 ? _a : m.groups['value2'];
+        const value = m.groups['value1'] ?? m.groups['value2'];
         this.r.advance(this.r.line());
-        return unist_builder_1.default('node-property', { key, value });
+        return u('node-property', { key, value });
     }
     parseParagraph(affiliated) {
         const contentsBegin = this.r.offset();
@@ -778,7 +776,7 @@ class Parser {
             }
             const drawerM = this.r.lookingAt(drawerRe);
             if (drawerM) {
-                const endM = this.r.match(/^[ \t]*:END:[ \t]*$/m);
+                const endM = this.r.match(/^[ \t]*:END:[ \t]*$/im);
                 if (!endM) {
                     this.r.advance(this.r.line());
                     continue;
@@ -809,16 +807,15 @@ class Parser {
         const contentsEnd = next ? this.r.offset() : this.r.endOffset();
         this.r.resetOffset(contentsEnd);
         this.parseEmptyLines();
-        return unist_builder_1.default('paragraph', { affiliated, contentsBegin, contentsEnd }, []);
+        return u('paragraph', { affiliated, contentsBegin, contentsEnd }, []);
     }
     parseFootnoteDefinition(affiliated) {
-        var _a;
         const m = this.r.forceLookingAt(footnoteDefinitionRe);
         const label = m[1];
         const begin = this.r.offset();
         this.r.advance(this.r.line());
         const endM = this.r.match(footnoteDefinitionSeparatorRe);
-        this.r.advance(endM === null || endM === void 0 ? void 0 : endM.index);
+        this.r.advance(endM?.index);
         let contentsEnd = endM ? this.r.offset() : this.r.endOffset();
         if (endM && endM[0][0] === '[') {
             // At a new footnote definition, make sure we end before any
@@ -829,7 +826,7 @@ class Parser {
             lines = lines.slice(1, lines.length - 1);
             while (lines.length) {
                 const line = lines.pop();
-                if (((_a = line.match(affiliatedRe)) === null || _a === void 0 ? void 0 : _a.index) === 0) {
+                if (line.match(affiliatedRe)?.index === 0) {
                     // -1 to compensate for \n
                     this.r.advance(-line.length - 1);
                 }
@@ -845,18 +842,18 @@ class Parser {
         this.r.widen();
         this.r.resetOffset(contentsEnd);
         this.parseEmptyLines();
-        return unist_builder_1.default('footnote-definition', { affiliated, label, contentsBegin, contentsEnd }, []);
+        return u('footnote-definition', { affiliated, label, contentsBegin, contentsEnd }, []);
     }
     parseHorizontalRule(affiliated) {
         this.r.advance(this.r.line());
         this.parseEmptyLines();
-        return unist_builder_1.default('horizontal-rule', { affiliated });
+        return u('horizontal-rule', { affiliated });
     }
     parseDiarySexp(affiliated) {
         const value = this.r.forceLookingAt(/^(%%\(.*)[ \t]*$/m)[1];
         this.r.advance(this.r.line());
         this.parseEmptyLines();
-        return unist_builder_1.default('diary-sexp', { affiliated, value });
+        return u('diary-sexp', { affiliated, value });
     }
     parseTable(affiliated) {
         const contentsBegin = this.r.offset();
@@ -877,10 +874,10 @@ class Parser {
         }
         this.parseEmptyLines();
         if (tableType === 'org') {
-            return unist_builder_1.default('table', { tableType, tblfm, contentsBegin, contentsEnd }, []);
+            return u('table', { tableType, tblfm, contentsBegin, contentsEnd }, []);
         }
         else {
-            return unist_builder_1.default('table', {
+            return u('table', {
                 affiliated,
                 tableType,
                 tblfm,
@@ -899,14 +896,14 @@ class Parser {
         // contentsBegin matches contentsEnd.
         const contentsEnd = rowType === 'rule' ? contentsBegin : this.r.offset();
         this.r.advance(this.r.line());
-        return unist_builder_1.default('table-row', { rowType, contentsBegin, contentsEnd }, []);
+        return u('table-row', { rowType, contentsBegin, contentsEnd }, []);
     }
     parseTableCell() {
         this.r.advance(this.r.forceLookingAt(/^[ \t]*/));
         const contentsBegin = this.r.offset();
         const m = this.r.advance(this.r.forceLookingAt(/(.*?)[ \t]*(?:\||$)/m));
         const contentsEnd = contentsBegin + m[1].length;
-        return unist_builder_1.default('table-cell', { contentsBegin, contentsEnd }, []);
+        return u('table-cell', { contentsBegin, contentsEnd }, []);
     }
     parseList(structure, affiliated) {
         const contentsBegin = this.r.offset();
@@ -929,7 +926,7 @@ class Parser {
         }
         const contentsEnd = pos;
         this.r.resetOffset(contentsEnd);
-        return unist_builder_1.default('plain-list', {
+        return u('plain-list', {
             affiliated,
             indent,
             listType,
@@ -941,14 +938,13 @@ class Parser {
         }, []);
     }
     parseListItem(structure) {
-        var _a, _b;
         const offset = this.r.offset();
         const m = this.r.advance(this.r.forceMatch(this.re.fullListItemRe()));
         const bullet = m.groups.bullet;
-        const counter = (_a = m.groups.counter) !== null && _a !== void 0 ? _a : null;
+        const counter = m.groups.counter ?? null;
         const checkbox = m.groups.checkbox === '[ ]'
             ? 'off'
-            : ((_b = m.groups.checkbox) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === '[x]'
+            : m.groups.checkbox?.toLowerCase() === '[x]'
                 ? 'on'
                 : m.groups.checkbox === '[-]'
                     ? 'trans'
@@ -957,21 +953,21 @@ class Parser {
         const contentsBegin = this.r.offset();
         const contentsEnd = item.end;
         this.r.resetOffset(contentsEnd);
-        return unist_builder_1.default('list-item', {
+        return u('list-item', {
             indent: item.indent,
             bullet,
             counter,
             checkbox,
             contentsBegin,
             contentsEnd,
+            structure,
         }, item.tag ? [item.tag] : []);
     }
     parseListStructure() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const items = [];
         const struct = [];
         while (true) {
-            if (this.r.eof() || ((_a = this.r.match(this.re.listEndRe())) === null || _a === void 0 ? void 0 : _a.index) === 0) {
+            if (this.r.eof() || this.r.match(this.re.listEndRe())?.index === 0) {
                 break;
             }
             const m = this.r.match(this.re.listItemRe());
@@ -994,21 +990,21 @@ class Parser {
                 let tag = null;
                 if (fullM.groups.tag !== undefined) {
                     const tagStartOffset = this.r.offset() +
-                        ((_c = (_b = fullM.groups.indent) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) +
-                        ((_e = (_d = fullM.groups.bullet) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0) +
-                        ((_g = (_f = fullM.groups.counter_group) === null || _f === void 0 ? void 0 : _f.length) !== null && _g !== void 0 ? _g : 0) +
-                        ((_j = (_h = fullM.groups.checkbox_group) === null || _h === void 0 ? void 0 : _h.length) !== null && _j !== void 0 ? _j : 0);
+                        (fullM.groups.indent?.length ?? 0) +
+                        (fullM.groups.bullet?.length ?? 0) +
+                        (fullM.groups.counter_group?.length ?? 0) +
+                        (fullM.groups.checkbox_group?.length ?? 0);
                     const tagStopOffset = tagStartOffset + fullM.groups.tag.length;
                     this.r.narrow(tagStartOffset, tagStopOffset);
-                    tag = unist_builder_1.default('list-item-tag', {}, this.parseObjects(utils_1.restrictionFor('list-item')));
+                    tag = u('list-item-tag', {}, this.parseObjects(restrictionFor('list-item')));
                     this.r.widen();
                 }
                 const item = {
                     begin: this.r.offset(),
                     indent,
                     bullet,
-                    counter: counter !== null && counter !== void 0 ? counter : null,
-                    checkbox: checkbox !== null && checkbox !== void 0 ? checkbox : null,
+                    counter: counter ?? null,
+                    checkbox: checkbox ?? null,
                     tag,
                     // will be overwritten later
                     end: this.r.offset(),
@@ -1032,7 +1028,14 @@ class Parser {
                     // closed full list
                     break;
                 }
-                // TODO: skip blocks
+                // skip blocks (any type) and drawers contents.
+                const mBlock = this.r.lookingAt(/[ \t]*#\+begin(:|_\S+)/i);
+                if (mBlock) {
+                    this.r.advance(this.r.match(new RegExp(`^[ \\t]*#\\+end${mBlock[1]}[ \\t]*`, 'im')));
+                }
+                else if (this.r.lookingAt(drawerRe)) {
+                    this.r.advance(this.r.match(/^[ \t]*:END:[ \t]*$/im));
+                }
                 this.r.advance(this.r.line());
             }
         }
@@ -1057,7 +1060,7 @@ class Parser {
         const contentsBegin = begin + m[2].length + (inside ? 1 : 0);
         const contentsEnd = begin + m[2].length + m[3].length - (inside ? 1 : 0);
         const _end = this.r.offset();
-        return unist_builder_1.default('superscript', { contentsBegin, contentsEnd, children: [] });
+        return u('superscript', { contentsBegin, contentsEnd, children: [] });
     }
     parseSubscript() {
         this.r.backoff(1); // backoff by one, to match previous char (should be non-space)
@@ -1070,7 +1073,7 @@ class Parser {
         const contentsBegin = begin + m[2].length + (inside ? 1 : 0);
         const contentsEnd = begin + m[2].length + m[3].length - (inside ? 1 : 0);
         const _end = this.r.offset();
-        return unist_builder_1.default('subscript', { contentsBegin, contentsEnd, children: [] });
+        return u('subscript', { contentsBegin, contentsEnd, children: [] });
     }
     parseUnderline() {
         // backoff one char to check border
@@ -1081,7 +1084,7 @@ class Parser {
         const contentsBegin = this.r.offset() + m.index + m[1].length + m[3].length;
         const contentsEnd = contentsBegin + m[4].length;
         this.r.resetOffset(contentsEnd + 1);
-        return unist_builder_1.default('underline', { contentsBegin, contentsEnd }, []);
+        return u('underline', { contentsBegin, contentsEnd }, []);
     }
     parseBold() {
         // backoff one char to check border
@@ -1092,7 +1095,7 @@ class Parser {
         const contentsBegin = this.r.offset() + m.index + m[1].length + m[3].length;
         const contentsEnd = contentsBegin + m[4].length;
         this.r.resetOffset(contentsEnd + 1);
-        return unist_builder_1.default('bold', { contentsBegin, contentsEnd }, []);
+        return u('bold', { contentsBegin, contentsEnd }, []);
     }
     parseItalic() {
         // backoff one char to check border
@@ -1103,7 +1106,7 @@ class Parser {
         const contentsBegin = this.r.offset() + m.index + m[1].length + m[3].length;
         const contentsEnd = contentsBegin + m[4].length;
         this.r.resetOffset(contentsEnd + 1);
-        return unist_builder_1.default('italic', { contentsBegin, contentsEnd }, []);
+        return u('italic', { contentsBegin, contentsEnd }, []);
     }
     parseCode() {
         // backoff one char to check border
@@ -1115,7 +1118,7 @@ class Parser {
         const contentsBegin = this.r.offset() + m.index + m[1].length + m[3].length;
         const contentsEnd = contentsBegin + m[4].length;
         this.r.resetOffset(contentsEnd + 1);
-        return unist_builder_1.default('code', { value }, []);
+        return u('code', { value }, []);
     }
     parseVerbatim() {
         this.r.backoff(1);
@@ -1126,7 +1129,7 @@ class Parser {
         const contentsBegin = this.r.offset() + m.index + m[1].length + m[3].length;
         const contentsEnd = contentsBegin + m[4].length;
         this.r.resetOffset(contentsEnd + 1);
-        return unist_builder_1.default('verbatim', { value }, []);
+        return u('verbatim', { value }, []);
     }
     parseStrikeThrough() {
         // backoff one char to check border
@@ -1137,10 +1140,9 @@ class Parser {
         const contentsBegin = this.r.offset() + m.index + m[1].length + m[3].length;
         const contentsEnd = contentsBegin + m[4].length;
         this.r.resetOffset(contentsEnd + 1);
-        return unist_builder_1.default('strike-through', { contentsBegin, contentsEnd }, []);
+        return u('strike-through', { contentsBegin, contentsEnd }, []);
     }
     parseEntity() {
-        var _a;
         const m = this.r.advance(this.r.lookingAt(/^\\(?:(?<value1>_ +)|(?<value2>there4|sup[123]|frac[13][24]|[a-zA-Z]+)(?<brackets>$|\{\}|\P{Letter}))/mu));
         if (!m)
             return null;
@@ -1151,13 +1153,12 @@ class Parser {
             // as text later.
             this.r.backoff(m.groups.brackets.length);
         }
-        const value = entities_1.getOrgEntity((_a = m.groups.value1) !== null && _a !== void 0 ? _a : m.groups.value2);
+        const value = getOrgEntity(m.groups.value1 ?? m.groups.value2);
         if (!value)
             return null;
-        return unist_builder_1.default('entity', Object.assign({ useBrackets: hasBrackets }, value));
+        return u('entity', { useBrackets: hasBrackets, ...value });
     }
     parseLatexFragment() {
-        var _a;
         const begin = this.r.offset();
         const prefix = this.r.peek(2);
         let contents = null;
@@ -1174,20 +1175,20 @@ class Parser {
                 default: {
                     // Macro.
                     const m = this.r.advance(this.r.lookingAt(/^\\[a-zA-Z]+\*?((\[[^\]\[\n{}]*\])|(\{[^{}\n]*\}))*/));
-                    contents = m === null || m === void 0 ? void 0 : m[0];
+                    contents = m?.[0];
                 }
             }
         }
         else if (prefix[1] === '$') {
             const m = this.r.advance(this.r.match(/\$\$((?:.|\n)*?)\$\$/m));
-            contents = m === null || m === void 0 ? void 0 : m[1];
+            contents = m?.[1];
         }
         else {
             // TODO: limit search to 2 lines
             const charBefore = this.r.substring(this.r.offset() - 1, this.r.offset());
             if (charBefore !== '$' &&
                 !' \t\n,.;'.includes(prefix[1]) &&
-                (contents = (_a = this.r.advance(this.r.match(/\$((?:.|\n)*?)\$/m))) === null || _a === void 0 ? void 0 : _a[1]) &&
+                (contents = this.r.advance(this.r.match(/\$((?:.|\n)*?)\$/m))?.[1]) &&
                 !' \t\n,.'.includes(this.r.substring(this.r.offset() - 1, this.r.offset())) &&
                 this.r.lookingAt(/^(\p{Punctuation}|\p{White_Space}|\p{Open_Punctuation}|\p{Close_Punctuation}|\\"|'|$)/mu)) {
                 // we've found the end
@@ -1201,10 +1202,9 @@ class Parser {
         if (begin === end)
             return null;
         const value = this.r.substring(begin, end);
-        return unist_builder_1.default('latex-fragment', { value, contents: contents !== null && contents !== void 0 ? contents : value });
+        return u('latex-fragment', { value, contents: contents ?? value });
     }
     parseFootnoteReference() {
-        var _a;
         const begin = this.r.offset();
         const m = this.r.match(footnoteRe);
         if (!m)
@@ -1233,9 +1233,10 @@ class Parser {
             ? 'inline'
             : 'standard';
         const label = footnoteType === 'inline'
-            ? (_a = m.groups.label_inline) !== null && _a !== void 0 ? _a : null : m.groups.label;
+            ? m.groups.label_inline ?? null
+            : m.groups.label;
         if (footnoteType === 'inline') {
-            return unist_builder_1.default('footnote-reference', {
+            return u('footnote-reference', {
                 label,
                 footnoteType,
                 contentsBegin,
@@ -1243,7 +1244,7 @@ class Parser {
             }, []);
         }
         else {
-            return unist_builder_1.default('footnote-reference', { label, footnoteType }, []);
+            return u('footnote-reference', { label, footnoteType }, []);
         }
     }
     parseLink() {
@@ -1277,9 +1278,13 @@ class Parser {
                 .replace(/(\\+)([\[\]])/g, (p1, p2) => '\\'.repeat(p1.length / 2) + p2);
             // TODO: org-link-expand-abbrev
             const { linkType, path } = this.linkType(rawLink);
-            return unist_builder_1.default('link', Object.assign({ format: 'bracket', linkType,
+            return u('link', {
+                format: 'bracket',
+                linkType,
                 rawLink,
-                path }, contents), []);
+                path,
+                ...contents,
+            }, []);
         }
         // TODO: this is different from OrgRegexUtils.linkPlainRe
         // Type 3: Plain link, e.g., https://orgmode.org
@@ -1287,7 +1292,7 @@ class Parser {
         const plainM = this.r.advance(this.r.lookingAt(linkPlainRe));
         if (plainM) {
             const m = plainM;
-            return unist_builder_1.default('link', {
+            return u('link', {
                 format: 'plain',
                 linkType: m[1],
                 rawLink: m[0],
@@ -1304,7 +1309,7 @@ class Parser {
             const linkType = m[1];
             const rawLink = m[0].substring(1, m[0].length - 1); // strip < >
             const path = m[2].replace(/[ \t]*\n[ \t]*/g, '');
-            return unist_builder_1.default('link', { format: 'angle', linkType, rawLink, path }, []);
+            return u('link', { format: 'angle', linkType, rawLink, path }, []);
         }
         return null;
     }
@@ -1375,8 +1380,9 @@ class Parser {
             : dateEnd
                 ? Parser.parseDate(dateEnd)
                 : timeRange
-                    ? Object.assign(Object.assign({}, start), timeRange) : null;
-        return unist_builder_1.default('timestamp', {
+                    ? { ...start, ...timeRange }
+                    : null;
+        return u('timestamp', {
             timestampType,
             rawValue,
             start,
@@ -1419,7 +1425,7 @@ class Parser {
 }
 const drawerRe = /^[ \t]*:((?:\w|[-_])+):[ \t]*$/m;
 const latexBeginEnvironmentRe = /^[ \t]*\\begin\{([A-Za-z0-9*]+)\}/i;
-const latexEndEnvironmentRe = (name) => new RegExp(`\\\\end\\{${utils_1.escapeRegExp(name)}\\}[ \\t]*$`, 'mi');
+const latexEndEnvironmentRe = (name) => new RegExp(`\\\\end\\{${escapeRegExp(name)}\\}[ \\t]*$`, 'mi');
 const affiliatedKeywords = [
     'CAPTION',
     'DATA',
@@ -1466,9 +1472,8 @@ const footnoteRe = /\[fn:(?:(?<label_inline>[-_\w]+)?(?<inline>:)|(?<label>[-_\w
 const footnoteDefinitionRe = /^\[fn:([-_\w]+)\]/;
 const footnoteDefinitionSeparatorRe = /^\*|^\[fn:([-_\w]+)\]|^([ \t]*\n){2,}/m;
 function appendChildren(node, children) {
-    var _a;
     if ('children' in node) {
-        const newChildren = [...((_a = node.children) !== null && _a !== void 0 ? _a : []), ...children];
+        const newChildren = [...(node.children ?? []), ...children];
         node.children = newChildren;
     }
 }