notations 0.0.40 → 0.0.45

package/lib/cjs/loader.js

@@ -55,39 +55,45 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.load = void 0;
+exports.load = exports.parse = void 0;
 var TSU = __importStar(require("@panyam/tsutils"));
-var layouts_1 = require("./layouts");
+var beats_1 = require("./beats");
 var parser_1 = require("./parser");
 var notation_1 = require("./notation");
-function load(codeText, config) {
-    var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
-    if (config === void 0) { config = {}; }
-    var beatsByLineRole = new Map();
-    var beatLayouts = new Map();
-    var errors = [];
-    var startTime = performance.now();
+function parse(input) {
+    var e_1, _a;
     var notation = new notation_1.Notation();
     var parser = new parser_1.Parser();
-    parser.parse(codeText);
+    var errors = [];
+    parser.parse(input);
     errors.push.apply(errors, __spreadArray([], __read(parser.errors), false));
-    var parseTime = performance.now();
     try {
-        for (var _e = __values(parser.commands), _f = _e.next(); !_f.done; _f = _e.next()) {
-            var cmd = _f.value;
+        for (var _b = __values(parser.commands), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var cmd = _c.value;
             cmd.applyToNotation(notation);
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
         finally { if (e_1) throw e_1.error; }
     }
+    return [notation, errors];
+}
+exports.parse = parse;
+function load(codeText, config) {
+    var e_2, _a, e_3, _b, e_4, _c;
+    if (config === void 0) { config = {}; }
+    var beatsByLineRole = new Map();
+    var beatLayouts = new Map();
+    var startTime = performance.now();
+    var _d = __read(parse(codeText), 2), notation = _d[0], errors = _d[1];
+    var parseTime = performance.now();
     try {
-        for (var _g = __values(notation.blocks), _h = _g.next(); !_h.done; _h = _g.next()) {
-            var block = _h.value;
+        for (var _e = __values(notation.blocks), _f = _e.next(); !_f.done; _f = _e.next()) {
+            var block = _f.value;
             if (block.type == "Line") {
                 var line = block;
                 var layoutParams = notation.layoutParamsForLine(line) || null;
@@ -95,29 +101,28 @@ function load(codeText, config) {
                     TSU.assert(layoutParams != null, "Layout params for a non empty line *should* exist");
                     var beatLayout = beatLayouts.get(layoutParams.uuid) || null;
                     if (beatLayout == null) {
-                        beatLayout = new layouts_1.BeatLayout(layoutParams);
+                        beatLayout = new beats_1.BeatLayout(layoutParams);
                         beatLayouts.set(layoutParams.uuid, beatLayout);
                     }
                     var roleBeats = [];
                     beatsByLineRole.set(line.uuid, roleBeats);
                     var lineOffset = line.offset.divbyNum(layoutParams.beatDuration);
                     try {
-                        for (var _j = (e_3 = void 0, __values(line.roles)), _k = _j.next(); !_k.done; _k = _j.next()) {
-                            var role = _k.value;
-                            var bb = new layouts_1.BeatsBuilder(role, layoutParams, lineOffset);
+                        for (var _g = (e_3 = void 0, __values(line.roles)), _h = _g.next(); !_h.done; _h = _g.next()) {
+                            var role = _h.value;
+                            var bb = new beats_1.BeatsBuilder(role, layoutParams, lineOffset);
                             bb.addAtoms.apply(bb, __spreadArray([], __read(role.atoms), false));
                             roleBeats.push(bb.beats);
                             try {
-                                for (var _l = (e_4 = void 0, __values(bb.beats)), _m = _l.next(); !_m.done; _m = _l.next()) {
-                                    var beat = _m.value;
-                                    beat.ensureUniformSpaces(layoutParams.beatDuration);
+                                for (var _j = (e_4 = void 0, __values(bb.beats)), _k = _j.next(); !_k.done; _k = _j.next()) {
+                                    var beat = _k.value;
                                     beatLayout.addBeat(beat);
                                 }
                             }
                             catch (e_4_1) { e_4 = { error: e_4_1 }; }
                             finally {
                                 try {
-                                    if (_m && !_m.done && (_d = _l.return)) _d.call(_l);
+                                    if (_k && !_k.done && (_c = _j.return)) _c.call(_j);
                                 }
                                 finally { if (e_4) throw e_4.error; }
                             }
@@ -126,7 +131,7 @@ function load(codeText, config) {
                     catch (e_3_1) { e_3 = { error: e_3_1 }; }
                     finally {
                         try {
-                            if (_k && !_k.done && (_c = _j.return)) _c.call(_j);
+                            if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
                         }
                         finally { if (e_3) throw e_3.error; }
                     }
@@ -137,13 +142,13 @@ function load(codeText, config) {
     catch (e_2_1) { e_2 = { error: e_2_1 }; }
     finally {
         try {
-            if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+            if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
         }
         finally { if (e_2) throw e_2.error; }
     }
     var buildTime = performance.now();
     if (config.log) {
-        console.log("V4 Document, Parse Time: " + (parseTime - startTime) + "ms, Build Time: " + (buildTime - parseTime) + "ms");
+        console.log("V4 Document, Parse Time: ".concat(parseTime - startTime, "ms, Build Time: ").concat(buildTime - parseTime, "ms"));
     }
     return [
         notation,

package/lib/cjs/loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/loader.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport * as G from \"galore\";\nimport { Line } from \"./core\";\nimport { BeatLayout, Beat, BeatsBuilder } from \"./layouts\";\nimport { Parser } from \"./parser\";\nimport { Notation } from \"./notation\";\n\nexport function load(\n  codeText: string,\n  config: any = {},\n): [Notation, Map<number, Beat[][]>, Map<number, BeatLayout>, G.ParseError[], TSU.StringMap<number>] {\n  const beatsByLineRole = new Map<number, Beat[][]>();\n  const beatLayouts = new Map<number, BeatLayout>();\n  const errors: G.ParseError[] = [];\n  const startTime = performance.now();\n  const notation = new Notation();\n  const parser = new Parser();\n  parser.parse(codeText);\n  errors.push(...parser.errors);\n  const parseTime = performance.now();\n  for (const cmd of parser.commands) cmd.applyToNotation(notation);\n\n  // Create Line Beats\n  for (const block of notation.blocks) {\n    if (block.type == \"Line\") {\n      const line = block as Line;\n      // LP should exist by now\n      const layoutParams = notation.layoutParamsForLine(line) || null;\n      if (!line.isEmpty) {\n        // Probably because this is an empty line and AddAtoms was not called\n        TSU.assert(layoutParams != null, \"Layout params for a non empty line *should* exist\");\n        let beatLayout = beatLayouts.get(layoutParams.uuid) || null;\n        if (beatLayout == null) {\n          beatLayout = new BeatLayout(layoutParams);\n          beatLayouts.set(layoutParams.uuid, beatLayout);\n        }\n        const roleBeats = [] as Beat[][];\n        beatsByLineRole.set(line.uuid, roleBeats);\n\n        const lineOffset = line.offset.divbyNum(layoutParams.beatDuration);\n        for (const role of line.roles) {\n          const bb = new BeatsBuilder(role, layoutParams, lineOffset);\n          bb.addAtoms(...role.atoms);\n          roleBeats.push(bb.beats);\n\n          // Add these to the beat layout too\n          for (const beat of bb.beats) {\n            beat.ensureUniformSpaces(layoutParams.beatDuration);\n            beatLayout.addBeat(beat);\n          }\n        }\n      }\n    }\n  }\n  const buildTime = performance.now();\n  if (config.log) {\n    console.log(`V4 Document, Parse Time: ${parseTime - startTime}ms, Build Time: ${buildTime - parseTime}ms`);\n  }\n  return [\n    notation,\n    beatsByLineRole,\n    beatLayouts,\n    errors,\n    {\n      parseTime: parseTime - startTime,\n      buildTime: buildTime - parseTime,\n    },\n  ];\n}\n"]}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/loader.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport * as G from \"galore\";\nimport { Line } from \"./core\";\nimport { BeatLayout, Beat, BeatsBuilder } from \"./beats\";\nimport { Parser } from \"./parser\";\nimport { Notation } from \"./notation\";\n\nexport function parse(input: string): [Notation, G.ParseError[]] {\n  const notation = new Notation();\n  const parser = new Parser();\n  const errors: G.ParseError[] = [];\n  parser.parse(input);\n  errors.push(...parser.errors);\n  for (const cmd of parser.commands) cmd.applyToNotation(notation);\n  return [notation, errors];\n}\n\nexport function load(\n  codeText: string,\n  config: any = {},\n): [Notation, Map<number, Beat[][]>, Map<number, BeatLayout>, G.ParseError[], TSU.StringMap<number>] {\n  const beatsByLineRole = new Map<number, Beat[][]>();\n  const beatLayouts = new Map<number, BeatLayout>();\n  const startTime = performance.now();\n  const [notation, errors] = parse(codeText);\n  const parseTime = performance.now();\n\n  // Create Line Beats\n  for (const block of notation.blocks) {\n    if (block.type == \"Line\") {\n      const line = block as Line;\n      // LP should exist by now\n      const layoutParams = notation.layoutParamsForLine(line) || null;\n      if (!line.isEmpty) {\n        // Probably because this is an empty line and AddAtoms was not called\n        TSU.assert(layoutParams != null, \"Layout params for a non empty line *should* exist\");\n        let beatLayout = beatLayouts.get(layoutParams.uuid) || null;\n        if (beatLayout == null) {\n          beatLayout = new BeatLayout(layoutParams);\n          beatLayouts.set(layoutParams.uuid, beatLayout);\n        }\n        const roleBeats = [] as Beat[][];\n        beatsByLineRole.set(line.uuid, roleBeats);\n\n        const lineOffset = line.offset.divbyNum(layoutParams.beatDuration);\n        for (const role of line.roles) {\n          const bb = new BeatsBuilder(role, layoutParams, lineOffset);\n          bb.addAtoms(...role.atoms);\n          roleBeats.push(bb.beats);\n\n          // Add these to the beat layout too\n          for (const beat of bb.beats) {\n            // beat.ensureUniformSpaces(layoutParams.beatDuration);\n            beatLayout.addBeat(beat);\n          }\n        }\n      }\n    }\n  }\n  const buildTime = performance.now();\n  if (config.log) {\n    console.log(`V4 Document, Parse Time: ${parseTime - startTime}ms, Build Time: ${buildTime - parseTime}ms`);\n  }\n  return [\n    notation,\n    beatsByLineRole,\n    beatLayouts,\n    errors,\n    {\n      parseTime: parseTime - startTime,\n      buildTime: buildTime - parseTime,\n    },\n  ];\n}\n"]}

package/lib/cjs/notation.d.ts

@@ -1,5 +1,7 @@
 import * as TSU from "@panyam/tsutils";
-import { Cycle, Entity, Line } from "./core";
+import { Entity } from "./entity";
+import { Cycle } from "./cycle";
+import { Line } from "./core";
 import { LayoutParams } from "./layouts";
 export declare class RoleDef {
     name: string;

package/lib/cjs/notation.js

@@ -38,6 +38,8 @@ var __values = (this && this.__values) || function(o) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Notation = exports.MetaData = exports.RawBlock = exports.Command = exports.RoleDef = void 0;
+var entity_1 = require("./entity");
+var cycle_1 = require("./cycle");
 var core_1 = require("./core");
 var layouts_1 = require("./layouts");
 var RoleDef = (function () {
@@ -103,7 +105,7 @@ var Command = (function (_super) {
         return index < this.params.length ? this.params[index].value : null;
     };
     return Command;
-}(core_1.Entity));
+}(entity_1.Entity));
 exports.Command = Command;
 var RawBlock = (function (_super) {
     __extends(RawBlock, _super);
@@ -118,7 +120,7 @@ var RawBlock = (function (_super) {
         return __assign(__assign({}, _super.prototype.debugValue.call(this)), { content: this.content, contentType: this.contentType });
     };
     return RawBlock;
-}(core_1.Entity));
+}(entity_1.Entity));
 exports.RawBlock = RawBlock;
 var MetaData = (function () {
     function MetaData(key, value, params) {
@@ -141,7 +143,7 @@ var Notation = (function (_super) {
         _this.blocks = [];
         _this.lpsForLine = new Map();
         _this.currentAPB = 1;
-        _this.currentCycle = core_1.Cycle.DEFAULT;
+        _this.currentCycle = cycle_1.Cycle.DEFAULT;
         _this.currentBreaks = [];
         _this.metadata = new Map();
         _this.onMissingRole = function (name) { return _this.newRoleDef(name, name == "sw"); };
@@ -328,6 +330,6 @@ var Notation = (function (_super) {
         }) || null);
     };
     return Notation;
-}(core_1.Entity));
+}(entity_1.Entity));
 exports.Notation = Notation;
 //# sourceMappingURL=notation.js.map

package/lib/cjs/notation.js.map

@@ -1 +1 @@
-{"version":3,"file":"notation.js","sourceRoot":"","sources":["../../src/notation.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Cycle, Entity, Line } from \"./core\";\nimport { LayoutParams } from \"./layouts\";\n\nexport class RoleDef {\n  name = \"\";\n  notesOnly = false;\n  index = 0;\n}\n\nexport type CmdParam = { key: TSU.Nullable<string>; value: any };\nexport abstract class Command extends Entity {\n  // Commands that are auto generated are usually created by other commands\n  autoGenerated = false;\n  prevSibling: null | Command = null;\n  nextSibling: null | Command = null;\n  params: CmdParam[];\n  index: number;\n\n  constructor(params: CmdParam[] = []) {\n    super();\n    this.params = params;\n    this.index = 0;\n    this.validateParams();\n  }\n\n  /**\n   * called to validate parameters.\n   */\n  validateParams(): void {\n    //\n  }\n\n  get name(): string {\n    return this.constructor.name;\n  }\n\n  get type(): string {\n    return \"Command\";\n  }\n\n  debugValue(): any {\n    return { name: this.name, index: this.index, params: this.params };\n  }\n\n  getParam(name: string): any {\n    for (const param of this.params) {\n      if (param.key == name) return param.value;\n    }\n    return null;\n  }\n\n  getParamAt(index: number): any {\n    return index < this.params.length ? this.params[index].value : null;\n  }\n  abstract applyToNotation(notebook: Notation): void;\n}\n\nexport class RawBlock extends Entity {\n  constructor(public content: string, public contentType: string = \"md\") {\n    super();\n  }\n\n  debugValue(): any {\n    return { ...super.debugValue(), content: this.content, contentType: this.contentType };\n  }\n}\n\nexport class MetaData {\n  constructor(public readonly key: string, public readonly value: string, public readonly params?: any) {\n    params = params || {};\n  }\n}\n\nexport class Notation extends Entity {\n  private _unnamedLayoutParams: LayoutParams[] = [];\n  private _namedLayoutParams = new Map<string, LayoutParams>();\n  private _currRoleDef: TSU.Nullable<RoleDef> = null;\n  roles: RoleDef[] = [];\n  blocks: (Line | RawBlock)[] = [];\n  private lpsForLine = new Map<number, LayoutParams>();\n  currentAPB = 1;\n  currentCycle: Cycle = Cycle.DEFAULT;\n  currentBreaks: number[] = [];\n  metadata = new Map<string, MetaData>();\n  onMissingRole: (name: string) => RoleDef | null = (name) => this.newRoleDef(name, name == \"sw\");\n\n  layoutParamsForLine(line: Line): null | LayoutParams {\n    return this.lpsForLine.get(line.uuid) || null;\n  }\n\n  setLayoutParamsForLine(line: Line, layoutParams: LayoutParams): void {\n    this.lpsForLine.set(line.uuid, layoutParams);\n  }\n\n  get unnamedLayoutParams(): ReadonlyArray<LayoutParams> {\n    return this._unnamedLayoutParams;\n  }\n\n  get namedLayoutParams(): ReadonlyMap<string, LayoutParams> {\n    return this._namedLayoutParams;\n  }\n\n  get type(): unknown {\n    return \"Notation\";\n  }\n\n  addLine(line: Line): void {\n    this.blocks.push(line);\n  }\n\n  removeLine(line: Line): number {\n    const index = this.blocks.findIndex((l) => l == line);\n    if (index >= 0) {\n      this.blocks.splice(index, 1);\n    }\n    return index;\n  }\n\n  addRawBlock(raw: RawBlock): void {\n    this.blocks.push(raw);\n    this.resetLine();\n  }\n\n  addMetaData(meta: MetaData): void {\n    if (!this.metadata.has(meta.key)) {\n      // Add a new raw block here\n      // set this by key so even if metadata changes we can\n      // get latest value of it\n      const raw = new RawBlock(meta.key, \"metadata\");\n      this.addRawBlock(raw);\n    }\n    this.metadata.set(meta.key, meta);\n  }\n\n  debugValue(): any {\n    return {\n      ...super.debugValue,\n      roles: this.roles,\n      blocks: this.blocks.map((b) => b.debugValue()),\n      currentAPB: this.currentAPB,\n      currentCycle: this.currentCycle?.uuid,\n      currentBreaks: this.currentBreaks,\n    };\n  }\n\n  getRoleDef(name: string): TSU.Nullable<RoleDef> {\n    name = name.trim().toLowerCase();\n    if (name == \"\") {\n      return this.roles[this.roles.length - 1] || null;\n    }\n    for (let i = 0; i < this.roles.length; i++) {\n      const rd = this.roles[i];\n      if (name == rd.name) return rd;\n    }\n    return null;\n  }\n\n  newRoleDef(name: string, notesOnly = false): RoleDef {\n    name = name.trim().toLowerCase();\n    if (name.trim() == \"\") {\n      throw new Error(\"Role name cannot be empty\");\n    }\n    const roleDef = this.getRoleDef(name);\n    if (roleDef != null) {\n      throw new Error(\"Role already exists\");\n      // roleDef.notesOnly = notesOnly;\n      // return roleDef;\n    }\n    // create new and add\n    const rd = new RoleDef();\n    rd.name = name;\n    rd.notesOnly = notesOnly;\n    rd.index = this.roles.length;\n    this.roles.push(rd);\n\n    return rd;\n  }\n\n  get currRoleDef(): RoleDef | null {\n    if (this._currRoleDef == null) {\n      if (this.roles.length == 0) {\n        return null;\n      } else {\n        this._currRoleDef = this.roles[this.roles.length - 1];\n      }\n    }\n    return this._currRoleDef;\n  }\n\n  setCurrRole(name: string): void {\n    name = name.trim().toLowerCase();\n    if (name.trim() == \"\") {\n      throw new Error(\"Role name cannot be empty\");\n    }\n    const roleDef = this.getRoleDef(name) || (this.onMissingRole ? this.onMissingRole(name) || null : null);\n    if (roleDef == null) {\n      throw new Error(\"Role not found: \" + name);\n    }\n    this._currRoleDef = roleDef;\n  }\n\n  // Gets the current line, creating it if needed\n  private _currentLine: Line | null = null;\n  get currentLine(): Line {\n    if (this._currentLine == null) {\n      return this.newLine();\n    }\n    return this._currentLine;\n  }\n\n  resetLine(): void {\n    this._currentLine = null;\n  }\n\n  newLine(): Line {\n    if (this._currentLine && this._currentLine.isEmpty) {\n      // then remove it first instead of adding another\n      // so we dont have a string of empty lines\n      this.removeLine(this._currentLine);\n    }\n    this._currentLine = new Line();\n    this.addLine(this._currentLine);\n    return this._currentLine;\n  }\n\n  private _layoutParams: LayoutParams | null = null;\n  resetLayoutParams(): void {\n    this._layoutParams = null;\n    this.resetLine();\n  }\n\n  get layoutParams(): LayoutParams {\n    if (this._layoutParams == null) {\n      // create it or find one that matches current params\n      this._layoutParams = this.findUnnamedLayoutParams();\n      if (this._layoutParams == null) {\n        this._layoutParams = this.snapshotLayoutParams();\n        this._unnamedLayoutParams.push(this._layoutParams);\n      }\n    }\n    return this._layoutParams;\n  }\n\n  ensureNamedLayoutParams(name: string): LayoutParams {\n    let lp = this._namedLayoutParams.get(name) || null;\n    if (lp == null || this._layoutParams != lp) {\n      // no change so go ahead\n      if (lp == null) {\n        // does not exist so create one by re-snapshotting it\n        // and saving it\n        lp = this.snapshotLayoutParams();\n        this._namedLayoutParams.set(name, lp);\n      } else {\n        // copy named LPs attributes into our locals\n        this.currentCycle = lp.cycle;\n        this.currentAPB = lp.beatDuration;\n        this.currentBreaks = lp.lineBreaks;\n      }\n      this._layoutParams = lp;\n      this.resetLine(); // since layout params have changed\n    }\n    return this._layoutParams;\n  }\n\n  protected snapshotLayoutParams(): LayoutParams {\n    return new LayoutParams({\n      cycle: this.currentCycle,\n      beatDuration: this.currentAPB,\n      layout: this.currentBreaks,\n    });\n  }\n\n  /**\n   * Find a layout params that is currently _unnamed but matches one\n   * by current set of layout attributes.\n   */\n  protected findUnnamedLayoutParams(): LayoutParams | null {\n    return (\n      this._unnamedLayoutParams.find((lp) => {\n        return (\n          lp.beatDuration == this.currentAPB &&\n          this.currentCycle.equals(lp.cycle) &&\n          lp.lineBreaksEqual(this.currentBreaks)\n        );\n      }) || null\n    );\n  }\n}\n"]}
+{"version":3,"file":"notation.js","sourceRoot":"","sources":["../../src/notation.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Entity } from \"./entity\";\nimport { Cycle } from \"./cycle\";\nimport { Line } from \"./core\";\nimport { LayoutParams } from \"./layouts\";\n\nexport class RoleDef {\n  name = \"\";\n  notesOnly = false;\n  index = 0;\n}\n\nexport type CmdParam = { key: TSU.Nullable<string>; value: any };\nexport abstract class Command extends Entity {\n  // Commands that are auto generated are usually created by other commands\n  autoGenerated = false;\n  prevSibling: null | Command = null;\n  nextSibling: null | Command = null;\n  params: CmdParam[];\n  index: number;\n\n  constructor(params: CmdParam[] = []) {\n    super();\n    this.params = params;\n    this.index = 0;\n    this.validateParams();\n  }\n\n  /**\n   * called to validate parameters.\n   */\n  validateParams(): void {\n    //\n  }\n\n  get name(): string {\n    return this.constructor.name;\n  }\n\n  get type(): string {\n    return \"Command\";\n  }\n\n  debugValue(): any {\n    return { name: this.name, index: this.index, params: this.params };\n  }\n\n  getParam(name: string): any {\n    for (const param of this.params) {\n      if (param.key == name) return param.value;\n    }\n    return null;\n  }\n\n  getParamAt(index: number): any {\n    return index < this.params.length ? this.params[index].value : null;\n  }\n  abstract applyToNotation(notebook: Notation): void;\n}\n\nexport class RawBlock extends Entity {\n  constructor(public content: string, public contentType: string = \"md\") {\n    super();\n  }\n\n  debugValue(): any {\n    return { ...super.debugValue(), content: this.content, contentType: this.contentType };\n  }\n}\n\nexport class MetaData {\n  constructor(public readonly key: string, public readonly value: string, public readonly params?: any) {\n    params = params || {};\n  }\n}\n\nexport class Notation extends Entity {\n  private _unnamedLayoutParams: LayoutParams[] = [];\n  private _namedLayoutParams = new Map<string, LayoutParams>();\n  private _currRoleDef: TSU.Nullable<RoleDef> = null;\n  roles: RoleDef[] = [];\n  blocks: (Line | RawBlock)[] = [];\n  private lpsForLine = new Map<number, LayoutParams>();\n  currentAPB = 1;\n  currentCycle: Cycle = Cycle.DEFAULT;\n  currentBreaks: number[] = [];\n  metadata = new Map<string, MetaData>();\n  onMissingRole: (name: string) => RoleDef | null = (name) => this.newRoleDef(name, name == \"sw\");\n\n  layoutParamsForLine(line: Line): null | LayoutParams {\n    return this.lpsForLine.get(line.uuid) || null;\n  }\n\n  setLayoutParamsForLine(line: Line, layoutParams: LayoutParams): void {\n    this.lpsForLine.set(line.uuid, layoutParams);\n  }\n\n  get unnamedLayoutParams(): ReadonlyArray<LayoutParams> {\n    return this._unnamedLayoutParams;\n  }\n\n  get namedLayoutParams(): ReadonlyMap<string, LayoutParams> {\n    return this._namedLayoutParams;\n  }\n\n  get type(): unknown {\n    return \"Notation\";\n  }\n\n  addLine(line: Line): void {\n    this.blocks.push(line);\n  }\n\n  removeLine(line: Line): number {\n    const index = this.blocks.findIndex((l) => l == line);\n    if (index >= 0) {\n      this.blocks.splice(index, 1);\n    }\n    return index;\n  }\n\n  addRawBlock(raw: RawBlock): void {\n    this.blocks.push(raw);\n    this.resetLine();\n  }\n\n  addMetaData(meta: MetaData): void {\n    if (!this.metadata.has(meta.key)) {\n      // Add a new raw block here\n      // set this by key so even if metadata changes we can\n      // get latest value of it\n      const raw = new RawBlock(meta.key, \"metadata\");\n      this.addRawBlock(raw);\n    }\n    this.metadata.set(meta.key, meta);\n  }\n\n  debugValue(): any {\n    return {\n      ...super.debugValue,\n      roles: this.roles,\n      blocks: this.blocks.map((b) => b.debugValue()),\n      currentAPB: this.currentAPB,\n      currentCycle: this.currentCycle?.uuid,\n      currentBreaks: this.currentBreaks,\n    };\n  }\n\n  getRoleDef(name: string): TSU.Nullable<RoleDef> {\n    name = name.trim().toLowerCase();\n    if (name == \"\") {\n      return this.roles[this.roles.length - 1] || null;\n    }\n    for (let i = 0; i < this.roles.length; i++) {\n      const rd = this.roles[i];\n      if (name == rd.name) return rd;\n    }\n    return null;\n  }\n\n  newRoleDef(name: string, notesOnly = false): RoleDef {\n    name = name.trim().toLowerCase();\n    if (name.trim() == \"\") {\n      throw new Error(\"Role name cannot be empty\");\n    }\n    const roleDef = this.getRoleDef(name);\n    if (roleDef != null) {\n      throw new Error(\"Role already exists\");\n      // roleDef.notesOnly = notesOnly;\n      // return roleDef;\n    }\n    // create new and add\n    const rd = new RoleDef();\n    rd.name = name;\n    rd.notesOnly = notesOnly;\n    rd.index = this.roles.length;\n    this.roles.push(rd);\n\n    return rd;\n  }\n\n  get currRoleDef(): RoleDef | null {\n    if (this._currRoleDef == null) {\n      if (this.roles.length == 0) {\n        return null;\n      } else {\n        this._currRoleDef = this.roles[this.roles.length - 1];\n      }\n    }\n    return this._currRoleDef;\n  }\n\n  setCurrRole(name: string): void {\n    name = name.trim().toLowerCase();\n    if (name.trim() == \"\") {\n      throw new Error(\"Role name cannot be empty\");\n    }\n    const roleDef = this.getRoleDef(name) || (this.onMissingRole ? this.onMissingRole(name) || null : null);\n    if (roleDef == null) {\n      throw new Error(\"Role not found: \" + name);\n    }\n    this._currRoleDef = roleDef;\n  }\n\n  // Gets the current line, creating it if needed\n  private _currentLine: Line | null = null;\n  get currentLine(): Line {\n    if (this._currentLine == null) {\n      return this.newLine();\n    }\n    return this._currentLine;\n  }\n\n  resetLine(): void {\n    this._currentLine = null;\n  }\n\n  newLine(): Line {\n    if (this._currentLine && this._currentLine.isEmpty) {\n      // then remove it first instead of adding another\n      // so we dont have a string of empty lines\n      this.removeLine(this._currentLine);\n    }\n    this._currentLine = new Line();\n    this.addLine(this._currentLine);\n    return this._currentLine;\n  }\n\n  private _layoutParams: LayoutParams | null = null;\n  resetLayoutParams(): void {\n    this._layoutParams = null;\n    this.resetLine();\n  }\n\n  get layoutParams(): LayoutParams {\n    if (this._layoutParams == null) {\n      // create it or find one that matches current params\n      this._layoutParams = this.findUnnamedLayoutParams();\n      if (this._layoutParams == null) {\n        this._layoutParams = this.snapshotLayoutParams();\n        this._unnamedLayoutParams.push(this._layoutParams);\n      }\n    }\n    return this._layoutParams;\n  }\n\n  ensureNamedLayoutParams(name: string): LayoutParams {\n    let lp = this._namedLayoutParams.get(name) || null;\n    if (lp == null || this._layoutParams != lp) {\n      // no change so go ahead\n      if (lp == null) {\n        // does not exist so create one by re-snapshotting it\n        // and saving it\n        lp = this.snapshotLayoutParams();\n        this._namedLayoutParams.set(name, lp);\n      } else {\n        // copy named LPs attributes into our locals\n        this.currentCycle = lp.cycle;\n        this.currentAPB = lp.beatDuration;\n        this.currentBreaks = lp.lineBreaks;\n      }\n      this._layoutParams = lp;\n      this.resetLine(); // since layout params have changed\n    }\n    return this._layoutParams;\n  }\n\n  protected snapshotLayoutParams(): LayoutParams {\n    return new LayoutParams({\n      cycle: this.currentCycle,\n      beatDuration: this.currentAPB,\n      layout: this.currentBreaks,\n    });\n  }\n\n  /**\n   * Find a layout params that is currently _unnamed but matches one\n   * by current set of layout attributes.\n   */\n  protected findUnnamedLayoutParams(): LayoutParams | null {\n    return (\n      this._unnamedLayoutParams.find((lp) => {\n        return (\n          lp.beatDuration == this.currentAPB &&\n          this.currentCycle.equals(lp.cycle) &&\n          lp.lineBreaksEqual(this.currentBreaks)\n        );\n      }) || null\n    );\n  }\n}\n"]}

package/lib/cjs/parser.js

@@ -66,7 +66,7 @@ var _a = __read(G.newParser(String.raw(templateObject_1 || (templateObject_1 = _
             var _a = __read(owner.parseEmbelishment(token.value), 2), emb = _a[0], pre = _a[1];
             if (emb == null) {
                 console.log("Skipping Embelishment: ", token.value);
-                owner.errors.push(new TLEX.TokenizerError(token.start, 1 + token.end - token.start, "InvalidEmbelishment", token.value));
+                owner.errors.push(new TLEX.TokenizerError("Invalid embelishment: ".concat(token.value), token.start, 1 + token.end - token.start, "InvalidEmbelishment", token.value));
                 return null;
             }
             token.value = emb;
@@ -154,8 +154,7 @@ var Parser = (function () {
                 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, TWO], __read(children[1].value), false)))();
-                out.durationIsMultiplier = true;
+                var out = new (core_1.Group.bind.apply(core_1.Group, __spreadArray([void 0], __read(children[1].value), false)))().setDuration(TWO, true);
                 return out;
             },
             litWithCaret: function (rule, parent) {
@@ -246,9 +245,11 @@ var Parser = (function () {
                 if (typeof dur === "number") {
                     dur = ONE.timesNum(dur);
                 }
-                leaf.duration = dur;
                 if (leaf.type == core_1.AtomType.GROUP) {
-                    leaf.durationIsMultiplier = true;
+                    leaf.setDuration(dur, true);
+                }
+                else {
+                    leaf.duration = dur;
                 }
                 return leaf;
             },

package/lib/cjs/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/parser.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport * as G from \"galore\";\nimport * as TLEX from \"tlex\";\nimport { Literal, AtomType, Note, Atom, Rest, Space, Syllable, Group } from \"./core\";\nimport { Command, CmdParam } from \"./notation\";\nimport {\n  RawEmbedding,\n  ApplyLayout,\n  AddAtoms,\n  SetCycle,\n  SetBeatDuration,\n  SetBreaks,\n  ActivateRole,\n  CreateRole,\n  CreateLine,\n  MetaData,\n} from \"./commands\";\n\n// TODO - Make this plugable from the client instead of hard coded\nimport * as carnatic from \"./carnatic\";\n\nconst ONE = TSU.Num.Fraction.ONE;\nconst TWO = ONE.timesNum(2);\n\n/**\n * V4 of our parser builds on V3 and has the following improvements:\n *\n * 1. Embedding Headings to demarcate sections so users dont have to use\n *    explicit MD for headings.\n * 2. Unlike V3 here users break out *of* song instead instead break out \"into\"\n * song.  So users spend more time writing notation and less worrying about\n * other things like headings etc.\n */\nconst [parser, itemGraph] = G.newParser(\n  String.raw`\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  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 ;\n    Rest -> HYPHEN { newRest };\n\n    Space -> COMMA { newSpace } \n          | SEMI_COLON { newDoubleSpace } \n          | UNDER_SCORE { newSilentSpace } \n          ;\n\n    /*\n    Lit -> DOTS_IDENT { litToAtom } \n        | IDENT { litToAtom } \n        | IDENT_DOTS { litToAtom } \n        | STRING  { litToAtom }\n        | PRE_EMB Lit { litWithPreEmb }\n        // | Lit POST_EMB { litWithPostEmb }\n        ;\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  {\n    allowLeftRecursion: true,\n    debug: \"\",\n    type: \"lalr\",\n    tokenHandlers: {\n      toEmbelishment: (token: TLEX.Token, tape: TLEX.Tape, owner: Parser) => {\n        const [emb, pre] = owner.parseEmbelishment(token.value);\n        if (emb == null) {\n          console.log(\"Skipping Embelishment: \", token.value);\n          owner.errors.push(\n            new TLEX.TokenizerError(token.start, 1 + token.end - token.start, \"InvalidEmbelishment\", token.value),\n          );\n          return null;\n        }\n        token.value = emb;\n        token.tag = pre ? \"PRE_EMB\" : \"POST_EMB\";\n        return token;\n      },\n      toCommandName: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toBoolean: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        token.value = token.value == \"true\";\n        return token;\n      },\n      toNumber: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        token.value = parseInt(token.value);\n        return token;\n      },\n      toString: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        token.value = token.value.substring(1, token.value.length - 1);\n        return token;\n      },\n      toOctavedNote: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        if (token.tag == \"DOTS_IDENT\") {\n          const octave = token.positions[1][1] - token.positions[1][0];\n          const note = token.value.substring(octave);\n          token.value = new Note(note, ONE, -octave);\n        } else if (token.tag == \"IDENT_DOTS\") {\n          const octave = token.positions[2][1] - token.positions[2][0];\n          const note = token.value.substring(0, token.value.length - octave);\n          token.value = new Note(note, ONE, octave);\n        } else {\n          throw new Error(\"Invalid token for converting to note: \" + token.tag);\n        }\n        return token;\n      },\n      toRoleSelector: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        token.value = token.value.substring(0, token.value.length - 1);\n        return token;\n      },\n      toLineAnnotation: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        // skip the initial \"!\"\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toSingleLineRawString: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        // skip the initial \">\"\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toMultiLineRawString: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        // consume everything until \"#<N times> as start\n        const hashes = tape.substring(token.positions[1][0], token.positions[1][1]);\n        const endPat = '\"' + hashes;\n        const startPos = tape.index;\n        const endPos = TLEX.TapeHelper.advanceAfter(tape, endPat) - endPat.length;\n        if (endPos < 0) {\n          throw new Error(\"EOF expected while finding end of Raw String Literal: '\" + endPat + \"'\");\n        }\n        token.value = tape.substring(startPos, endPos);\n        return token;\n      },\n    },\n  },\n);\n\n/**\n * A notation doc is a list of lines that are found in a single document.\n *\n * Since our document (md or html etc) can contain multiple snippets\n * all these snippets are related\n */\nexport class Parser {\n  errors: TLEX.TokenizerError[] = [];\n  readonly commands: Command[] = [];\n  // readonly notation: Notation = new Notation();\n  private runCommandFound = false;\n  // readonly parseTree = new PTNodeList(\"Snippet\", null);\n\n  protected ruleHandlers = {\n    newFraction: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      if (children.length == 1) {\n        return new TSU.Num.Fraction(children[0].value);\n      } else {\n        return new TSU.Num.Fraction(children[0].value, children[2].value);\n      }\n    },\n    newGroup: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const out = new Group(TWO, ...children[1].value);\n      out.durationIsMultiplier = true;\n      return out;\n    },\n    litWithCaret: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = Note.fromLit(children[0].value as Literal);\n      const opnode = children[2];\n      const shiftValue = opnode.sym.label == \"STAR\" ? true : opnode.value;\n      lit.shift = shiftValue;\n      return lit;\n    },\n    litWithPreEmb: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const emb = children[0];\n      const lit = children[1].value as Literal;\n      lit.embelishments.splice(0, 0, emb.value);\n      return lit;\n    },\n    litWithPostEmb: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = children[0].value as Literal;\n      const emb = children[1];\n      lit.embelishments.push(emb);\n      return lit;\n    },\n    litToAtom: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = children[0];\n      if (lit.sym.label == \"DOTS_IDENT\" || lit.sym.label == \"IDENT_DOTS\") {\n        return lit.value;\n      } else if (lit.sym.label == \"IDENT\") {\n        // Mark this as a Literal to be processed later\n        return new Literal(lit.value);\n        // return role.notesOnly ? new Note(lit.value) : new Syllable(lit.value);\n      } else if (lit.sym.label == \"STRING\") {\n        // const role = this.snippet.currRole;\n        // if (role.notesOnly) throw new Error(\"Strings cannot appear in notes only mode\");\n        return new Syllable(lit.value);\n      } else {\n        throw new Error(\"Invalid lit: \" + lit);\n      }\n    },\n    newSpace: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return new Space();\n    },\n    newRest: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return new Rest();\n    },\n    newDoubleSpace: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return new Space(ONE.timesNum(2));\n    },\n    newSilentSpace: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return new Space(ONE, true);\n    },\n    applyDuration: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      let dur = children[0].value as TSU.Num.Fraction | number;\n      const leaf = children[1].value as Atom;\n      if (typeof dur === \"number\") {\n        dur = ONE.timesNum(dur);\n      }\n      leaf.duration = dur;\n      if (leaf.type == AtomType.GROUP) {\n        (leaf as Group).durationIsMultiplier = true;\n      }\n      return leaf;\n    },\n    newArray: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      // create an array of values from all the values of child nodes\n      return children.map((c) => c.value);\n    },\n    concatAtoms: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const atoms = children[0].value;\n      const atom = children[1].value;\n      atoms.push(atom);\n      return atoms;\n    },\n    newParam: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      if (children.length == 1) {\n        return { key: null, value: children[0].value };\n      } else {\n        return { key: children[0].value, value: children[2].value };\n      }\n    },\n    newParamList: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return [children[0].value];\n    },\n    concatParamList: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const params = children[0].value;\n      const newParam = children[2].value;\n      params.push(newParam);\n      return params;\n    },\n    newCommand: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return this.createCommand(children[0].value, children[1].value);\n    },\n    appendAtoms: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const atoms = children[0].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    appendCommand: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const command = children[1].value as Command;\n      this.addCommand(command);\n\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    appendRoleSelector: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const roleName = children[1].value;\n      const lName = roleName.toLowerCase().trim();\n      this.addCommand(new ActivateRole([{ key: null, value: lName }]));\n\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    insertEmbedding: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      // How to handle embeddings - these are just blocks\n      // to escape out of song (most likely for some rendering of html/md etc)\n      const rawVal = children[1].value;\n      this.addCommand(new RawEmbedding([{ key: null, value: rawVal }]));\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n  };\n\n  constructor(config?: any) {\n    config = config || {};\n  }\n\n  createCommand(name: string, params: CmdParam[]): Command {\n    const lName = name.trim().toLowerCase();\n    params = params || [];\n    if (lName == \"line\") {\n      return new CreateLine(params);\n    } else if (lName == \"meta\") {\n      return new MetaData(params);\n    } else if (lName == \"role\") {\n      return new CreateRole(params);\n    } else if (lName == \"layout\") {\n      return new ApplyLayout(params);\n    } else if (lName == \"beatduration\") {\n      return new SetBeatDuration(params);\n    } else if (lName == \"breaks\") {\n      return new SetBreaks(params);\n    } else if (lName == \"cycle\") {\n      return new SetCycle(params);\n    } else {\n      // Try to set this as the current role\n      throw new Error(\"Invalid command: \" + lName);\n    }\n  }\n\n  addCommand(cmd: Command): void {\n    cmd.index = this.commands.length;\n    this.commands.push(cmd);\n  }\n\n  parse(input: string): any {\n    this.errors = [];\n    const ptree = parser.parse(input, {\n      tokenizerContext: this,\n      ruleHandlers: this.ruleHandlers,\n      onTokenError: (err: TLEX.TokenizerError) => {\n        this.errors.push(err);\n        return true;\n      },\n    });\n    return ptree;\n  }\n\n  parseEmbelishment(value: string): [any, boolean] {\n    return carnatic.parseEmbelishment(value);\n  }\n}\n"]}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/parser.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport * as G from \"galore\";\nimport * as TLEX from \"tlex\";\nimport { Literal, AtomType, Note, Atom, Rest, Space, Syllable, Group } from \"./core\";\nimport { Command, CmdParam } from \"./notation\";\nimport {\n  RawEmbedding,\n  ApplyLayout,\n  AddAtoms,\n  SetCycle,\n  SetBeatDuration,\n  SetBreaks,\n  ActivateRole,\n  CreateRole,\n  CreateLine,\n  MetaData,\n} from \"./commands\";\n\n// TODO - Make this plugable from the client instead of hard coded\nimport * as carnatic from \"./carnatic\";\n\nconst ONE = TSU.Num.Fraction.ONE;\nconst TWO = ONE.timesNum(2);\n\n/**\n * V4 of our parser builds on V3 and has the following improvements:\n *\n * 1. Embedding Headings to demarcate sections so users dont have to use\n *    explicit MD for headings.\n * 2. Unlike V3 here users break out *of* song instead instead break out \"into\"\n * song.  So users spend more time writing notation and less worrying about\n * other things like headings etc.\n */\nconst [parser, itemGraph] = G.newParser(\n  String.raw`\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  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 ;\n    Rest -> HYPHEN { newRest };\n\n    Space -> COMMA { newSpace } \n          | SEMI_COLON { newDoubleSpace } \n          | UNDER_SCORE { newSilentSpace } \n          ;\n\n    /*\n    Lit -> DOTS_IDENT { litToAtom } \n        | IDENT { litToAtom } \n        | IDENT_DOTS { litToAtom } \n        | STRING  { litToAtom }\n        | PRE_EMB Lit { litWithPreEmb }\n        // | Lit POST_EMB { litWithPostEmb }\n        ;\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  {\n    allowLeftRecursion: true,\n    debug: \"\",\n    type: \"lalr\",\n    tokenHandlers: {\n      toEmbelishment: (token: TLEX.Token, tape: TLEX.Tape, owner: Parser) => {\n        const [emb, pre] = owner.parseEmbelishment(token.value);\n        if (emb == null) {\n          console.log(\"Skipping Embelishment: \", token.value);\n          owner.errors.push(\n            new TLEX.TokenizerError(\n              `Invalid embelishment: ${token.value}`,\n              token.start,\n              1 + token.end - token.start,\n              \"InvalidEmbelishment\",\n              token.value,\n            ),\n          );\n          return null;\n        }\n        token.value = emb;\n        token.tag = pre ? \"PRE_EMB\" : \"POST_EMB\";\n        return token;\n      },\n      toCommandName: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toBoolean: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        token.value = token.value == \"true\";\n        return token;\n      },\n      toNumber: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        token.value = parseInt(token.value);\n        return token;\n      },\n      toString: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        token.value = token.value.substring(1, token.value.length - 1);\n        return token;\n      },\n      toOctavedNote: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        if (token.tag == \"DOTS_IDENT\") {\n          const octave = token.positions[1][1] - token.positions[1][0];\n          const note = token.value.substring(octave);\n          token.value = new Note(note, ONE, -octave);\n        } else if (token.tag == \"IDENT_DOTS\") {\n          const octave = token.positions[2][1] - token.positions[2][0];\n          const note = token.value.substring(0, token.value.length - octave);\n          token.value = new Note(note, ONE, octave);\n        } else {\n          throw new Error(\"Invalid token for converting to note: \" + token.tag);\n        }\n        return token;\n      },\n      toRoleSelector: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        token.value = token.value.substring(0, token.value.length - 1);\n        return token;\n      },\n      toLineAnnotation: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        // skip the initial \"!\"\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toSingleLineRawString: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        // skip the initial \">\"\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toMultiLineRawString: (token: TLEX.Token, tape: TLEX.Tape, owner: any) => {\n        // consume everything until \"#<N times> as start\n        const hashes = tape.substring(token.positions[1][0], token.positions[1][1]);\n        const endPat = '\"' + hashes;\n        const startPos = tape.index;\n        const endPos = TLEX.TapeHelper.advanceAfter(tape, endPat) - endPat.length;\n        if (endPos < 0) {\n          throw new Error(\"EOF expected while finding end of Raw String Literal: '\" + endPat + \"'\");\n        }\n        token.value = tape.substring(startPos, endPos);\n        return token;\n      },\n    },\n  },\n);\n\n/**\n * A notation doc is a list of lines that are found in a single document.\n *\n * Since our document (md or html etc) can contain multiple snippets\n * all these snippets are related\n */\nexport class Parser {\n  errors: TLEX.TokenizerError[] = [];\n  readonly commands: Command[] = [];\n  // readonly notation: Notation = new Notation();\n  private runCommandFound = false;\n  // readonly parseTree = new PTNodeList(\"Snippet\", null);\n\n  protected ruleHandlers = {\n    newFraction: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      if (children.length == 1) {\n        return new TSU.Num.Fraction(children[0].value);\n      } else {\n        return new TSU.Num.Fraction(children[0].value, children[2].value);\n      }\n    },\n    newGroup: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const out = new Group(...children[1].value).setDuration(TWO, true);\n      return out;\n    },\n    litWithCaret: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = Note.fromLit(children[0].value as Literal);\n      const opnode = children[2];\n      const shiftValue = opnode.sym.label == \"STAR\" ? true : opnode.value;\n      lit.shift = shiftValue;\n      return lit;\n    },\n    litWithPreEmb: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const emb = children[0];\n      const lit = children[1].value as Literal;\n      lit.embelishments.splice(0, 0, emb.value);\n      return lit;\n    },\n    litWithPostEmb: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = children[0].value as Literal;\n      const emb = children[1];\n      lit.embelishments.push(emb);\n      return lit;\n    },\n    litToAtom: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = children[0];\n      if (lit.sym.label == \"DOTS_IDENT\" || lit.sym.label == \"IDENT_DOTS\") {\n        return lit.value;\n      } else if (lit.sym.label == \"IDENT\") {\n        // Mark this as a Literal to be processed later\n        return new Literal(lit.value);\n        // return role.notesOnly ? new Note(lit.value) : new Syllable(lit.value);\n      } else if (lit.sym.label == \"STRING\") {\n        // const role = this.snippet.currRole;\n        // if (role.notesOnly) throw new Error(\"Strings cannot appear in notes only mode\");\n        return new Syllable(lit.value);\n      } else {\n        throw new Error(\"Invalid lit: \" + lit);\n      }\n    },\n    newSpace: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return new Space();\n    },\n    newRest: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return new Rest();\n    },\n    newDoubleSpace: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return new Space(ONE.timesNum(2));\n    },\n    newSilentSpace: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return new Space(ONE, true);\n    },\n    applyDuration: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      let dur = children[0].value as TSU.Num.Fraction | number;\n      const leaf = children[1].value as Atom;\n      if (typeof dur === \"number\") {\n        dur = ONE.timesNum(dur);\n      }\n      if (leaf.type == AtomType.GROUP) {\n        (leaf as Group).setDuration(dur, true);\n      } else {\n        leaf.duration = dur;\n      }\n      return leaf;\n    },\n    newArray: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      // create an array of values from all the values of child nodes\n      return children.map((c) => c.value);\n    },\n    concatAtoms: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const atoms = children[0].value;\n      const atom = children[1].value;\n      atoms.push(atom);\n      return atoms;\n    },\n    newParam: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      if (children.length == 1) {\n        return { key: null, value: children[0].value };\n      } else {\n        return { key: children[0].value, value: children[2].value };\n      }\n    },\n    newParamList: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return [children[0].value];\n    },\n    concatParamList: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const params = children[0].value;\n      const newParam = children[2].value;\n      params.push(newParam);\n      return params;\n    },\n    newCommand: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return this.createCommand(children[0].value, children[1].value);\n    },\n    appendAtoms: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const atoms = children[0].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    appendCommand: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const command = children[1].value as Command;\n      this.addCommand(command);\n\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    appendRoleSelector: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const roleName = children[1].value;\n      const lName = roleName.toLowerCase().trim();\n      this.addCommand(new ActivateRole([{ key: null, value: lName }]));\n\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    insertEmbedding: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      // How to handle embeddings - these are just blocks\n      // to escape out of song (most likely for some rendering of html/md etc)\n      const rawVal = children[1].value;\n      this.addCommand(new RawEmbedding([{ key: null, value: rawVal }]));\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n  };\n\n  constructor(config?: any) {\n    config = config || {};\n  }\n\n  createCommand(name: string, params: CmdParam[]): Command {\n    const lName = name.trim().toLowerCase();\n    params = params || [];\n    if (lName == \"line\") {\n      return new CreateLine(params);\n    } else if (lName == \"meta\") {\n      return new MetaData(params);\n    } else if (lName == \"role\") {\n      return new CreateRole(params);\n    } else if (lName == \"layout\") {\n      return new ApplyLayout(params);\n    } else if (lName == \"beatduration\") {\n      return new SetBeatDuration(params);\n    } else if (lName == \"breaks\") {\n      return new SetBreaks(params);\n    } else if (lName == \"cycle\") {\n      return new SetCycle(params);\n    } else {\n      // Try to set this as the current role\n      throw new Error(\"Invalid command: \" + lName);\n    }\n  }\n\n  addCommand(cmd: Command): void {\n    cmd.index = this.commands.length;\n    this.commands.push(cmd);\n  }\n\n  parse(input: string): any {\n    this.errors = [];\n    const ptree = parser.parse(input, {\n      tokenizerContext: this,\n      ruleHandlers: this.ruleHandlers,\n      onTokenError: (err: TLEX.TokenizerError) => {\n        this.errors.push(err);\n        return true;\n      },\n    });\n    return ptree;\n  }\n\n  parseEmbelishment(value: string): [any, boolean] {\n    return carnatic.parseEmbelishment(value);\n  }\n}\n"]}

package/lib/cjs/shapes.d.ts

@@ -1,5 +1,5 @@
 import * as TSU from "@panyam/tsutils";
-import { FlatAtom } from "./iterators";
+import { Atom, LeafAtom, Group } from "./core";
 export declare abstract class Shape {
     private static idCounter;
     readonly shapeId: number;
@@ -7,16 +7,16 @@ export declare abstract class Shape {
     protected _y: number | null;
     protected _width: number | null;
     protected _height: number | null;
+    protected _bbox: TSU.Geom.Rect;
     protected _minSize: TSU.Geom.Size;
     protected parentShape: Shape | null;
     children: Shape[];
+    get bbox(): TSU.Geom.Rect;
     get minSize(): TSU.Geom.Size;
-    addShape(child: Shape, index?: number): void;
-    removeShape(child: Shape): void;
-    removeFromParent(): void;
+    protected abstract refreshBBox(): TSU.Geom.Rect;
     protected abstract refreshMinSize(): TSU.Geom.Size;
     protected abstract updateBounds(x: null | number, y: null | number, w: null | number, h: null | number): [number | null, number | null, number | null, number | null];
-    resetMinSize(): void;
+    invalidateBounds(): void;
     setBounds(x: number | null, y: number | null, w: number | null, h: number | null, applyLayout?: boolean): [number | null, number | null, number | null, number | null];
     get hasX(): boolean;
     get hasY(): boolean;
@@ -34,16 +34,15 @@ export declare abstract class Shape {
 }
 export declare abstract class Embelishment extends Shape {
 }
-export declare class ElementShape extends Shape {
-    readonly element: SVGGraphicsElement;
-    constructor(element: SVGGraphicsElement);
+export declare class ElementShape<T extends SVGGraphicsElement = SVGGraphicsElement> extends Shape {
+    readonly element: T;
+    constructor(element: T);
+    protected refreshBBox(): TSU.Geom.Rect;
     protected refreshMinSize(): TSU.Geom.Size;
     protected updateBounds(x: null | number, y: null | number, w: null | number, h: null | number): [number | null, number | null, number | null, number | null];
     refreshLayout(): void;
 }
 export declare abstract class AtomView extends Shape {
-    flatAtom: FlatAtom;
-    glyph: ElementShape;
     depth: number;
     roleIndex: number;
     baseline: number;
@@ -51,11 +50,33 @@ export declare abstract class AtomView extends Shape {
     descent: number;
     capHeight: number;
     leading: number;
-    constructor(flatAtom: FlatAtom);
+    abstract isLeaf(): boolean;
     abstract createElements(parent: SVGGraphicsElement): void;
-    abstract refreshLayout(): void;
+}
+export declare abstract class LeafAtomView extends AtomView {
+    leafAtom: LeafAtom;
+    constructor(leafAtom: LeafAtom);
+    isLeaf(): boolean;
+    get viewId(): number;
+}
+export declare abstract class GroupView extends AtomView {
+    group: Group;
+    protected atomSpacing: number;
+    protected groupElement: SVGGElement;
+    protected atomViews: AtomView[];
+    private _embelishments;
+    defaultToNotes: boolean;
+    needsLayout: boolean;
+    scaleFactor: number;
+    constructor(group: Group, config?: any);
+    createElements(parent: SVGGraphicsElement): void;
+    isLeaf(): boolean;
+    protected refreshBBox(): TSU.Geom.Rect;
     protected refreshMinSize(): TSU.Geom.Size;
+    abstract createAtomView(atom: Atom): AtomView;
     protected updateBounds(x: null | number, y: null | number, w: null | number, h: null | number): [number | null, number | null, number | null, number | null];
-    get viewId(): number;
-    embRoot(): SVGGraphicsElement;
+    refreshLayout(): void;
+    get embelishments(): Embelishment[];
+    protected createEmbelishments(): Embelishment[];
+    setStyles(config: any): void;
 }