notations 0.0.69 → 1.0.0

package/lib/cjs/loader.js

@@ -1,41 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = parse;
 exports.load = load;
-const TSU = __importStar(require("@panyam/tsutils"));
 const beats_1 = require("./beats");
 const parser_1 = require("./parser");
 function parse(input) {
@@ -47,13 +13,7 @@ function load(codeText, config = {}) {
     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);
-        }
-    }
+    beatLayout.processBlock(notation);
     const buildTime = performance.now();
     if (config.log) {
         console.log(`V4 Document, Parse Time: ${parseTime - startTime}ms, Build Time: ${buildTime - parseTime}ms`);

package/lib/cjs/loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA,sBAEC;AASD,oBAkCC;AA1DD,qDAAuC;AAGvC,mCAA2C;AAC3C,qCAAkC;AASlC,SAAgB,KAAK,CAAC,KAAa;IACjC,OAAO,IAAI,eAAM,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC3C,CAAC;AASD,SAAgB,IAAI,CAClB,QAAgB,EAChB,SAAc,EAAE;IAEhB,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;IAC1B,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,CAAC;QACpC,IAAI,KAAK,CAAC,IAAI,IAAI,MAAM,IAAI,CAAE,KAAc,CAAC,OAAO,EAAE,CAAC;YACrD,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;QAC3B,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IACpC,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,4BAA4B,SAAS,GAAG,SAAS,mBAAmB,SAAS,GAAG,SAAS,IAAI,CAAC,CAAC;IAC7G,CAAC;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","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\n/**\n * Parses a notation string into a Notation object.\n *\n * @param input The notation string to parse\n * @returns A tuple containing the parsed Notation and any parsing errors\n */\nexport function parse(input: string): [Notation, G.ParseError[]] {\n  return new Parser().parseAndBuild(input);\n}\n\n/**\n * Loads a notation from a string and builds the beat layout.\n *\n * @param codeText The notation string to load\n * @param config Optional configuration object\n * @returns A tuple containing the Notation, GlobalBeatLayout, parsing errors, and timing information\n */\nexport function load(\n  codeText: string,\n  config: any = {},\n): [Notation, GlobalBeatLayout, G.ParseError[], TSU.StringMap<number>] {\n  codeText = codeText || \"\";\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"]}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/loader.ts"],"names":[],"mappings":";;AAYA,sBAEC;AASD,oBA2BC;AAhDD,mCAA2C;AAC3C,qCAAkC;AASlC,SAAgB,KAAK,CAAC,KAAa;IACjC,OAAO,IAAI,eAAM,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC3C,CAAC;AASD,SAAgB,IAAI,CAClB,QAAgB,EAChB,SAAc,EAAE;IAEhB,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;IAC1B,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;IAIpC,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAElC,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IACpC,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,4BAA4B,SAAS,GAAG,SAAS,mBAAmB,SAAS,GAAG,SAAS,IAAI,CAAC,CAAC;IAC7G,CAAC;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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport * as G from \"galore\";\nimport { GlobalBeatLayout } from \"./beats\";\nimport { Parser } from \"./parser\";\nimport { Notation } from \"./notation\";\n\n/**\n * Parses a notation string into a Notation object.\n *\n * @param input The notation string to parse\n * @returns A tuple containing the parsed Notation and any parsing errors\n */\nexport function parse(input: string): [Notation, G.ParseError[]] {\n  return new Parser().parseAndBuild(input);\n}\n\n/**\n * Loads a notation from a string and builds the beat layout.\n *\n * @param codeText The notation string to load\n * @param config Optional configuration object\n * @returns A tuple containing the Notation, GlobalBeatLayout, parsing errors, and timing information\n */\nexport function load(\n  codeText: string,\n  config: any = {},\n): [Notation, GlobalBeatLayout, G.ParseError[], TSU.StringMap<number>] {\n  codeText = codeText || \"\";\n  const beatLayout = new GlobalBeatLayout();\n  const startTime = performance.now();\n  const [notation, errors] = parse(codeText);\n  const parseTime = performance.now();\n\n  // Process all blocks recursively using block.children()\n  // This handles nested blocks like \\repeat { }, \\section { }, etc.\n  beatLayout.processBlock(notation);\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

@@ -2,12 +2,8 @@ import * as TSU from "@panyam/tsutils";
 import { Entity } from "./entity";
 import { Cycle } from "./cycle";
 import { Line } from "./core";
