notations 0.0.48 → 0.0.51

package/lib/cjs/parser.js

@@ -1,8 +1,4 @@
 "use strict";
-var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-    return cooked;
-};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -26,95 +22,172 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Parser = void 0;
-var TSU = __importStar(require("@panyam/tsutils"));
-var G = __importStar(require("galore"));
-var TLEX = __importStar(require("tlex"));
-var core_1 = require("./core");
-var commands_1 = require("./commands");
-var carnatic = __importStar(require("./carnatic"));
-var ONE = TSU.Num.Fraction.ONE;
-var TWO = ONE.timesNum(2);
-var _a = __read(G.newParser(String.raw(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n    %define IdentChar     /[^%!@&^|[]={}()+-,;~: \t\f\r\n\v\\.]/\n\n    %token  BSLASH        \"\\\"\n    %token  OPEN_SQ       \"[\"\n    %token  CLOSE_SQ      \"]\"\n    %token  EQUALS        \"=\"\n    %token  OPEN_PAREN    \"(\"\n    %token  CLOSE_PAREN   \")\"\n    %token  OPEN_BRACE    \"{\"\n    %token  CLOSE_BRACE   \"}\"\n    %token  SLASH         \"/\"\n    %token  STAR          \"*\"\n    %token  CARET         \"^\"\n    // %skip \"-\"\n    %token  COMMA         \",\"\n    %token  SEMI_COLON    \";\"\n    %token  COLON         \":\"\n\n    %token  SINGLE_LINE_RAW_STRING       />(.*)$/m    { toSingleLineRawString }\n    %token  MULTI_LINE_RAW_STRING        /r(#{0,})\"/  { toMultiLineRawString }\n\n    %token  EMBELISHMENT  /~[^s]*/                 { toEmbelishment }\n    %token  NUMBER        /-?d+/                   { toNumber }\n    %token  BOOLEAN       /true|false/              { toBoolean }\n    %token  POST_MARKER   /<<\"(([^\"\\\n]|\\.|\\\n)*)\"/  { toMarker }\n    %token  POST_MARKER   /<<'(([^'\\\n]|\\.|\\\n)*)'/  { toMarker }\n    %token  PRE_MARKER   /\"(([^\"\\\n]|\\.|\\\n)*)\">>/  { toMarker }\n    %token  PRE_MARKER   /'(([^'\\\n]|\\.|\\\n)*)'>>/  { toMarker }\n    %token  STRING        /\"([^\"\\\n]|\\.|\\\n)*\"/  { toString }\n    %token  STRING        /'([^'\\\n]|\\.|\\\n)*'/  { toString }\n    %token  DOTS_IDENT    /(.+)({IdentChar}+)/     { toOctavedNote   }\n    %token  IDENT_DOTS    /({IdentChar}+)(.+)/     { toOctavedNote   }\n    %token  IDENT_COLON   /{IdentChar}+:/           { toRoleSelector  }\n    %token  IDENT         /{IdentChar}+/\n    %token  BSLASH_IDENT  /\\{IDENT}/               { toCommandName   }\n    %token  BSLASH_NUMBER /\\{NUMBER}/\n    %token  HYPHEN        /-/\n    %skip                 /[ \t\n\f\r]+/\n    %skip_flex            \"//.*$\"\n    %skip                 //*.*?*//\n\n    Elements -> Elements Command Atoms { appendCommand } \n              | Elements RoleSelector Atoms { appendRoleSelector } \n              | Elements Embedding  Atoms { insertEmbedding }\n              | Atoms { appendAtoms }\n              ;\n\n    Embedding -> SINGLE_LINE_RAW_STRING | MULTI_LINE_RAW_STRING ;\n\n    Command -> BSLASH_IDENT CommandParams ? { newCommand } ;\n    CommandParams -> OPEN_PAREN ParamList ? CLOSE_PAREN { $2 } ;\n\n    ParamList -> ParamList COMMA Param { concatParamList } ;\n    ParamList -> Param { newParamList };\n    Param -> ParamValue { newParam } ;\n    Param -> ParamKey EQUALS ParamValue { newParam } ;\n    ParamKey  -> IDENT ;\n    ParamValue -> ( STRING | Fraction | NUMBER | BOOLEAN ) ;\n\n    RoleSelector -> IDENT_COLON ;\n\n    Atoms -> Atoms Atom { concatAtoms } ;\n    Atoms -> { newArray } ;\n\n    Atom -> Leaf ;\n    Atom -> Duration  Leaf { applyDuration } ;\n    Leaf -> Space | Lit | Group | Rest | Marker ;\n    Rest -> HYPHEN { newRest };\n    Marker -> PRE_MARKER\n          | POST_MARKER\n          ;\n\n    Space -> COMMA { newSpace } \n          | SEMI_COLON { newDoubleSpace } \n          | UNDER_SCORE { newSilentSpace } \n          ;\n\n    /* - An alternative representation to support both pre and post embelishment operators.  */\n     Lit -> Lit POST_EMB  { litWithPostEmb }\n         | PreEmbLit\n         ;\n\n     PreEmbLit -> LitToken \n                | LitToken CARET NUMBER { litWithCaret }\n                | LitToken CARET STAR   { litWithCaret }\n                | PRE_EMB PreEmbLit     { litWithPreEmb }\n                ;\n      \n     LitToken -> DOTS_IDENT { litToAtom }\n              | IDENT { litToAtom }\n              | IDENT_DOTS { litToAtom }\n              | STRING  { litToAtom }\n              ;\n\n    Group -> OPEN_SQ Atoms CLOSE_SQ { newGroup };\n\n    Duration -> Fraction | NUMBER;\n    Fraction -> NUMBER SLASH NUMBER { newFraction } ;\n    "], ["\n    %define IdentChar     /[^%!@&\\^|\\[\\]={}()+\\-,;~: \\t\\f\\r\\n\\v\\\\\\.]/\n\n    %token  BSLASH        \"\\\\\"\n    %token  OPEN_SQ       \"[\"\n    %token  CLOSE_SQ      \"]\"\n    %token  EQUALS        \"=\"\n    %token  OPEN_PAREN    \"(\"\n    %token  CLOSE_PAREN   \")\"\n    %token  OPEN_BRACE    \"{\"\n    %token  CLOSE_BRACE   \"}\"\n    %token  SLASH         \"/\"\n    %token  STAR          \"*\"\n    %token  CARET         \"^\"\n    // %skip \"-\"\n    %token  COMMA         \",\"\n    %token  SEMI_COLON    \";\"\n    %token  COLON         \":\"\n\n    %token  SINGLE_LINE_RAW_STRING       />(.*)$/m    { toSingleLineRawString }\n    %token  MULTI_LINE_RAW_STRING        /r(#{0,})\"/  { toMultiLineRawString }\n\n    %token  EMBELISHMENT  /~[^\\s]*/                 { toEmbelishment }\n    %token  NUMBER        /-?\\d+/                   { toNumber }\n    %token  BOOLEAN       /true|false/              { toBoolean }\n    %token  POST_MARKER   /<<\"(([^\"\\\\\\n]|\\\\.|\\\\\\n)*)\"/  { toMarker }\n    %token  POST_MARKER   /<<'(([^'\\\\\\n]|\\\\.|\\\\\\n)*)'/  { toMarker }\n    %token  PRE_MARKER   /\"(([^\"\\\\\\n]|\\\\.|\\\\\\n)*)\">>/  { toMarker }\n    %token  PRE_MARKER   /'(([^'\\\\\\n]|\\\\.|\\\\\\n)*)'>>/  { toMarker }\n    %token  STRING        /\"([^\"\\\\\\n]|\\\\.|\\\\\\n)*\"/  { toString }\n    %token  STRING        /'([^'\\\\\\n]|\\\\.|\\\\\\n)*'/  { toString }\n    %token  DOTS_IDENT    /(\\.+)({IdentChar}+)/     { toOctavedNote   }\n    %token  IDENT_DOTS    /({IdentChar}+)(\\.+)/     { toOctavedNote   }\n    %token  IDENT_COLON   /{IdentChar}+:/           { toRoleSelector  }\n    %token  IDENT         /{IdentChar}+/\n    %token  BSLASH_IDENT  /\\\\{IDENT}/               { toCommandName   }\n    %token  BSLASH_NUMBER /\\\\{NUMBER}/\n    %token  HYPHEN        /-/\n    %skip                 /[ \\t\\n\\f\\r]+/\n    %skip_flex            \"//.*$\"\n    %skip                 /\\/\\*.*?\\*\\//\n\n    Elements -> Elements Command Atoms { appendCommand } \n              | Elements RoleSelector Atoms { appendRoleSelector } \n              | Elements Embedding  Atoms { insertEmbedding }\n              | Atoms { appendAtoms }\n              ;\n\n    Embedding -> SINGLE_LINE_RAW_STRING | MULTI_LINE_RAW_STRING ;\n\n    Command -> BSLASH_IDENT CommandParams ? { newCommand } ;\n    CommandParams -> OPEN_PAREN ParamList ? CLOSE_PAREN { $2 } ;\n\n    ParamList -> ParamList COMMA Param { concatParamList } ;\n    ParamList -> Param { newParamList };\n    Param -> ParamValue { newParam } ;\n    Param -> ParamKey EQUALS ParamValue { newParam } ;\n    ParamKey  -> IDENT ;\n    ParamValue -> ( STRING | Fraction | NUMBER | BOOLEAN ) ;\n\n    RoleSelector -> IDENT_COLON ;\n\n    Atoms -> Atoms Atom { concatAtoms } ;\n    Atoms -> { newArray } ;\n\n    Atom -> Leaf ;\n    Atom -> Duration  Leaf { applyDuration } ;\n    Leaf -> Space | Lit | Group | Rest | Marker ;\n    Rest -> HYPHEN { newRest };\n    Marker -> PRE_MARKER\n          | POST_MARKER\n          ;\n\n    Space -> COMMA { newSpace } \n          | SEMI_COLON { newDoubleSpace } \n          | UNDER_SCORE { newSilentSpace } \n          ;\n\n    /* - An alternative representation to support both pre and post embelishment operators.  */\n     Lit -> Lit POST_EMB  { litWithPostEmb }\n         | PreEmbLit\n         ;\n\n     PreEmbLit -> LitToken \n                | LitToken CARET NUMBER { litWithCaret }\n                | LitToken CARET STAR   { litWithCaret }\n                | PRE_EMB PreEmbLit     { litWithPreEmb }\n                ;\n      \n     LitToken -> DOTS_IDENT { litToAtom }\n              | IDENT { litToAtom }\n              | IDENT_DOTS { litToAtom }\n              | STRING  { litToAtom }\n              ;\n\n    Group -> OPEN_SQ Atoms CLOSE_SQ { newGroup };\n\n    Duration -> Fraction | NUMBER;\n    Fraction -> NUMBER SLASH NUMBER { newFraction } ;\n    "]))), {
+const TSU = __importStar(require("@panyam/tsutils"));
+const G = __importStar(require("galore"));
+const TLEX = __importStar(require("tlex"));
+const core_1 = require("./core");
+const commands_1 = require("./commands");
+const carnatic = __importStar(require("./carnatic"));
+const ONE = TSU.Num.Fraction.ONE;
+const TWO = ONE.timesNum(2);
+const [parser, itemGraph] = G.newParser(String.raw `
+    %define IdentChar     /[^%!@&\^|\[\]={}()+\-,;~: \t\f\r\n\v\\\.]/
+
+    %token  BSLASH        "\\"
+    %token  OPEN_SQ       "["
+    %token  CLOSE_SQ      "]"
+    %token  EQUALS        "="
+    %token  OPEN_PAREN    "("
+    %token  CLOSE_PAREN   ")"
+    %token  OPEN_BRACE    "{"
+    %token  CLOSE_BRACE   "}"
+    %token  SLASH         "/"
+    %token  STAR          "*"
+    %token  CARET         "^"
+    // %skip "-"
+    %token  COMMA         ","
+    %token  SEMI_COLON    ";"
+    %token  COLON         ":"
+
+    %token  SINGLE_LINE_RAW_STRING       />(.*)$/m    { toSingleLineRawString }
+    %token  MULTI_LINE_RAW_STRING        /r(#{0,})"/  { toMultiLineRawString }
+
+    %token  EMBELISHMENT  /~[^\s]*/                 { toEmbelishment }
+    %token  NUMBER        /-?\d+/                   { toNumber }
+    %token  BOOLEAN       /true|false/              { toBoolean }
+    %token  POST_MARKER   /<<"(([^"\\\n]|\\.|\\\n)*)"/  { toMarker }
+    %token  POST_MARKER   /<<'(([^'\\\n]|\\.|\\\n)*)'/  { toMarker }
+    %token  PRE_MARKER   /"(([^"\\\n]|\\.|\\\n)*)">>/  { toMarker }
+    %token  PRE_MARKER   /'(([^'\\\n]|\\.|\\\n)*)'>>/  { toMarker }
+    %token  STRING        /"([^"\\\n]|\\.|\\\n)*"/  { toString }
+    %token  STRING        /'([^'\\\n]|\\.|\\\n)*'/  { toString }
+    %token  DOTS_IDENT    /(\.+)({IdentChar}+)/     { toOctavedNote   }
+    %token  IDENT_DOTS    /({IdentChar}+)(\.+)/     { toOctavedNote   }
+    %token  IDENT_COLON   /{IdentChar}+:/           { toRoleSelector  }
+    %token  IDENT         /{IdentChar}+/
+    %token  BSLASH_IDENT  /\\{IDENT}/               { toCommandName   }
+    %token  BSLASH_NUMBER /\\{NUMBER}/
+    %token  HYPHEN        /-/
+    %skip                 /[ \t\n\f\r]+/
+    %skip_flex            "//.*$"
+    %skip                 /\/\*.*?\*\//
+
+    Elements -> Elements Command Atoms { appendCommand } 
+              | Elements RoleSelector Atoms { appendRoleSelector } 
+              | Elements Embedding  Atoms { insertEmbedding }
+              | Atoms { appendAtoms }
+              ;
+
+    Embedding -> SINGLE_LINE_RAW_STRING | MULTI_LINE_RAW_STRING ;
+
+    Command -> BSLASH_IDENT CommandParams ? { newCommand } ;
+    CommandParams -> OPEN_PAREN ParamList ? CLOSE_PAREN { $2 } ;
+
+    ParamList -> ParamList COMMA Param { concatParamList } ;
+    ParamList -> Param { newParamList };
+    Param -> ParamValue { newParam } ;
+    Param -> ParamKey EQUALS ParamValue { newParam } ;
+    ParamKey  -> IDENT ;
+    ParamValue -> ( STRING | Fraction | NUMBER | BOOLEAN ) ;
+
+    RoleSelector -> IDENT_COLON ;
+
+    Atoms -> Atoms Atom { concatAtoms } ;
+    Atoms -> { newArray } ;
+
+    Atom -> Atom POST_MARKER  { applyPostMarker }
+          | PreMarkedAtom
+          ;
+    PreMarkedAtom -> Leaf
+                  | PRE_MARKER PreMarkedAtom { applyPreMarker }
+                  ;
+
+    Leaf -> Space | Lit | Group | Rest  ;
+    Leaf -> Duration Leaf { applyDuration } ;
+    Rest -> HYPHEN { newRest };
+    Space -> COMMA { newSpace } 
+          | SEMI_COLON { newDoubleSpace } 
+          | UNDER_SCORE { newSilentSpace } 
+          ;
+
+    /* - An alternative representation to support both pre and
+     *   post embelishment operators.   Here PRE_EMBs have a higher
+     *   associativity over POST_EMBs
+     */
+     Lit -> Lit POST_EMB  { litWithPostEmb }
+         | PreEmbLit
+         ;
+
+     PreEmbLit -> LitToken 
+                | LitToken CARET NUMBER { litWithCaret }
+                | LitToken CARET STAR   { litWithCaret }
+                | PRE_EMB PreEmbLit     { litWithPreEmb }
+                ;
+      
+     LitToken -> DOTS_IDENT { litToAtom }
+              | IDENT { litToAtom }
+              | IDENT_DOTS { litToAtom }
+              | STRING  { litToAtom }
+              ;
+
+    Group -> OPEN_SQ Atoms CLOSE_SQ { newGroup };
+
+    Duration -> Fraction | NUMBER;
+    Fraction -> NUMBER SLASH NUMBER { newFraction } ;
+    `, {
     allowLeftRecursion: true,
     debug: "",
     type: "lalr",
     tokenHandlers: {
-        toEmbelishment: function (token, tape, owner) {
-            var _a = __read(owner.parseEmbelishment(token.value), 2), emb = _a[0], pre = _a[1];
+        toEmbelishment: (token, tape, owner) => {
+            const [emb, pre] = owner.parseEmbelishment(token.value);
             if (emb == null) {
                 console.log("Skipping Embelishment: ", token.value);
-                owner.errors.push(new TLEX.TokenizerError("Invalid embelishment: ".concat(token.value), token.start, 1 + token.end - token.start, "InvalidEmbelishment", token.value));
+                owner.errors.push(new TLEX.TokenizerError(`Invalid embelishment: ${token.value}`, token.start, 1 + token.end - token.start, "InvalidEmbelishment", token.value));
                 return null;
             }
             token.value = emb;
             token.tag = pre ? "PRE_EMB" : "POST_EMB";
             return token;
         },
-        toCommandName: function (token, tape, owner) {
+        toCommandName: (token, tape, owner) => {
             token.value = token.value.substring(1);
             return token;
         },
-        toBoolean: function (token, tape, owner) {
+        toBoolean: (token, tape, owner) => {
             token.value = token.value == "true";
             return token;
         },
-        toNumber: function (token, tape, owner) {
+        toNumber: (token, tape, owner) => {
             token.value = parseInt(token.value);
             return token;
         },
-        toString: function (token, tape, owner) {
+        toString: (token, tape, owner) => {
             token.value = token.value.substring(1, token.value.length - 1);
             return token;
         },
-        toMarker: function (token, tape, owner) {
+        toMarker: (token, tape, owner) => {
             if (token.tag != "PRE_MARKER" && token.tag != "POST_MARKER") {
                 throw new Error("Invalid token for converting to note: " + token.tag);
             }
-            var isBefore = token.tag == "PRE_MARKER";
-            var markerText = isBefore
+            const isBefore = token.tag == "PRE_MARKER";
+            const markerText = isBefore
                 ? token.value.substring(1, token.value.length - 3)
                 : token.value.substring(3, token.value.length - 1);
-            console.log("TokVal: ", token.value, token.positions);
-            console.log("Marker Text: ", markerText, isBefore);
             token.value = new core_1.Marker(markerText, isBefore);
             return token;
         },
-        toOctavedNote: function (token, tape, owner) {
+        toOctavedNote: (token, tape, owner) => {
             if (token.tag == "DOTS_IDENT") {
-                var octave = token.positions[1][1] - token.positions[1][0];
-                var note = token.value.substring(octave);
+                const octave = token.positions[1][1] - token.positions[1][0];
+                const note = token.value.substring(octave);
                 token.value = new core_1.Note(note, ONE, -octave);
             }
             else if (token.tag == "IDENT_DOTS") {
-                var octave = token.positions[2][1] - token.positions[2][0];
-                var note = token.value.substring(0, token.value.length - octave);
+                const octave = token.positions[2][1] - token.positions[2][0];
+                const note = token.value.substring(0, token.value.length - octave);
                 token.value = new core_1.Note(note, ONE, octave);
             }
             else {
@@ -122,23 +195,23 @@ var _a = __read(G.newParser(String.raw(templateObject_1 || (templateObject_1 = _
             }
             return token;
         },
-        toRoleSelector: function (token, tape, owner) {
+        toRoleSelector: (token, tape, owner) => {
             token.value = token.value.substring(0, token.value.length - 1);
             return token;
         },
-        toLineAnnotation: function (token, tape, owner) {
+        toLineAnnotation: (token, tape, owner) => {
             token.value = token.value.substring(1);
             return token;
         },
-        toSingleLineRawString: function (token, tape, owner) {
+        toSingleLineRawString: (token, tape, owner) => {
             token.value = token.value.substring(1);
             return token;
         },
-        toMultiLineRawString: function (token, tape, owner) {
-            var hashes = tape.substring(token.positions[1][0], token.positions[1][1]);
-            var endPat = '"' + hashes;
-            var startPos = tape.index;
-            var endPos = TLEX.TapeHelper.advanceAfter(tape, endPat) - endPat.length;
+        toMultiLineRawString: (token, tape, owner) => {
+            const hashes = tape.substring(token.positions[1][0], token.positions[1][1]);
+            const endPat = '"' + hashes;
+            const startPos = tape.index;
+            const endPos = TLEX.TapeHelper.advanceAfter(tape, endPat) - endPat.length;
             if (endPos < 0) {
                 throw new Error("EOF expected while finding end of Raw String Literal: '" + endPat + "'");
             }
@@ -146,19 +219,14 @@ var _a = __read(G.newParser(String.raw(templateObject_1 || (templateObject_1 = _
             return token;
         },
     },
-}), 2), parser = _a[0], itemGraph = _a[1];
-var Parser = (function () {
-    function Parser(config) {
-        var _this = this;
+});
+class Parser {
+    constructor(config) {
         this.errors = [];
         this.commands = [];
         this.runCommandFound = false;
         this.ruleHandlers = {
-            newFraction: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
+            newFraction: (rule, parent, ...children) => {
                 if (children.length == 1) {
                     return new TSU.Num.Fraction(children[0].value);
                 }
@@ -166,51 +234,31 @@ var Parser = (function () {
                     return new TSU.Num.Fraction(children[0].value, children[2].value);
                 }
             },
-            newGroup: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                var out = new (core_1.Group.bind.apply(core_1.Group, __spreadArray([void 0], __read(children[1].value), false)))().setDuration(TWO, true);
+            newGroup: (rule, parent, ...children) => {
+                const out = new core_1.Group(...children[1].value).setDuration(TWO, true);
                 return out;
             },
-            litWithCaret: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                var lit = core_1.Note.fromLit(children[0].value);
-                var opnode = children[2];
-                var shiftValue = opnode.sym.label == "STAR" ? true : opnode.value;
+            litWithCaret: (rule, parent, ...children) => {
+                const lit = core_1.Note.fromLit(children[0].value);
+                const opnode = children[2];
+                const shiftValue = opnode.sym.label == "STAR" ? true : opnode.value;
                 lit.shift = shiftValue;
                 return lit;
             },
-            litWithPreEmb: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                var emb = children[0];
-                var lit = children[1].value;
+            litWithPreEmb: (rule, parent, ...children) => {
+                const emb = children[0];
+                const lit = children[1].value;
                 lit.embelishments.splice(0, 0, emb.value);
                 return lit;
             },
-            litWithPostEmb: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                var lit = children[0].value;
-                var emb = children[1];
+            litWithPostEmb: (rule, parent, ...children) => {
+                const lit = children[0].value;
+                const emb = children[1];
                 lit.embelishments.push(emb);
                 return lit;
             },
-            litToAtom: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                var lit = children[0];
+            litToAtom: (rule, parent, ...children) => {
+                const lit = children[0];
                 if (lit.sym.label == "DOTS_IDENT" || lit.sym.label == "IDENT_DOTS") {
                     return lit.value;
                 }
@@ -224,41 +272,39 @@ var Parser = (function () {
                     throw new Error("Invalid lit: " + lit);
                 }
             },
-            newSpace: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
+            newSpace: (rule, parent, ...children) => {
                 return new core_1.Space();
             },
-            newRest: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
+            newRest: (rule, parent, ...children) => {
                 return new core_1.Rest();
             },
-            newDoubleSpace: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
+            newDoubleSpace: (rule, parent, ...children) => {
                 return new core_1.Space(ONE.timesNum(2));
             },
-            newSilentSpace: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
+            newSilentSpace: (rule, parent, ...children) => {
                 return new core_1.Space(ONE, true);
             },
-            applyDuration: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
+            applyPreMarker: (rule, parent, ...children) => {
+                const marker = children[0].value;
+                const leaf = children[1].value;
+                if (!leaf.markersBefore) {
+                    leaf.markersBefore = [];
                 }
-                var dur = children[0].value;
-                var leaf = children[1].value;
+                leaf.markersBefore.splice(0, 0, marker);
+                return leaf;
+            },
+            applyPostMarker: (rule, parent, ...children) => {
+                const leaf = children[0].value;
+                const marker = children[1].value;
+                if (!leaf.markersAfter) {
+                    leaf.markersAfter = [];
+                }
+                leaf.markersAfter.push(marker);
+                return leaf;
+            },
+            applyDuration: (rule, parent, ...children) => {
+                let dur = children[0].value;
+                const leaf = children[1].value;
                 if (typeof dur === "number") {
                     dur = ONE.timesNum(dur);
                 }
@@ -270,28 +316,16 @@ var Parser = (function () {
                 }
                 return leaf;
             },
-            newArray: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                return children.map(function (c) { return c.value; });
+            newArray: (rule, parent, ...children) => {
+                return children.map((c) => c.value);
             },
-            concatAtoms: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                var atoms = children[0].value;
-                var atom = children[1].value;
+            concatAtoms: (rule, parent, ...children) => {
+                const atoms = children[0].value;
+                const atom = children[1].value;
                 atoms.push(atom);
                 return atoms;
             },
-            newParam: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
+            newParam: (rule, parent, ...children) => {
                 if (children.length == 1) {
                     return { key: null, value: children[0].value };
                 }
@@ -299,86 +333,58 @@ var Parser = (function () {
                     return { key: children[0].value, value: children[2].value };
                 }
             },
-            newParamList: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
+            newParamList: (rule, parent, ...children) => {
                 return [children[0].value];
             },
-            concatParamList: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                var params = children[0].value;
-                var newParam = children[2].value;
+            concatParamList: (rule, parent, ...children) => {
+                const params = children[0].value;
+                const newParam = children[2].value;
                 params.push(newParam);
                 return params;
             },
-            newCommand: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                return _this.createCommand(children[0].value, children[1].value);
+            newCommand: (rule, parent, ...children) => {
+                return this.createCommand(children[0].value, children[1].value);
             },
-            appendAtoms: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                var atoms = children[0].value;
+            appendAtoms: (rule, parent, ...children) => {
+                const atoms = children[0].value;
                 if (atoms.length > 0) {
-                    _this.addCommand(new (commands_1.AddAtoms.bind.apply(commands_1.AddAtoms, __spreadArray([void 0], __read(atoms), false)))());
+                    this.addCommand(new commands_1.AddAtoms(...atoms));
                 }
                 return null;
             },
-            appendCommand: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                var command = children[1].value;
-                _this.addCommand(command);
-                var atoms = children[2].value;
+            appendCommand: (rule, parent, ...children) => {
+                const command = children[1].value;
+                this.addCommand(command);
+                const atoms = children[2].value;
                 if (atoms.length > 0) {
-                    _this.addCommand(new (commands_1.AddAtoms.bind.apply(commands_1.AddAtoms, __spreadArray([void 0], __read(atoms), false)))());
+                    this.addCommand(new commands_1.AddAtoms(...atoms));
                 }
                 return null;
             },
-            appendRoleSelector: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                var roleName = children[1].value;
-                var lName = roleName.toLowerCase().trim();
-                _this.addCommand(new commands_1.ActivateRole([{ key: null, value: lName }]));
-                var atoms = children[2].value;
+            appendRoleSelector: (rule, parent, ...children) => {
+                const roleName = children[1].value;
+                const lName = roleName.toLowerCase().trim();
+                this.addCommand(new commands_1.ActivateRole([{ key: null, value: lName }]));
+                const atoms = children[2].value;
                 if (atoms.length > 0) {
-                    _this.addCommand(new (commands_1.AddAtoms.bind.apply(commands_1.AddAtoms, __spreadArray([void 0], __read(atoms), false)))());
+                    this.addCommand(new commands_1.AddAtoms(...atoms));
                 }
                 return null;
             },
-            insertEmbedding: function (rule, parent) {
-                var children = [];
-                for (var _i = 2; _i < arguments.length; _i++) {
-                    children[_i - 2] = arguments[_i];
-                }
-                var rawVal = children[1].value;
-                _this.addCommand(new commands_1.RawEmbedding([{ key: null, value: rawVal }]));
-                var atoms = children[2].value;
+            insertEmbedding: (rule, parent, ...children) => {
+                const rawVal = children[1].value;
+                this.addCommand(new commands_1.RawEmbedding([{ key: null, value: rawVal }]));
+                const atoms = children[2].value;
                 if (atoms.length > 0) {
-                    _this.addCommand(new (commands_1.AddAtoms.bind.apply(commands_1.AddAtoms, __spreadArray([void 0], __read(atoms), false)))());
+                    this.addCommand(new commands_1.AddAtoms(...atoms));
                 }
                 return null;
             },
         };
         config = config || {};
     }
-    Parser.prototype.createCommand = function (name, params) {
-        var lName = name.trim().toLowerCase();
+    createCommand(name, params) {
+        const lName = name.trim().toLowerCase();
         params = params || [];
         if (lName == "line") {
             return new commands_1.CreateLine(params);
@@ -404,29 +410,26 @@ var Parser = (function () {
         else {
             throw new Error("Invalid command: " + lName);
         }
-    };
-    Parser.prototype.addCommand = function (cmd) {
+    }
+    addCommand(cmd) {
         cmd.index = this.commands.length;
         this.commands.push(cmd);
-    };
-    Parser.prototype.parse = function (input) {
-        var _this = this;
+    }
+    parse(input) {
         this.errors = [];
-        var ptree = parser.parse(input, {
+        const ptree = parser.parse(input, {
             tokenizerContext: this,
             ruleHandlers: this.ruleHandlers,
-            onTokenError: function (err) {
-                _this.errors.push(err);
+            onTokenError: (err) => {
+                this.errors.push(err);
                 return true;
             },
         });
         return ptree;
-    };
-    Parser.prototype.parseEmbelishment = function (value) {
+    }
+    parseEmbelishment(value) {
         return carnatic.parseEmbelishment(value);
-    };
-    return Parser;
-}());
+    }
+}
 exports.Parser = Parser;
-var templateObject_1;
 //# sourceMappingURL=parser.js.map