notations 0.0.47 → 0.0.50

package/lib/cjs/layouts.js

@@ -22,29 +22,13 @@ 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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayoutParams = void 0;
-var TSU = __importStar(require("@panyam/tsutils"));
-var cycle_1 = require("./cycle");
-var ZERO = TSU.Num.Fraction.ZERO;
-var LayoutParams = (function () {
-    function LayoutParams(config) {
+const TSU = __importStar(require("@panyam/tsutils"));
+const cycle_1 = require("./cycle");
+const ZERO = TSU.Num.Fraction.ZERO;
+class LayoutParams {
+    constructor(config) {
         this.uuid = LayoutParams.counter++;
         config = config || {};
         this.beatDuration = config.beatDuration || 1;
@@ -61,35 +45,33 @@ var LayoutParams = (function () {
         this._beatLayouts = [];
         this.lineBreaks = config.lineBreaks || config.layout || [];
     }
-    LayoutParams.prototype.equals = function (another) {
+    equals(another) {
         return (this.beatDuration == another.beatDuration &&
             this.cycle.equals(another.cycle) &&
             this.lineBreaksEqual(another._lineBreaks));
-    };
-    LayoutParams.prototype.lineBreaksEqual = function (another) {
-        return this._lineBreaks.length == another.length && this._lineBreaks.every(function (x, i) { return x == another[i]; });
-    };
-    LayoutParams.prototype.debugValue = function () {
+    }
+    lineBreaksEqual(another) {
+        return this._lineBreaks.length == another.length && this._lineBreaks.every((x, i) => x == another[i]);
+    }
+    debugValue() {
         var _a;
         return {
             cycle: (_a = this.cycle) === null || _a === void 0 ? void 0 : _a.debugValue(),
             beatDuration: this.beatDuration,
             lineBreaks: this._lineBreaks,
         };
-    };
-    LayoutParams.prototype.getBeatLocation = function (beat) {
-        var _a;
-        var modIndex = beat.index % this.totalBeats;
-        var total = 0;
-        for (var i = 0; i < this._lineBreaks.length; i++) {
+    }
+    getBeatLocation(beat) {
+        const modIndex = beat.index % this.totalBeats;
+        let total = 0;
+        for (let i = 0; i < this._lineBreaks.length; i++) {
             if (modIndex < total + this._lineBreaks[i]) {
-                var offset = ZERO;
-                var startBeat = beat;
+                let offset = ZERO;
                 if (modIndex > total) {
-                    var cursor = new cycle_1.CycleCursor(this.cycle, beat.barIndex, beat.beatIndex, beat.instance);
-                    var _b = __read(cursor.prev, 2), pos = _b[0], duration = _b[1];
-                    for (var i_1 = total; i_1 < modIndex; i_1++) {
-                        _a = __read(cursor.prev, 2), pos = _a[0], duration = _a[1];
+                    const cursor = new cycle_1.CycleCursor(this.cycle, beat.barIndex, beat.beatIndex, beat.instance);
+                    let [, duration] = cursor.prev;
+                    for (let i = total; i < modIndex; i++) {
+                        [, duration] = cursor.prev;
                         offset = offset.plus(duration.timesNum(this.beatDuration));
                     }
                 }
@@ -99,72 +81,54 @@ var LayoutParams = (function () {
         }
         throw new Error("Invalid beat index: " + beat.index);
         return [-1, -1, ZERO];
-    };
-    Object.defineProperty(LayoutParams.prototype, "lineBreaks", {
-        get: function () {
-            if (!this._lineBreaks || this._lineBreaks.length == 0) {
-                this.lineBreaks = [this.cycle.beatCount];
-            }
-            return this._lineBreaks;
-        },
-        set: function (val) {
-            this._lineBreaks = val;
+    }
+    get lineBreaks() {
+        if (!this._lineBreaks || this._lineBreaks.length == 0) {
+            this.lineBreaks = [this.cycle.beatCount];
+        }
+        return this._lineBreaks;
+    }
+    set lineBreaks(val) {
+        this._lineBreaks = val;
+        this.refreshLayout();
+    }
+    get beatLayouts() {
+        if (!this._beatLayouts || this._beatLayouts.length < this.lineBreaks.length) {
             this.refreshLayout();
-        },
-        enumerable: false,
-        configurable: true
-    });
-    LayoutParams.prototype.refreshLayout = function () {
-        var _this = this;
-        var cycleIter = this.cycle.iterateBeats();
-        var akb = this.beatDuration;
-        this._beatLayouts = this.lineBreaks.map(function (numBeats, index) {
-            var beats = [];
-            for (var i = 0; i < numBeats; i++) {
-                var nextCP = cycleIter.next().value;
+        }
+        return this._beatLayouts;
+    }
+    get totalBeats() {
+        this.beatLayouts;
+        return this._totalBeats;
+    }
+    get totalLayoutDuration() {
+        this.beatLayouts;
+        return this._totalLayoutDuration;
+    }
+    refreshLayout() {
+        const cycleIter = this.cycle.iterateBeats();
+        const akb = this.beatDuration;
+        this._beatLayouts = this.lineBreaks.map((numBeats, index) => {
+            const beats = [];
+            for (let i = 0; i < numBeats; i++) {
+                const nextCP = cycleIter.next().value;
                 nextCP[1] = nextCP[1].timesNum(akb);
                 beats.push(nextCP);
             }
             return beats;
         });
-        this._totalBeats = this.lineBreaks.reduce(function (a, b) { return a + b; }, 0);
-        this._rowDurations = this._beatLayouts.map(function (beats) { return beats.reduce(function (x, y) { return x.plus(y[1]); }, ZERO); });
-        this._rowDurations.forEach(function (rd, index) {
-            _this._rowStartOffsets[index] = index == 0 ? ZERO : _this._rowStartOffsets[index - 1].plus(rd);
+        this._totalBeats = this.lineBreaks.reduce((a, b) => a + b, 0);
+        this._rowDurations = this._beatLayouts.map((beats) => beats.reduce((x, y) => x.plus(y[1]), ZERO));
+        this._rowDurations.forEach((rd, index) => {
+            this._rowStartOffsets[index] = index == 0 ? ZERO : this._rowStartOffsets[index - 1].plus(rd);
         });
-        this._rowEndOffsets = this._rowDurations.map(function (rd, index) {
-            return _this._rowStartOffsets[index].plus(rd);
+        this._rowEndOffsets = this._rowDurations.map((rd, index) => {
+            return this._rowStartOffsets[index].plus(rd);
         });
-        this._totalLayoutDuration = this._rowDurations.reduce(function (x, y) { return x.plus(y); }, ZERO);
-    };
-    Object.defineProperty(LayoutParams.prototype, "beatLayouts", {
-        get: function () {
-            if (!this._beatLayouts || this._beatLayouts.length < this.lineBreaks.length) {
-                this.refreshLayout();
-            }
-            return this._beatLayouts;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(LayoutParams.prototype, "totalBeats", {
-        get: function () {
-            this.beatLayouts;
-            return this._totalBeats;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(LayoutParams.prototype, "totalLayoutDuration", {
-        get: function () {
-            this.beatLayouts;
-            return this._totalLayoutDuration;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    LayoutParams.counter = 0;
-    return LayoutParams;
-}());
+        this._totalLayoutDuration = this._rowDurations.reduce((x, y) => x.plus(y), ZERO);
+    }
+}
 exports.LayoutParams = LayoutParams;
+LayoutParams.counter = 0;
 //# sourceMappingURL=layouts.js.map

package/lib/cjs/layouts.js.map

@@ -1 +1 @@
-{"version":3,"file":"layouts.js","sourceRoot":"","sources":["../../src/layouts.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Cycle, CyclePosition, CycleCursor } from \"./cycle\";\n\ntype Fraction = TSU.Num.Fraction;\nconst ZERO = TSU.Num.Fraction.ZERO;\n\nexport class LayoutParams {\n  private static counter = 0;\n  readonly uuid = LayoutParams.counter++;\n  beatDuration: number;\n  cycle: Cycle;\n  protected _lineBreaks: number[];\n  private _rowStartOffsets: Fraction[];\n  private _rowEndOffsets: Fraction[];\n  private _rowDurations: Fraction[];\n  private _totalLayoutDuration;\n  private _beatLayouts: [CyclePosition, Fraction][][];\n  private _totalBeats: number;\n\n  constructor(config?: any) {\n    config = config || {};\n    this.beatDuration = config.beatDuration || 1;\n    if (\"cycle\" in config) this.cycle = config.cycle;\n    if (!this.cycle || this.cycle.duration.isZero) {\n      this.cycle = Cycle.DEFAULT;\n    }\n\n    this._rowStartOffsets = [];\n    this._rowEndOffsets = [];\n    this._rowDurations = [];\n    this._totalLayoutDuration = ZERO;\n    this._totalBeats = 0;\n    this._beatLayouts = [];\n    this.lineBreaks = config.lineBreaks || config.layout || [];\n  }\n\n  equals(another: this): boolean {\n    return (\n      // super.equals(another) &&\n      this.beatDuration == another.beatDuration &&\n      this.cycle.equals(another.cycle) &&\n      this.lineBreaksEqual(another._lineBreaks)\n    );\n  }\n\n  lineBreaksEqual(another: number[]): boolean {\n    return this._lineBreaks.length == another.length && this._lineBreaks.every((x, i) => x == another[i]);\n  }\n\n  debugValue(): any {\n    return {\n      // ...super.debugValue(),\n      cycle: this.cycle?.debugValue(),\n      beatDuration: this.beatDuration,\n      lineBreaks: this._lineBreaks,\n    };\n  }\n\n  /**\n   * Returns the \"location\" of a beat within a layout.\n   *\n   * Lines are broken into beats of notes (which can be changed) and those beats\n   * are aligned as per the specs in the LayoutParams (breaks).\n   *\n   * This methods returns the triple: [layoutLine, layoutColumn, rowOffset]\n   * where\n   *\n   *  layoutLine: The particular line in the layout break spec this index falls in.  Note\n   *              that since lines can start with negative offsets, we can even return a\n   *              layoutLine that is towards the end and then go back to 0, eg 4, 0, 1, 2, 3, 4 ...\n   *  layoutColumn: The column within the layoutLine line where this beat falls.\n   *  rowOffset: The note offset of the beat from the start of the row/line\n   *             (not from the start of the cycle).\n   *\n   * Note the beatIndex can also be negative so we can return a beat starting from before\n   * the cycle starting point.\n   *\n   *  To calculate the \"real\" line globally simply do:\n   *\n   *    realLine = [Math.floor(beatIndex / this.totalBeats) + layoutLine;\n   */\n  getBeatLocation(beat: {\n    index: number;\n    barIndex: number;\n    beatIndex: number;\n    instance: number;\n  }): [number, number, Fraction] {\n    const modIndex = beat.index % this.totalBeats;\n    let total = 0;\n    for (let i = 0; i < this._lineBreaks.length; i++) {\n      if (modIndex < total + this._lineBreaks[i]) {\n        // TODO: What is the right offset here?\n        let offset = ZERO;\n        const startBeat = beat;\n        if (modIndex > total) {\n          const cursor = new CycleCursor(this.cycle, beat.barIndex, beat.beatIndex, beat.instance);\n          let [pos, duration] = cursor.prev;\n          for (let i = total; i < modIndex; i++) {\n            [pos, duration] = cursor.prev;\n            offset = offset.plus(duration.timesNum(this.beatDuration));\n          }\n        }\n        return [i, modIndex - total, offset];\n      }\n      total += this._lineBreaks[i];\n    }\n    throw new Error(\"Invalid beat index: \" + beat.index);\n    return [-1, -1, ZERO];\n  }\n\n  /**\n   * Return the line layout - ie number of beats in each line - as a\n   * repeating pattern.\n   *\n   * For example 4,2,4 indicates that the notes in our song should be\n   * laid out 4 beats in line 1, 2 beats in line 2, 4 beats in line 3 and\n   * 4 beats in line 4 and so on as long as there are more notes available\n   * in this line.\n   */\n  get lineBreaks(): number[] {\n    if (!this._lineBreaks || this._lineBreaks.length == 0) {\n      // trigger a refresh\n      this.lineBreaks = [this.cycle.beatCount];\n    }\n    return this._lineBreaks;\n  }\n\n  /**\n   * Sets the line layout pattern.\n   */\n  set lineBreaks(val: number[]) {\n    this._lineBreaks = val;\n    this.refreshLayout();\n  }\n\n  refreshLayout(): void {\n    const cycleIter = this.cycle.iterateBeats();\n    const akb = this.beatDuration;\n    this._beatLayouts = this.lineBreaks.map((numBeats, index) => {\n      const beats: [CyclePosition, Fraction][] = [];\n      // see what the beat lengths are here\n      for (let i = 0; i < numBeats; i++) {\n        const nextCP = cycleIter.next().value;\n        nextCP[1] = nextCP[1].timesNum(akb);\n        beats.push(nextCP);\n      }\n      return beats;\n    });\n    this._totalBeats = this.lineBreaks.reduce((a, b) => a + b, 0);\n    this._rowDurations = this._beatLayouts.map((beats) => beats.reduce((x, y) => x.plus(y[1]), ZERO));\n    this._rowDurations.forEach((rd, index) => {\n      this._rowStartOffsets[index] = index == 0 ? ZERO : this._rowStartOffsets[index - 1].plus(rd);\n    });\n    this._rowEndOffsets = this._rowDurations.map((rd, index) => {\n      return this._rowStartOffsets[index].plus(rd);\n    });\n    this._totalLayoutDuration = this._rowDurations.reduce((x, y) => x.plus(y), ZERO);\n  }\n\n  /**\n   * Returns the number of beats in each line based on the line layout\n   * after taking beatDuration into account.\n   */\n  get beatLayouts(): ReadonlyArray<ReadonlyArray<[CyclePosition, Fraction]>> {\n    if (!this._beatLayouts || this._beatLayouts.length < this.lineBreaks.length) {\n      this.refreshLayout();\n    }\n    return this._beatLayouts;\n  }\n\n  /**\n   * Total duration of all beats across all lines in our line layout.\n   */\n  get totalBeats(): number {\n    this.beatLayouts;\n    return this._totalBeats;\n  }\n\n  /**\n   * Total duration of all beats across all lines in our line layout.\n   */\n  get totalLayoutDuration(): Fraction {\n    this.beatLayouts;\n    return this._totalLayoutDuration;\n  }\n\n  /*\n  layoutOffsetsFor(offset: Fraction, layoutLine = -1): [number, Fraction] {\n    const m1 = offset.mod(this.totalLayoutDuration);\n\n    // layoutLine = L such that layout[L].startOffset <= atom.offset % totalLayoutDuration < layout[L].endOffset\n    // calculate layoutLine if not provided\n    if (layoutLine < 0) {\n      // this.beatLayouts should kick off eval of all row offsets, durations etc\n      for (let i = 0; i < this.beatLayouts.length; i++) {\n        let cmp = this._rowStartOffsets[i].cmp(m1);\n        if (cmp >= 0) {\n          cmp = m1.cmp(this._rowEndOffsets[i]);\n          if (cmp < 0) {\n            layoutLine = i;\n            break;\n          }\n        }\n      }\n    }\n    if (layoutLine < 0) {\n      throw new Error(\"Atom offset falls outside beat layout range: \" + offset.toString());\n    }\n\n    // offset = atom.offset % totalLayoutDuration - rowOffset[layoutLine]\n    const layoutOffset = m1.minus(this._rowStartOffsets[layoutLine]);\n    return [layoutLine, layoutOffset];\n  }\n */\n}\n"]}
+{"version":3,"file":"layouts.js","sourceRoot":"","sources":["../../src/layouts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAuC;AACvC,mCAA4D;AAG5D,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;AAEnC,MAAa,YAAY;IAavB,YAAY,MAAY;QAXf,SAAI,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;QAYrC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC;QAC7C,IAAI,OAAO,IAAI,MAAM;YAAE,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QACjD,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE;YAC7C,IAAI,CAAC,KAAK,GAAG,aAAK,CAAC,OAAO,CAAC;SAC5B;QAED,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,OAAa;QAClB,OAAO,CAEL,IAAI,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY;YACzC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;YAChC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,CAC1C,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,OAAiB;QAC/B,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACxG,CAAC;IAED,UAAU;;QACR,OAAO;YAEL,KAAK,EAAE,MAAA,IAAI,CAAC,KAAK,0CAAE,UAAU,EAAE;YAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,UAAU,EAAE,IAAI,CAAC,WAAW;SAC7B,CAAC;IACJ,CAAC;IAiDD,eAAe,CAAC,IAKf;QACC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;QAC9C,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAChD,IAAI,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;gBAE1C,IAAI,MAAM,GAAG,IAAI,CAAC;gBAClB,IAAI,QAAQ,GAAG,KAAK,EAAE;oBACpB,MAAM,MAAM,GAAG,IAAI,mBAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACzF,IAAI,CAAC,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;oBAC/B,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;wBACrC,CAAC,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;wBAC3B,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;qBAC5D;iBACF;gBACD,OAAO,CAAC,CAAC,EAAE,QAAQ,GAAG,KAAK,EAAE,MAAM,CAAC,CAAC;aACtC;YACD,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;SAC9B;QACD,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QACrD,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACxB,CAAC;IAWD,IAAI,UAAU;QACZ,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;YAErD,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;SAC1C;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAKD,IAAI,UAAU,CAAC,GAAa;QAC1B,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC;QACvB,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAMD,IAAI,WAAW;QACb,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC3E,IAAI,CAAC,aAAa,EAAE,CAAC;SACtB;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAKD,IAAI,UAAU;QACZ,IAAI,CAAC,WAAW,CAAC;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAKD,IAAI,mBAAmB;QACrB,IAAI,CAAC,WAAW,CAAC;QACjB,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACnC,CAAC;IAES,aAAa;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC;QAC9B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;YAC1D,MAAM,KAAK,GAAgC,EAAE,CAAC;YAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;gBACjC,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;gBACtC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACpC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACpB;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAClG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE;YACvC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE;YACzD,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACnF,CAAC;;AAzMH,oCA0MC;AAzMgB,oBAAO,GAAG,CAAC,CAAC","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Cycle, CyclePosition, CycleCursor } from \"./cycle\";\n\ntype Fraction = TSU.Num.Fraction;\nconst ZERO = TSU.Num.Fraction.ZERO;\n\nexport class LayoutParams {\n  private static counter = 0;\n  readonly uuid = LayoutParams.counter++;\n  beatDuration: number;\n  cycle: Cycle;\n  protected _lineBreaks: number[];\n  private _rowStartOffsets: Fraction[];\n  private _rowEndOffsets: Fraction[];\n  private _rowDurations: Fraction[];\n  private _totalLayoutDuration;\n  private _beatLayouts: [CyclePosition, Fraction][][];\n  private _totalBeats: number;\n\n  constructor(config?: any) {\n    config = config || {};\n    this.beatDuration = config.beatDuration || 1;\n    if (\"cycle\" in config) this.cycle = config.cycle;\n    if (!this.cycle || this.cycle.duration.isZero) {\n      this.cycle = Cycle.DEFAULT;\n    }\n\n    this._rowStartOffsets = [];\n    this._rowEndOffsets = [];\n    this._rowDurations = [];\n    this._totalLayoutDuration = ZERO;\n    this._totalBeats = 0;\n    this._beatLayouts = [];\n    this.lineBreaks = config.lineBreaks || config.layout || [];\n  }\n\n  equals(another: this): boolean {\n    return (\n      // super.equals(another) &&\n      this.beatDuration == another.beatDuration &&\n      this.cycle.equals(another.cycle) &&\n      this.lineBreaksEqual(another._lineBreaks)\n    );\n  }\n\n  lineBreaksEqual(another: number[]): boolean {\n    return this._lineBreaks.length == another.length && this._lineBreaks.every((x, i) => x == another[i]);\n  }\n\n  debugValue(): any {\n    return {\n      // ...super.debugValue(),\n      cycle: this.cycle?.debugValue(),\n      beatDuration: this.beatDuration,\n      lineBreaks: this._lineBreaks,\n    };\n  }\n\n  /**\n   * Returns the \"location\" of a beat within a layout.\n   *\n   * Lines are broken into beats of notes and those beats are aligned as per\n   * the specs in the LayoutParams (breaks).  For example if the breaks param\n   * stipulates [5, 5, 4] then we have 5 beats in the first 2 lines and 4 in\n   * the last line.\n   *\n   * If a line contains say 50 beats (B1 - B50), then it is laid out as:\n   *\n   *      C1  C2  C3  C4  C5\n   *    ---------------------\n   * L1 | B1  B2  B3  B4  B5\n   * L1 | B6  B7  B8  B9  B10\n   * L1 | B11 B12 B13 B14\n   * L2 | B15 B16 B17 B18 B19\n   * L2 | B20 B21 B22 B23 B24\n   * L2 | B25 B26 B27 B28\n   * L3 | B29 B30 B31 B32 B33\n   * L3 | B34 B35 B36 B37 B38\n   * L3 | B39 B40 B41 B42\n   * L4 | B43 B44 B45 B46 B47\n   * L4 | B48 B49 B50\n   *\n   * This methods returns the triple: [layoutLine, layoutColumn, rowOffset]\n   * where\n   *\n   *  layoutLine: The particular line in the layout break spec this index falls in.\n   *              *Note*: Since lines can start with negative offsets, we can\n   *              even return a layoutLine that is towards the end and then go\n   *              back to 0, eg 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4 ...\n   *              (eg returns L1 or L2 ... Ln)\n   *  layoutColumn: The column within the layoutLine line where this beat falls.\n   *                (eg C1 - C5 above - or depending on how many columns exist\n   *                in the particular layout line).\n   *  rowOffset: The note offset of the beat from the start of the row/line\n   *             (not from the start of the cycle).\n   *\n   * Note the beatIndex can also be negative so we can return a beat\n   * starting from before the cycle starting point.\n   *\n   *  To calculate the \"real\" line globally simply do:\n   *\n   *    realLine = [Math.floor(beatIndex / this.totalBeats) + layoutLine;\n   *\n   * Some examples here are (using B1-B50 above):\n   */\n  getBeatLocation(beat: {\n    index: number;\n    barIndex: number;\n    beatIndex: number;\n    instance: number;\n  }): [number, number, Fraction] {\n    const modIndex = beat.index % this.totalBeats;\n    let total = 0;\n    for (let i = 0; i < this._lineBreaks.length; i++) {\n      if (modIndex < total + this._lineBreaks[i]) {\n        // TODO: What is the right offset here?\n        let offset = ZERO;\n        if (modIndex > total) {\n          const cursor = new CycleCursor(this.cycle, beat.barIndex, beat.beatIndex, beat.instance);\n          let [, duration] = cursor.prev;\n          for (let i = total; i < modIndex; i++) {\n            [, duration] = cursor.prev;\n            offset = offset.plus(duration.timesNum(this.beatDuration));\n          }\n        }\n        return [i, modIndex - total, offset];\n      }\n      total += this._lineBreaks[i];\n    }\n    throw new Error(\"Invalid beat index: \" + beat.index);\n    return [-1, -1, ZERO];\n  }\n\n  /**\n   * Return the line layout - ie number of beats in each line - as a\n   * repeating pattern.\n   *\n   * For example 4,2,4 indicates that the notes in our song should be\n   * laid out 4 beats in line 1, 2 beats in line 2, 4 beats in line 3 and\n   * 4 beats in line 4 and so on as long as there are more notes available\n   * in this line.\n   */\n  get lineBreaks(): number[] {\n    if (!this._lineBreaks || this._lineBreaks.length == 0) {\n      // trigger a refresh\n      this.lineBreaks = [this.cycle.beatCount];\n    }\n    return this._lineBreaks;\n  }\n\n  /**\n   * Sets the line layout pattern.\n   */\n  set lineBreaks(val: number[]) {\n    this._lineBreaks = val;\n    this.refreshLayout();\n  }\n\n  /**\n   * Returns the number of beats in each line based on the line layout\n   * after taking beatDuration into account.\n   */\n  get beatLayouts(): ReadonlyArray<ReadonlyArray<[CyclePosition, Fraction]>> {\n    if (!this._beatLayouts || this._beatLayouts.length < this.lineBreaks.length) {\n      this.refreshLayout();\n    }\n    return this._beatLayouts;\n  }\n\n  /**\n   * Total duration of all beats across all lines in our line layout.\n   */\n  get totalBeats(): number {\n    this.beatLayouts;\n    return this._totalBeats;\n  }\n\n  /**\n   * Total duration of all beats across all lines in our line layout.\n   */\n  get totalLayoutDuration(): Fraction {\n    this.beatLayouts;\n    return this._totalLayoutDuration;\n  }\n\n  protected refreshLayout(): void {\n    const cycleIter = this.cycle.iterateBeats();\n    const akb = this.beatDuration;\n    this._beatLayouts = this.lineBreaks.map((numBeats, index) => {\n      const beats: [CyclePosition, Fraction][] = [];\n      // see what the beat lengths are here\n      for (let i = 0; i < numBeats; i++) {\n        const nextCP = cycleIter.next().value;\n        nextCP[1] = nextCP[1].timesNum(akb);\n        beats.push(nextCP);\n      }\n      return beats;\n    });\n    this._totalBeats = this.lineBreaks.reduce((a, b) => a + b, 0);\n    this._rowDurations = this._beatLayouts.map((beats) => beats.reduce((x, y) => x.plus(y[1]), ZERO));\n    this._rowDurations.forEach((rd, index) => {\n      this._rowStartOffsets[index] = index == 0 ? ZERO : this._rowStartOffsets[index - 1].plus(rd);\n    });\n    this._rowEndOffsets = this._rowDurations.map((rd, index) => {\n      return this._rowStartOffsets[index].plus(rd);\n    });\n    this._totalLayoutDuration = this._rowDurations.reduce((x, y) => x.plus(y), ZERO);\n  }\n}\n"]}

package/lib/cjs/loader.d.ts

@@ -1,6 +1,6 @@
 import * as TSU from "@panyam/tsutils";
 import * as G from "galore";
-import { BeatLayout, Beat } from "./beats";
+import { GlobalBeatLayout } from "./beats";
 import { Notation } from "./notation";
 export declare function parse(input: string): [Notation, G.ParseError[]];
-export declare function load(codeText: string, config?: any): [Notation, Map<number, Beat[][]>, Map<number, BeatLayout>, G.ParseError[], TSU.StringMap<number>];
+export declare function load(codeText: string, config?: any): [Notation, GlobalBeatLayout, G.ParseError[], TSU.StringMap<number>];

package/lib/cjs/loader.js

@@ -22,142 +22,42 @@ 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));
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.load = exports.parse = void 0;
-var TSU = __importStar(require("@panyam/tsutils"));
-var beats_1 = require("./beats");
-var parser_1 = require("./parser");
-var notation_1 = require("./notation");
+const TSU = __importStar(require("@panyam/tsutils"));
+const beats_1 = require("./beats");
+const parser_1 = require("./parser");
+const notation_1 = require("./notation");
 function parse(input) {
-    var e_1, _a;
-    var notation = new notation_1.Notation();
-    var parser = new parser_1.Parser();
-    var errors = [];
+    const notation = new notation_1.Notation();
+    const parser = new parser_1.Parser();
+    const errors = [];
     parser.parse(input);
-    errors.push.apply(errors, __spreadArray([], __read(parser.errors), false));
-    try {
-        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 (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
+    errors.push(...parser.errors);
+    for (const cmd of parser.commands)
+        cmd.applyToNotation(notation);
     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 _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;
-                if (!line.isEmpty) {
-                    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 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 _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 _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 (_k && !_k.done && (_c = _j.return)) _c.call(_j);
-                                }
-                                finally { if (e_4) throw e_4.error; }
-                            }
-                        }
-                    }
-                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                    finally {
-                        try {
-                            if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
-                        }
-                        finally { if (e_3) throw e_3.error; }
-                    }
-                }
-            }
-        }
-    }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-    finally {
-        try {
-            if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+function load(codeText, config = {}) {
+    const beatLayout = new beats_1.GlobalBeatLayout();
+    const startTime = performance.now();
+    const [notation, errors] = parse(codeText);
+    const parseTime = performance.now();
+    for (const block of notation.blocks) {
+        if (block.type == "Line" && !block.isEmpty) {
+            const line = block;
+            TSU.assert(line.layoutParams != null, "Layout params for a non empty line *SHOULD* exist");
+            beatLayout.addLine(line);
         }
-        finally { if (e_2) throw e_2.error; }
     }
-    var buildTime = performance.now();
+    const buildTime = performance.now();
     if (config.log) {
-        console.log("V4 Document, Parse Time: ".concat(parseTime - startTime, "ms, Build Time: ").concat(buildTime - parseTime, "ms"));
+        console.log(`V4 Document, Parse Time: ${parseTime - startTime}ms, Build Time: ${buildTime - parseTime}ms`);
     }
     return [
         notation,
-        beatsByLineRole,
-        beatLayouts,
+        beatLayout,
         errors,
         {
             parseTime: parseTime - startTime,

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 \"./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"]}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAuC;AAGvC,mCAA2C;AAC3C,qCAAkC;AAClC,yCAAsC;AAEtC,SAAgB,KAAK,CAAC,KAAa;IACjC,MAAM,QAAQ,GAAG,IAAI,mBAAQ,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;IAC5B,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpB,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ;QAAE,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IACjE,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC5B,CAAC;AARD,sBAQC;AAED,SAAgB,IAAI,CAClB,QAAgB,EAChB,SAAc,EAAE;IAEhB,MAAM,UAAU,GAAG,IAAI,wBAAgB,EAAE,CAAC;IAC1C,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IACpC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAGpC,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE;QACnC,IAAI,KAAK,CAAC,IAAI,IAAI,MAAM,IAAI,CAAE,KAAc,CAAC,OAAO,EAAE;YACpD,MAAM,IAAI,GAAG,KAAa,CAAC;YAG3B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,EAAE,mDAAmD,CAAC,CAAC;YAC3F,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC1B;KACF;IAED,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IACpC,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,4BAA4B,SAAS,GAAG,SAAS,mBAAmB,SAAS,GAAG,SAAS,IAAI,CAAC,CAAC;KAC5G;IACD,OAAO;QACL,QAAQ;QACR,UAAU;QACV,MAAM;QACN;YACE,SAAS,EAAE,SAAS,GAAG,SAAS;YAChC,SAAS,EAAE,SAAS,GAAG,SAAS;SACjC;KACF,CAAC;AACJ,CAAC;AAjCD,oBAiCC","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport * as G from \"galore\";\nimport { Line } from \"./core\";\nimport { GlobalBeatLayout } 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, GlobalBeatLayout, G.ParseError[], TSU.StringMap<number>] {\n  const beatLayout = new GlobalBeatLayout();\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\" && !(block as Line).isEmpty) {\n      const line = block as Line;\n      // LP should exist by now\n      // Probably because this is an empty line and AddAtoms was not called\n      TSU.assert(line.layoutParams != null, \"Layout params for a non empty line *SHOULD* exist\");\n      beatLayout.addLine(line);\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    beatLayout,\n    errors,\n    {\n      parseTime: parseTime - startTime,\n      buildTime: buildTime - parseTime,\n    },\n  ];\n}\n"]}

package/lib/cjs/notation.d.ts

@@ -45,14 +45,11 @@ export declare class Notation extends Entity {
     private _currRoleDef;
     roles: RoleDef[];
     blocks: (Line | RawBlock)[];
-    private lpsForLine;
     currentAPB: number;
     currentCycle: Cycle;
     currentBreaks: number[];
     metadata: Map<string, MetaData>;
     onMissingRole: (name: string) => RoleDef | null;
-    layoutParamsForLine(line: Line): null | LayoutParams;
-    setLayoutParamsForLine(line: Line, layoutParams: LayoutParams): void;
     get unnamedLayoutParams(): ReadonlyArray<LayoutParams>;
     get namedLayoutParams(): ReadonlyMap<string, LayoutParams>;
     get type(): unknown;