Make automos() work with absurd scales

Generalize Diamond-mos nominals.

ref #324

package.json

@@ -67,7 +67,7 @@
     "vitest": "^1.4.0"
   },
   "dependencies": {
-    "moment-of-symmetry": "^0.6.0",
+    "moment-of-symmetry": "^0.7.0",
     "xen-dev-utils": "^0.7.0"
   },
   "engines": {

src/diamond-mos.ts

@@ -53,7 +53,7 @@ export type MosConfig = {
   /**
    * Relative scale from J onwards. Echelon depends on J. Use equave to reach higher octave numbers.
    */
-  scale: Map<MosNominal, TimeMonzo>;
+  scale: Map<string, TimeMonzo>;
   /**
    * Intervals for relative notation. Use period to reach larger intervals.
    */
@@ -100,36 +100,12 @@ export type SplitMosAccidental = {
   accidental: Accidental | MosAccidental;
 };
 
-/**
- * Diamond-mos nominals from J to Z.
- *
- * The number of valid nominals corresponds to the size of the MOS scale and repeats every equave.
- */
-export type MosNominal =
-  | 'J'
-  | 'K'
-  | 'L'
-  | 'M'
-  | 'N'
-  | 'O'
-  | 'P'
-  | 'Q'
-  | 'R'
-  | 'S'
-  | 'T'
-  | 'U'
-  | 'V'
-  | 'W'
-  | 'X'
-  | 'Y'
-  | 'Z';
-
 /**
  * Absolute Diamond-mos pitch.
  */
 export type AbsoluteMosPitch = {
   type: 'AbsolutePitch';
-  nominal: MosNominal;
+  nominal: string;
   accidentals: SplitMosAccidental[];
   octave: number;
 };

src/grammars/sonic-weave.pegjs

@@ -1509,8 +1509,17 @@ PitchNominal 'pitch nominal'
   / 'ome'
 
 // Some pitches like M3 or S9 are inaccessible due to other rules and require accidentals to disambiguate.
+// Absurd nominals like SQRT#4 also require accidentals to disambiguate.
 AbsolutePitch
-  = nominal: PitchNominal accidentals: Accidental* octave: SignedBasicInteger {
+  = nominal: $[J-Z]|2..| accidentals: Accidental+ octave: SignedBasicInteger {
+    return {
+      type: 'AbsolutePitch',
+      nominal,
+      accidentals,
+      octave,
+    };
+  }
+  / nominal: PitchNominal accidentals: Accidental* octave: SignedBasicInteger {
     return {
       type: 'AbsolutePitch',
       nominal,
@@ -1562,6 +1571,7 @@ ArrowFunction
 // This rule is a faster version of the part of (FJS / AbsoluteFJS / (SquareSuperparticular)) which overlaps with identifiers.
 ReservedPattern
   = [sqQ]? (AugmentedToken+ / [mMnP]) [0-9]+ 'ms'? ([_v] [0-9])*
+  / [J-Z]|2..| [sqQxdb_ae]+ [0-9]+ ([_v] [0-9])*
   / PitchNominal [sqQxdb_ae]* [0-9]+ ([_v] [0-9])*
 
 // TODO: Figure out where to put this

src/parser/__tests__/source.spec.ts

@@ -1776,4 +1776,22 @@ describe('SonicWeave parser', () => {
       '1\\1',
     ]);
   });
+
+  it('supports large MOS scales', () => {
+    const scale = expand(`
+      MOS 42L 7s
+      JK_4
+      JT♮4
+      KQ&4
+      J5
+      i => i str(nedji(i, niente, 91))
+    `);
+    expect(scale).toEqual([
+      'MOS {LLLLLLsLLLLLLsLLLLLLsLLLLLLsLLLLLLsLLLLLLsLLLLLLs;L=2^2/91;s=2^1/91}',
+      'JK_4 "34\\\\91"',
+      'JT♮4 "51\\\\91"',
+      'KQ&4 "78\\\\91"',
+      'J5 "91\\\\91"',
+    ]);
+  });
 });

src/parser/mos.ts

@@ -14,7 +14,7 @@ import {TimeMonzo, TimeReal} from '../monzo';
 import {ExpressionVisitor} from './expression';
 import {MosMonzo, MosOptions, generateNotation, mos} from 'moment-of-symmetry';
 import {Interval} from '../interval';
-import {MosConfig, MosDegree, MosNominal} from '../diamond-mos';
+import {MosConfig, MosDegree} from '../diamond-mos';
 import {ONE, TWO, ZERO} from '../utils';
 
 const TWO_MONZO = new TimeMonzo(ZERO, [ONE]);
@@ -148,7 +148,7 @@ export class Tardigrade {
     const semiam = am.sqrt() as TimeMonzo;
     const r = (m: MosMonzo) =>
       realize(m, large as TimeMonzo, small as TimeMonzo);
-    const scale = notation.scale as unknown as Map<MosNominal, TimeMonzo>;
+    const scale = notation.scale as unknown as Map<string, TimeMonzo>;
     for (const [key, value] of notation.scale) {
       scale.set(key, r(value));
     }

src/stdlib/builtin.ts

@@ -26,7 +26,7 @@ import {
   setNumberOfComponents,
 } from '../monzo';
 import {type ExpressionVisitor} from '../parser';
-import {MosOptions, mos} from 'moment-of-symmetry';
+import {MosOptions, mos, nthNominal} from 'moment-of-symmetry';
 import {expressionToString} from '../ast';
 import {
   BasisElement,
@@ -72,7 +72,7 @@ import {
   factorColor as pubFactorColor,
   compare,
 } from './public';
-import {MosNominal, scaleMonzos} from '../diamond-mos';
+import {scaleMonzos} from '../diamond-mos';
 const {version: VERSION} = require('../../package.json');
 
 // === Library ===
@@ -1941,9 +1941,7 @@ function automos(this: ExpressionVisitor) {
         type: 'AbsoluteFJS',
         pitch: {
           type: 'AbsolutePitch',
-          nominal: String.fromCharCode(
-            'J'.charCodeAt(0) + mmod(i + 1, monzos.length)
-          ) as MosNominal,
+          nominal: nthNominal(mmod(i + 1, monzos.length)),
           accidentals: [{accidental: '♮', fraction: ''}],
           octave: i === monzos.length - 1 ? 5 : 4,
         },