-import { LayoutParams } from "./layouts";
-export declare class RoleDef {
-    name: string;
-    notesOnly: boolean;
-    index: number;
-}
+import { RoleDef, RawBlock, BlockItem, Block, SectionBlock, RepeatBlock, CycleBlock, BeatDurationBlock, BreaksBlock, RoleBlock, GroupBlock, isBlock, isLine, isRawBlock, findContainingBlock } from "./block";
+export { RoleDef, RawBlock, BlockItem, Block, SectionBlock, RepeatBlock, CycleBlock, BeatDurationBlock, BreaksBlock, RoleBlock, GroupBlock, isBlock, isLine, isRawBlock, findContainingBlock, };
 export type CmdParam = {
     key: TSU.Nullable<string>;
     value: any;
@@ -24,14 +20,8 @@ export declare abstract class Command extends Entity {
     debugValue(): any;
     getParam(name: string): any;
     getParamAt(index: number): any;
-    abstract applyToNotation(notebook: Notation): void;
-}
-export declare class RawBlock extends Entity {
-    content: string;
-    contentType: string;
-    readonly TYPE: string;
-    constructor(content: string, contentType?: string);
-    debugValue(): any;
+    abstract applyToBlock(container: Block): void;
+    applyToNotation(notation: Notation): void;
 }
 export declare class MetaData {
     readonly key: string;
@@ -39,37 +29,31 @@ export declare class MetaData {
     readonly params?: any | undefined;
     constructor(key: string, value: string, params?: any | undefined);
 }
-export declare class Notation extends Entity {
+export declare class Notation extends Block {
     readonly TYPE = "Notation";
-    private _unnamedLayoutParams;
-    private _namedLayoutParams;
-    private _currRoleDef;
-    roles: RoleDef[];
-    blocks: (Line | RawBlock)[];
-    currentAPB: number;
-    currentCycle: Cycle;
-    currentBreaks: number[];
     metadata: Map<string, MetaData>;
     onMissingRole: (name: string) => RoleDef | null;
-    get unnamedLayoutParams(): ReadonlyArray<LayoutParams>;
-    get namedLayoutParams(): ReadonlyMap<string, LayoutParams>;
+    constructor();
+    get blocks(): BlockItem[];
+    get currentAPB(): number;
+    set currentAPB(value: number);
+    get currentCycle(): Cycle;
+    set currentCycle(value: Cycle);
+    get currentBreaks(): number[];
+    set currentBreaks(value: number[]);
+    get roles(): RoleDef[];
+    setCurrRole(name: string): void;
+    getRoleDef(name: string): TSU.Nullable<RoleDef>;
+    newRoleDef(name: string, notesOnly?: boolean): RoleDef;
     addLine(line: Line): void;
     removeLine(line: Line): number;
     addRawBlock(raw: RawBlock): void;
     addMetaData(meta: MetaData, addBlock?: boolean): void;
+    resetLine(): void;
     debugValue(): any;
-    getRoleDef(name: string): TSU.Nullable<RoleDef>;
-    newRoleDef(name: string, notesOnly?: boolean): RoleDef;
+    protected _currRoleDef: TSU.Nullable<RoleDef>;
     get currRoleDef(): RoleDef | null;
-    setCurrRole(name: string): void;
-    private _currentLine;
+    protected _currentLine: Line | null;
     get currentLine(): Line;
-    resetLine(): void;
     newLine(): Line;
-    private _layoutParams;
-    resetLayoutParams(): void;
-    get layoutParams(): LayoutParams;
-    ensureNamedLayoutParams(name: string): LayoutParams;
-    protected snapshotLayoutParams(): LayoutParams;
-    protected findUnnamedLayoutParams(): LayoutParams | null;
 }

package/lib/cjs/notation.js

@@ -1,18 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Notation = exports.MetaData = exports.RawBlock = exports.Command = exports.RoleDef = void 0;
+exports.Notation = exports.MetaData = exports.Command = exports.findContainingBlock = exports.isRawBlock = exports.isLine = exports.isBlock = exports.GroupBlock = exports.RoleBlock = exports.BreaksBlock = exports.BeatDurationBlock = exports.CycleBlock = exports.RepeatBlock = exports.SectionBlock = exports.Block = exports.RawBlock = exports.RoleDef = void 0;
 const entity_1 = require("./entity");
 const cycle_1 = require("./cycle");
 const core_1 = require("./core");
-const layouts_1 = require("./layouts");
-class RoleDef {
-    constructor() {
-        this.name = "";
-        this.notesOnly = false;
-        this.index = 0;
-    }
-}
-exports.RoleDef = RoleDef;
+const block_1 = require("./block");
+Object.defineProperty(exports, "RoleDef", { enumerable: true, get: function () { return block_1.RoleDef; } });
+Object.defineProperty(exports, "RawBlock", { enumerable: true, get: function () { return block_1.RawBlock; } });
+Object.defineProperty(exports, "Block", { enumerable: true, get: function () { return block_1.Block; } });
+Object.defineProperty(exports, "SectionBlock", { enumerable: true, get: function () { return block_1.SectionBlock; } });
+Object.defineProperty(exports, "RepeatBlock", { enumerable: true, get: function () { return block_1.RepeatBlock; } });
+Object.defineProperty(exports, "CycleBlock", { enumerable: true, get: function () { return block_1.CycleBlock; } });
+Object.defineProperty(exports, "BeatDurationBlock", { enumerable: true, get: function () { return block_1.BeatDurationBlock; } });
+Object.defineProperty(exports, "BreaksBlock", { enumerable: true, get: function () { return block_1.BreaksBlock; } });
+Object.defineProperty(exports, "RoleBlock", { enumerable: true, get: function () { return block_1.RoleBlock; } });
+Object.defineProperty(exports, "GroupBlock", { enumerable: true, get: function () { return block_1.GroupBlock; } });
+Object.defineProperty(exports, "isBlock", { enumerable: true, get: function () { return block_1.isBlock; } });
+Object.defineProperty(exports, "isLine", { enumerable: true, get: function () { return block_1.isLine; } });
+Object.defineProperty(exports, "isRawBlock", { enumerable: true, get: function () { return block_1.isRawBlock; } });
+Object.defineProperty(exports, "findContainingBlock", { enumerable: true, get: function () { return block_1.findContainingBlock; } });
 class Command extends entity_1.Entity {
     constructor(params = []) {
         super();
@@ -41,20 +47,11 @@ class Command extends entity_1.Entity {
     getParamAt(index) {
         return index < this.params.length ? this.params[index].value : null;
     }
-}
-exports.Command = Command;
-class RawBlock extends entity_1.Entity {
-    constructor(content, contentType = "md") {
-        super();
-        this.content = content;
-        this.contentType = contentType;
-        this.TYPE = "RawBlock";
-    }
-    debugValue() {
-        return Object.assign(Object.assign({}, super.debugValue()), { content: this.content, contentType: this.contentType });
+    applyToNotation(notation) {
+        this.applyToBlock(notation);
     }
 }
-exports.RawBlock = RawBlock;
+exports.Command = Command;
 class MetaData {
     constructor(key, value, params) {
         this.key = key;
@@ -64,113 +61,128 @@ class MetaData {
     }
 }
 exports.MetaData = MetaData;
-class Notation extends entity_1.Entity {
+class Notation extends block_1.Block {
     constructor() {
-        super(...arguments);
+        super("notation", null);
         this.TYPE = "Notation";
-        this._unnamedLayoutParams = [];
-        this._namedLayoutParams = new Map();
-        this._currRoleDef = null;
-        this.roles = [];
-        this.blocks = [];
-        this.currentAPB = 1;
-        this.currentCycle = cycle_1.Cycle.DEFAULT;
-        this.currentBreaks = [];
         this.metadata = new Map();
         this.onMissingRole = (name) => this.newRoleDef(name, name == "sw");
+        this._currRoleDef = null;
         this._currentLine = null;
-        this._layoutParams = null;
-    }
-    get unnamedLayoutParams() {
-        return this._unnamedLayoutParams;
+        this.localCycle = cycle_1.Cycle.DEFAULT;
+        this.localAtomsPerBeat = 1;
+        this.localBreaks = [];
     }
-    get namedLayoutParams() {
-        return this._namedLayoutParams;
+    get blocks() {
+        return this.blockItems;
     }
-    addLine(line) {
-        this.blocks.push(line);
+    get currentAPB() {
+        var _a;
+        return (_a = this.localAtomsPerBeat) !== null && _a !== void 0 ? _a : 1;
     }
-    removeLine(line) {
-        const index = this.blocks.findIndex((l) => l == line);
-        if (index >= 0) {
-            this.blocks.splice(index, 1);
-        }
-        return index;
+    set currentAPB(value) {
+        this.localAtomsPerBeat = value;
     }
-    addRawBlock(raw) {
-        this.blocks.push(raw);
-        this.resetLine();
+    get currentCycle() {
+        var _a;
+        return (_a = this.localCycle) !== null && _a !== void 0 ? _a : cycle_1.Cycle.DEFAULT;
     }
-    addMetaData(meta, addBlock = true) {
-        if (addBlock && !this.metadata.has(meta.key)) {
-            const raw = new RawBlock(meta.key, "metadata");
-            this.addRawBlock(raw);
-        }
-        this.metadata.set(meta.key, meta);
+    set currentCycle(value) {
+        this.localCycle = value;
     }
-    debugValue() {
+    get currentBreaks() {
         var _a;
-        return Object.assign(Object.assign({}, super.debugValue), { roles: this.roles, blocks: this.blocks.map((b) => b.debugValue()), currentAPB: this.currentAPB, currentCycle: (_a = this.currentCycle) === null || _a === void 0 ? void 0 : _a.uuid, currentBreaks: this.currentBreaks });
+        return (_a = this.localBreaks) !== null && _a !== void 0 ? _a : [];
     }
-    getRoleDef(name) {
+    set currentBreaks(value) {
+        this.localBreaks = value;
+    }
+    get roles() {
+        return Array.from(this.localRoles.values());
+    }
+    setCurrRole(name) {
         name = name.trim().toLowerCase();
-        if (name == "") {
-            return this.roles[this.roles.length - 1] || null;
+        if (name.trim() == "") {
+            throw new Error("Role name cannot be empty");
         }
-        for (let i = 0; i < this.roles.length; i++) {
-            const rd = this.roles[i];
-            if (name == rd.name)
-                return rd;
+        const roleDef = this.getRole(name) || (this.onMissingRole ? this.onMissingRole(name) || null : null);
+        if (roleDef == null) {
+            throw new Error("Role not found: " + name);
         }
-        return null;
+        this._currRoleDef = roleDef;
+    }
+    getRoleDef(name) {
+        var _a;
+        name = name.trim().toLowerCase();
+        if (name === "") {
+            const roles = Array.from(this.localRoles.values());
+            return roles[roles.length - 1] || null;
+        }
+        return (_a = this.localRoles.get(name)) !== null && _a !== void 0 ? _a : null;
     }
     newRoleDef(name, notesOnly = false) {
         name = name.trim().toLowerCase();
-        if (name.trim() == "") {
+        if (name === "") {
             throw new Error("Role name cannot be empty");
         }
-        const roleDef = this.getRoleDef(name);
-        if (roleDef != null) {
-            throw new Error("Role already exists");
+        if (this.localRoles.has(name)) {
+            throw new Error("Role already exists: " + name);
         }
-        const rd = new RoleDef();
+        const rd = new block_1.RoleDef();
         rd.name = name;
         rd.notesOnly = notesOnly;
-        rd.index = this.roles.length;
-        this.roles.push(rd);
+        rd.index = this.localRoles.size;
+        this.localRoles.set(name, rd);
         return rd;
     }
+    addLine(line) {
+        this.addBlockItem(line);
+    }
+    removeLine(line) {
+        return this.removeBlockItem(line);
+    }
+    addRawBlock(raw) {
+        this.addBlockItem(raw);
+        this.resetLine();
+    }
+    addMetaData(meta, addBlock = true) {
+        if (addBlock && !this.metadata.has(meta.key)) {
+            const raw = new block_1.RawBlock(meta.key, "metadata");
+            this.addRawBlock(raw);
+        }
+        this.metadata.set(meta.key, meta);
+    }
+    resetLine() {
+        this._currentLine = null;
+    }
+    debugValue() {
+        var _a;
+        return {
+            blocks: this.blocks.map((b) => b.debugValue()),
+            currentAPB: this.currentAPB,
+            currentBreaks: this.currentBreaks,
+            currentCycle: (_a = this.currentCycle) === null || _a === void 0 ? void 0 : _a.uuid,
+            roles: this.roles,
+        };
+    }
     get currRoleDef() {
         if (this._currRoleDef == null) {
-            if (this.roles.length == 0) {
+            const roles = Array.from(this.localRoles.values());
+            if (roles.length === 0) {
                 return null;
             }
             else {
-                this._currRoleDef = this.roles[this.roles.length - 1];
+                this._currRoleDef = roles[roles.length - 1];
             }
         }
         return this._currRoleDef;
     }
-    setCurrRole(name) {
-        name = name.trim().toLowerCase();
-        if (name.trim() == "") {
-            throw new Error("Role name cannot be empty");
-        }
-        const roleDef = this.getRoleDef(name) || (this.onMissingRole ? this.onMissingRole(name) || null : null);
-        if (roleDef == null) {
-            throw new Error("Role not found: " + name);
-        }
-        this._currRoleDef = roleDef;
-    }
     get currentLine() {
         if (this._currentLine == null) {
             return this.newLine();
         }
         return this._currentLine;
     }
-    resetLine() {
-        this._currentLine = null;
-    }
     newLine() {
         if (this._currentLine && this._currentLine.isEmpty) {
             this.removeLine(this._currentLine);
@@ -179,51 +191,6 @@ class Notation extends entity_1.Entity {
         this.addLine(this._currentLine);
         return this._currentLine;
     }
-    resetLayoutParams() {
-        this._layoutParams = null;
-        this.resetLine();
-    }
-    get layoutParams() {
-        if (this._layoutParams == null) {
-            this._layoutParams = this.findUnnamedLayoutParams();
-            if (this._layoutParams == null) {
-                this._layoutParams = this.snapshotLayoutParams();
-                this._unnamedLayoutParams.push(this._layoutParams);
-            }
-        }
-        return this._layoutParams;
-    }
-    ensureNamedLayoutParams(name) {
-        let lp = this._namedLayoutParams.get(name) || null;
-        if (lp == null || this._layoutParams != lp) {
-            if (lp == null) {
-                lp = this.snapshotLayoutParams();
-                this._namedLayoutParams.set(name, lp);
-            }
-            else {
-                this.currentCycle = lp.cycle;
-                this.currentAPB = lp.beatDuration;
-                this.currentBreaks = lp.lineBreaks;
-            }
-            this._layoutParams = lp;
-            this.resetLine();
-        }
-        return this._layoutParams;
-    }
-    snapshotLayoutParams() {
-        return new layouts_1.LayoutParams({
-            cycle: this.currentCycle,
-            beatDuration: this.currentAPB,
-            layout: this.currentBreaks,
-        });
-    }
-    findUnnamedLayoutParams() {
-        return (this._unnamedLayoutParams.find((lp) => {
-            return (lp.beatDuration == this.currentAPB &&
-                this.currentCycle.equals(lp.cycle) &&
-                lp.lineBreaksEqual(this.currentBreaks));
-        }) || null);
-    }
 }
 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 { Entity } from \"./entity\";\nimport { Cycle } from \"./cycle\";\nimport { Line } from \"./core\";\nimport { LayoutParams } from \"./layouts\";\n\n/**\n * Definition of a role in the notation.\n * A role represents a specific voice or part in the music notation.\n */\nexport class RoleDef {\n  /** Name of the role */\n  name = \"\";\n\n  /** Whether this role contains only notes (true) or can also contain syllables/text (false) */\n  notesOnly = false;\n\n  /** Index of this role in the notation */\n  index = 0;\n}\n\n/**\n * Type representing a command parameter with optional key and value.\n */\nexport type CmdParam = { key: TSU.Nullable<string>; value: any };\n\n/**\n * Base class for commands in the notation.\n * Commands modify the notation in various ways, such as adding content,\n * changing layout, setting roles, etc.\n */\nexport abstract class Command extends Entity {\n  /** Whether this command was auto-generated */\n  autoGenerated = false;\n\n  /** Previous command in the sequence */\n  prevSibling: null | Command = null;\n\n  /** Next command in the sequence */\n  nextSibling: null | Command = null;\n\n  /** Parameters for this command */\n  params: CmdParam[];\n\n  /** Index of this command in the sequence */\n  index: number;\n\n  /**\n   * Creates a new Command.\n   * @param params Optional parameters for the command\n   */\n  constructor(params: CmdParam[] = []) {\n    super();\n    this.params = params;\n    this.index = 0;\n    this.validateParams();\n  }\n\n  /**\n   * Validates the parameters for this command.\n   * @throws Error if parameters are invalid\n   */\n  validateParams(): void {\n    //\n  }\n\n  /**\n   * Gets the name of this command.\n   */\n  get name(): string {\n    return this.constructor.name;\n  }\n\n  /**\n   * Returns a debug-friendly representation of this command.\n   * @returns An object containing debug information\n   */\n  debugValue(): any {\n    return { name: this.name, index: this.index, params: this.params };\n  }\n\n  /**\n   * Gets a parameter value by name.\n   * @param name The name of the parameter\n   * @returns The parameter value, or null if not found\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  /**\n   * Gets a parameter value by index.\n   * @param index The index of the parameter\n   * @returns The parameter value, or null if not found\n   */\n  getParamAt(index: number): any {\n    return index < this.params.length ? this.params[index].value : null;\n  }\n\n  /**\n   * Applies this command to a notation.\n   * @param notation The notation to apply this command to\n   */\n  abstract applyToNotation(notebook: Notation): void;\n}\n\n/**\n * Represents a raw block of content in the notation.\n * Raw blocks can contain arbitrary content like markdown, HTML, etc.\n */\nexport class RawBlock extends Entity {\n  readonly TYPE: string = \"RawBlock\";\n\n  /**\n   * Creates a new RawBlock.\n   * @param content The content of the block\n   * @param contentType The type of content (e.g., \"md\" for markdown)\n   */\n  constructor(\n    public content: string,\n    public contentType: string = \"md\",\n  ) {\n    super();\n  }\n\n  /**\n   * Returns a debug-friendly representation of this raw block.\n   * @returns An object containing debug information\n   */\n  debugValue(): any {\n    return { ...super.debugValue(), content: this.content, contentType: this.contentType };\n  }\n}\n\n/**\n * Represents metadata for the notation.\n */\nexport class MetaData {\n  /**\n   * Creates a new MetaData.\n   * @param key The key for this metadata\n   * @param value The value of this metadata\n   * @param params Optional additional parameters\n   */\n  constructor(\n    public readonly key: string,\n    public readonly value: string,\n    public readonly params?: any,\n  ) {\n    params = params || {};\n  }\n}\n\n/**\n * The main class representing a complete notation.\n * Notation contains all the elements, settings, and layout information for a piece of music.\n */\nexport class Notation extends Entity {\n  readonly TYPE = \"Notation\";\n  private _unnamedLayoutParams: LayoutParams[] = [];\n  private _namedLayoutParams = new Map<string, LayoutParams>();\n  private _currRoleDef: TSU.Nullable<RoleDef> = null;\n\n  /** Roles defined in this notation */\n  roles: RoleDef[] = [];\n\n  /** Blocks (lines or raw blocks) in this notation */\n  blocks: (Line | RawBlock)[] = [];\n\n  /** Current beat duration multiplier */\n  currentAPB = 1;\n\n  /** Current cycle pattern */\n  currentCycle: Cycle = Cycle.DEFAULT;\n\n  /** Current line breaks pattern */\n  currentBreaks: number[] = [];\n\n  /** Metadata associated with this notation */\n  metadata = new Map<string, MetaData>();\n\n  /** Handler for missing roles */\n  onMissingRole: (name: string) => RoleDef | null = (name) => this.newRoleDef(name, name == \"sw\");\n\n  /**\n   * Gets the unnamed layout parameters.\n   */\n  get unnamedLayoutParams(): ReadonlyArray<LayoutParams> {\n    return this._unnamedLayoutParams;\n  }\n\n  /**\n   * Gets the named layout parameters.\n   */\n  get namedLayoutParams(): ReadonlyMap<string, LayoutParams> {\n    return this._namedLayoutParams;\n  }\n\n  /**\n   * Adds a line to this notation.\n   * @param line The line to add\n   */\n  addLine(line: Line): void {\n    this.blocks.push(line);\n  }\n\n  /**\n   * Removes a line from this notation.\n   * @param line The line to remove\n   * @returns The index of the removed line, or -1 if not found\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  /**\n   * Adds a raw block to this notation.\n   * @param raw The raw block to add\n   */\n  addRawBlock(raw: RawBlock): void {\n    this.blocks.push(raw);\n    this.resetLine();\n  }\n\n  /**\n   * Adds metadata to this notation.\n   * @param meta The metadata to add\n   * @param addBlock Whether to add a corresponding raw block, defaults to true\n   */\n  addMetaData(meta: MetaData, addBlock = true): void {\n    if (addBlock && !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  /**\n   * Returns a debug-friendly representation of this notation.\n   * @returns An object containing debug information\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  /**\n   * Gets a role definition by name.\n   * @param name The name of the role\n   * @returns The role definition, or null if not found\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  /**\n   * Creates a new role definition.\n   * @param name The name of the role\n   * @param notesOnly Whether the role contains only notes, defaults to false\n   * @returns The created role definition\n   * @throws Error if the name is empty or the role already exists\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  /**\n   * Gets the current role definition.\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  /**\n   * Sets the current role by name.\n   * @param name The name of the role to set as current\n   * @throws Error if the name is empty or the role is not found\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\n  /**\n   * Gets the current line, creating it if needed.\n   */\n  get currentLine(): Line {\n    if (this._currentLine == null) {\n      return this.newLine();\n    }\n    return this._currentLine;\n  }\n\n  /**\n   * Resets the current line pointer to null.\n   */\n  resetLine(): void {\n    this._currentLine = null;\n  }\n\n  /**\n   * Creates a new line and makes it the current line.\n   * @returns The newly created line\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\n  /**\n   * Resets the current layout parameters to null.\n   */\n  resetLayoutParams(): void {\n    this._layoutParams = null;\n    this.resetLine();\n  }\n\n  /**\n   * Gets the current layout parameters, creating or finding an appropriate one if needed.\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  /**\n   * Ensures that named layout parameters with the given name exist.\n   * Creates them if they don't exist, or updates current layout parameters to match.\n   *\n   * @param name The name of the layout parameters\n   * @returns The layout parameters\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  /**\n   * Creates a snapshot of the current layout parameters.\n   * @returns A new LayoutParams object with the current settings\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   * Finds an unnamed layout parameters object that matches the current settings.\n   * @returns Matching layout parameters, or null if none found\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 {\n  RoleDef,\n  RawBlock,\n  BlockItem,\n  Block,\n  SectionBlock,\n  RepeatBlock,\n  CycleBlock,\n  BeatDurationBlock,\n  BreaksBlock,\n  RoleBlock,\n  GroupBlock,\n  isBlock,\n  isLine,\n  isRawBlock,\n  findContainingBlock,\n} from \"./block\";\n\n// Re-export for backward compatibility\nexport {\n  RoleDef,\n  RawBlock,\n  BlockItem,\n  Block,\n  SectionBlock,\n  RepeatBlock,\n  CycleBlock,\n  BeatDurationBlock,\n  BreaksBlock,\n  RoleBlock,\n  GroupBlock,\n  isBlock,\n  isLine,\n  isRawBlock,\n  findContainingBlock,\n};\n\n/**\n * Type representing a command parameter with optional key and value.\n */\nexport type CmdParam = { key: TSU.Nullable<string>; value: any };\n\n/**\n * Base class for commands in the notation.\n * Commands modify the notation in various ways, such as adding content,\n * changing layout, setting roles, etc.\n */\nexport abstract class Command extends Entity {\n  /** Whether this command was auto-generated */\n  autoGenerated = false;\n\n  /** Previous command in the sequence */\n  prevSibling: null | Command = null;\n\n  /** Next command in the sequence */\n  nextSibling: null | Command = null;\n\n  /** Parameters for this command */\n  params: CmdParam[];\n\n  /** Index of this command in the sequence */\n  index: number;\n\n  /**\n   * Creates a new Command.\n   * @param params Optional parameters for the command\n   */\n  constructor(params: CmdParam[] = []) {\n    super();\n    this.params = params;\n    this.index = 0;\n    this.validateParams();\n  }\n\n  /**\n   * Validates the parameters for this command.\n   * @throws Error if parameters are invalid\n   */\n  validateParams(): void {\n    //\n  }\n\n  /**\n   * Gets the name of this command.\n   */\n  get name(): string {\n    return this.constructor.name;\n  }\n\n  /**\n   * Returns a debug-friendly representation of this command.\n   * @returns An object containing debug information\n   */\n  debugValue(): any {\n    return { name: this.name, index: this.index, params: this.params };\n  }\n\n  /**\n   * Gets a parameter value by name.\n   * @param name The name of the parameter\n   * @returns The parameter value, or null if not found\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  /**\n   * Gets a parameter value by index.\n   * @param index The index of the parameter\n   * @returns The parameter value, or null if not found\n   */\n  getParamAt(index: number): any {\n    return index < this.params.length ? this.params[index].value : null;\n  }\n\n  /**\n   * Applies this command to a block (the primary method).\n   * Since Notation extends Block, this works for both.\n   * @param container The block to apply this command to\n   */\n  abstract applyToBlock(container: Block): void;\n\n  /**\n   * @deprecated Use applyToBlock instead\n   * Applies this command to a notation.\n   * Default implementation delegates to applyToBlock.\n   * @param notation The notation to apply this command to\n   */\n  applyToNotation(notation: Notation): void {\n    this.applyToBlock(notation);\n  }\n}\n\n/**\n * Represents metadata for the notation.\n */\nexport class MetaData {\n  /**\n   * Creates a new MetaData.\n   * @param key The key for this metadata\n   * @param value The value of this metadata\n   * @param params Optional additional parameters\n   */\n  constructor(\n    public readonly key: string,\n    public readonly value: string,\n    public readonly params?: any,\n  ) {\n    params = params || {};\n  }\n}\n\n/**\n * The main class representing a complete notation.\n * Notation is the root Block of the notation hierarchy.\n * It contains all the elements, settings, and layout information for a piece of music.\n */\nexport class Notation extends Block {\n  readonly TYPE = \"Notation\";\n\n  // ============================================\n  // Notation-specific properties\n  // ============================================\n\n  /** Metadata associated with this notation */\n  metadata = new Map<string, MetaData>();\n\n  /** Handler for missing roles */\n  onMissingRole: (name: string) => RoleDef | null = (name) => this.newRoleDef(name, name == \"sw\");\n\n  /**\n   * Creates a new Notation.\n   */\n  constructor() {\n    super(\"notation\", null);\n    // Set default values for root notation\n    this.localCycle = Cycle.DEFAULT;\n    this.localAtomsPerBeat = 1;\n    this.localBreaks = [];\n  }\n\n  // ============================================\n  // Backward compatibility aliases\n  // ============================================\n\n  /**\n   * @deprecated Use blockItems instead\n   * Legacy accessor for blocks array.\n   */\n  get blocks(): BlockItem[] {\n    return this.blockItems;\n  }\n\n  /**\n   * @deprecated Use localAtomsPerBeat instead\n   * Legacy accessor for current atoms per beat.\n   */\n  get currentAPB(): number {\n    return this.localAtomsPerBeat ?? 1;\n  }\n\n  set currentAPB(value: number) {\n    this.localAtomsPerBeat = value;\n  }\n\n  /**\n   * @deprecated Use localCycle instead\n   * Legacy accessor for current cycle.\n   */\n  get currentCycle(): Cycle {\n    return this.localCycle ?? Cycle.DEFAULT;\n  }\n\n  set currentCycle(value: Cycle) {\n    this.localCycle = value;\n  }\n\n  /**\n   * @deprecated Use localBreaks instead\n   * Legacy accessor for current breaks.\n   */\n  get currentBreaks(): number[] {\n    return this.localBreaks ?? [];\n  }\n\n  set currentBreaks(value: number[]) {\n    this.localBreaks = value;\n  }\n\n  /**\n   * @deprecated Use localRoles instead\n   * Legacy accessor for roles array.\n   */\n  get roles(): RoleDef[] {\n    return Array.from(this.localRoles.values());\n  }\n\n  // ============================================\n  // Overridden methods\n  // ============================================\n\n  /**\n   * Sets the current role by name.\n   * Uses onMissingRole callback for auto-creation of missing roles.\n   * @param name The name of the role to set as current\n   * @throws Error if the name is empty or the role is not found\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.getRole(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  /**\n   * Gets a role definition by name.\n   * Handles empty name by returning the last added role.\n   * @param name The name of the role\n   * @returns The role definition, or null if not found\n   */\n  getRoleDef(name: string): TSU.Nullable<RoleDef> {\n    name = name.trim().toLowerCase();\n    if (name === \"\") {\n      // Return the last added role if name is empty\n      const roles = Array.from(this.localRoles.values());\n      return roles[roles.length - 1] || null;\n    }\n    return this.localRoles.get(name) ?? null;\n  }\n\n  /**\n   * Creates a new role definition.\n   * @param name The name of the role\n   * @param notesOnly Whether the role contains only notes, defaults to false\n   * @returns The created role definition\n   * @throws Error if the name is empty or the role already exists\n   */\n  newRoleDef(name: string, notesOnly = false): RoleDef {\n    name = name.trim().toLowerCase();\n    if (name === \"\") {\n      throw new Error(\"Role name cannot be empty\");\n    }\n    if (this.localRoles.has(name)) {\n      throw new Error(\"Role already exists: \" + name);\n    }\n    // create new and add\n    const rd = new RoleDef();\n    rd.name = name;\n    rd.notesOnly = notesOnly;\n    rd.index = this.localRoles.size;\n    this.localRoles.set(name, rd);\n\n    return rd;\n  }\n\n  // ============================================\n  // Additional methods\n  // ============================================\n\n  /**\n   * Adds a line to this notation.\n   * @param line The line to add\n   */\n  addLine(line: Line): void {\n    this.addBlockItem(line);\n  }\n\n  /**\n   * Removes a line from this notation.\n   * @param line The line to remove\n   * @returns The index of the removed line, or -1 if not found\n   */\n  removeLine(line: Line): number {\n    return this.removeBlockItem(line);\n  }\n\n  /**\n   * Adds a raw block to this notation.\n   * @param raw The raw block to add\n   */\n  addRawBlock(raw: RawBlock): void {\n    this.addBlockItem(raw);\n    this.resetLine();\n  }\n\n  /**\n   * Adds metadata to this notation.\n   * @param meta The metadata to add\n   * @param addBlock Whether to add a corresponding raw block, defaults to true\n   */\n  addMetaData(meta: MetaData, addBlock = true): void {\n    if (addBlock && !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  /**\n   * Resets the current line pointer to null.\n   */\n  resetLine(): void {\n    this._currentLine = null;\n  }\n\n  /**\n   * Returns a debug-friendly representation of this notation.\n   * Uses Notation-specific property names for backward compatibility.\n   * @returns An object containing debug information\n   */\n  debugValue(): any {\n    // Use Notation-specific names (blocks, currentCycle, etc.)\n    // instead of Block names (blockItems, localCycle, etc.)\n    // to maintain backward compatibility with existing tests\n    return {\n      blocks: this.blocks.map((b) => b.debugValue()),\n      currentAPB: this.currentAPB,\n      currentBreaks: this.currentBreaks,\n      currentCycle: this.currentCycle?.uuid,\n      roles: this.roles,\n    };\n  }\n\n  // Need protected access to _currRoleDef for setCurrRole override\n  protected _currRoleDef: TSU.Nullable<RoleDef> = null;\n\n  /**\n   * Gets the current role definition.\n   */\n  get currRoleDef(): RoleDef | null {\n    if (this._currRoleDef == null) {\n      const roles = Array.from(this.localRoles.values());\n      if (roles.length === 0) {\n        return null;\n      } else {\n        this._currRoleDef = roles[roles.length - 1];\n      }\n    }\n    return this._currRoleDef;\n  }\n\n  // Need protected access to _currentLine for resetLine\n  protected _currentLine: Line | null = null;\n\n  /**\n   * Gets the current line, creating it if needed.\n   */\n  get currentLine(): Line {\n    if (this._currentLine == null) {\n      return this.newLine();\n    }\n    return this._currentLine;\n  }\n\n  /**\n   * Creates a new line and makes it the current line.\n   * @returns The newly created line\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"]}

package/lib/cjs/parser.d.ts

@@ -3,10 +3,22 @@ import * as G from "galore";
 import * as TLEX from "tlex";
 import { Literal, Note, Atom, Rest, Space, Group } from "./core";
 import { Notation, Command, CmdParam } from "./notation";
+import { Block } from "./block";
+export declare class BlockCommand extends Command {
+    readonly innerCommand: Command;
+    readonly blockCommands: Command[];
+    constructor(innerCommand: Command, blockCommands: Command[]);
+    get name(): string;
+    private createBlock;
+    debugValue(): any;
+    applyToNotation(notation: Notation): void;
+    applyToBlock(container: Block): void;
+}
 export declare class Parser {
     errors: (TLEX.TokenizerError | G.ParseError)[];
     metadata: any;
     readonly commands: Command[];
+    private blockStartStack;
     protected ruleHandlers: {
         newFraction: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => TSU.Num.Fraction;
         newGroup: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Group;
@@ -14,10 +26,10 @@ export declare class Parser {
         litWithPreEmb: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Literal;
         litWithPostEmb: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Literal;
         litToAtom: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => any;
-        newSpace: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Space;
-        newRest: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Rest;
-        newDoubleSpace: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Space;
-        newSilentSpace: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Space;
+        newSpace: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => Space;
+        newRest: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => Rest;
+        newDoubleSpace: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => Space;
+        newSilentSpace: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => Space;
         applyPreMarker: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Atom;
         applyPostMarker: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Atom;
         applyDuration: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Atom;
@@ -29,14 +41,17 @@ export declare class Parser {
         };
         newParamList: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => any[];
         concatParamList: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => any;
-        newCommand: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Command;
+        beginBlock: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => null;
+        endBlock: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => Command[];
+        nullBlock: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => null;
+        newCommandWithBlock: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Command;
         appendAtoms: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => null;
         prependFrontMatter: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => any;
         appendCommand: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => null;
         appendRoleSelector: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => null;
         insertEmbedding: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => null;
     };
-    constructor(config?: any);
+    constructor(_config?: any);
     createCommand(name: string, params: CmdParam[]): Command;
     addCommand(cmd: Command): void;
     parse(input: string): any;