notations 0.0.48 → 0.0.49

package/lib/esm/cycle.js

@@ -1,297 +1,154 @@
-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 __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-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.");
-};
-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));
-};
 import * as TSU from "@panyam/tsutils";
 import { TimedEntity } from "./entity";
-var ZERO = TSU.Num.Fraction.ZERO;
-var ONE = TSU.Num.Fraction.ONE;
-var CycleCursor = (function () {
-    function CycleCursor(cycle, barIndex, beatIndex, instance) {
-        if (barIndex === void 0) { barIndex = 0; }
-        if (beatIndex === void 0) { beatIndex = 0; }
-        if (instance === void 0) { instance = 0; }
+const ZERO = TSU.Num.Fraction.ZERO;
+const ONE = TSU.Num.Fraction.ONE;
+export class CycleCursor {
+    constructor(cycle, barIndex = 0, beatIndex = 0, instance = 0) {
         this.cycle = cycle;
         this.barIndex = barIndex;
         this.beatIndex = beatIndex;
         this.instance = instance;
     }
-    Object.defineProperty(CycleCursor.prototype, "next", {
-        get: function () {
-            var currBar = this.cycle.bars[this.barIndex];
-            var result = [
-                [this.barIndex, this.beatIndex, this.instance],
-                currBar.beatLengths[this.beatIndex],
-            ];
-            this.instance++;
-            if (!currBar.beatCounts[this.beatIndex] || this.instance >= currBar.beatCounts[this.beatIndex]) {
-                this.instance = 0;
-                this.beatIndex++;
-                if (this.beatIndex >= currBar.beatLengths.length) {
-                    this.beatIndex = 0;
-                    this.barIndex++;
-                    if (this.barIndex >= this.cycle.bars.length) {
-                        this.barIndex = 0;
-                    }
-                }
-            }
-            return result;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(CycleCursor.prototype, "prev", {
-        get: function () {
-            var currBar = this.cycle.bars[this.barIndex];
-            var result = [
-                [this.barIndex, this.beatIndex, this.instance],
-                currBar.beatLengths[this.beatIndex],
-            ];
-            this.instance--;
-            if (this.instance < 0) {
-                this.beatIndex--;
-                if (this.beatIndex < 0) {
-                    this.barIndex--;
-                    if (this.barIndex < 0) {
-                        this.barIndex = this.cycle.bars.length - 1;
-                    }
-                    this.beatIndex = this.cycle.bars[this.barIndex].beatCount - 1;
+    get next() {
+        const currBar = this.cycle.bars[this.barIndex];
+        const result = [
+            [this.barIndex, this.beatIndex, this.instance],
+            currBar.beatLengths[this.beatIndex],
+        ];
+        this.instance++;
+        if (!currBar.beatCounts[this.beatIndex] || this.instance >= currBar.beatCounts[this.beatIndex]) {
+            this.instance = 0;
+            this.beatIndex++;
+            if (this.beatIndex >= currBar.beatLengths.length) {
+                this.beatIndex = 0;
+                this.barIndex++;
+                if (this.barIndex >= this.cycle.bars.length) {
+                    this.barIndex = 0;
                 }
-                this.instance = (this.cycle.bars[this.barIndex].beatCounts[this.beatIndex] || 1) - 1;
             }
-            return result;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return CycleCursor;
-}());
-export { CycleCursor };
-var Bar = (function (_super) {
-    __extends(Bar, _super);
-    function Bar(config) {
-        var e_1, _a, e_2, _b;
-        if (config === void 0) { config = null; }
-        var _this = _super.call(this, (config = config || {})) || this;
-        _this.beatLengths = [];
-        _this.beatCounts = [];
-        _this.name = config.name || "";
-        try {
-            for (var _c = __values(config.beatLengths || []), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var bl = _d.value;
-                if (typeof bl === "number") {
-                    _this.beatLengths.push(TSU.Num.Frac(bl));
-                }
-                else {
-                    _this.beatLengths.push(bl);
+        }
+        return result;
+    }
+    get prev() {
+        const currBar = this.cycle.bars[this.barIndex];
+        const result = [
+            [this.barIndex, this.beatIndex, this.instance],
+            currBar.beatLengths[this.beatIndex],
+        ];
+        this.instance--;
+        if (this.instance < 0) {
+            this.beatIndex--;
+            if (this.beatIndex < 0) {
+                this.barIndex--;
+                if (this.barIndex < 0) {
+                    this.barIndex = this.cycle.bars.length - 1;
                 }
+                this.beatIndex = this.cycle.bars[this.barIndex].beatCount - 1;
             }
+            this.instance = (this.cycle.bars[this.barIndex].beatCounts[this.beatIndex] || 1) - 1;
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+        return result;
+    }
+}
+export class Bar extends TimedEntity {
+    constructor(config = null) {
+        super((config = config || {}));
+        this.beatLengths = [];
+        this.beatCounts = [];
+        this.name = config.name || "";
+        for (const bl of config.beatLengths || []) {
+            if (typeof bl === "number") {
+                this.beatLengths.push(TSU.Num.Frac(bl));
             }
-            finally { if (e_1) throw e_1.error; }
-        }
-        try {
-            for (var _e = __values(config.beatCounts || []), _f = _e.next(); !_f.done; _f = _e.next()) {
-                var bc = _f.value;
-                _this.beatCounts.push(bc);
+            else {
+                this.beatLengths.push(bl);
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-            }
-            finally { if (e_2) throw e_2.error; }
+        for (const bc of config.beatCounts || []) {
+            this.beatCounts.push(bc);
         }
-        while (_this.beatCounts.length < _this.beatLengths.length) {
-            _this.beatCounts.push(1);
+        while (this.beatCounts.length < this.beatLengths.length) {
+            this.beatCounts.push(1);
         }
-        return _this;
     }
-    Bar.prototype.debugValue = function () {
-        return __assign(__assign({}, _super.prototype.debugValue.call(this)), { name: name, beatLengths: this.beatLengths });
-    };
-    Bar.prototype.equals = function (another) {
-        if (!_super.prototype.equals.call(this, another))
+    debugValue() {
+        return Object.assign(Object.assign({}, super.debugValue()), { name: name, beatLengths: this.beatLengths });
+    }
+    equals(another) {
+        if (!super.equals(another))
             return false;
         if (this.beatLengths.length != another.beatLengths.length)
             return false;
         if (this.beatCounts.length != another.beatCounts.length)
             return false;
-        for (var i = 0; i < this.beatLengths.length; i++) {
+        for (let i = 0; i < this.beatLengths.length; i++) {
             if (!this.beatLengths[i].equals(another.beatLengths[i]))
                 return false;
         }
-        for (var i = 0; i < this.beatCounts.length; i++) {
+        for (let i = 0; i < this.beatCounts.length; i++) {
             if (this.beatCounts[i] != another.beatCounts[i])
                 return false;
         }
         return true;
-    };
-    Bar.prototype.copyTo = function (another) {
-        _super.prototype.copyTo.call(this, another);
+    }
+    copyTo(another) {
+        super.copyTo(another);
         another.name = this.name;
-        another.beatLengths = __spreadArray([], __read(this.beatLengths), false);
-        another.beatCounts = __spreadArray([], __read(this.beatCounts), false);
-    };
-    Bar.prototype.instanceCount = function (beatIndex) {
+        another.beatLengths = [...this.beatLengths];
+        another.beatCounts = [...this.beatCounts];
+    }
+    instanceCount(beatIndex) {
         if (beatIndex > this.beatCounts.length) {
             return 1;
         }
         else {
             return this.beatCounts[beatIndex];
         }
-    };
-    Object.defineProperty(Bar.prototype, "beatCount", {
-        get: function () {
-            return this.beatLengths.length;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(Bar.prototype, "totalBeatCount", {
-        get: function () {
-            var out = 0;
-            for (var i = 0; i < this.beatLengths.length; i++) {
-                out += this.beatCounts[i] || 1;
-            }
-            return out;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(Bar.prototype, "duration", {
-        get: function () {
-            var total = ZERO;
-            for (var i = 0; i < this.beatLengths.length; i++) {
-                total = total.plus(this.beatLengths[i].timesNum(this.beatCounts[i] || 1));
-            }
-            return total;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return Bar;
-}(TimedEntity));
-export { Bar };
-var Cycle = (function (_super) {
-    __extends(Cycle, _super);
-    function Cycle(config) {
-        if (config === void 0) { config = null; }
-        var _this = _super.call(this, (config = config || {})) || this;
-        _this.name = config.name || "";
-        _this.bars = config.bars || [];
-        return _this;
     }
-    Cycle.prototype.debugValue = function () {
-        return __assign(__assign({}, _super.prototype.debugValue.call(this)), { name: name, bars: this.bars.map(function (p) { return p.debugValue(); }) });
-    };
-    Cycle.prototype.children = function () {
+    get beatCount() {
+        return this.beatLengths.length;
+    }
+    get totalBeatCount() {
+        let out = 0;
+        for (let i = 0; i < this.beatLengths.length; i++) {
+            out += this.beatCounts[i] || 1;
+        }
+        return out;
+    }
+    get duration() {
+        let total = ZERO;
+        for (let i = 0; i < this.beatLengths.length; i++) {
+            total = total.plus(this.beatLengths[i].timesNum(this.beatCounts[i] || 1));
+        }
+        return total;
+    }
+}
+export class Cycle extends TimedEntity {
+    constructor(config = null) {
+        super((config = config || {}));
+        this.name = config.name || "";
+        this.bars = config.bars || [];
+    }
+    debugValue() {
+        return Object.assign(Object.assign({}, super.debugValue()), { name: name, bars: this.bars.map((p) => p.debugValue()) });
+    }
+    children() {
         return this.bars;
-    };
-    Cycle.prototype.equals = function (another) {
-        if (!_super.prototype.equals.call(this, another)) {
+    }
+    equals(another) {
+        if (!super.equals(another)) {
             return false;
         }
         if (this.bars.length != another.bars.length)
             return false;
-        for (var i = 0; i < this.bars.length; i++) {
+        for (let i = 0; i < this.bars.length; i++) {
             if (!this.bars[i].equals(another.bars[i]))
                 return false;
         }
         return true;
-    };
-    Cycle.prototype.getAtIndex = function (globalIndex) {
-        var cycle = 0;
+    }
+    getAtIndex(globalIndex) {
+        let cycle = 0;
         while (globalIndex < 0) {
             globalIndex += this.totalBeatCount;
             cycle--;
@@ -300,33 +157,33 @@ var Cycle = (function (_super) {
             cycle = Math.floor(globalIndex / this.totalBeatCount);
         }
         globalIndex = globalIndex % this.totalBeatCount;
-        var offset = ZERO;
-        for (var barIndex = 0; barIndex < this.bars.length; barIndex++) {
-            var bar = this.bars[barIndex];
+        let offset = ZERO;
+        for (let barIndex = 0; barIndex < this.bars.length; barIndex++) {
+            const bar = this.bars[barIndex];
             if (globalIndex >= bar.totalBeatCount) {
                 globalIndex -= bar.totalBeatCount;
                 offset = offset.plus(bar.duration);
             }
             else {
-                for (var beatIndex = 0; beatIndex < bar.beatCount; beatIndex++) {
-                    var beatLength = bar.beatLengths[beatIndex];
-                    var beatCount = bar.beatCounts[beatIndex] || 1;
+                for (let beatIndex = 0; beatIndex < bar.beatCount; beatIndex++) {
+                    const beatLength = bar.beatLengths[beatIndex];
+                    const beatCount = bar.beatCounts[beatIndex] || 1;
                     if (globalIndex >= beatCount) {
                         globalIndex -= beatCount;
                         offset = offset.plus(beatLength.timesNum(beatCount));
                     }
                     else {
-                        var instance = globalIndex;
+                        const instance = globalIndex;
                         return [cycle, [barIndex, beatIndex, instance], offset.plus(beatLength.timesNum(instance))];
                     }
                 }
             }
         }
         throw new Error("Should not be here!");
-    };
-    Cycle.prototype.getPosition = function (globalOffset) {
-        var duration = this.duration;
-        var cycleNum = 0;
+    }
+    getPosition(globalOffset) {
+        const duration = this.duration;
+        let cycleNum = 0;
         if (globalOffset.isLT(ZERO)) {
             while (globalOffset.isLT(ZERO)) {
                 cycleNum--;
@@ -334,24 +191,24 @@ var Cycle = (function (_super) {
             }
         }
         else if (globalOffset.isGTE(duration)) {
-            var realOffset = globalOffset.mod(duration);
+            const realOffset = globalOffset.mod(duration);
             globalOffset = globalOffset.minus(realOffset).divby(duration);
             TSU.assert(globalOffset.isWhole);
             cycleNum = globalOffset.floor;
             globalOffset = realOffset;
         }
-        var globalIndex = 0;
-        for (var barIndex = 0; barIndex < this.bars.length; barIndex++) {
-            var bar = this.bars[barIndex];
-            var barDuration = bar.duration;
+        let globalIndex = 0;
+        for (let barIndex = 0; barIndex < this.bars.length; barIndex++) {
+            const bar = this.bars[barIndex];
+            const barDuration = bar.duration;
             if (globalOffset.isGTE(barDuration)) {
                 globalOffset = globalOffset.minus(barDuration);
             }
             else {
-                for (var beatIndex = 0; beatIndex < bar.beatCount; beatIndex++) {
-                    var beatLength = bar.beatLengths[beatIndex];
-                    var beatCount = bar.beatCounts[beatIndex] || 1;
-                    for (var instance = 0; instance < beatCount; instance++, globalIndex++) {
+                for (let beatIndex = 0; beatIndex < bar.beatCount; beatIndex++) {
+                    const beatLength = bar.beatLengths[beatIndex];
+                    const beatCount = bar.beatCounts[beatIndex] || 1;
+                    for (let instance = 0; instance < beatCount; instance++, globalIndex++) {
                         if (globalOffset.isGTE(beatLength)) {
                             globalOffset = globalOffset.minus(beatLength);
                         }
@@ -364,107 +221,55 @@ var Cycle = (function (_super) {
             globalIndex += bar.totalBeatCount;
         }
         throw new Error("Should not be here!");
-    };
-    Cycle.prototype.iterateBeats = function (startBar, startBeat, startInstance) {
-        var barIndex, beatIndex, instanceIndex, currBar;
-        if (startBar === void 0) { startBar = 0; }
-        if (startBeat === void 0) { startBeat = 0; }
-        if (startInstance === void 0) { startInstance = 0; }
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    barIndex = startBar;
-                    beatIndex = startBeat;
-                    instanceIndex = startInstance;
-                    _a.label = 1;
-                case 1:
-                    if (!true) return [3, 3];
-                    currBar = this.bars[barIndex];
-                    return [4, [[barIndex, beatIndex, instanceIndex], currBar.beatLengths[beatIndex]]];
-                case 2:
-                    _a.sent();
-                    instanceIndex++;
-                    if (!currBar.beatCounts[beatIndex] || instanceIndex >= currBar.beatCounts[beatIndex]) {
-                        instanceIndex = 0;
-                        beatIndex++;
-                        if (beatIndex >= currBar.beatLengths.length) {
-                            beatIndex = 0;
-                            barIndex++;
-                            if (barIndex >= this.bars.length) {
-                                barIndex = 0;
-                            }
-                        }
+    }
+    *iterateBeats(startBar = 0, startBeat = 0, startInstance = 0) {
+        let barIndex = startBar;
+        let beatIndex = startBeat;
+        let instanceIndex = startInstance;
+        while (true) {
+            const currBar = this.bars[barIndex];
+            yield [[barIndex, beatIndex, instanceIndex], currBar.beatLengths[beatIndex]];
+            instanceIndex++;
+            if (!currBar.beatCounts[beatIndex] || instanceIndex >= currBar.beatCounts[beatIndex]) {
+                instanceIndex = 0;
+                beatIndex++;
+                if (beatIndex >= currBar.beatLengths.length) {
+                    beatIndex = 0;
+                    barIndex++;
+                    if (barIndex >= this.bars.length) {
+                        barIndex = 0;
                     }
-                    return [3, 1];
-                case 3: return [2];
-            }
-        });
-    };
-    Cycle.prototype.copyTo = function (another) {
-        _super.prototype.copyTo.call(this, another);
-        another.name = this.name;
-        another.bars = this.bars.map(function (x) { return x.clone(); });
-    };
-    Object.defineProperty(Cycle.prototype, "beatCount", {
-        get: function () {
-            var e_3, _a;
-            var out = 0;
-            try {
-                for (var _b = __values(this.bars), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var bar = _c.value;
-                    out += bar.beatCount;
                 }
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_3) throw e_3.error; }
-            }
-            return out;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(Cycle.prototype, "totalBeatCount", {
-        get: function () {
-            var e_4, _a;
-            var out = 0;
-            try {
-                for (var _b = __values(this.bars), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var bar = _c.value;
-                    out += bar.totalBeatCount;
-                }
-            }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_4) throw e_4.error; }
-            }
-            return out;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(Cycle.prototype, "duration", {
-        get: function () {
-            return this.bars.reduce(function (x, y) { return x.plus(y.duration); }, ZERO);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Cycle.DEFAULT = new Cycle({
-        name: "Adi Thalam",
-        bars: [
-            new Bar({ name: "Laghu", beatLengths: [1, 1, 1, 1] }),
-            new Bar({ name: "Dhrutam", beatLengths: [1, 1] }),
-            new Bar({ name: "Dhrutam", beatLengths: [1, 1] }),
-        ],
-    });
-    return Cycle;
-}(TimedEntity));
-export { Cycle };
+        }
+    }
+    copyTo(another) {
+        super.copyTo(another);
+        another.name = this.name;
+        another.bars = this.bars.map((x) => x.clone());
+    }
+    get beatCount() {
+        let out = 0;
+        for (const bar of this.bars)
+            out += bar.beatCount;
+        return out;
+    }
+    get totalBeatCount() {
+        let out = 0;
+        for (const bar of this.bars)
+            out += bar.totalBeatCount;
+        return out;
+    }
+    get duration() {
+        return this.bars.reduce((x, y) => x.plus(y.duration), ZERO);
+    }
+}
+Cycle.DEFAULT = new Cycle({
+    name: "Adi Thalam",
+    bars: [
+        new Bar({ name: "Laghu", beatLengths: [1, 1, 1, 1] }),
+        new Bar({ name: "Dhrutam", beatLengths: [1, 1] }),
+        new Bar({ name: "Dhrutam", beatLengths: [1, 1] }),
+    ],
+});
 //# sourceMappingURL=cycle.js.map