discombobulator 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discombobulator",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Discombobulator core library",
   "license": "ISC",
   "author": "Mark Webb",

package/src/articulation.mjs

@@ -2,7 +2,8 @@
 //
 // An articulation is a modification to a note, such as an accent or roll.
 
-import util from "util";
+// import util from "util";
+import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { Element } from "./element.mjs";
 
@@ -21,7 +22,8 @@ export class Articulation extends Element {
     return "Articulation";
   }
 
-  [util.inspect.custom](depth, opts) {
+  // [util.inspect.custom](depth, opts) {
+  [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
     return `${this[Symbol.toStringTag]} {${
       !!this.#symbol ? this.#symbol.toString() : "undefined"
     }}`;

package/src/group.mjs

@@ -2,7 +2,8 @@
 //
 // A group is a time-axis pattern that specifies how chords may be grouped.
 
-import util from "util";
+// import util from "util";
+import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { Element } from "./element.mjs";
 
@@ -56,7 +57,8 @@ export class Group extends Element {
     return description;
   }
 
-  [util.inspect.custom](depth, opts) {
+  // [util.inspect.custom](depth, opts) {
+  [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
     return `${this[Symbol.toStringTag]} {${this.#describe()}}`;
   }
 

package/src/groupset.mjs

@@ -3,7 +3,8 @@
 // A group set is a set of groups, and allows patterns to be generated by 
 // permutating the group set with a pattern set.
 
-import util from "util";
+// import util from "util";
+import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { bitCount, factorial } from "./util.mjs";
 import { permutations, permutationIndexGenerator } from "./permute.mjs";
@@ -60,13 +61,15 @@ export class GroupSet extends Set {
       let description = "";
 
       for (let pattern of this) {
-        description += util.inspect(pattern);
+        // description += util.inspect(pattern);
+        description += inspect(pattern);  // from Disco App (base44)
       }
 
       return description;
     }
 
-    [util.inspect.custom](depth, opts) {
+    // [util.inspect.custom](depth, opts) {
+    [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
       return `${this[Symbol.toStringTag]} {${this.#describe()}}`;
     }
 

package/src/instrument.mjs

@@ -2,7 +2,8 @@
 //
 // An instrument is a playing surface that generates a note.
 
-import util from "util";
+// import util from "util";
+import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { Element } from "./element.mjs";
 
@@ -21,7 +22,8 @@ export class Instrument extends Element {
     return "Instrument";
   }
 
-  [util.inspect.custom](depth, opts) {
+  // [util.inspect.custom](depth, opts) {
+  [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
     return `Instrument {${
       !!this.#symbol ? this.#symbol.toString() : "undefined"
     }}`;

package/src/irregulargroupset.mjs

@@ -3,7 +3,8 @@
 // chords in a group varies based on another range, and all permutation of such groups
 // are generated.
 
-import util from "util";
+// import util from "util";
+import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { bitCount } from "./util.mjs";
 import { combinations, ithBinaryCombination } from "./permute.mjs";
@@ -103,11 +104,13 @@ export class IrregularGroupSet extends RegularGroupSet {
     );
   }
 
-  [util.inspect.custom](depth, opts) {
+  // [util.inspect.custom](depth, opts) {
+  [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
     let groups = "";
 
     for (const group of this) {
-      groups += (groups.length == 0 ? "" : ", ") + util.inspect(group);
+      // groups += (groups.length == 0 ? "" : ", ") + util.inspect(group);
+      groups += (groups.length == 0 ? "" : ", ") + inspect(group);
     }
 
     return `${this[Symbol.toStringTag]} {[${groups}]}`;

package/src/note.mjs

@@ -2,7 +2,8 @@
 //
 // A note is a tuple of an instrument and a set of articulations that affect how it's played.
 
-import util from "util";
+// import util from "util";
+import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { Element } from "./element.mjs";
 import { Instrument } from "./instrument.mjs";
@@ -87,11 +88,14 @@ export class Note extends Element {
     return this;
   }
 
-  [util.inspect.custom](depth, opts) {
+  // [util.inspect.custom](depth, opts) {
+  [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 ? util.inspect(this.#instrument) : "undefined"
+      !!this.#instrument ? inspect(this.#instrument) : "undefined"
     }, {${
-      !!this.#articulations ? util.inspect(this.#articulations) : "undefined"
+      // !!this.#articulations ? util.inspect(this.#articulations) : "undefined"
+      !!this.#articulations ? inspect(this.#articulations) : "undefined"
     }}}`;
   }
 

package/src/regulargroupset.mjs

@@ -1,7 +1,8 @@
 // RegularGroupGenerator is a Group generator that generates fully active
 // groups in a range determined by boundaries and a step rate.
 
-import util from "util";
+// import util from "util";
+import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { bitCount } from "./util.mjs";
 import { Group } from "./group.mjs";
@@ -77,11 +78,13 @@ export class RegularGroupSet extends GroupSet {
     return "RegularGroupSet";
   }
 
-  [util.inspect.custom](depth, opts) {
+  // [util.inspect.custom](depth, opts) {
+  [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
     let groups = "";
 
     for (const group of this) {
-      groups += (groups.length == 0 ? "" : ", ") + util.inspect(group);
+      // groups += (groups.length == 0 ? "" : ", ") + util.inspect(group);
+      groups += (groups.length == 0 ? "" : ", ") + inspect(group);
     }
 
     return `${this[Symbol.toStringTag]} {[${groups}]}`;

package/src/schedule.mjs

@@ -7,7 +7,9 @@
 // The duration is used by Schema to calculate the duration of each chord in each
 // pattern.
 
-import util from "util";
+// import util from "util";
+import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
+
 import Fraction from "fraction.js"
 
 import { Set } from "./set.mjs";
@@ -42,13 +44,15 @@ export class Schedule extends Set {
     let description = "";
 
     for (let patterns of this) {
-      description += util.inspect(patterns);
+      // description += util.inspect(patterns);
+      description += inspect(patterns); // from Disco App (base44)
     }
 
     return description;
   }
 
-  [util.inspect.custom](depth, opts) {
+  // [util.inspect.custom](depth, opts) {
+  [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
     return `${this[Symbol.toStringTag]} {${this.#duration.toString()}, {${this.#describe()}}}`;
   }
 

package/src/set.mjs

@@ -2,7 +2,8 @@
 //
 // Base class for sets and sequences.
 
-import util from "util";
+// import util from "util";
+import { inspect } from "./util-adapter.mjs"; // From Disco App (base44)
 
 import { Element } from "./element.mjs";
 
@@ -141,8 +142,10 @@ export class Set extends Element {
     if (this.isAbstract) throw new Error("Attempt to modify immutable set");
   }
 
-  [util.inspect.custom](depth, opts) {
-    return `${this[Symbol.toStringTag]} {${util.inspect(this.elements)}}`;
+  // [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)
   }
 
   // Set generator/iterator. By default, just enumerate the elements in the set.
@@ -210,9 +213,11 @@ export class Set extends Element {
       return "SetOf";
     }
 
-    [util.inspect.custom](depth, opts) {
-      return `${this[Symbol.toStringTag]} {${util.inspect(this.#setof)}}`;
-    }
+    // [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)}}`;
+  }
 
     get name() {
       return this[util.inspect.custom]();
@@ -620,7 +625,9 @@ export class Set extends Element {
       return inspect;
     }
 
-    [util.inspect.custom](depth, opts) {
+    // [util.inspect.custom](depth, opts) {
+    //   return `${this[Symbol.toStringTag]} {${this.inspect()}}`;
+    [Symbol.for('nodejs.util.inspect.custom')](depth, opts) { // from Disco App (base44)
       return `${this[Symbol.toStringTag]} {${this.inspect()}}`;
     }
 
@@ -687,11 +694,13 @@ export class Set extends Element {
       return this.elements[0];
     }
 
-    [util.inspect.custom](depth, opts) {
+    // [util.inspect.custom](depth, opts) {
+    [Symbol.for('nodejs.util.inspect.custom')](depth, opts) {
       let elements = "";
 
       for (const element of this) {
-        elements += (elements.length == 0 ? "" : ", ") + util.inspect(element);
+        // elements += (elements.length == 0 ? "" : ", ") + util.inspect(element);
+        elements += (elements.length == 0 ? "" : ", ") + inspect(element);
       }
 
       return `${this[Symbol.toStringTag]} {[${elements}]}`;
@@ -774,7 +783,8 @@ export class Set extends Element {
       return inspect;
     }
 
-    [util.inspect.custom](depth, opts) {
+    // [util.inspect.custom](depth, opts) {
+    [Symbol.for('nodejs.util.inspect.custom')](depth, opts) {
       return `${this[Symbol.toStringTag]} {${this.inspect()}}`;
     }
 

package/src/util-adapter.mjs

@@ -0,0 +1,21 @@
+// Inserted from Disco App (base44)
+
+// A browser-safe adapter for Node's util module
+let inspect = (value) => String(value);
+
+try {
+  // Dynamic import works in both Node (as of v12+) and browser environments
+  const util = await import('util');
+  inspect = util.inspect;
+} catch (e) {
+  // Fallback for browsers
+  inspect = (value) => {
+    try {
+      return JSON.stringify(value, null, 2);
+    } catch (err) {
+      return String(value);
+    }
+  };
+}
+
+export { inspect };