notations 0.0.48 → 0.0.51

package/lib/cjs/carnatic/beatviews.d.ts

@@ -1,16 +1,24 @@
-import { Cycle } from "../cycle";
-import { BeatView as BeatViewBase, Beat } from "../beats";
-import { AtomView, Embelishment, ElementShape } from "../shapes";
-export declare class BeatView extends ElementShape<SVGGElement> implements BeatViewBase {
+import { Embelishment } from "../shapes";
+import { GridCell, GridCellView } from "../grids";
+import { ElementShape } from "../shapes";
+import { Marker } from "../core";
+import { Beat } from "../beats";
+import { BeatView as BeatViewBase } from "../beatview";
+export declare class MarkerView extends ElementShape<SVGGElement> implements GridCellView {
+    readonly cell: GridCell;
     readonly beat: Beat;
+    readonly markers: Marker[];
+    readonly isPreMarker: boolean;
     readonly rootElement: SVGGraphicsElement;
-    readonly cycle: Cycle;
-    private _embelishments;
-    atomView: AtomView;
     needsLayout: boolean;
-    constructor(beat: Beat, rootElement: SVGGraphicsElement, cycle: Cycle, config?: any);
+    rootGroup: SVGGElement;
+    textElement: SVGTextElement;
+    constructor(cell: GridCell, beat: Beat, markers: Marker[], isPreMarker: boolean, rootElement: SVGGraphicsElement, config?: any);
+    refreshLayout(): void;
+    protected updateBounds(x: null | number, y: null | number, w: null | number, h: null | number): [number | null, number | null, number | null, number | null];
+}
+export declare class BeatView extends BeatViewBase {
+    createAtomView(): import("../shapes").AtomView;
     refreshLayout(): void;
-    get embelishments(): Embelishment[];
     protected createEmbelishments(): Embelishment[];
-    setStyles(config: any): void;
 }

package/lib/cjs/carnatic/beatviews.js

@@ -1,19 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -37,107 +22,90 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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.BeatView = void 0;
-var TSU = __importStar(require("@panyam/tsutils"));
-var shapes_1 = require("../shapes");
-var atomviews_1 = require("./atomviews");
-var embelishments_1 = require("./embelishments");
-var BeatView = (function (_super) {
-    __extends(BeatView, _super);
-    function BeatView(beat, rootElement, cycle, config) {
-        var _this = _super.call(this, TSU.DOM.createSVGNode("g", {
+exports.BeatView = exports.MarkerView = void 0;
+const TSU = __importStar(require("@panyam/tsutils"));
+const shapes_1 = require("../shapes");
+const atomviews_1 = require("./atomviews");
+const beatview_1 = require("../beatview");
+const embelishments_1 = require("./embelishments");
+class MarkerView extends shapes_1.ElementShape {
+    constructor(cell, beat, markers, isPreMarker, rootElement, config) {
+        const rootGroup = TSU.DOM.createSVGNode("g", {
             parent: rootElement,
             attrs: {
-                class: "beatView",
-                beatId: "" + beat.uuid,
-                id: "" + beat.uuid,
+                class: "markerView",
+                pre: isPreMarker,
                 roleName: beat.role.name,
-                layoutLine: "" + beat.layoutLine,
-                layoutColumn: "" + beat.layoutColumn,
                 beatIndex: "" + beat.index,
+                gridRow: cell.rowIndex,
+                gridCol: cell.colIndex,
+            },
+        });
+        super(rootGroup);
+        this.cell = cell;
+        this.beat = beat;
+        this.markers = markers;
+        this.isPreMarker = isPreMarker;
+        this.rootElement = rootElement;
+        this.needsLayout = true;
+        this.rootGroup = rootGroup;
+        this.textElement = TSU.DOM.createSVGNode("text", {
+            parent: rootGroup,
+            attrs: {
+                class: "markerText",
+                pre: isPreMarker,
             },
-        })) || this;
-        _this.beat = beat;
-        _this.rootElement = rootElement;
-        _this.cycle = cycle;
-        _this.needsLayout = true;
-        _this.atomView = (0, atomviews_1.createAtomView)(_this.element, beat.atom, beat.role.defaultToNotes);
-        _this.atomView.refreshLayout();
-        return _this;
+            text: this.markers[0].text,
+        });
+    }
+    refreshLayout() {
+        this.rootGroup.setAttribute("transform", "translate(" + this.x + "," + this.y + ")");
+    }
+    updateBounds(x, y, w, h) {
+        return [x, y, NaN, NaN];
+    }
+}
+exports.MarkerView = MarkerView;
+class BeatView extends beatview_1.BeatView {
+    createAtomView() {
+        return (0, atomviews_1.createAtomView)(this.element, this.beat.atom, this.beat.role.defaultToNotes);
     }
-    BeatView.prototype.refreshLayout = function () {
-        var e_1, _a;
-        var newX = this.hasX ? this._x : 0;
-        var newY = this.hasY ? this._y : 0;
+    refreshLayout() {
+        const newX = this.hasX ? this._x : 0;
+        const newY = this.hasY ? this._y : 0;
         this.element.setAttribute("transform", "translate(" + newX + "," + newY + ")");
         this.invalidateBounds();
-        try {
-            for (var _b = __values(this.embelishments), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var e = _c.value;
-                e.refreshLayout();
-            }
-        }
-        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; }
-        }
+        for (const e of this.embelishments)
+            e.refreshLayout();
         this.invalidateBounds();
-    };
-    Object.defineProperty(BeatView.prototype, "embelishments", {
-        get: function () {
-            if (!this._embelishments) {
-                this._embelishments = this.createEmbelishments();
-            }
-            return this._embelishments;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    BeatView.prototype.createEmbelishments = function () {
-        var embelishments = [];
-        var beat = this.beat;
-        var rootElement = this.rootElement;
+    }
+    createEmbelishments() {
+        let embelishments = [];
+        const beat = this.beat;
+        const rootElement = this.rootElement;
         if (beat.beatIndex == 0 && beat.barIndex == 0 && beat.instance == 0) {
-            var emb = new embelishments_1.BeatStartLines(this, rootElement);
+            const emb = new embelishments_1.BeatStartLines(this, rootElement);
             embelishments = [emb];
         }
         else {
-            var cycle = this.cycle;
-            var bar = cycle.bars[beat.barIndex];
+            const cycle = this.cycle;
+            const bar = cycle.bars[beat.barIndex];
             if (beat.beatIndex == bar.beatCount - 1) {
                 if (beat.instance == bar.instanceCount(beat.beatIndex) - 1) {
                     if (beat.barIndex == cycle.bars.length - 1) {
-                        var emb = new embelishments_1.BeatEndLines(this, rootElement, 2);
+                        const emb = new embelishments_1.BeatEndLines(this, rootElement, 2);
                         embelishments = [emb];
                     }
                     else {
-                        var emb = new embelishments_1.BeatEndLines(this, rootElement);
+                        const emb = new embelishments_1.BeatEndLines(this, rootElement);
                         embelishments = [emb];
                     }
                 }
             }
         }
         return embelishments;
-    };
-    BeatView.prototype.setStyles = function (config) {
-        this.needsLayout = true;
-    };
-    return BeatView;
-}(shapes_1.ElementShape));
+    }
+}
 exports.BeatView = BeatView;
 //# sourceMappingURL=beatviews.js.map

package/lib/cjs/carnatic/beatviews.js.map

@@ -1 +1 @@
-{"version":3,"file":"beatviews.js","sourceRoot":"","sources":["../../../src/carnatic/beatviews.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { AtomType } from \"../core\";\nimport { Cycle } from \"../cycle\";\nimport { BeatView as BeatViewBase, Beat } from \"../beats\";\nimport { AtomView, GroupView, Embelishment, ElementShape } from \"../shapes\";\nimport { createAtomView } from \"./atomviews\";\nimport { BeatStartLines, BeatEndLines } from \"./embelishments\";\n\nexport class BeatView extends ElementShape<SVGGElement> implements BeatViewBase {\n  private _embelishments: Embelishment[];\n  atomView: AtomView;\n  needsLayout = true;\n  constructor(\n    public readonly beat: Beat,\n    public readonly rootElement: SVGGraphicsElement,\n    public readonly cycle: Cycle,\n    config?: any,\n  ) {\n    super(\n      TSU.DOM.createSVGNode(\"g\", {\n        parent: rootElement,\n        attrs: {\n          class: \"beatView\",\n          beatId: \"\" + beat.uuid,\n          id: \"\" + beat.uuid,\n          roleName: beat.role.name,\n          layoutLine: \"\" + beat.layoutLine,\n          layoutColumn: \"\" + beat.layoutColumn,\n          beatIndex: \"\" + beat.index,\n        },\n      }),\n    );\n    this.atomView = createAtomView(this.element, beat.atom, beat.role.defaultToNotes);\n    this.atomView.refreshLayout();\n  }\n\n  refreshLayout(): void {\n    const newX = this.hasX ? this._x : 0;\n    const newY = this.hasY ? this._y : 0;\n    this.element.setAttribute(\"transform\", \"translate(\" + newX + \",\" + newY + \")\");\n    this.invalidateBounds();\n    for (const e of this.embelishments) e.refreshLayout();\n    this.invalidateBounds();\n  }\n\n  get embelishments(): Embelishment[] {\n    if (!this._embelishments) {\n      this._embelishments = this.createEmbelishments();\n    }\n    return this._embelishments;\n  }\n\n  protected createEmbelishments(): Embelishment[] {\n    let embelishments: Embelishment[] = [];\n    const beat = this.beat;\n    // TODO - Should this be the group's parent element?\n    const rootElement = this.rootElement;\n    if (beat.beatIndex == 0 && beat.barIndex == 0 && beat.instance == 0) {\n      // first beat in bar - Do a BarStart\n      const emb = new BeatStartLines(this, rootElement);\n      embelishments = [emb];\n    } else {\n      const cycle = this.cycle;\n      const bar = cycle.bars[beat.barIndex];\n      if (beat.beatIndex == bar.beatCount - 1) {\n        // It is important that we are not just looking at the last beat of the bar\n        // but also in the last \"instance\" of the beat in this bar to account for\n        // kalais\n        if (beat.instance == bar.instanceCount(beat.beatIndex) - 1) {\n          if (beat.barIndex == cycle.bars.length - 1) {\n            // last beat in last bar so - do a thalam end (2 lines)\n            const emb = new BeatEndLines(this, rootElement, 2);\n            embelishments = [emb];\n          } else {\n            // end of a bar so single line end\n            const emb = new BeatEndLines(this, rootElement);\n            embelishments = [emb];\n          }\n        }\n      }\n    }\n    return embelishments;\n  }\n\n  setStyles(config: any): void {\n    this.needsLayout = true;\n  }\n}\n"]}
+{"version":3,"file":"beatviews.js","sourceRoot":"","sources":["../../../src/carnatic/beatviews.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { Embelishment } from \"../shapes\";\nimport { GridCell, GridCellView } from \"../grids\";\nimport { ElementShape } from \"../shapes\";\nimport { createAtomView } from \"./atomviews\";\nimport { Marker } from \"../core\";\nimport { Beat } from \"../beats\";\nimport { BeatView as BeatViewBase } from \"../beatview\";\nimport { BeatStartLines, BeatEndLines } from \"./embelishments\";\n\nexport class MarkerView extends ElementShape<SVGGElement> implements GridCellView {\n  needsLayout = true;\n  rootGroup: SVGGElement;\n  textElement: SVGTextElement;\n  constructor(\n    public readonly cell: GridCell,\n    public readonly beat: Beat,\n    public readonly markers: Marker[],\n    public readonly isPreMarker: boolean,\n    public readonly rootElement: SVGGraphicsElement,\n    config?: any,\n  ) {\n    const rootGroup = TSU.DOM.createSVGNode(\"g\", {\n      parent: rootElement,\n      attrs: {\n        class: \"markerView\",\n        pre: isPreMarker,\n        roleName: beat.role.name,\n        beatIndex: \"\" + beat.index,\n        gridRow: cell.rowIndex,\n        gridCol: cell.colIndex,\n      },\n    });\n    super(rootGroup);\n    this.rootGroup = rootGroup as SVGGElement;\n    this.textElement = TSU.DOM.createSVGNode(\"text\", {\n      parent: rootGroup,\n      attrs: {\n        class: \"markerText\",\n        pre: isPreMarker,\n      },\n      text: this.markers[0].text,\n    });\n  }\n\n  refreshLayout(): void {\n    // TODO - move this code out to refreshLayout?\n    // set the glyphs Y first so we can layout others\n    this.rootGroup.setAttribute(\"transform\", \"translate(\" + this.x + \",\" + this.y + \")\");\n  }\n\n  protected updateBounds(\n    x: null | number,\n    y: null | number,\n    w: null | number,\n    h: null | number,\n  ): [number | null, number | null, number | null, number | null] {\n    return [x, y, NaN, NaN];\n  }\n}\n\nexport class BeatView extends BeatViewBase {\n  createAtomView() {\n    return createAtomView(this.element, this.beat.atom, this.beat.role.defaultToNotes);\n  }\n\n  refreshLayout(): void {\n    const newX = this.hasX ? this._x : 0;\n    const newY = this.hasY ? this._y : 0;\n    this.element.setAttribute(\"transform\", \"translate(\" + newX + \",\" + newY + \")\");\n    this.invalidateBounds();\n    for (const e of this.embelishments) e.refreshLayout();\n    this.invalidateBounds();\n  }\n\n  protected createEmbelishments(): Embelishment[] {\n    let embelishments: Embelishment[] = [];\n    const beat = this.beat;\n    // TODO - Should this be the group's parent element?\n    const rootElement = this.rootElement;\n    if (beat.beatIndex == 0 && beat.barIndex == 0 && beat.instance == 0) {\n      // first beat in bar - Do a BarStart\n      const emb = new BeatStartLines(this, rootElement);\n      embelishments = [emb];\n    } else {\n      const cycle = this.cycle;\n      const bar = cycle.bars[beat.barIndex];\n      if (beat.beatIndex == bar.beatCount - 1) {\n        // It is important that we are not just looking at the last beat of the bar\n        // but also in the last \"instance\" of the beat in this bar to account for\n        // kalais\n        if (beat.instance == bar.instanceCount(beat.beatIndex) - 1) {\n          if (beat.barIndex == cycle.bars.length - 1) {\n            // last beat in last bar so - do a thalam end (2 lines)\n            const emb = new BeatEndLines(this, rootElement, 2);\n            embelishments = [emb];\n          } else {\n            // end of a bar so single line end\n            const emb = new BeatEndLines(this, rootElement);\n            embelishments = [emb];\n          }\n        }\n      }\n    }\n    return embelishments;\n  }\n}\n"]}

package/lib/cjs/carnatic/embelishments.d.ts

@@ -1,6 +1,6 @@
 import * as TSU from "@panyam/tsutils";
 import { Note } from "../core";
-import { BeatView } from "../beats";
+import { BeatView } from "../beatview";
 import { Embelishment } from "../shapes";
 import { LeafAtomView } from "./atomviews";
 import { JaaruGamaka } from "./gamakas";