discombobulator 1.0.8 → 1.0.10

package/package.json

@@ -1,7 +1,15 @@
 {
   "name": "discombobulator",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Discombobulator core library",
+  "homepage": "https://github.com/MarkPWebb/discombobulator#readme",
+  "bugs": {
+    "url": "https://github.com/MarkPWebb/discombobulator/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MarkPWebb/discombobulator.git"
+  },
   "license": "ISC",
   "author": "Mark Webb",
   "type": "module",

package/src/articulation.mjs

@@ -3,7 +3,7 @@
 // An articulation is a modification to a note, such as an accent or roll.
 
 // import util from "util";
-import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
+// import { _inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { Element } from "./element.mjs";
 
@@ -18,9 +18,12 @@ export class Articulation extends Element {
     }
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "Articulation";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   // [util.inspect.custom](depth, opts) {
   [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)

package/src/articulationset.mjs

@@ -7,14 +7,17 @@ import { Articulation } from './articulation.mjs'
 
 export class ArticulationSet extends Set {
     constructor(options = {}) {
-        super(options)
+      super(options);
     }
 
     get allowedElements() {
-        return [ Articulation ];
+      return [ Articulation ];
     }
 
+    get asString() {
+      return "ArticulationSet";
+    }
     get [Symbol.toStringTag]() {
-        return "ArticulationSet";
+      return this.asString;
     }
 }

package/src/chord.mjs

@@ -13,9 +13,12 @@ export class Chord extends PatternSource {
     super({ ...options, strict: false });
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "Chord";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   // Utility method to represent a chord for display, diagnostic and comparison purposes.
   static summarise(chord) {

package/src/cross.mjs

@@ -12,7 +12,7 @@ import { Pattern } from './pattern.mjs'
 import { PatternSet } from './patternset.mjs'
 
 // Cross (Cartesian Product): All pairs of elements innerElement2-element setfrom two sets.
-export class Cross extends Set.Operator {
+export class Cross extends Set.BinaryOperator {
   // Map cross parameter types (sets) to a resultant set type that Cross acts as
   // a proxy for. Entries in the map have the following fields:
   //  a: first set argument type in the cross.
@@ -83,15 +83,21 @@ export class Cross extends Set.Operator {
     return this.#proxyfor;
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return `Cross (${this.#proxyfor.name})`;
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   *[Symbol.iterator]() {
     let element = this.#allowed[0];
     let outer = this.elements[0];
     let inner = this.elements[1];
 
+    console.log(inner);
+    console.log(outer);
+
     for (let outerElement of outer) {
       for (let innerElement of inner) {
         yield new element({add: [ outerElement, innerElement ]});

package/src/element.mjs

@@ -5,9 +5,12 @@
 export class Element {
   constructor() {}
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "Element";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   // Base class equality operator.
   //

package/src/group.mjs

@@ -3,7 +3,7 @@
 // A group is a time-axis pattern that specifies how chords may be grouped.
 
 // import util from "util";
-import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
+// import { _inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { Element } from "./element.mjs";
 
@@ -29,9 +29,12 @@ export class Group extends Element {
     this.#length = length;
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "Group";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   get group() {
     return this.#group;

package/src/groupset.mjs

@@ -4,7 +4,7 @@
 // permutating the group set with a pattern set.
 
 // import util from "util";
-import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
+// import { _inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { bitCount, factorial } from "./util.mjs";
 import { permutations, permutationIndexGenerator } from "./permute.mjs";
@@ -53,16 +53,19 @@ export class GroupSet extends Set {
       this.#allowRepeats = options.allowRepeats;
     }
 
-    get [Symbol.toStringTag]() {
+    get asString() {
       return "Permute";
     }
+    get [Symbol.toStringTag]() {
+      return this.asString;
+    }
 
     #describe() {
       let description = "";
 
       for (let pattern of this) {
         // description += util.inspect(pattern);
-        description += inspect(pattern);  // from Disco App (base44)
+        description += pattern.asString;  // from Disco App (base44)
       }
 
       return description;
@@ -248,9 +251,12 @@ export class GroupSet extends Set {
     return [Group];
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "GroupSet";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   // Permute a Pattern, or each Pattern of a PatternSet, with each
   // Group in this GroupSet to produce a new PatternSet.

package/src/instrument.mjs

@@ -3,7 +3,7 @@
 // An instrument is a playing surface that generates a note.
 
 // import util from "util";
-import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
+// import { _inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { Element } from "./element.mjs";
 
@@ -18,9 +18,12 @@ export class Instrument extends Element {
     }
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "Instrument";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   // [util.inspect.custom](depth, opts) {
   [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)

package/src/instrumentset.mjs

@@ -14,7 +14,10 @@ export class InstrumentSet extends Set {
         return [ Instrument ];
     }
 
+    get asString() {
+      return "InstrumentSet";
+    }
     get [Symbol.toStringTag]() {
-        return "InstrumentSet";
+        return this.asString;
     }
 }

package/src/irregulargroupset.mjs

@@ -4,7 +4,7 @@
 // are generated.
 
 // import util from "util";
-import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
+// import { _inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { bitCount } from "./util.mjs";
 import { combinations, ithBinaryCombination } from "./permute.mjs";
@@ -89,9 +89,12 @@ export class IrregularGroupSet extends RegularGroupSet {
     return this.#reverseMax;
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "IrregularGroupSet";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   #actualMax(length) {
     return Math.max(
@@ -110,7 +113,7 @@ export class IrregularGroupSet extends RegularGroupSet {
 
     for (const group of this) {
       // groups += (groups.length == 0 ? "" : ", ") + util.inspect(group);
-      groups += (groups.length == 0 ? "" : ", ") + inspect(group);
+      groups += (groups.length == 0 ? "" : ", ") + group.asString;
     }
 
     return `${this[Symbol.toStringTag]} {[${groups}]}`;

package/src/note.mjs

@@ -3,7 +3,7 @@
 // A note is a tuple of an instrument and a set of articulations that affect how it's played.
 
 // import util from "util";
-import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
+// import { _inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { Element } from "./element.mjs";
 import { Instrument } from "./instrument.mjs";
@@ -54,9 +54,12 @@ export class Note extends Element {
     return new this.constructor({ add: [ this.#instrument, articulations ]});
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "Note";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   // Pseudo-implementation to allow Note to act like a set of two elements.
   elementAt(index = 0) {
@@ -92,10 +95,10 @@ export class Note extends Element {
   [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
     return `${this[Symbol.toStringTag]} {${
       // !!this.#instrument ? util.inspect(this.#instrument) : "undefined"
-      !!this.#instrument ? inspect(this.#instrument) : "undefined"
+      !!this.#instrument ? this.#instrument.asString : "undefined"
     }, {${
       // !!this.#articulations ? util.inspect(this.#articulations) : "undefined"
-      !!this.#articulations ? inspect(this.#articulations) : "undefined"
+      !!this.#articulations ? this.#articulations.asString : "undefined"
     }}}`;
   }
 

package/src/noteset.mjs

@@ -11,9 +11,12 @@ export class NoteSet extends PatternSource {
     super(options);
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "NoteSet";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   toChord() {
     return new Chord({add: this});

package/src/pattern.mjs

@@ -14,9 +14,12 @@ export class Pattern extends Set {
     return [PatternSource];
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "Pattern";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   // Equality operator overide.
   //

package/src/patternset.mjs

@@ -14,7 +14,10 @@ export class PatternSet extends Set {
     return [Pattern];
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "PatternSet";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 }

package/src/patternsource.mjs

@@ -15,7 +15,10 @@ export class PatternSource extends Set {
     return [ Note ];
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "PatternSource";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 }

package/src/regulargroupset.mjs

@@ -2,7 +2,7 @@
 // groups in a range determined by boundaries and a step rate.
 
 // import util from "util";
-import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
+// import { _inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { bitCount } from "./util.mjs";
 import { Group } from "./group.mjs";
@@ -74,9 +74,12 @@ export class RegularGroupSet extends GroupSet {
     return this.#step;
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "RegularGroupSet";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   // [util.inspect.custom](depth, opts) {
   [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
@@ -84,7 +87,7 @@ export class RegularGroupSet extends GroupSet {
 
     for (const group of this) {
       // groups += (groups.length == 0 ? "" : ", ") + util.inspect(group);
-      groups += (groups.length == 0 ? "" : ", ") + inspect(group);
+      groups += (groups.length == 0 ? "" : ", ") + group.asString;
     }
 
     return `${this[Symbol.toStringTag]} {[${groups}]}`;

package/src/schedule.mjs

@@ -8,7 +8,7 @@
 // pattern.
 
 // import util from "util";
-import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
+// import { _inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import Fraction from "fraction.js"
 
@@ -36,16 +36,19 @@ export class Schedule extends Set {
     return [ Pattern, PatternSet ];
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "Schedule";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   #describe() {
     let description = "";
 
     for (let patterns of this) {
       // description += util.inspect(patterns);
-      description += inspect(patterns); // from Disco App (base44)
+      description += patterns.asString; // from Disco App (base44)
     }
 
     return description;

package/src/schema.mjs

@@ -23,9 +23,12 @@ export class Schema extends Set {
     return [ Schedule ];
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "Schema";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   get timeSignature() {
     return this.#timeSignature;

package/src/set.mjs

@@ -3,7 +3,7 @@
 // Base class for sets and sequences.
 
 // import util from "util";
-import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
+// import { _inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { Element } from "./element.mjs";
 
@@ -50,9 +50,12 @@ export class Set extends Element {
     return this.#allowedElementTypes;
   }
 
-  get [Symbol.toStringTag]() {
+  get asString() {
     return "Set";
   }
+  get [Symbol.toStringTag]() {
+    return this.asString;
+  }
 
   get isAbstract() {
     return this.#isAbstract;
@@ -145,7 +148,7 @@ export class Set extends Element {
   // [util.inspect.custom](depth, opts) {
   [Symbol.for('nodejs.util.inspect.custom')](depth, opts) {  // from Disco App (base44)
     // return `${this[Symbol.toStringTag]} {${util.inspect(this.elements)}}`;
-    return `${this[Symbol.toStringTag]} {${inspect(this.elements)}}`; // from Disco App (base44)
+    return `${this[Symbol.toStringTag]} {${this.elements.asString}}`; // from Disco App (base44)
   }
 
   // Set generator/iterator. By default, just enumerate the elements in the set.
@@ -209,18 +212,22 @@ export class Set extends Element {
       return this.#setof;
     }
 
-    get [Symbol.toStringTag]() {
+    get asString() {
       return "SetOf";
     }
+    get [Symbol.toStringTag]() {
+      return this.asString;
+    }
 
     // [util.inspect.custom](depth, opts) {
     //   return `${this[Symbol.toStringTag]} {${util.inspect(this.#setof)}}`;
-  [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
-    return `${this[Symbol.toStringTag]} {${inspect(this.#setof)}}`;
-  }
+    [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
+      return `${this[Symbol.toStringTag]} {${this.#setof.asString}}`;
+    }
 
     get name() {
-      return this[util.inspect.custom]();
+      // return this[util.inspect.custom]();
+      return this[inspect.custom](); // from Disco App (base44)
     }
 
     equals(other) {
@@ -366,7 +373,7 @@ export class Set extends Element {
             }
           }
         } else {
-          throw new Error("Attempt to add incorrect element type to set");
+          throw new Error(`Attempt to add incorrect element type to set: ${element}`);
         }
       } else {
         this.internalAdd(promoted);
@@ -607,9 +614,12 @@ export class Set extends Element {
       super(options);
     }
 
-    get [Symbol.toStringTag]() {
+    get asString() {
       return "Operator";
     }
+    get [Symbol.toStringTag]() {
+      return this.asString;
+    }
 
     get smallestSet() {
       return this.elements[0].size <= this.elements[1].size ? 0 : 1;
@@ -619,7 +629,8 @@ export class Set extends Element {
       let inspect = "";
 
       for (let element of this) {
-        inspect += (inspect.length > 0 ? ", " : "") + util.inspect(element);
+        // inspect += (inspect.length > 0 ? ", " : "") + util.inspect(element);
+        inspect += (inspect.length > 0 ? ", " : "") + element.asString;
       }
 
       return inspect;
@@ -700,7 +711,7 @@ export class Set extends Element {
 
       for (const element of this) {
         // elements += (elements.length == 0 ? "" : ", ") + util.inspect(element);
-        elements += (elements.length == 0 ? "" : ", ") + inspect(element);
+        elements += (elements.length == 0 ? "" : ", ") + element.asString;
       }
 
       return `${this[Symbol.toStringTag]} {[${elements}]}`;
@@ -765,9 +776,12 @@ export class Set extends Element {
       return this.elements[0].allowedElements;
     }
 
-    get [Symbol.toStringTag]() {
+    get asString() {
       return "BinaryOperator";
     }
+    get [Symbol.toStringTag]() {
+      return this.asString;
+    }
 
     get smallestSet() {
       return this.elements[0].size <= this.elements[1].size ? 0 : 1;
@@ -777,7 +791,8 @@ export class Set extends Element {
       let inspect = "";
 
       for (let element of this) {
-        inspect += (inspect.length > 0 ? ", " : "") + util.inspect(element);
+        // inspect += (inspect.length > 0 ? ", " : "") + util.inspect(element);
+        inspect += (inspect.length > 0 ? ", " : "") + element.asString; // from Disco App (base44)
       }
 
       return inspect;
@@ -835,9 +850,12 @@ export class Set extends Element {
       super(set1, set2, options);
     }
 
-    get [Symbol.toStringTag]() {
+    get asString() {
       return "Difference";
     }
+    get [Symbol.toStringTag]() {
+      return this.asString;
+    }
 
     *[Symbol.iterator]() {
       for (let element of this.elements[0]) {
@@ -880,9 +898,12 @@ export class Set extends Element {
       super(set1, set2, options);
     }
 
-    get [Symbol.toStringTag]() {
+    get asString() {
       return "Intersection";
     }
+    get [Symbol.toStringTag]() {
+      return this.asString;
+    }
 
     *[Symbol.iterator]() {
       const smallestSet = this.smallestSet;
@@ -961,9 +982,12 @@ export class Set extends Element {
       return this.#rotateLeft;
     }
 
-    get [Symbol.toStringTag]() {
+    get asString() {
       return "Rotation";
     }
+    get [Symbol.toStringTag]() {
+      return this.asString;
+    }
 
     *[Symbol.iterator]() {
       const setSize = this.set.size;
@@ -1043,9 +1067,12 @@ export class Set extends Element {
       super(set1, set2, options);
     }
 
-    get [Symbol.toStringTag]() {
+    get asString() {
       return "SymmetricDifference";
     }
+    get [Symbol.toStringTag]() {
+      return this.asString;
+    }
 
     *[Symbol.iterator]() {
       for (let element of this.elements[0]) {
@@ -1101,9 +1128,12 @@ export class Set extends Element {
       super(set1, set2, options);
     }
 
-    get [Symbol.toStringTag]() {
+    get asString() {
       return "Union";
     }
+    get [Symbol.toStringTag]() {
+      return this.asString;
+    }
 
     *[Symbol.iterator]() {
       yield* this.elements[0];