notations 1.0.7 → 1.0.9

package/lib/esm/entity.js

@@ -1,3 +1,20 @@
+export function ParamsMixin(Base) {
+    class Mixed extends Base {
+        constructor() {
+            super(...arguments);
+            this.params = [];
+        }
+        getParam(key) {
+            var _a, _b;
+            return (_b = (_a = this.params.find((p) => p.key === key)) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : null;
+        }
+        getParamAt(index) {
+            var _a, _b;
+            return (_b = (_a = this.params[index]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : null;
+        }
+    }
+    return Mixed;
+}
 export class Entity {
     constructor(config = null) {
         this.TYPE = "Entity";

package/lib/esm/entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/entity.ts"],"names":[],"mappings":"AAgBA,MAAM,OAAO,MAAM;IAmBjB,YAAY,SAAc,IAAI;QAlBrB,SAAI,GAAW,QAAQ,CAAC;QAIxB,SAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAEvB,YAAO,GAAyB,IAAI,CAAC;QAMrC,mBAAc,GAAG,KAAK,CAAC;QAO/B,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QACtB,IAAI,MAAM,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAC7E,CAAC;IAOD,YAAY;QACV,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAMD,aAAa;QACX,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAKD,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAKD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAMD,SAAS,CAAC,MAA4B;QACpC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAOD,UAAU;QACR,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAMD,QAAQ;QACN,OAAO,eAAe,IAAI,CAAC,IAAI,GAAG,CAAC;IACrC,CAAC;IAQD,MAAM,CAAC,OAAa,EAAE,MAAM,GAAG,KAAK;QAClC,IAAI,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAUD,KAAK;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,GAAG,CAAC;IACb,CAAC;IAMD,MAAM,CAAC,OAAa;IAEpB,CAAC;IAMS,WAAW;QACnB,OAAO,IAAK,IAAI,CAAC,WAAmB,EAAE,CAAC;IACzC,CAAC;;AAtHc,cAAO,GAAG,CAAC,AAAJ,CAAK;AA6H7B,MAAM,OAAgB,WAAY,SAAQ,MAAM;IAAhD;;QACW,SAAI,GAAW,aAAa,CAAC;IAgBxC,CAAC;IAHC,MAAM,CAAC,OAAa;QAClB,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzE,CAAC;CACF","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\n\n/**\n * A common Entity base class with support for unique IDs, parent references,\n * copying, and debug info. This serves as the foundation for all entities\n * in the notation system.\n *\n * Note: Child management is intentionally NOT included here. Each container type\n * (BlockContainer, Line, Group, etc.) defines its own child management with\n * appropriate types.\n *\n * Observer Pattern:\n * Each observable entity subclass (Group, Role, Line, Block) manages its own\n * typed observer list. This provides type safety and clear contracts between\n * observables and observers.\n */\nexport class Entity {\n  readonly TYPE: string = \"Entity\";\n\n  private static counter = 0;\n  /** Unique identifier for this entity */\n  readonly uuid = Entity.counter++;\n  /** Parent entity in the tree hierarchy */\n  protected _parent: TSU.Nullable<Entity> = null;\n\n  /**\n   * Whether events/observer notifications are enabled for this entity.\n   * Subclasses check this flag before notifying observers.\n   */\n  protected _eventsEnabled = false;\n\n  /**\n   * Creates a new Entity.\n   * @param config Optional configuration object\n   */\n  constructor(config: any = null) {\n    config = config || {};\n    if (config.metadata) throw new Error(\"See where metadata is being passed\");\n  }\n\n  /**\n   * Enables observer notifications for this entity.\n   * Call this to activate change notifications on entities that support them.\n   * @returns This entity for method chaining\n   */\n  enableEvents(): this {\n    this._eventsEnabled = true;\n    return this;\n  }\n\n  /**\n   * Disables observer notifications for this entity.\n   * @returns This entity for method chaining\n   */\n  disableEvents(): this {\n    this._eventsEnabled = false;\n    return this;\n  }\n\n  /**\n   * Checks if events/observer notifications are enabled.\n   */\n  get eventsEnabled(): boolean {\n    return this._eventsEnabled;\n  }\n\n  /**\n   * Gets the parent entity.\n   */\n  get parent(): TSU.Nullable<Entity> {\n    return this._parent;\n  }\n\n  /**\n   * Sets the parent entity.\n   * @param parent The parent entity to set\n   */\n  setParent(parent: TSU.Nullable<Entity>): void {\n    this._parent = parent;\n  }\n\n  /**\n   * Returns a debug-friendly representation of this entity.\n   * Usually overridden by children to add more debug info.\n   * @returns An object containing debug information\n   */\n  debugValue(): any {\n    return { type: this.TYPE };\n  }\n\n  /**\n   * Returns a simple string representation of this Entity.\n   * @returns A string representation\n   */\n  toString(): string {\n    return `Entity(id = ${this.uuid})`;\n  }\n\n  /**\n   * Checks if this Entity is equal to another Entity.\n   * @param another The Entity to compare with\n   * @param expect Optional parameter\n   * @returns True if the Entities are equal, false otherwise\n   */\n  equals(another: this, expect = false): boolean {\n    if (this.TYPE != another.TYPE) return false;\n    return true;\n  }\n\n  /**\n   * Creates a clone of this entity.\n   * Cloning is a two-part process:\n   * 1. Creation of a new instance via this.newInstance()\n   * 2. Copying of data into the new instance via this.copyTo()\n   *\n   * @returns A new instance of the same type with the same properties\n   */\n  clone(): this {\n    const out = this.newInstance();\n    this.copyTo(out);\n    return out;\n  }\n\n  /**\n   * Copies information about this instance into another instance of the same type.\n   * @param another The target instance to copy properties to\n   */\n  copyTo(another: this): void {\n    // Subclasses override to copy their specific properties\n  }\n\n  /**\n   * First part of the cloning process where the instance is created.\n   * @returns A new instance of the same type\n   */\n  protected newInstance(): this {\n    return new (this.constructor as any)();\n  }\n}\n\n/**\n * Music is all about timing! TimedEntities are base of all entities that\n * have a duration. This is an abstract class that all timed entities inherit from.\n */\nexport abstract class TimedEntity extends Entity {\n  readonly TYPE: string = \"TimedEntity\";\n\n  /**\n   * Gets the duration of this entity in terms of beats.\n   * By default, entity durations are readonly.\n   */\n  abstract get duration(): TSU.Num.Fraction;\n\n  /**\n   * Checks if this TimedEntity is equal to another TimedEntity.\n   * @param another The TimedEntity to compare with\n   * @returns True if the TimedEntities are equal, false otherwise\n   */\n  equals(another: this): boolean {\n    return super.equals(another) && this.duration.equals(another.duration);\n  }\n}\n"]}
+{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/entity.ts"],"names":[],"mappings":"AAqBA,MAAM,UAAU,WAAW,CAAoD,IAAO;IACpF,MAAe,KAAM,SAAQ,IAAI;QAAjC;;YACE,WAAM,GAAe,EAAE,CAAC;QAmB1B,CAAC;QAZC,QAAQ,CAAC,GAAW;;YAClB,OAAO,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,0CAAE,KAAK,mCAAI,IAAI,CAAC;QAC/D,CAAC;QAOD,UAAU,CAAC,KAAa;;YACtB,OAAO,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAAE,KAAK,mCAAI,IAAI,CAAC;QAC3C,CAAC;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAgBD,MAAM,OAAO,MAAM;IAmBjB,YAAY,SAAc,IAAI;QAlBrB,SAAI,GAAW,QAAQ,CAAC;QAIxB,SAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAEvB,YAAO,GAAyB,IAAI,CAAC;QAMrC,mBAAc,GAAG,KAAK,CAAC;QAO/B,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QACtB,IAAI,MAAM,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAC7E,CAAC;IAOD,YAAY;QACV,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAMD,aAAa;QACX,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAKD,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAKD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAMD,SAAS,CAAC,MAA4B;QACpC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAOD,UAAU;QACR,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAMD,QAAQ;QACN,OAAO,eAAe,IAAI,CAAC,IAAI,GAAG,CAAC;IACrC,CAAC;IAQD,MAAM,CAAC,OAAa,EAAE,MAAM,GAAG,KAAK;QAClC,IAAI,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAUD,KAAK;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,GAAG,CAAC;IACb,CAAC;IAMD,MAAM,CAAC,OAAa;IAEpB,CAAC;IAMS,WAAW;QACnB,OAAO,IAAK,IAAI,CAAC,WAAmB,EAAE,CAAC;IACzC,CAAC;;AAtHc,cAAO,GAAG,CAAC,AAAJ,CAAK;AA6H7B,MAAM,OAAgB,WAAY,SAAQ,MAAM;IAAhD;;QACW,SAAI,GAAW,aAAa,CAAC;IAgBxC,CAAC;IAHC,MAAM,CAAC,OAAa;QAClB,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzE,CAAC;CACF","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\n\n/**\n * Parameter type for commands and markers.\n * Used by both Command and Marker classes.\n */\nexport type CmdParam = { key: TSU.Nullable<string>; value: any };\n\n/**\n * Interface for entities that have parameters.\n */\nexport interface HasParams {\n  params: CmdParam[];\n}\n\n/**\n * Mixin that adds parameter handling to a class.\n * Provides getParam and getParamAt methods.\n * Works with both concrete and abstract base classes.\n */\n// eslint-disable-next-line @typescript-eslint/explicit-function-return-type\nexport function ParamsMixin<T extends abstract new (...args: any[]) => object>(Base: T) {\n  abstract class Mixed extends Base implements HasParams {\n    params: CmdParam[] = [];\n\n    /**\n     * Gets a parameter value by key.\n     * @param key The parameter key to look for\n     * @returns The parameter value, or null if not found\n     */\n    getParam(key: string): any {\n      return this.params.find((p) => p.key === key)?.value ?? null;\n    }\n\n    /**\n     * Gets a parameter value by index (for positional params).\n     * @param index The parameter index\n     * @returns The parameter value, or null if not found\n     */\n    getParamAt(index: number): any {\n      return this.params[index]?.value ?? null;\n    }\n  }\n  return Mixed;\n}\n\n/**\n * A common Entity base class with support for unique IDs, parent references,\n * copying, and debug info. This serves as the foundation for all entities\n * in the notation system.\n *\n * Note: Child management is intentionally NOT included here. Each container type\n * (BlockContainer, Line, Group, etc.) defines its own child management with\n * appropriate types.\n *\n * Observer Pattern:\n * Each observable entity subclass (Group, Role, Line, Block) manages its own\n * typed observer list. This provides type safety and clear contracts between\n * observables and observers.\n */\nexport class Entity {\n  readonly TYPE: string = \"Entity\";\n\n  private static counter = 0;\n  /** Unique identifier for this entity */\n  readonly uuid = Entity.counter++;\n  /** Parent entity in the tree hierarchy */\n  protected _parent: TSU.Nullable<Entity> = null;\n\n  /**\n   * Whether events/observer notifications are enabled for this entity.\n   * Subclasses check this flag before notifying observers.\n   */\n  protected _eventsEnabled = false;\n\n  /**\n   * Creates a new Entity.\n   * @param config Optional configuration object\n   */\n  constructor(config: any = null) {\n    config = config || {};\n    if (config.metadata) throw new Error(\"See where metadata is being passed\");\n  }\n\n  /**\n   * Enables observer notifications for this entity.\n   * Call this to activate change notifications on entities that support them.\n   * @returns This entity for method chaining\n   */\n  enableEvents(): this {\n    this._eventsEnabled = true;\n    return this;\n  }\n\n  /**\n   * Disables observer notifications for this entity.\n   * @returns This entity for method chaining\n   */\n  disableEvents(): this {\n    this._eventsEnabled = false;\n    return this;\n  }\n\n  /**\n   * Checks if events/observer notifications are enabled.\n   */\n  get eventsEnabled(): boolean {\n    return this._eventsEnabled;\n  }\n\n  /**\n   * Gets the parent entity.\n   */\n  get parent(): TSU.Nullable<Entity> {\n    return this._parent;\n  }\n\n  /**\n   * Sets the parent entity.\n   * @param parent The parent entity to set\n   */\n  setParent(parent: TSU.Nullable<Entity>): void {\n    this._parent = parent;\n  }\n\n  /**\n   * Returns a debug-friendly representation of this entity.\n   * Usually overridden by children to add more debug info.\n   * @returns An object containing debug information\n   */\n  debugValue(): any {\n    return { type: this.TYPE };\n  }\n\n  /**\n   * Returns a simple string representation of this Entity.\n   * @returns A string representation\n   */\n  toString(): string {\n    return `Entity(id = ${this.uuid})`;\n  }\n\n  /**\n   * Checks if this Entity is equal to another Entity.\n   * @param another The Entity to compare with\n   * @param expect Optional parameter\n   * @returns True if the Entities are equal, false otherwise\n   */\n  equals(another: this, expect = false): boolean {\n    if (this.TYPE != another.TYPE) return false;\n    return true;\n  }\n\n  /**\n   * Creates a clone of this entity.\n   * Cloning is a two-part process:\n   * 1. Creation of a new instance via this.newInstance()\n   * 2. Copying of data into the new instance via this.copyTo()\n   *\n   * @returns A new instance of the same type with the same properties\n   */\n  clone(): this {\n    const out = this.newInstance();\n    this.copyTo(out);\n    return out;\n  }\n\n  /**\n   * Copies information about this instance into another instance of the same type.\n   * @param another The target instance to copy properties to\n   */\n  copyTo(another: this): void {\n    // Subclasses override to copy their specific properties\n  }\n\n  /**\n   * First part of the cloning process where the instance is created.\n   * @returns A new instance of the same type\n   */\n  protected newInstance(): this {\n    return new (this.constructor as any)();\n  }\n}\n\n/**\n * Music is all about timing! TimedEntities are base of all entities that\n * have a duration. This is an abstract class that all timed entities inherit from.\n */\nexport abstract class TimedEntity extends Entity {\n  readonly TYPE: string = \"TimedEntity\";\n\n  /**\n   * Gets the duration of this entity in terms of beats.\n   * By default, entity durations are readonly.\n   */\n  abstract get duration(): TSU.Num.Fraction;\n\n  /**\n   * Checks if this TimedEntity is equal to another TimedEntity.\n   * @param another The TimedEntity to compare with\n   * @returns True if the TimedEntities are equal, false otherwise\n   */\n  equals(another: this): boolean {\n    return super.equals(another) && this.duration.equals(another.duration);\n  }\n}\n"]}

package/lib/esm/iterators.js

@@ -109,7 +109,7 @@ export class WindowIterator {
     next() {
         const out = this.peek();
         this.peeked = null;
-        if (out != null) {
+        if (out != null && out.participatesInTiming) {
             this.currOffset = this.currOffset.plus(out.duration, true);
         }
         return out;
@@ -130,10 +130,12 @@ export class WindowIterator {
             const next = this.next();
             TSU.assert(next != null, "Next cannot be null here");
             out.push(next);
-            const spillOver = next.splitAt(remaining);
-            remaining = remaining.minus(next.duration);
-            if (spillOver != null) {
-                this.atomQueue.pushFront(spillOver);
+            if (next.participatesInTiming) {
+                const spillOver = next.splitAt(remaining);
+                remaining = remaining.minus(next.duration);
+                if (spillOver != null) {
+                    this.atomQueue.pushFront(spillOver);
+                }
             }
         }
         return [out, remaining.isZero];

package/lib/esm/iterators.js.map

@@ -1 +1 @@
-{"version":3,"file":"iterators.js","sourceRoot":"","sources":["../../src/iterators.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { TimedEntity } from \"./entity\";\nimport { Atom, LeafAtom, Space, Group, AtomType } from \"./core\";\n\ntype Fraction = TSU.Num.Fraction;\n// type FlatAtom2 = [atom: Atom, duration: TSU.Num.Fraction, offset: TSU.Num.Fraction];\n\n/**\n * Represents a flattened atom with timing information.\n * FlatAtom is used to process nested atom structures in a flat, sequential manner\n * with proper timing information.\n */\nexport class FlatAtom extends TimedEntity {\n  readonly TYPE = \"FlatAtom\";\n\n  /** Nesting depth of this atom in the original structure */\n  depth: number;\n\n  /** Duration of this atom */\n  duration: TSU.Num.Fraction;\n\n  /** Time offset of this atom */\n  offset: TSU.Num.Fraction;\n\n  /** Whether this atom is a continuation of a previous atom */\n  private isContinuation: boolean;\n\n  /**\n   * Creates a new FlatAtom.\n   * @param atom The leaf atom this flat atom represents\n   * @param config Optional configuration with depth, duration, offset, and continuation info\n   */\n  constructor(\n    public atom: LeafAtom,\n    config: any = null,\n  ) {\n    super((config = config || {}));\n    this.depth = config.depth || 0;\n    this.duration = config.duration || atom.duration;\n    this.offset = config.offset || TSU.Num.Fraction.ZERO;\n    this.isContinuation = \"isContinuation\" in config ? config.isContinuation : false;\n  }\n\n  /**\n   * Gets the end offset of this atom (offset + duration).\n   */\n  get endOffset(): TSU.Num.Fraction {\n    return this.offset.plus(this.duration);\n  }\n\n  /**\n   * Returns a debug-friendly representation of this FlatAtom.\n   * @returns An object containing debug information\n   */\n  debugValue(): any {\n    const out = {\n      ...super.debugValue(),\n      atom: this.atom.debugValue(),\n      duration: this.duration.toString(),\n      offset: this.offset.toString(),\n      depth: this.depth,\n    };\n    if (this.isContinuation) out.isContinuation = true;\n    return out;\n  }\n}\n\n/**\n * A nested atom iterator that returns one atom at a time at the leaf-most level.\n * If we have a Group (or nested Groups) only the leaf atoms are returned as if\n * in an in-order traversal, thus ensuring time order of atoms.\n */\nexport class AtomIterator {\n  private atomQueue = new TSU.Lists.List<[Atom, number, Fraction]>();\n  private currOffset = TSU.Num.Fraction.ZERO;\n  private peeked: TSU.Nullable<FlatAtom> = null;\n\n  /**\n   * Creates a new AtomIterator with optional initial atoms.\n   * @param atoms Initial atoms to iterate through\n   */\n  constructor(...atoms: Atom[]) {\n    this.push(...atoms);\n  }\n\n  /**\n   * Push atoms to be flattened and served by this iterator.\n   * @param atoms The atoms to add to the queue\n   * @returns This iterator instance for method chaining\n   */\n  push(...atoms: Atom[]): this {\n    for (const atom of atoms) {\n      this.atomQueue.add([atom, 0, atom.duration]);\n    }\n    return this;\n  }\n\n  /**\n   * Gets the next atom in the sequence and advances the iterator.\n   * @returns The next FlatAtom, or null if no more atoms are available\n   */\n  next(): TSU.Nullable<FlatAtom> {\n    const out = this.peek();\n    this.peeked = null;\n    if (out != null) {\n      this.currOffset = this.currOffset.plus(out.duration).factorized;\n    }\n    return out;\n  }\n\n  /**\n   * Peeks at the next atom without advancing the iterator.\n   * @returns The next FlatAtom, or null if no more atoms are available\n   */\n  peek(): TSU.Nullable<FlatAtom> {\n    if (this.peeked == null) {\n      if (this.hasNext) {\n        const [nextAtom, nextDepth, nextDuration] = this.atomQueue.popFront();\n        this.peeked = new FlatAtom(nextAtom as LeafAtom, {\n          depth: nextDepth,\n          offset: this.currOffset,\n          duration: nextDuration,\n        });\n      }\n    }\n    return this.peeked;\n  }\n\n  /**\n   * Checks if more atoms are available in this iterator.\n   * This may process group atoms to find the next leaf atom.\n   */\n  get hasNext(): boolean {\n    while (this.atomQueue.first != null) {\n      // Get from front of queue\n      const [nextAtom, nextDepth, nextDuration] = this.atomQueue.first.value;\n      if (nextAtom.TYPE != AtomType.GROUP) {\n        return true;\n      } else {\n        this.atomQueue.popFront();\n        const group = nextAtom as Group;\n        for (const child of group.atoms.reversedValues()) {\n          this.atomQueue.pushFront([\n            child,\n            nextDepth + 1,\n            nextDuration.times(child.duration).divby(group.totalChildDuration).factorized,\n          ]);\n        }\n      }\n    }\n    return false;\n  }\n\n  /**\n   * Gets the atom with the minimum offset from multiple iterators.\n   * @param iterators An array of AtomIterators to compare\n   * @returns A tuple containing the index of the selected iterator and its next atom\n   */\n  static getMin(iterators: AtomIterator[]): [number, FlatAtom] {\n    let currRole = -1;\n    let currAtom: TSU.Nullable<FlatAtom> = null;\n    for (let ri = 0; ri < iterators.length; ri++) {\n      const flatAtom = iterators[ri].peek();\n      if (flatAtom != null) {\n        if (currAtom == null || flatAtom.offset.cmp(currAtom.offset) < 0) {\n          currRole = ri;\n          currAtom = flatAtom;\n        }\n      }\n    }\n    if (currRole >= 0) {\n      iterators[currRole].next();\n    }\n    return [currRole, currAtom!];\n  }\n}\n\n/**\n * An iterator that provides atoms within specified time windows.\n * WindowIterator allows fetching atoms to cover a specific duration,\n * handling the splitting of atoms if necessary.\n */\nexport class WindowIterator {\n  private atomQueue = new TSU.Lists.List<Atom>();\n  private currOffset = TSU.Num.Fraction.ZERO;\n  private peeked: TSU.Nullable<Atom> = null;\n\n  /**\n   * Creates a new WindowIterator with optional initial atoms.\n   * @param atoms Initial atoms to iterate through\n   */\n  constructor(...atoms: Atom[]) {\n    this.push(...atoms);\n  }\n\n  /**\n   * Push atoms to be served by this iterator.\n   * @param atoms The atoms to add to the queue\n   * @returns This iterator instance for method chaining\n   */\n  push(...atoms: Atom[]): this {\n    for (const atom of atoms) {\n      this.atomQueue.add(atom);\n    }\n    return this;\n  }\n\n  /**\n   * Gets the next atom in the sequence and advances the iterator.\n   * @returns The next Atom, or null if no more atoms are available\n   */\n  next(): TSU.Nullable<Atom> {\n    const out = this.peek();\n    this.peeked = null;\n    if (out != null) {\n      this.currOffset = this.currOffset.plus(out.duration, true);\n    }\n    return out;\n  }\n\n  /**\n   * Peeks at the next atom without advancing the iterator.\n   * @returns The next Atom, or null if no more atoms are available\n   */\n  peek(): TSU.Nullable<Atom> {\n    if (this.peeked == null && this.hasMore) {\n      this.peeked = this.atomQueue.popFront();\n    }\n    return this.peeked;\n  }\n\n  /**\n   * Checks if more atoms are available in this iterator.\n   */\n  get hasMore(): boolean {\n    return !this.atomQueue.isEmpty;\n  }\n\n  /**\n   * Gets atoms to cover the specified duration.\n   *\n   * If the number of atoms left in the iterator is 0, an empty list\n   * is returned. Otherwise, the duration of atoms returned will cover\n   * the given duration even if padding with Space atoms is necessary.\n   *\n   * @param duration The duration to cover\n   * @returns A tuple containing the array of atoms and whether the full duration was filled\n   */\n  get(duration: TSU.Num.Fraction): [Atom[], boolean] {\n    const out: Atom[] = [];\n    let remaining = duration;\n    while (remaining.isGTNum(0) && this.hasMore) {\n      const next = this.next();\n      TSU.assert(next != null, \"Next cannot be null here\");\n      out.push(next);\n      const spillOver = next.splitAt(remaining);\n      remaining = remaining.minus(next.duration);\n      if (spillOver != null) {\n        // push the spill over to the front of the queue to be\n        // picked up on the next \"get\" call\n        this.atomQueue.pushFront(spillOver);\n      }\n    }\n    return [out, remaining.isZero];\n  }\n}\n\n/**\n * An iterator that provides atoms with specific durations.\n * DurationIterator ensures that atoms fit within specified duration windows,\n * splitting atoms if necessary to fit.\n */\nexport class DurationIterator {\n  private atomIterator: AtomIterator;\n  private spillOver: TSU.Nullable<FlatAtom> = null;\n\n  /**\n   * Creates a new DurationIterator.\n   * @param atomIterator The AtomIterator to use as a source of atoms\n   */\n  constructor(atomIterator: AtomIterator) {\n    this.atomIterator = atomIterator;\n  }\n\n  /**\n   * Checks if more atoms are available in this iterator.\n   */\n  get hasMore(): boolean {\n    if (this.spillOver != null) {\n      return true;\n    }\n    return this.atomIterator.hasNext;\n  }\n\n  /**\n   * Gets atoms to cover the specified duration.\n   *\n   * If the number of atoms left in the iterator is 0, an empty list\n   * is returned. Otherwise, the duration of atoms returned will cover\n   * the given duration even if padding with Space atoms is necessary.\n   *\n   * @param duration The duration to cover\n   * @returns A tuple containing the array of FlatAtoms and whether the full duration was filled\n   */\n  get(duration: TSU.Num.Fraction): [FlatAtom[], boolean] {\n    const iter = this.atomIterator;\n    const out: FlatAtom[] = [];\n    let remaining = duration;\n    while (remaining.isGTNum(0)) {\n      const next = this.spillOver == null ? iter.next() : this.spillOver;\n      this.spillOver = null;\n      if (next == null) {\n        // stop here\n        break;\n      } else {\n        out.push(next);\n        if (next.duration.cmp(remaining) <= 0) {\n          remaining = remaining.minus(next.duration);\n        } else {\n          // Next leaf atom is > duration\n          // so split it into two\n          this.spillOver = new FlatAtom(new Space(next.duration.minus(remaining)));\n          next.duration = remaining;\n          remaining = TSU.Num.Fraction.ZERO;\n        }\n      }\n    }\n    return [out, remaining.isZero];\n  }\n}\n"]}
+{"version":3,"file":"iterators.js","sourceRoot":"","sources":["../../src/iterators.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport { TimedEntity } from \"./entity\";\nimport { Atom, LeafAtom, Space, Group, AtomType } from \"./core\";\n\ntype Fraction = TSU.Num.Fraction;\n// type FlatAtom2 = [atom: Atom, duration: TSU.Num.Fraction, offset: TSU.Num.Fraction];\n\n/**\n * Represents a flattened atom with timing information.\n * FlatAtom is used to process nested atom structures in a flat, sequential manner\n * with proper timing information.\n */\nexport class FlatAtom extends TimedEntity {\n  readonly TYPE = \"FlatAtom\";\n\n  /** Nesting depth of this atom in the original structure */\n  depth: number;\n\n  /** Duration of this atom */\n  duration: TSU.Num.Fraction;\n\n  /** Time offset of this atom */\n  offset: TSU.Num.Fraction;\n\n  /** Whether this atom is a continuation of a previous atom */\n  private isContinuation: boolean;\n\n  /**\n   * Creates a new FlatAtom.\n   * @param atom The leaf atom this flat atom represents\n   * @param config Optional configuration with depth, duration, offset, and continuation info\n   */\n  constructor(\n    public atom: LeafAtom,\n    config: any = null,\n  ) {\n    super((config = config || {}));\n    this.depth = config.depth || 0;\n    this.duration = config.duration || atom.duration;\n    this.offset = config.offset || TSU.Num.Fraction.ZERO;\n    this.isContinuation = \"isContinuation\" in config ? config.isContinuation : false;\n  }\n\n  /**\n   * Gets the end offset of this atom (offset + duration).\n   */\n  get endOffset(): TSU.Num.Fraction {\n    return this.offset.plus(this.duration);\n  }\n\n  /**\n   * Returns a debug-friendly representation of this FlatAtom.\n   * @returns An object containing debug information\n   */\n  debugValue(): any {\n    const out = {\n      ...super.debugValue(),\n      atom: this.atom.debugValue(),\n      duration: this.duration.toString(),\n      offset: this.offset.toString(),\n      depth: this.depth,\n    };\n    if (this.isContinuation) out.isContinuation = true;\n    return out;\n  }\n}\n\n/**\n * A nested atom iterator that returns one atom at a time at the leaf-most level.\n * If we have a Group (or nested Groups) only the leaf atoms are returned as if\n * in an in-order traversal, thus ensuring time order of atoms.\n */\nexport class AtomIterator {\n  private atomQueue = new TSU.Lists.List<[Atom, number, Fraction]>();\n  private currOffset = TSU.Num.Fraction.ZERO;\n  private peeked: TSU.Nullable<FlatAtom> = null;\n\n  /**\n   * Creates a new AtomIterator with optional initial atoms.\n   * @param atoms Initial atoms to iterate through\n   */\n  constructor(...atoms: Atom[]) {\n    this.push(...atoms);\n  }\n\n  /**\n   * Push atoms to be flattened and served by this iterator.\n   * @param atoms The atoms to add to the queue\n   * @returns This iterator instance for method chaining\n   */\n  push(...atoms: Atom[]): this {\n    for (const atom of atoms) {\n      this.atomQueue.add([atom, 0, atom.duration]);\n    }\n    return this;\n  }\n\n  /**\n   * Gets the next atom in the sequence and advances the iterator.\n   * @returns The next FlatAtom, or null if no more atoms are available\n   */\n  next(): TSU.Nullable<FlatAtom> {\n    const out = this.peek();\n    this.peeked = null;\n    if (out != null) {\n      this.currOffset = this.currOffset.plus(out.duration).factorized;\n    }\n    return out;\n  }\n\n  /**\n   * Peeks at the next atom without advancing the iterator.\n   * @returns The next FlatAtom, or null if no more atoms are available\n   */\n  peek(): TSU.Nullable<FlatAtom> {\n    if (this.peeked == null) {\n      if (this.hasNext) {\n        const [nextAtom, nextDepth, nextDuration] = this.atomQueue.popFront();\n        this.peeked = new FlatAtom(nextAtom as LeafAtom, {\n          depth: nextDepth,\n          offset: this.currOffset,\n          duration: nextDuration,\n        });\n      }\n    }\n    return this.peeked;\n  }\n\n  /**\n   * Checks if more atoms are available in this iterator.\n   * This may process group atoms to find the next leaf atom.\n   */\n  get hasNext(): boolean {\n    while (this.atomQueue.first != null) {\n      // Get from front of queue\n      const [nextAtom, nextDepth, nextDuration] = this.atomQueue.first.value;\n      if (nextAtom.TYPE != AtomType.GROUP) {\n        return true;\n      } else {\n        this.atomQueue.popFront();\n        const group = nextAtom as Group;\n        for (const child of group.atoms.reversedValues()) {\n          this.atomQueue.pushFront([\n            child,\n            nextDepth + 1,\n            nextDuration.times(child.duration).divby(group.totalChildDuration).factorized,\n          ]);\n        }\n      }\n    }\n    return false;\n  }\n\n  /**\n   * Gets the atom with the minimum offset from multiple iterators.\n   * @param iterators An array of AtomIterators to compare\n   * @returns A tuple containing the index of the selected iterator and its next atom\n   */\n  static getMin(iterators: AtomIterator[]): [number, FlatAtom] {\n    let currRole = -1;\n    let currAtom: TSU.Nullable<FlatAtom> = null;\n    for (let ri = 0; ri < iterators.length; ri++) {\n      const flatAtom = iterators[ri].peek();\n      if (flatAtom != null) {\n        if (currAtom == null || flatAtom.offset.cmp(currAtom.offset) < 0) {\n          currRole = ri;\n          currAtom = flatAtom;\n        }\n      }\n    }\n    if (currRole >= 0) {\n      iterators[currRole].next();\n    }\n    return [currRole, currAtom!];\n  }\n}\n\n/**\n * An iterator that provides atoms within specified time windows.\n * WindowIterator allows fetching atoms to cover a specific duration,\n * handling the splitting of atoms if necessary.\n */\nexport class WindowIterator {\n  private atomQueue = new TSU.Lists.List<Atom>();\n  private currOffset = TSU.Num.Fraction.ZERO;\n  private peeked: TSU.Nullable<Atom> = null;\n\n  /**\n   * Creates a new WindowIterator with optional initial atoms.\n   * @param atoms Initial atoms to iterate through\n   */\n  constructor(...atoms: Atom[]) {\n    this.push(...atoms);\n  }\n\n  /**\n   * Push atoms to be served by this iterator.\n   * @param atoms The atoms to add to the queue\n   * @returns This iterator instance for method chaining\n   */\n  push(...atoms: Atom[]): this {\n    for (const atom of atoms) {\n      this.atomQueue.add(atom);\n    }\n    return this;\n  }\n\n  /**\n   * Gets the next atom in the sequence and advances the iterator.\n   * For atoms with participatesInTiming=false, the offset is not advanced.\n   * @returns The next Atom, or null if no more atoms are available\n   */\n  next(): TSU.Nullable<Atom> {\n    const out = this.peek();\n    this.peeked = null;\n    if (out != null && out.participatesInTiming) {\n      this.currOffset = this.currOffset.plus(out.duration, true);\n    }\n    return out;\n  }\n\n  /**\n   * Peeks at the next atom without advancing the iterator.\n   * @returns The next Atom, or null if no more atoms are available\n   */\n  peek(): TSU.Nullable<Atom> {\n    if (this.peeked == null && this.hasMore) {\n      this.peeked = this.atomQueue.popFront();\n    }\n    return this.peeked;\n  }\n\n  /**\n   * Checks if more atoms are available in this iterator.\n   */\n  get hasMore(): boolean {\n    return !this.atomQueue.isEmpty;\n  }\n\n  /**\n   * Gets atoms to cover the specified duration.\n   *\n   * If the number of atoms left in the iterator is 0, an empty list\n   * is returned. Otherwise, the duration of atoms returned will cover\n   * the given duration even if padding with Space atoms is necessary.\n   *\n   * Atoms with participatesInTiming=false (like Markers) are returned\n   * but don't consume any of the requested duration.\n   *\n   * @param duration The duration to cover\n   * @returns A tuple containing the array of atoms and whether the full duration was filled\n   */\n  get(duration: TSU.Num.Fraction): [Atom[], boolean] {\n    const out: Atom[] = [];\n    let remaining = duration;\n    while (remaining.isGTNum(0) && this.hasMore) {\n      const next = this.next();\n      TSU.assert(next != null, \"Next cannot be null here\");\n      out.push(next);\n\n      // Only process timing for atoms that participate in timing\n      // Markers and other non-timing atoms are returned without consuming duration\n      if (next.participatesInTiming) {\n        const spillOver = next.splitAt(remaining);\n        remaining = remaining.minus(next.duration);\n        if (spillOver != null) {\n          // push the spill over to the front of the queue to be\n          // picked up on the next \"get\" call\n          this.atomQueue.pushFront(spillOver);\n        }\n      }\n    }\n    return [out, remaining.isZero];\n  }\n}\n\n/**\n * An iterator that provides atoms with specific durations.\n * DurationIterator ensures that atoms fit within specified duration windows,\n * splitting atoms if necessary to fit.\n */\nexport class DurationIterator {\n  private atomIterator: AtomIterator;\n  private spillOver: TSU.Nullable<FlatAtom> = null;\n\n  /**\n   * Creates a new DurationIterator.\n   * @param atomIterator The AtomIterator to use as a source of atoms\n   */\n  constructor(atomIterator: AtomIterator) {\n    this.atomIterator = atomIterator;\n  }\n\n  /**\n   * Checks if more atoms are available in this iterator.\n   */\n  get hasMore(): boolean {\n    if (this.spillOver != null) {\n      return true;\n    }\n    return this.atomIterator.hasNext;\n  }\n\n  /**\n   * Gets atoms to cover the specified duration.\n   *\n   * If the number of atoms left in the iterator is 0, an empty list\n   * is returned. Otherwise, the duration of atoms returned will cover\n   * the given duration even if padding with Space atoms is necessary.\n   *\n   * @param duration The duration to cover\n   * @returns A tuple containing the array of FlatAtoms and whether the full duration was filled\n   */\n  get(duration: TSU.Num.Fraction): [FlatAtom[], boolean] {\n    const iter = this.atomIterator;\n    const out: FlatAtom[] = [];\n    let remaining = duration;\n    while (remaining.isGTNum(0)) {\n      const next = this.spillOver == null ? iter.next() : this.spillOver;\n      this.spillOver = null;\n      if (next == null) {\n        // stop here\n        break;\n      } else {\n        out.push(next);\n        if (next.duration.cmp(remaining) <= 0) {\n          remaining = remaining.minus(next.duration);\n        } else {\n          // Next leaf atom is > duration\n          // so split it into two\n          this.spillOver = new FlatAtom(new Space(next.duration.minus(remaining)));\n          next.duration = remaining;\n          remaining = TSU.Num.Fraction.ZERO;\n        }\n      }\n    }\n    return [out, remaining.isZero];\n  }\n}\n"]}

package/lib/esm/notation.d.ts

@@ -1,25 +1,24 @@
 import * as TSU from "@panyam/tsutils";
-import { Entity } from "./entity";
+import { Entity, CmdParam } from "./entity";
 import { Cycle } from "./cycle";
 import { Line } from "./core";
 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;
-};
-export declare abstract class Command extends Entity {
+export { CmdParam } from "./entity";
+declare const EntityWithParams: (abstract new (...args: any[]) => {
+    params: CmdParam[];
+    getParam(key: string): any;
+    getParamAt(index: number): any;
+}) & typeof Entity;
+export declare abstract class Command extends EntityWithParams {
     autoGenerated: boolean;
     prevSibling: null | Command;
     nextSibling: null | Command;
-    params: CmdParam[];
     index: number;
     constructor(params?: CmdParam[]);
     validateParams(): void;
     get name(): string;
     debugValue(): any;
-    getParam(name: string): any;
-    getParamAt(index: number): any;
     abstract applyToBlock(container: Block): void;
     applyToNotation(notation: Notation): void;
 }

package/lib/esm/notation.js

@@ -1,9 +1,10 @@
-import { Entity } from "./entity";
+import { Entity, ParamsMixin } from "./entity";
 import { Cycle } from "./cycle";
 import { Line } from "./core";
 import { RoleDef, RawBlock, Block, SectionBlock, RepeatBlock, CycleBlock, BeatDurationBlock, BreaksBlock, RoleBlock, GroupBlock, isBlock, isLine, isRawBlock, findContainingBlock, } from "./block";
 export { RoleDef, RawBlock, Block, SectionBlock, RepeatBlock, CycleBlock, BeatDurationBlock, BreaksBlock, RoleBlock, GroupBlock, isBlock, isLine, isRawBlock, findContainingBlock, };
-export class Command extends Entity {
+const EntityWithParams = ParamsMixin(Entity);
+export class Command extends EntityWithParams {
     constructor(params = []) {
         super();
         this.autoGenerated = false;
@@ -21,16 +22,6 @@ export class Command extends Entity {
     debugValue() {
         return { name: this.name, index: this.index, params: this.params };
     }
-    getParam(name) {
-        for (const param of this.params) {
-            if (param.key == name)
-                return param.value;
-        }
-        return null;
-    }
-    getParamAt(index) {
-        return index < this.params.length ? this.params[index].value : null;
-    }
     applyToNotation(notation) {
         this.applyToBlock(notation);
     }

package/lib/esm/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 {\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"]}
+{"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, CmdParam, ParamsMixin } 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// Re-export CmdParam for backwards compatibility\nexport { CmdParam } from \"./entity\";\n\n// Apply ParamsMixin to Entity for Command base class\nconst EntityWithParams = ParamsMixin(Entity);\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 EntityWithParams {\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  /** 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   * 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/esm/parser.d.ts

@@ -1,7 +1,7 @@
 import * as TSU from "@panyam/tsutils";
 import * as G from "galore";
 import * as TLEX from "tlex";
-import { Literal, Note, Atom, Rest, Space, Group } from "./core";
+import { Literal, Note, Atom, Rest, Space, Group, Marker } from "./core";
 import { Notation, Command, CmdParam } from "./notation";
 import { Block } from "./block";
 export declare class BlockCommand extends Command {
@@ -30,8 +30,7 @@ export declare class Parser {
         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;
+        newMarker: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Marker;
         applyDuration: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => Atom;
         newArray: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => any[];
         concatAtoms: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => any;

package/lib/esm/parser.js

@@ -34,12 +34,9 @@ const [parser] = G.newParser(String.raw `
     %token  EMBELISHMENT  /~[^\s]*/                 { toEmbelishment }
     %token  NUMBER        /-?\d+/                   { toNumber }
     %token  BOOLEAN       /true|false/              { toBoolean }
-    %token  POST_MARKER   /<<"(([^"\\\n]|\\.|\\\n)*)"/  { toMarker }
-    %token  POST_MARKER   /<<'(([^'\\\n]|\\.|\\\n)*)'/  { toMarker }
-    %token  PRE_MARKER   /"(([^"\\\n]|\\.|\\\n)*)">>/  { toMarker }
-    %token  PRE_MARKER   /'(([^'\\\n]|\\.|\\\n)*)'>>/  { toMarker }
     %token  STRING        /"([^"\\\n]|\\.|\\\n)*"/  { toString }
     %token  STRING        /'([^'\\\n]|\\.|\\\n)*'/  { toString }
+    %token  MARKER_NAME   /\\@{IDENT}/              { toMarkerName }
     %token  DOTS_IDENT    /(\.+)({IdentChar}+)/     { toOctavedNote   }
     %token  IDENT_DOTS    /({IdentChar}+)(\.+)/     { toOctavedNote   }
     %token  IDENT_COLON   /{IdentChar}+:/           { toRoleSelector  }
@@ -83,14 +80,10 @@ const [parser] = G.newParser(String.raw `
     Atoms -> Atoms Atom { concatAtoms } ;
     Atoms -> { newArray } ;
 
-    Atom -> Atom POST_MARKER  { applyPostMarker }
-          | PreMarkedAtom
-          ;
-    PreMarkedAtom -> Leaf
-                  | PRE_MARKER PreMarkedAtom { applyPreMarker }
-                  ;
+    Atom -> Leaf ;
 
-    Leaf -> Space | Lit | Group | Rest  ;
+    Leaf -> Space | Lit | Group | Rest | Marker ;
+    Marker -> MARKER_NAME CommandParams { newMarker } ;
     Leaf -> Duration Leaf { applyDuration } ;
     Rest -> HYPHEN { newRest };
     Space -> COMMA { newSpace } 
@@ -154,15 +147,8 @@ const [parser] = G.newParser(String.raw `
             token.value = token.value.substring(1, token.value.length - 1);
             return token;
         },
-        toMarker: (token, _tape, _owner) => {
-            if (token.tag != "PRE_MARKER" && token.tag != "POST_MARKER") {
-                throw new Error("Invalid token for converting to note: " + token.tag);
-            }
-            const isBefore = token.tag == "PRE_MARKER";
-            const markerText = isBefore
-                ? token.value.substring(1, token.value.length - 3)
-                : token.value.substring(3, token.value.length - 1);
-            token.value = new Marker(markerText, isBefore);
+        toMarkerName: (token, _tape, _owner) => {
+            token.value = token.value.substring(2);
             return token;
         },
         toOctavedNote: (token, _tape, _owner) => {
@@ -344,23 +330,10 @@ export class Parser {
             newSilentSpace: (_rule, _parent, ..._children) => {
                 return new Space(ONE, true);
             },
-            applyPreMarker: (rule, parent, ...children) => {
-                const marker = children[0].value;
-                const leaf = children[1].value;
-                if (!leaf.markersBefore) {
-                    leaf.markersBefore = [];
-                }
-                leaf.markersBefore.splice(0, 0, marker);
-                return leaf;
-            },
-            applyPostMarker: (rule, parent, ...children) => {
-                const leaf = children[0].value;
-                const marker = children[1].value;
-                if (!leaf.markersAfter) {
-                    leaf.markersAfter = [];
-                }
-                leaf.markersAfter.push(marker);
-                return leaf;
+            newMarker: (rule, parent, ...children) => {
+                const name = children[0].value;
+                const params = children[1].value || [];
+                return new Marker(name, params);
             },
             applyDuration: (rule, parent, ...children) => {
                 let dur = children[0].value;

package/lib/esm/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,iBAAiB,CAAC;AACvC,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAQ,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7F,OAAO,EAAE,QAAQ,EAAE,QAAQ,IAAI,IAAI,EAAE,OAAO,EAAY,MAAM,YAAY,CAAC;AAC3E,OAAO,EACL,YAAY,EACZ,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,eAAe,EACf,SAAS,EACT,YAAY,EACZ,UAAU,EACV,UAAU,EACV,OAAO,EACP,WAAW,EACX,MAAM,GACP,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AAEvC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC;AACjC,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAW5B,MAAM,CAAC,MAAM,CAAe,GAAG,CAAC,CAAC,SAAS,CACxC,MAAM,CAAC,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkHP,EACH;IACE,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,IAAI;IACnB,aAAa,EAAE;QACb,cAAc,EAAE,CAAC,KAAiB,EAAE,IAAwB,EAAE,KAAU,EAAE,EAAE;YAC1E,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACxD,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBAChB,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;gBACpD,KAAK,CAAC,MAAM,CAAC,IAAI,CACf,IAAI,IAAI,CAAC,cAAc,CACrB,yBAAyB,KAAK,CAAC,KAAK,EAAE,EACtC,KAAK,CAAC,KAAK,EACX,CAAC,GAAG,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC,KAAK,EAC3B,qBAAqB,EACrB,KAAK,CAAC,KAAK,CACZ,CACF,CAAC;gBACF,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,CAAC,KAAK,GAAG,GAAG,CAAC;YAClB,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;YACzC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,aAAa,EAAE,CAAC,KAAiB,EAAE,KAAyB,EAAE,MAAW,EAAE,EAAE;YAC3E,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACvC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,SAAS,EAAE,CAAC,KAAiB,EAAE,KAAyB,EAAE,MAAW,EAAE,EAAE;YACvE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC;YACpC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,QAAQ,EAAE,CAAC,KAAiB,EAAE,KAAyB,EAAE,MAAW,EAAE,EAAE;YACtE,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,QAAQ,EAAE,CAAC,KAAiB,EAAE,KAAyB,EAAE,MAAW,EAAE,EAAE;YACtE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC/D,OAAO,KAAK,CAAC;QACf,CAAC;QACD,QAAQ,EAAE,CAAC,KAAiB,EAAE,KAAyB,EAAE,MAAW,EAAE,EAAE;YACtE,IAAI,KAAK,CAAC,GAAG,IAAI,YAAY,IAAI,KAAK,CAAC,GAAG,IAAI,aAAa,EAAE,CAAC;gBAC5D,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YACxE,CAAC;YACD,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,IAAI,YAAY,CAAC;YAC3C,MAAM,UAAU,GAAG,QAAQ;gBACzB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;gBAClD,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAGrD,KAAK,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;QACD,aAAa,EAAE,CAAC,KAAiB,EAAE,KAAyB,EAAE,MAAW,EAAE,EAAE;YAC3E,IAAI,KAAK,CAAC,GAAG,IAAI,YAAY,EAAE,CAAC;gBAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7D,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC3C,KAAK,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;YAC7C,CAAC;iBAAM,IAAI,KAAK,CAAC,GAAG,IAAI,YAAY,EAAE,CAAC;gBACrC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7D,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;gBACnE,KAAK,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YACxE,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,cAAc,EAAE,CAAC,KAAiB,EAAE,KAAyB,EAAE,MAAW,EAAE,EAAE;YAC5E,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC/D,OAAO,KAAK,CAAC;QACf,CAAC;QACD,gBAAgB,EAAE,CAAC,KAAiB,EAAE,KAAyB,EAAE,MAAW,EAAE,EAAE;YAE9E,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACvC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,qBAAqB,EAAE,CAAC,KAAiB,EAAE,KAAyB,EAAE,MAAW,EAAE,EAAE;YAEnF,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACvC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,oBAAoB,EAAE,CAAC,KAAiB,EAAE,IAAwB,EAAE,MAAW,EAAE,EAAE;YAEjF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5E,MAAM,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC;YAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;YAC1E,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,yDAAyD,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC;YAC5F,CAAC;YACD,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;QACD,aAAa,EAAE,CAAC,KAAiB,EAAE,IAAwB,EAAE,MAAW,EAAE,EAAE;YAE1E,MAAM,MAAM,GAAG,OAAO,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;YAC1E,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;YACpE,CAAC;YACD,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAE/C,OAAO,KAAK,CAAC;QACf,CAAC;KACF;CACF,CACF,CAAC;AAQF,OAAO,EACL,KAAK,EACL,YAAY,EACZ,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,WAAW,EACX,SAAS,EACT,UAAU,GACX,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAMrC,MAAM,OAAO,YAAa,SAAQ,OAAO;IAIvC,YAAY,YAAqB,EAAE,aAAwB;QACzD,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,SAAS,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;IAC5C,CAAC;IAKO,WAAW,CAAC,MAAa;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC;QAE9B,IAAI,GAAG,YAAY,OAAO,EAAE,CAAC;YAC3B,OAAO,IAAI,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACnD,CAAC;aAAM,IAAI,GAAG,YAAY,MAAM,EAAE,CAAC;YACjC,OAAO,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC;YACnC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACvC,CAAC;aAAM,IAAI,GAAG,YAAY,eAAe,EAAE,CAAC;YAC1C,OAAO,IAAI,iBAAiB,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACzD,CAAC;aAAM,IAAI,GAAG,YAAY,SAAS,EAAE,CAAC;YACpC,OAAO,IAAI,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC;aAAM,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;YACrC,MAAM,QAAQ,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACnC,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACxD,CAAC;aAAM,IAAI,GAAG,YAAY,WAAW,EAAE,CAAC;YACtC,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,SAAS,IAAI,IAAI,EAAE,MAAM,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YAEN,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,MAAM,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAED,UAAU;QACR,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE;YAC5C,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;SACjE,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,QAAkB;QAGhC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,QAA4B,CAAC,CAAC;QAG7D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;QAGD,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,YAAY,CAAC,SAAgB;QAE3B,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAG1C,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;QAGD,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF;AAED,MAAM,OAAO,MAAM;IA6MjB,YAAY,OAAa;QA5MzB,WAAM,GAA2C,EAAE,CAAC;QACpD,aAAQ,GAAQ,EAAE,CAAC;QACV,aAAQ,GAAc,EAAE,CAAC;QAE1B,oBAAe,GAAa,EAAE,CAAC;QAE7B,iBAAY,GAAG;YACvB,WAAW,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBACvE,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;oBACzB,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACjD,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACpE,CAAC;YACH,CAAC;YACD,QAAQ,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBACpE,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACnE,OAAO,GAAG,CAAC;YACb,CAAC;YACD,YAAY,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBACxE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAgB,CAAC,CAAC;gBACvD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;gBACpE,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC;gBACvB,OAAO,GAAG,CAAC;YACb,CAAC;YACD,aAAa,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBACzE,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxB,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAgB,CAAC;gBACzC,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC1C,OAAO,GAAG,CAAC;YACb,CAAC;YACD,cAAc,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBAC1E,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAgB,CAAC;gBACzC,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxB,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC5B,OAAO,GAAG,CAAC;YACb,CAAC;YACD,SAAS,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBACrE,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxB,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,YAAY,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,YAAY,EAAE,CAAC;oBACnE,OAAO,GAAG,CAAC,KAAK,CAAC;gBACnB,CAAC;qBAAM,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,OAAO,EAAE,CAAC;oBAEpC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAEhC,CAAC;qBAAM,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,QAAQ,EAAE,CAAC;oBAGrC,OAAO,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACjC,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;YACD,QAAQ,EAAE,CAAC,KAAa,EAAE,OAAiB,EAAE,GAAG,SAAqB,EAAE,EAAE;gBACvE,OAAO,IAAI,KAAK,EAAE,CAAC;YACrB,CAAC;YACD,OAAO,EAAE,CAAC,KAAa,EAAE,OAAiB,EAAE,GAAG,SAAqB,EAAE,EAAE;gBACtE,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,CAAC;YACD,cAAc,EAAE,CAAC,KAAa,EAAE,OAAiB,EAAE,GAAG,SAAqB,EAAE,EAAE;gBAC7E,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACpC,CAAC;YACD,cAAc,EAAE,CAAC,KAAa,EAAE,OAAiB,EAAE,GAAG,SAAqB,EAAE,EAAE;gBAC7E,OAAO,IAAI,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC9B,CAAC;YACD,cAAc,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBAC1E,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC;gBAC3C,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAa,CAAC;gBAEvC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;oBACxB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;gBAC1B,CAAC;gBACD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;gBACxC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,eAAe,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBAC3E,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAa,CAAC;gBACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC;gBAC3C,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;oBACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;gBACzB,CAAC;gBACD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC/B,OAAO,IAAI,CAAC;YACd,CAAC;YACD,aAAa,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBACzE,IAAI,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAkC,CAAC;gBACzD,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAa,CAAC;gBACvC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;oBAC5B,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAC1B,CAAC;gBACD,IAAI,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBAC/B,IAAc,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACzC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;gBACtB,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,QAAQ,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBAEpE,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACtC,CAAC;YACD,WAAW,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBACvE,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAC/B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjB,OAAO,KAAK,CAAC;YACf,CAAC;YACD,QAAQ,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBACpE,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;oBACzB,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;gBACjD,CAAC;qBAAM,CAAC;oBACN,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;gBAC9D,CAAC;YACH,CAAC;YACD,YAAY,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBACxE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;YACD,eAAe,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBAC3E,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBACjC,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBACnC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACtB,OAAO,MAAM,CAAC;YAChB,CAAC;YAED,UAAU,EAAE,CAAC,KAAa,EAAE,OAAiB,EAAE,GAAG,SAAqB,EAAE,EAAE;gBAEzE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAChD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,QAAQ,EAAE,CAAC,KAAa,EAAE,OAAiB,EAAE,GAAG,SAAqB,EAAE,EAAE;gBAEvE,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAG,CAAC;gBAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBACvD,OAAO,aAAa,CAAC;YACvB,CAAC;YACD,SAAS,EAAE,CAAC,KAAa,EAAE,OAAiB,EAAE,GAAG,SAAqB,EAAE,EAAE;gBAExE,OAAO,IAAI,CAAC;YACd,CAAC;YACD,mBAAmB,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBAC/E,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAC/B,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBACjC,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAyB,CAAC;gBAE5D,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAEtD,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;oBAE3B,OAAO,IAAI,YAAY,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;gBACvD,CAAC;qBAAM,CAAC;oBAEN,OAAO,YAAY,CAAC;gBACtB,CAAC;YACH,CAAC;YACD,WAAW,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBACvE,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC;gBAC1C,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACrB,IAAI,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;gBAC1C,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,kBAAkB,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBAC9E,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAG7B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;gBACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACrB,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC3B,CAAC;YACD,aAAa,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBACzE,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAgB,CAAC;gBAC7C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAEzB,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC;gBAC1C,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACrB,IAAI,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;gBAC1C,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,kBAAkB,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBAC9E,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBACnC,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,CAAC,UAAU,CAAC,IAAI,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;gBAEjE,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC;gBAC1C,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACrB,IAAI,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;gBAC1C,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,eAAe,EAAE,CAAC,IAAY,EAAE,MAAgB,EAAE,GAAG,QAAoB,EAAE,EAAE;gBAG3E,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBACjC,IAAI,CAAC,UAAU,CAAC,IAAI,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;gBAClE,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC;gBAC1C,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACrB,IAAI,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;gBAC1C,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC;IAIF,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,MAAkB;QAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QACtB,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YACpB,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;QAEhC,CAAC;aAAM,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC;aAAM,IAAI,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC7B,OAAO,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;aAAM,IAAI,KAAK,IAAI,cAAc,EAAE,CAAC;YACnC,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;aAAM,IAAI,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC7B,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;aAAM,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,OAAO,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;aAAM,IAAI,KAAK,IAAI,SAAS,EAAE,CAAC;YAC9B,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC;aAAM,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,OAAO,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;aAAM,IAAI,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC7B,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;aAAM,CAAC;YAEN,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,UAAU,CAAC,GAAY;QACrB,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,KAAa;QACjB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE;gBAChC,gBAAgB,EAAE,IAAI;gBACtB,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,YAAY,EAAE,CAAC,GAAwB,EAAE,EAAE;oBACzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACtB,OAAO,IAAI,CAAC;gBACd,CAAC;aACF,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,CAAC,CAAC,UAAU,EAAE,CAAC;gBAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,KAAa;QACzB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAClB,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,MAAM,GAAmB,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;QAG5B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ;YAAE,QAAQ,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACzF,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ;YAAE,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC/D,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,iBAAiB,CAAC,KAAa;QAC7B,OAAO,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;CACF","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport * as G from \"galore\";\nimport * as TLEX from \"tlex\";\nimport YAML from \"yaml\";\nimport { Literal, AtomType, Note, Atom, Rest, Space, Syllable, Group, Marker } from \"./core\";\nimport { Notation, MetaData as Meta, Command, CmdParam } from \"./notation\";\nimport {\n  RawEmbedding,\n  ApplyLayout,\n  AddAtoms,\n  SetCycle,\n  SetBeatDuration,\n  SetBreaks,\n  ActivateRole,\n  CreateRole,\n  CreateLine,\n  Section,\n  ScopedGroup,\n  Repeat,\n} from \"./commands\";\n\n// TODO - Make this plugable from the client instead of hard coded\nimport * as carnatic from \"./carnatic\";\n\nconst ONE = TSU.Num.Fraction.ONE;\nconst TWO = ONE.timesNum(2);\n\n/**\n * V4 of our parser builds on V3 and has the following improvements:\n *\n * 1. Embedding Headings to demarcate sections so users dont have to use\n *    explicit MD for headings.\n * 2. Unlike V3 here users break out *of* song instead instead break out \"into\"\n * song.  So users spend more time writing notation and less worrying about\n * other things like headings etc.\n */\nconst [parser /*itemGraph*/] = G.newParser(\n  String.raw`\n    %define IdentChar     /[^%!@$#&\\^|\\[\\]={}()<>+\\-,;~: \\t\\f\\r\\n\\v\\\\\\.\\'\\\"]/\n\n    %token  BSLASH        \"\\\\\"\n    %token  OPEN_SQ       \"[\"\n    %token  CLOSE_SQ      \"]\"\n    %token  EQUALS        \"=\"\n    %token  OPEN_PAREN    \"(\"\n    %token  CLOSE_PAREN   \")\"\n    %token  OPEN_BRACE    \"{\"\n    %token  CLOSE_BRACE   \"}\"\n    %token  SLASH         \"/\"\n    %token  STAR          \"*\"\n    %token  CARET         \"^\"\n    // %skip \"-\"\n    %token  COMMA         \",\"\n    %token  SEMI_COLON    \";\"\n    %token  COLON         \":\"\n\n    %token  FRONT_MATTER                 /^---$/m    { toFrontMatter }\n    %token  SINGLE_LINE_RAW_STRING       />(.*)$/m    { toSingleLineRawString }\n    %token  MULTI_LINE_RAW_STRING        /r(#{0,})\"/  { toMultiLineRawString }\n\n    %token  EMBELISHMENT  /~[^\\s]*/                 { toEmbelishment }\n    %token  NUMBER        /-?\\d+/                   { toNumber }\n    %token  BOOLEAN       /true|false/              { toBoolean }\n    %token  POST_MARKER   /<<\"(([^\"\\\\\\n]|\\\\.|\\\\\\n)*)\"/  { toMarker }\n    %token  POST_MARKER   /<<'(([^'\\\\\\n]|\\\\.|\\\\\\n)*)'/  { toMarker }\n    %token  PRE_MARKER   /\"(([^\"\\\\\\n]|\\\\.|\\\\\\n)*)\">>/  { toMarker }\n    %token  PRE_MARKER   /'(([^'\\\\\\n]|\\\\.|\\\\\\n)*)'>>/  { toMarker }\n    %token  STRING        /\"([^\"\\\\\\n]|\\\\.|\\\\\\n)*\"/  { toString }\n    %token  STRING        /'([^'\\\\\\n]|\\\\.|\\\\\\n)*'/  { toString }\n    %token  DOTS_IDENT    /(\\.+)({IdentChar}+)/     { toOctavedNote   }\n    %token  IDENT_DOTS    /({IdentChar}+)(\\.+)/     { toOctavedNote   }\n    %token  IDENT_COLON   /{IdentChar}+:/           { toRoleSelector  }\n    %token  IDENT         /{IdentChar}+/\n    %token  BSLASH_IDENT  /\\\\{IDENT}/               { toCommandName   }\n    %token  BSLASH_NUMBER /\\\\{NUMBER}/\n    %token  HYPHEN        /-/\n    %skip                 /[ \\t\\n\\f\\r]+/\n    %skip_flex            \"//.*$\"\n    %skip                 /\\/\\*.*?\\*\\//\n\n    Document -> Elements\n              | FRONT_MATTER Elements { prependFrontMatter }\n              ;\n\n    Elements -> Elements Command Atoms { appendCommand } \n              | Elements RoleSelector Atoms { appendRoleSelector } \n              | Elements Embedding  Atoms { insertEmbedding }\n              | Atoms { appendAtoms }\n              ;\n\n    Embedding -> SINGLE_LINE_RAW_STRING | MULTI_LINE_RAW_STRING ;\n\n    Command -> BSLASH_IDENT CommandParams ? OptBlock { newCommandWithBlock } ;\n    CommandParams -> OPEN_PAREN ParamList ? CLOSE_PAREN { $2 } ;\n    OptBlock -> Block\n             | { nullBlock }\n             ;\n    Block -> BlockStart Elements CLOSE_BRACE { endBlock } ;\n    BlockStart -> OPEN_BRACE { beginBlock } ;\n\n    ParamList -> ParamList COMMA Param { concatParamList } ;\n    ParamList -> Param { newParamList };\n    Param -> ParamValue { newParam } ;\n    Param -> ParamKey EQUALS ParamValue { newParam } ;\n    ParamKey  -> IDENT ;\n    ParamValue -> ( STRING | Fraction | NUMBER | BOOLEAN ) ;\n\n    RoleSelector -> IDENT_COLON ;\n\n    Atoms -> Atoms Atom { concatAtoms } ;\n    Atoms -> { newArray } ;\n\n    Atom -> Atom POST_MARKER  { applyPostMarker }\n          | PreMarkedAtom\n          ;\n    PreMarkedAtom -> Leaf\n                  | PRE_MARKER PreMarkedAtom { applyPreMarker }\n                  ;\n\n    Leaf -> Space | Lit | Group | Rest  ;\n    Leaf -> Duration Leaf { applyDuration } ;\n    Rest -> HYPHEN { newRest };\n    Space -> COMMA { newSpace } \n          | SEMI_COLON { newDoubleSpace } \n          | UNDER_SCORE { newSilentSpace } \n          ;\n\n    /* - An alternative representation to support both pre and\n     *   post embelishment operators.   Here PRE_EMBs have a higher\n     *   associativity over POST_EMBs\n     */\n     Lit -> Lit POST_EMB  { litWithPostEmb }\n         | PreEmbLit\n         ;\n\n     PreEmbLit -> LitToken \n                | LitToken CARET NUMBER { litWithCaret }\n                | LitToken CARET STAR   { litWithCaret }\n                | PRE_EMB PreEmbLit     { litWithPreEmb }\n                ;\n      \n     LitToken -> DOTS_IDENT { litToAtom }\n              | IDENT { litToAtom }\n              | IDENT_DOTS { litToAtom }\n              | STRING  { litToAtom }\n              ;\n\n    Group -> OPEN_SQ Atoms CLOSE_SQ { newGroup };\n\n    Duration -> Fraction | NUMBER;\n    Fraction -> NUMBER SLASH NUMBER { newFraction } ;\n    `,\n  {\n    debug: \"\",\n    type: \"lalr\",\n    leftRecursive: true,\n    tokenHandlers: {\n      toEmbelishment: (token: TLEX.Token, tape: TLEX.TapeInterface, owner: any) => {\n        const [emb, pre] = owner.parseEmbelishment(token.value);\n        if (emb == null) {\n          console.log(\"Skipping Embelishment: \", token.value);\n          owner.errors.push(\n            new TLEX.TokenizerError(\n              `Invalid embelishment: ${token.value}`,\n              token.start,\n              1 + token.end - token.start,\n              \"InvalidEmbelishment\",\n              token.value,\n            ),\n          );\n          return null;\n        }\n        token.value = emb;\n        token.tag = pre ? \"PRE_EMB\" : \"POST_EMB\";\n        return token;\n      },\n      toCommandName: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toBoolean: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        token.value = token.value == \"true\";\n        return token;\n      },\n      toNumber: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        token.value = parseInt(token.value);\n        return token;\n      },\n      toString: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        token.value = token.value.substring(1, token.value.length - 1);\n        return token;\n      },\n      toMarker: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        if (token.tag != \"PRE_MARKER\" && token.tag != \"POST_MARKER\") {\n          throw new Error(\"Invalid token for converting to note: \" + token.tag);\n        }\n        const isBefore = token.tag == \"PRE_MARKER\";\n        const markerText = isBefore\n          ? token.value.substring(1, token.value.length - 3)\n          : token.value.substring(3, token.value.length - 1);\n        // console.log(\"TokVal: \", token.value, token.positions);\n        // console.log(\"Marker Text: \", markerText, isBefore);\n        token.value = new Marker(markerText, isBefore);\n        return token;\n      },\n      toOctavedNote: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        if (token.tag == \"DOTS_IDENT\") {\n          const octave = token.positions[1][1] - token.positions[1][0];\n          const note = token.value.substring(octave);\n          token.value = new Note(note, ONE, -octave);\n        } else if (token.tag == \"IDENT_DOTS\") {\n          const octave = token.positions[2][1] - token.positions[2][0];\n          const note = token.value.substring(0, token.value.length - octave);\n          token.value = new Note(note, ONE, octave);\n        } else {\n          throw new Error(\"Invalid token for converting to note: \" + token.tag);\n        }\n        return token;\n      },\n      toRoleSelector: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        token.value = token.value.substring(0, token.value.length - 1);\n        return token;\n      },\n      toLineAnnotation: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        // skip the initial \"!\"\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toSingleLineRawString: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        // skip the initial \">\"\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toMultiLineRawString: (token: TLEX.Token, tape: TLEX.TapeInterface, _owner: any) => {\n        // consume everything until \"#<N times> as start\n        const hashes = tape.substring(token.positions[1][0], token.positions[1][1]);\n        const endPat = '\"' + hashes;\n        const startPos = tape.index;\n        const endPos = TLEX.TapeHelper.advanceAfter(tape, endPat) - endPat.length;\n        if (endPos < 0) {\n          throw new Error(\"EOF expected while finding end of Raw String Literal: '\" + endPat + \"'\");\n        }\n        token.value = tape.substring(startPos, endPos);\n        return token;\n      },\n      toFrontMatter: (token: TLEX.Token, tape: TLEX.TapeInterface, _owner: any) => {\n        // skip the initial \">\"\n        const endPat = \"\\n---\";\n        const startPos = tape.index;\n        const endPos = TLEX.TapeHelper.advanceAfter(tape, endPat) - endPat.length;\n        if (endPos < 0) {\n          throw new Error(\"EOF expected while finding end of front matter\");\n        }\n        token.value = tape.substring(startPos, endPos);\n        // console.log(\"Found FM: \", token.value);\n        return token;\n      },\n    },\n  },\n);\n\n/**\n * A notation doc is a list of lines that are found in a single document.\n *\n * Since our document (md or html etc) can contain multiple snippets\n * all these snippets are related\n */\nimport {\n  Block,\n  SectionBlock,\n  RepeatBlock,\n  CycleBlock,\n  BeatDurationBlock,\n  BreaksBlock,\n  RoleBlock,\n  GroupBlock,\n} from \"./block\";\nimport { parseCycle } from \"./utils\";\n\n/**\n * Wrapper for a command that has a block of child commands.\n * When applied, it creates the appropriate Block subclass and applies child commands to it.\n */\nexport class BlockCommand extends Command {\n  readonly innerCommand: Command;\n  readonly blockCommands: Command[];\n\n  constructor(innerCommand: Command, blockCommands: Command[]) {\n    super(innerCommand.params);\n    this.innerCommand = innerCommand;\n    this.blockCommands = blockCommands;\n  }\n\n  get name(): string {\n    return `Block(${this.innerCommand.name})`;\n  }\n\n  /**\n   * Creates the appropriate Block subclass based on the inner command type.\n   */\n  private createBlock(parent: Block): Block {\n    const cmd = this.innerCommand;\n\n    if (cmd instanceof Section) {\n      return new SectionBlock(cmd.sectionName, parent);\n    } else if (cmd instanceof Repeat) {\n      return new RepeatBlock(cmd.count, parent);\n    } else if (cmd instanceof SetCycle) {\n      const cycle = parseCycle(cmd.getParamAt(0));\n      return new CycleBlock(cycle, parent);\n    } else if (cmd instanceof SetBeatDuration) {\n      return new BeatDurationBlock(cmd.beatDuration, parent);\n    } else if (cmd instanceof SetBreaks) {\n      return new BreaksBlock(cmd.pattern, parent);\n    } else if (cmd instanceof CreateRole) {\n      const roleName = cmd.getParamAt(0);\n      return new RoleBlock(roleName, cmd.notesOnly, parent);\n    } else if (cmd instanceof ScopedGroup) {\n      return new GroupBlock(cmd.groupName || null, parent);\n    } else {\n      // Generic block for other commands\n      return new Block(cmd.name.toLowerCase(), parent);\n    }\n  }\n\n  debugValue(): any {\n    return {\n      name: this.name,\n      index: this.index,\n      innerCommand: this.innerCommand.debugValue(),\n      blockCommands: this.blockCommands.map((cmd) => cmd.debugValue()),\n    };\n  }\n\n  applyToNotation(notation: Notation): void {\n    // Create the appropriate Block subclass\n    // Cast notation as Block since Notation will extend Block\n    const block = this.createBlock(notation as unknown as Block);\n\n    // Apply all child commands to the block\n    for (const cmd of this.blockCommands) {\n      cmd.applyToBlock(block);\n    }\n\n    // Add the block to the notation\n    notation.addBlockItem(block);\n  }\n\n  applyToBlock(container: Block): void {\n    // Create the appropriate Block subclass\n    const block = this.createBlock(container);\n\n    // Apply all child commands to the block\n    for (const cmd of this.blockCommands) {\n      cmd.applyToBlock(block);\n    }\n\n    // Add the block to the container\n    container.addBlockItem(block);\n  }\n}\n\nexport class Parser {\n  errors: (TLEX.TokenizerError | G.ParseError)[] = [];\n  metadata: any = {};\n  readonly commands: Command[] = [];\n  // Stack to track command indices when entering blocks\n  private blockStartStack: number[] = [];\n\n  protected ruleHandlers = {\n    newFraction: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      if (children.length == 1) {\n        return new TSU.Num.Fraction(children[0].value);\n      } else {\n        return new TSU.Num.Fraction(children[0].value, children[2].value);\n      }\n    },\n    newGroup: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const out = new Group(...children[1].value).setDuration(TWO, true);\n      return out;\n    },\n    litWithCaret: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = Note.fromLit(children[0].value as Literal);\n      const opnode = children[2];\n      const shiftValue = opnode.sym.label == \"STAR\" ? true : opnode.value;\n      lit.shift = shiftValue;\n      return lit;\n    },\n    litWithPreEmb: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const emb = children[0];\n      const lit = children[1].value as Literal;\n      lit.embelishments.splice(0, 0, emb.value);\n      return lit;\n    },\n    litWithPostEmb: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = children[0].value as Literal;\n      const emb = children[1];\n      lit.embelishments.push(emb);\n      return lit;\n    },\n    litToAtom: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = children[0];\n      if (lit.sym.label == \"DOTS_IDENT\" || lit.sym.label == \"IDENT_DOTS\") {\n        return lit.value;\n      } else if (lit.sym.label == \"IDENT\") {\n        // Mark this as a Literal to be processed later\n        return new Literal(lit.value);\n        // return role.notesOnly ? new Note(lit.value) : new Syllable(lit.value);\n      } else if (lit.sym.label == \"STRING\") {\n        // const role = this.snippet.currRole;\n        // if (role.notesOnly) throw new Error(\"Strings cannot appear in notes only mode\");\n        return new Syllable(lit.value);\n      } else {\n        throw new Error(\"Invalid lit: \" + lit);\n      }\n    },\n    newSpace: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      return new Space();\n    },\n    newRest: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      return new Rest();\n    },\n    newDoubleSpace: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      return new Space(ONE.timesNum(2));\n    },\n    newSilentSpace: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      return new Space(ONE, true);\n    },\n    applyPreMarker: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const marker = children[0].value as Marker;\n      const leaf = children[1].value as Atom;\n      // console.log(\"marker, leaf: \", marker, leaf);\n      if (!leaf.markersBefore) {\n        leaf.markersBefore = [];\n      }\n      leaf.markersBefore.splice(0, 0, marker);\n      return leaf;\n    },\n    applyPostMarker: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const leaf = children[0].value as Atom;\n      const marker = children[1].value as Marker;\n      if (!leaf.markersAfter) {\n        leaf.markersAfter = [];\n      }\n      leaf.markersAfter.push(marker);\n      return leaf;\n    },\n    applyDuration: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      let dur = children[0].value as TSU.Num.Fraction | number;\n      const leaf = children[1].value as Atom;\n      if (typeof dur === \"number\") {\n        dur = ONE.timesNum(dur);\n      }\n      if (leaf.TYPE == AtomType.GROUP) {\n        (leaf as Group).setDuration(dur, true);\n      } else {\n        leaf.duration = dur;\n      }\n      return leaf;\n    },\n    newArray: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      // create an array of values from all the values of child nodes\n      return children.map((c) => c.value);\n    },\n    concatAtoms: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const atoms = children[0].value;\n      const atom = children[1].value;\n      atoms.push(atom);\n      return atoms;\n    },\n    newParam: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      if (children.length == 1) {\n        return { key: null, value: children[0].value };\n      } else {\n        return { key: children[0].value, value: children[2].value };\n      }\n    },\n    newParamList: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return [children[0].value];\n    },\n    concatParamList: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const params = children[0].value;\n      const newParam = children[2].value;\n      params.push(newParam);\n      return params;\n    },\n    // Block handling semantic actions\n    beginBlock: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      // Push current command count to track where this block's commands start\n      this.blockStartStack.push(this.commands.length);\n      return null;\n    },\n    endBlock: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      // Pop the start index and extract commands added since then\n      const startIndex = this.blockStartStack.pop()!;\n      const blockCommands = this.commands.splice(startIndex);\n      return blockCommands;\n    },\n    nullBlock: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      // No block present\n      return null;\n    },\n    newCommandWithBlock: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const name = children[0].value;\n      const params = children[1].value;\n      const blockCommands = children[2].value as Command[] | null;\n\n      const innerCommand = this.createCommand(name, params);\n\n      if (blockCommands !== null) {\n        // Wrap in BlockCommand\n        return new BlockCommand(innerCommand, blockCommands);\n      } else {\n        // No block, return regular command\n        return innerCommand;\n      }\n    },\n    appendAtoms: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const atoms = children[0].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    prependFrontMatter: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const fm = children[0].value;\n      // console.log(\"Child 0: \", fm);\n      // console.log(\"Child 1: \", children[1].value);\n      const data = YAML.parse(fm);\n      console.log(\"Parsed FM: \", data);\n      this.metadata = data;\n      return children[1].value;\n    },\n    appendCommand: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const command = children[1].value as Command;\n      this.addCommand(command);\n\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    appendRoleSelector: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const roleName = children[1].value;\n      const lName = roleName.toLowerCase().trim();\n      this.addCommand(new ActivateRole([{ key: null, value: lName }]));\n\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    insertEmbedding: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      // How to handle embeddings - these are just blocks\n      // to escape out of song (most likely for some rendering of html/md etc)\n      const rawVal = children[1].value;\n      this.addCommand(new RawEmbedding([{ key: null, value: rawVal }]));\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n  };\n\n  constructor(_config?: any) {\n    // config = config || {};\n  }\n\n  createCommand(name: string, params: CmdParam[]): Command {\n    const lName = name.trim().toLowerCase();\n    params = params || [];\n    if (lName == \"line\") {\n      return new CreateLine(params);\n      // } else if (lName == \"meta\") { return new MetaData(params);\n    } else if (lName == \"role\") {\n      return new CreateRole(params);\n    } else if (lName == \"layout\") {\n      return new ApplyLayout(params);\n    } else if (lName == \"beatduration\") {\n      return new SetBeatDuration(params);\n    } else if (lName == \"breaks\") {\n      return new SetBreaks(params);\n    } else if (lName == \"cycle\") {\n      return new SetCycle(params);\n    } else if (lName == \"section\") {\n      return new Section(params);\n    } else if (lName == \"group\") {\n      return new ScopedGroup(params);\n    } else if (lName == \"repeat\") {\n      return new Repeat(params);\n    } else {\n      // Try to set this as the current role\n      throw new Error(\"Invalid command: \" + lName);\n    }\n  }\n\n  addCommand(cmd: Command): void {\n    cmd.index = this.commands.length;\n    this.commands.push(cmd);\n  }\n\n  parse(input: string): any {\n    this.errors = [];\n    try {\n      const ptree = parser.parse(input, {\n        tokenizerContext: this,\n        ruleHandlers: this.ruleHandlers,\n        onTokenError: (err: TLEX.TokenizerError) => {\n          this.errors.push(err);\n          return true;\n        },\n      });\n      return ptree;\n    } catch (err) {\n      if (err instanceof G.ParseError) {\n        this.errors.push(err);\n      } else {\n        throw err;\n      }\n    }\n    return null;\n  }\n\n  parseAndBuild(input: string): [Notation, G.ParseError[]] {\n    this.parse(input);\n    const notation = new Notation();\n    const errors: G.ParseError[] = [];\n    errors.push(...this.errors);\n\n    // First add the metadata then we can set it\n    for (const key in this.metadata) notation.addMetaData(new Meta(key, this.metadata[key]));\n    for (const cmd of this.commands) cmd.applyToNotation(notation);\n    return [notation, errors];\n  }\n\n  parseEmbelishment(value: string): [any, boolean] {\n    return carnatic.parseEmbelishment(value);\n  }\n}\n"]}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/parser.ts"],"names":[],"mappings":"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","sourcesContent":["import * as TSU from \"@panyam/tsutils\";\nimport * as G from \"galore\";\nimport * as TLEX from \"tlex\";\nimport YAML from \"yaml\";\nimport { Literal, AtomType, Note, Atom, Rest, Space, Syllable, Group, Marker } from \"./core\";\nimport { Notation, MetaData as Meta, Command, CmdParam } from \"./notation\";\nimport {\n  RawEmbedding,\n  ApplyLayout,\n  AddAtoms,\n  SetCycle,\n  SetBeatDuration,\n  SetBreaks,\n  ActivateRole,\n  CreateRole,\n  CreateLine,\n  Section,\n  ScopedGroup,\n  Repeat,\n} from \"./commands\";\n\n// TODO - Make this plugable from the client instead of hard coded\nimport * as carnatic from \"./carnatic\";\n\nconst ONE = TSU.Num.Fraction.ONE;\nconst TWO = ONE.timesNum(2);\n\n/**\n * V4 of our parser builds on V3 and has the following improvements:\n *\n * 1. Embedding Headings to demarcate sections so users dont have to use\n *    explicit MD for headings.\n * 2. Unlike V3 here users break out *of* song instead instead break out \"into\"\n * song.  So users spend more time writing notation and less worrying about\n * other things like headings etc.\n */\nconst [parser /*itemGraph*/] = G.newParser(\n  String.raw`\n    %define IdentChar     /[^%!@$#&\\^|\\[\\]={}()<>+\\-,;~: \\t\\f\\r\\n\\v\\\\\\.\\'\\\"]/\n\n    %token  BSLASH        \"\\\\\"\n    %token  OPEN_SQ       \"[\"\n    %token  CLOSE_SQ      \"]\"\n    %token  EQUALS        \"=\"\n    %token  OPEN_PAREN    \"(\"\n    %token  CLOSE_PAREN   \")\"\n    %token  OPEN_BRACE    \"{\"\n    %token  CLOSE_BRACE   \"}\"\n    %token  SLASH         \"/\"\n    %token  STAR          \"*\"\n    %token  CARET         \"^\"\n    // %skip \"-\"\n    %token  COMMA         \",\"\n    %token  SEMI_COLON    \";\"\n    %token  COLON         \":\"\n\n    %token  FRONT_MATTER                 /^---$/m    { toFrontMatter }\n    %token  SINGLE_LINE_RAW_STRING       />(.*)$/m    { toSingleLineRawString }\n    %token  MULTI_LINE_RAW_STRING        /r(#{0,})\"/  { toMultiLineRawString }\n\n    %token  EMBELISHMENT  /~[^\\s]*/                 { toEmbelishment }\n    %token  NUMBER        /-?\\d+/                   { toNumber }\n    %token  BOOLEAN       /true|false/              { toBoolean }\n    %token  STRING        /\"([^\"\\\\\\n]|\\\\.|\\\\\\n)*\"/  { toString }\n    %token  STRING        /'([^'\\\\\\n]|\\\\.|\\\\\\n)*'/  { toString }\n    %token  MARKER_NAME   /\\\\@{IDENT}/              { toMarkerName }\n    %token  DOTS_IDENT    /(\\.+)({IdentChar}+)/     { toOctavedNote   }\n    %token  IDENT_DOTS    /({IdentChar}+)(\\.+)/     { toOctavedNote   }\n    %token  IDENT_COLON   /{IdentChar}+:/           { toRoleSelector  }\n    %token  IDENT         /{IdentChar}+/\n    %token  BSLASH_IDENT  /\\\\{IDENT}/               { toCommandName   }\n    %token  BSLASH_NUMBER /\\\\{NUMBER}/\n    %token  HYPHEN        /-/\n    %skip                 /[ \\t\\n\\f\\r]+/\n    %skip_flex            \"//.*$\"\n    %skip                 /\\/\\*.*?\\*\\//\n\n    Document -> Elements\n              | FRONT_MATTER Elements { prependFrontMatter }\n              ;\n\n    Elements -> Elements Command Atoms { appendCommand } \n              | Elements RoleSelector Atoms { appendRoleSelector } \n              | Elements Embedding  Atoms { insertEmbedding }\n              | Atoms { appendAtoms }\n              ;\n\n    Embedding -> SINGLE_LINE_RAW_STRING | MULTI_LINE_RAW_STRING ;\n\n    Command -> BSLASH_IDENT CommandParams ? OptBlock { newCommandWithBlock } ;\n    CommandParams -> OPEN_PAREN ParamList ? CLOSE_PAREN { $2 } ;\n    OptBlock -> Block\n             | { nullBlock }\n             ;\n    Block -> BlockStart Elements CLOSE_BRACE { endBlock } ;\n    BlockStart -> OPEN_BRACE { beginBlock } ;\n\n    ParamList -> ParamList COMMA Param { concatParamList } ;\n    ParamList -> Param { newParamList };\n    Param -> ParamValue { newParam } ;\n    Param -> ParamKey EQUALS ParamValue { newParam } ;\n    ParamKey  -> IDENT ;\n    ParamValue -> ( STRING | Fraction | NUMBER | BOOLEAN ) ;\n\n    RoleSelector -> IDENT_COLON ;\n\n    Atoms -> Atoms Atom { concatAtoms } ;\n    Atoms -> { newArray } ;\n\n    Atom -> Leaf ;\n\n    Leaf -> Space | Lit | Group | Rest | Marker ;\n    Marker -> MARKER_NAME CommandParams { newMarker } ;\n    Leaf -> Duration Leaf { applyDuration } ;\n    Rest -> HYPHEN { newRest };\n    Space -> COMMA { newSpace } \n          | SEMI_COLON { newDoubleSpace } \n          | UNDER_SCORE { newSilentSpace } \n          ;\n\n    /* - An alternative representation to support both pre and\n     *   post embelishment operators.   Here PRE_EMBs have a higher\n     *   associativity over POST_EMBs\n     */\n     Lit -> Lit POST_EMB  { litWithPostEmb }\n         | PreEmbLit\n         ;\n\n     PreEmbLit -> LitToken \n                | LitToken CARET NUMBER { litWithCaret }\n                | LitToken CARET STAR   { litWithCaret }\n                | PRE_EMB PreEmbLit     { litWithPreEmb }\n                ;\n      \n     LitToken -> DOTS_IDENT { litToAtom }\n              | IDENT { litToAtom }\n              | IDENT_DOTS { litToAtom }\n              | STRING  { litToAtom }\n              ;\n\n    Group -> OPEN_SQ Atoms CLOSE_SQ { newGroup };\n\n    Duration -> Fraction | NUMBER;\n    Fraction -> NUMBER SLASH NUMBER { newFraction } ;\n    `,\n  {\n    debug: \"\",\n    type: \"lalr\",\n    leftRecursive: true,\n    tokenHandlers: {\n      toEmbelishment: (token: TLEX.Token, tape: TLEX.TapeInterface, owner: any) => {\n        const [emb, pre] = owner.parseEmbelishment(token.value);\n        if (emb == null) {\n          console.log(\"Skipping Embelishment: \", token.value);\n          owner.errors.push(\n            new TLEX.TokenizerError(\n              `Invalid embelishment: ${token.value}`,\n              token.start,\n              1 + token.end - token.start,\n              \"InvalidEmbelishment\",\n              token.value,\n            ),\n          );\n          return null;\n        }\n        token.value = emb;\n        token.tag = pre ? \"PRE_EMB\" : \"POST_EMB\";\n        return token;\n      },\n      toCommandName: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toBoolean: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        token.value = token.value == \"true\";\n        return token;\n      },\n      toNumber: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        token.value = parseInt(token.value);\n        return token;\n      },\n      toString: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        token.value = token.value.substring(1, token.value.length - 1);\n        return token;\n      },\n      toMarkerName: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        // Extract marker name from \\@markerName - skip the \\@\n        token.value = token.value.substring(2);\n        return token;\n      },\n      toOctavedNote: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        if (token.tag == \"DOTS_IDENT\") {\n          const octave = token.positions[1][1] - token.positions[1][0];\n          const note = token.value.substring(octave);\n          token.value = new Note(note, ONE, -octave);\n        } else if (token.tag == \"IDENT_DOTS\") {\n          const octave = token.positions[2][1] - token.positions[2][0];\n          const note = token.value.substring(0, token.value.length - octave);\n          token.value = new Note(note, ONE, octave);\n        } else {\n          throw new Error(\"Invalid token for converting to note: \" + token.tag);\n        }\n        return token;\n      },\n      toRoleSelector: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        token.value = token.value.substring(0, token.value.length - 1);\n        return token;\n      },\n      toLineAnnotation: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        // skip the initial \"!\"\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toSingleLineRawString: (token: TLEX.Token, _tape: TLEX.TapeInterface, _owner: any) => {\n        // skip the initial \">\"\n        token.value = token.value.substring(1);\n        return token;\n      },\n      toMultiLineRawString: (token: TLEX.Token, tape: TLEX.TapeInterface, _owner: any) => {\n        // consume everything until \"#<N times> as start\n        const hashes = tape.substring(token.positions[1][0], token.positions[1][1]);\n        const endPat = '\"' + hashes;\n        const startPos = tape.index;\n        const endPos = TLEX.TapeHelper.advanceAfter(tape, endPat) - endPat.length;\n        if (endPos < 0) {\n          throw new Error(\"EOF expected while finding end of Raw String Literal: '\" + endPat + \"'\");\n        }\n        token.value = tape.substring(startPos, endPos);\n        return token;\n      },\n      toFrontMatter: (token: TLEX.Token, tape: TLEX.TapeInterface, _owner: any) => {\n        // skip the initial \">\"\n        const endPat = \"\\n---\";\n        const startPos = tape.index;\n        const endPos = TLEX.TapeHelper.advanceAfter(tape, endPat) - endPat.length;\n        if (endPos < 0) {\n          throw new Error(\"EOF expected while finding end of front matter\");\n        }\n        token.value = tape.substring(startPos, endPos);\n        // console.log(\"Found FM: \", token.value);\n        return token;\n      },\n    },\n  },\n);\n\n/**\n * A notation doc is a list of lines that are found in a single document.\n *\n * Since our document (md or html etc) can contain multiple snippets\n * all these snippets are related\n */\nimport {\n  Block,\n  SectionBlock,\n  RepeatBlock,\n  CycleBlock,\n  BeatDurationBlock,\n  BreaksBlock,\n  RoleBlock,\n  GroupBlock,\n} from \"./block\";\nimport { parseCycle } from \"./utils\";\n\n/**\n * Wrapper for a command that has a block of child commands.\n * When applied, it creates the appropriate Block subclass and applies child commands to it.\n */\nexport class BlockCommand extends Command {\n  readonly innerCommand: Command;\n  readonly blockCommands: Command[];\n\n  constructor(innerCommand: Command, blockCommands: Command[]) {\n    super(innerCommand.params);\n    this.innerCommand = innerCommand;\n    this.blockCommands = blockCommands;\n  }\n\n  get name(): string {\n    return `Block(${this.innerCommand.name})`;\n  }\n\n  /**\n   * Creates the appropriate Block subclass based on the inner command type.\n   */\n  private createBlock(parent: Block): Block {\n    const cmd = this.innerCommand;\n\n    if (cmd instanceof Section) {\n      return new SectionBlock(cmd.sectionName, parent);\n    } else if (cmd instanceof Repeat) {\n      return new RepeatBlock(cmd.count, parent);\n    } else if (cmd instanceof SetCycle) {\n      const cycle = parseCycle(cmd.getParamAt(0));\n      return new CycleBlock(cycle, parent);\n    } else if (cmd instanceof SetBeatDuration) {\n      return new BeatDurationBlock(cmd.beatDuration, parent);\n    } else if (cmd instanceof SetBreaks) {\n      return new BreaksBlock(cmd.pattern, parent);\n    } else if (cmd instanceof CreateRole) {\n      const roleName = cmd.getParamAt(0);\n      return new RoleBlock(roleName, cmd.notesOnly, parent);\n    } else if (cmd instanceof ScopedGroup) {\n      return new GroupBlock(cmd.groupName || null, parent);\n    } else {\n      // Generic block for other commands\n      return new Block(cmd.name.toLowerCase(), parent);\n    }\n  }\n\n  debugValue(): any {\n    return {\n      name: this.name,\n      index: this.index,\n      innerCommand: this.innerCommand.debugValue(),\n      blockCommands: this.blockCommands.map((cmd) => cmd.debugValue()),\n    };\n  }\n\n  applyToNotation(notation: Notation): void {\n    // Create the appropriate Block subclass\n    // Cast notation as Block since Notation will extend Block\n    const block = this.createBlock(notation as unknown as Block);\n\n    // Apply all child commands to the block\n    for (const cmd of this.blockCommands) {\n      cmd.applyToBlock(block);\n    }\n\n    // Add the block to the notation\n    notation.addBlockItem(block);\n  }\n\n  applyToBlock(container: Block): void {\n    // Create the appropriate Block subclass\n    const block = this.createBlock(container);\n\n    // Apply all child commands to the block\n    for (const cmd of this.blockCommands) {\n      cmd.applyToBlock(block);\n    }\n\n    // Add the block to the container\n    container.addBlockItem(block);\n  }\n}\n\nexport class Parser {\n  errors: (TLEX.TokenizerError | G.ParseError)[] = [];\n  metadata: any = {};\n  readonly commands: Command[] = [];\n  // Stack to track command indices when entering blocks\n  private blockStartStack: number[] = [];\n\n  protected ruleHandlers = {\n    newFraction: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      if (children.length == 1) {\n        return new TSU.Num.Fraction(children[0].value);\n      } else {\n        return new TSU.Num.Fraction(children[0].value, children[2].value);\n      }\n    },\n    newGroup: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const out = new Group(...children[1].value).setDuration(TWO, true);\n      return out;\n    },\n    litWithCaret: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = Note.fromLit(children[0].value as Literal);\n      const opnode = children[2];\n      const shiftValue = opnode.sym.label == \"STAR\" ? true : opnode.value;\n      lit.shift = shiftValue;\n      return lit;\n    },\n    litWithPreEmb: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const emb = children[0];\n      const lit = children[1].value as Literal;\n      lit.embelishments.splice(0, 0, emb.value);\n      return lit;\n    },\n    litWithPostEmb: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = children[0].value as Literal;\n      const emb = children[1];\n      lit.embelishments.push(emb);\n      return lit;\n    },\n    litToAtom: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const lit = children[0];\n      if (lit.sym.label == \"DOTS_IDENT\" || lit.sym.label == \"IDENT_DOTS\") {\n        return lit.value;\n      } else if (lit.sym.label == \"IDENT\") {\n        // Mark this as a Literal to be processed later\n        return new Literal(lit.value);\n        // return role.notesOnly ? new Note(lit.value) : new Syllable(lit.value);\n      } else if (lit.sym.label == \"STRING\") {\n        // const role = this.snippet.currRole;\n        // if (role.notesOnly) throw new Error(\"Strings cannot appear in notes only mode\");\n        return new Syllable(lit.value);\n      } else {\n        throw new Error(\"Invalid lit: \" + lit);\n      }\n    },\n    newSpace: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      return new Space();\n    },\n    newRest: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      return new Rest();\n    },\n    newDoubleSpace: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      return new Space(ONE.timesNum(2));\n    },\n    newSilentSpace: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      return new Space(ONE, true);\n    },\n    newMarker: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const name = children[0].value as string;\n      const params = children[1].value || [];\n      return new Marker(name, params);\n    },\n    applyDuration: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      let dur = children[0].value as TSU.Num.Fraction | number;\n      const leaf = children[1].value as Atom;\n      if (typeof dur === \"number\") {\n        dur = ONE.timesNum(dur);\n      }\n      if (leaf.TYPE == AtomType.GROUP) {\n        (leaf as Group).setDuration(dur, true);\n      } else {\n        leaf.duration = dur;\n      }\n      return leaf;\n    },\n    newArray: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      // create an array of values from all the values of child nodes\n      return children.map((c) => c.value);\n    },\n    concatAtoms: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const atoms = children[0].value;\n      const atom = children[1].value;\n      atoms.push(atom);\n      return atoms;\n    },\n    newParam: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      if (children.length == 1) {\n        return { key: null, value: children[0].value };\n      } else {\n        return { key: children[0].value, value: children[2].value };\n      }\n    },\n    newParamList: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      return [children[0].value];\n    },\n    concatParamList: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const params = children[0].value;\n      const newParam = children[2].value;\n      params.push(newParam);\n      return params;\n    },\n    // Block handling semantic actions\n    beginBlock: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      // Push current command count to track where this block's commands start\n      this.blockStartStack.push(this.commands.length);\n      return null;\n    },\n    endBlock: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      // Pop the start index and extract commands added since then\n      const startIndex = this.blockStartStack.pop()!;\n      const blockCommands = this.commands.splice(startIndex);\n      return blockCommands;\n    },\n    nullBlock: (_rule: G.Rule, _parent: G.PTNode, ..._children: G.PTNode[]) => {\n      // No block present\n      return null;\n    },\n    newCommandWithBlock: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const name = children[0].value;\n      const params = children[1].value;\n      const blockCommands = children[2].value as Command[] | null;\n\n      const innerCommand = this.createCommand(name, params);\n\n      if (blockCommands !== null) {\n        // Wrap in BlockCommand\n        return new BlockCommand(innerCommand, blockCommands);\n      } else {\n        // No block, return regular command\n        return innerCommand;\n      }\n    },\n    appendAtoms: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const atoms = children[0].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    prependFrontMatter: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const fm = children[0].value;\n      // console.log(\"Child 0: \", fm);\n      // console.log(\"Child 1: \", children[1].value);\n      const data = YAML.parse(fm);\n      console.log(\"Parsed FM: \", data);\n      this.metadata = data;\n      return children[1].value;\n    },\n    appendCommand: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const command = children[1].value as Command;\n      this.addCommand(command);\n\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    appendRoleSelector: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      const roleName = children[1].value;\n      const lName = roleName.toLowerCase().trim();\n      this.addCommand(new ActivateRole([{ key: null, value: lName }]));\n\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n    insertEmbedding: (rule: G.Rule, parent: G.PTNode, ...children: G.PTNode[]) => {\n      // How to handle embeddings - these are just blocks\n      // to escape out of song (most likely for some rendering of html/md etc)\n      const rawVal = children[1].value;\n      this.addCommand(new RawEmbedding([{ key: null, value: rawVal }]));\n      const atoms = children[2].value as Atom[];\n      if (atoms.length > 0) {\n        this.addCommand(new AddAtoms(...atoms));\n      }\n      return null;\n    },\n  };\n\n  constructor(_config?: any) {\n    // config = config || {};\n  }\n\n  createCommand(name: string, params: CmdParam[]): Command {\n    const lName = name.trim().toLowerCase();\n    params = params || [];\n    if (lName == \"line\") {\n      return new CreateLine(params);\n      // } else if (lName == \"meta\") { return new MetaData(params);\n    } else if (lName == \"role\") {\n      return new CreateRole(params);\n    } else if (lName == \"layout\") {\n      return new ApplyLayout(params);\n    } else if (lName == \"beatduration\") {\n      return new SetBeatDuration(params);\n    } else if (lName == \"breaks\") {\n      return new SetBreaks(params);\n    } else if (lName == \"cycle\") {\n      return new SetCycle(params);\n    } else if (lName == \"section\") {\n      return new Section(params);\n    } else if (lName == \"group\") {\n      return new ScopedGroup(params);\n    } else if (lName == \"repeat\") {\n      return new Repeat(params);\n    } else {\n      // Try to set this as the current role\n      throw new Error(\"Invalid command: \" + lName);\n    }\n  }\n\n  addCommand(cmd: Command): void {\n    cmd.index = this.commands.length;\n    this.commands.push(cmd);\n  }\n\n  parse(input: string): any {\n    this.errors = [];\n    try {\n      const ptree = parser.parse(input, {\n        tokenizerContext: this,\n        ruleHandlers: this.ruleHandlers,\n        onTokenError: (err: TLEX.TokenizerError) => {\n          this.errors.push(err);\n          return true;\n        },\n      });\n      return ptree;\n    } catch (err) {\n      if (err instanceof G.ParseError) {\n        this.errors.push(err);\n      } else {\n        throw err;\n      }\n    }\n    return null;\n  }\n\n  parseAndBuild(input: string): [Notation, G.ParseError[]] {\n    this.parse(input);\n    const notation = new Notation();\n    const errors: G.ParseError[] = [];\n    errors.push(...this.errors);\n\n    // First add the metadata then we can set it\n    for (const key in this.metadata) notation.addMetaData(new Meta(key, this.metadata[key]));\n    for (const cmd of this.commands) cmd.applyToNotation(notation);\n    return [notation, errors];\n  }\n\n  parseEmbelishment(value: string): [any, boolean] {\n    return carnatic.parseEmbelishment(value);\n  }\n}\n"]}