@vibuca/synth8-core 0.1.1 → 0.2.0

package/dist/index.js

@@ -37,42 +37,46 @@ var e = (e) => {
 		return a;
 	};
 	return r();
-}, n = /^[a-gA-G](#|b)?[0-8]$/, r = (e) => e === "_" || n.test(e);
-//#endregion
-//#region src/parser/melody-pattern-parser.ts
-function i(e) {
-	let t = [...e], n = 0;
-	function i() {
+}, n = /^[a-gA-G](#|b)?[0-8]$/, r = (e) => e === "_" || n.test(e), i = (e) => {
+	let t = e.split("+").filter(Boolean);
+	return t.length === 1 ? {
+		kind: "MelodyNote",
+		value: t[0]
+	} : {
+		kind: "MelodyParallel",
+		notes: t.map((e) => ({
+			kind: "MelodyNote",
+			value: e
+		}))
+	};
+}, a = (e) => {
+	let t = e.split("+").filter(Boolean);
+	if (t.length === 0) throw Error("Expected note.");
+	for (let e of t) if (!r(e)) throw Error(`Unknown note: ${e}`);
+}, o = (e) => {
+	let t = [...e], n = 0, r = () => {
 		for (; t[n] === " ";) n++;
-	}
-	function a(e) {
-		let o = [];
+	}, o = (e) => {
+		let s = [];
 		for (; n < t.length;) {
-			if (i(), e && t[n] === e) return n++, o;
+			if (r(), e && t[n] === e) return n++, s;
 			if (t[n] === "[") {
-				n++, o.push({
+				n++, s.push({
 					kind: "MelodyGroup",
-					notes: a("]")
+					notes: o("]")
 				});
 				continue;
 			}
-			let s = "";
-			for (; n < t.length && t[n] !== " " && t[n] !== "[" && t[n] !== "]";) s += t[n++];
-			if (!s) break;
-			if (!r(s)) throw Error(`Unknown note: ${s}`);
-			o.push({
-				kind: "MelodyNote",
-				value: s
-			});
+			let c = "";
+			for (; n < t.length && t[n] !== " " && t[n] !== "[" && t[n] !== "]";) c += t[n++];
+			if (!c) break;
+			a(c), s.push(i(c));
 		}
 		if (e) throw Error("Unclosed melody group");
-		return o;
-	}
-	return a();
-}
-//#endregion
-//#region src/parser/tokenizer.ts
-var a = (e) => {
+		return s;
+	};
+	return o();
+}, s = (e) => {
 	let t = [], n = 0;
 	for (; n < e.length;) {
 		let r = e[n];
@@ -119,7 +123,7 @@ var a = (e) => {
 		throw Error(`Unexpected character: ${r}`);
 	}
 	return t;
-}, o = class {
+}, c = class {
 	tokens;
 	index = 0;
 	constructor(e) {
@@ -161,7 +165,7 @@ var a = (e) => {
 		let t = this.parseOptionalRate();
 		return {
 			kind: "MelodyExpression",
-			notes: i(e),
+			notes: o(e),
 			rate: t
 		};
 	}
@@ -211,7 +215,7 @@ var a = (e) => {
 	isAtEnd() {
 		return this.index >= this.tokens.length;
 	}
-}, s = (e) => new o(a(e)).parse(), c = "_", l = new Set([
+}, l = (e) => new c(s(e)).parse(), u = "_", d = new Set([
 	"kick",
 	"snare",
 	"clap",
@@ -220,29 +224,29 @@ var a = (e) => {
 	"tom",
 	"rim",
 	"cowbell"
-]), u = (e) => {
-	if (e !== c && !l.has(e)) throw Error(`Unknown drum sound: ${e}`);
-}, d = (e) => {
+]), f = (e) => {
+	if (e !== u && !d.has(e)) throw Error(`Unknown drum sound: ${e}`);
+}, p = (e) => {
 	if (e.kind === "BeatGroup") {
-		for (let t of e.steps) d(t);
+		for (let t of e.steps) p(t);
 		return;
 	}
 	if (e.kind === "BeatParallel") {
-		for (let t of e.sounds) u(t.value);
+		for (let t of e.sounds) f(t.value);
 		return;
 	}
-	u(e.value);
-}, f = (e, t, n) => {
+	f(e.value);
+}, m = (e, t, n) => {
 	if (e.length === 0) return [];
 	let r = [], i = n / e.length;
 	return e.forEach((e, n) => {
 		let a = t + n * i;
 		switch (e.kind) {
 			case "BeatGroup":
-				r.push(...f(e.steps, a, i));
+				r.push(...m(e.steps, a, i));
 				break;
 			case "BeatParallel":
-				for (let t of e.sounds) t.value !== c && r.push({
+				for (let t of e.sounds) t.value !== u && r.push({
 					time: a,
 					dur: i,
 					type: "drum",
@@ -250,7 +254,7 @@ var a = (e) => {
 				});
 				break;
 			case "BeatSound":
-				if (e.value === c) break;
+				if (e.value === u) break;
 				r.push({
 					time: a,
 					dur: i,
@@ -260,25 +264,25 @@ var a = (e) => {
 				break;
 		}
 	}), r;
-}, p = (e) => {
+}, h = (e) => {
 	switch (e.kind) {
 		case "BeatExpression": {
-			for (let t of e.steps) d(t);
+			for (let t of e.steps) p(t);
 			let t = 1 / e.rate, n = e.steps.length * t;
 			return {
 				length: n,
-				events: f(e.steps, 0, n)
+				events: m(e.steps, 0, n)
 			};
 		}
 		case "MelodyExpression": {
 			let t = 1 / e.rate, n = e.notes.length * t;
 			return {
 				length: n,
-				events: m(e.notes, 0, n)
+				events: g(e.notes, 0, n)
 			};
 		}
 		case "SongExpression": {
-			let t = e.tracks.map(p);
+			let t = e.tracks.map(h);
 			return {
 				length: Math.max(...t.map((e) => e.length)),
 				events: t.flatMap((e) => e.events)
@@ -286,7 +290,7 @@ var a = (e) => {
 		}
 		default: throw Error("Unknown AST node");
 	}
-}, m = (e, t, n) => {
+}, g = (e, t, n) => {
 	let r = n / e.length;
 	return e.flatMap((e, n) => {
 		let i = t + n * r;
@@ -295,8 +299,13 @@ var a = (e) => {
 			dur: r,
 			type: "note",
 			value: e.value
-		}] : m(e.notes, i, r);
+		}] : e.kind === "MelodyParallel" ? e.notes.filter((e) => e.value !== "_").map((e) => ({
+			time: i,
+			dur: r,
+			type: "note",
+			value: e.value
+		})) : g(e.notes, i, r);
 	});
-}, h = (e) => p(s(e)), g = "0.1.0";
+}, _ = (e) => h(l(e)), v = "0.1.0";
 //#endregion
-export { g as VERSION, h as compile, s as parse, a as tokenize };
+export { v as VERSION, _ as compile, l as parse, s as tokenize };

package/dist/model/ast.d.ts

@@ -13,7 +13,7 @@ export type MelodyExpression = {
     notes: MelodyStep[];
     rate: number;
 };
-export type MelodyStep = MelodyNote | MelodyGroup;
+export type MelodyStep = MelodyNote | MelodyGroup | MelodyParallel;
 export type MelodyNote = {
     kind: "MelodyNote";
     value: string;
@@ -22,6 +22,10 @@ export type MelodyGroup = {
     kind: "MelodyGroup";
     notes: MelodyStep[];
 };
+export type MelodyParallel = {
+    kind: "MelodyParallel";
+    notes: MelodyNote[];
+};
 export type BeatStep = BeatSound | BeatGroup | BeatParallel;
 export type BeatSound = {
     kind: "BeatSound";

package/dist/parser/melody-pattern-parser.d.ts

@@ -1,2 +1,2 @@
 import { MelodyStep } from '../model/ast';
-export declare function parseMelodyPattern(source: string): MelodyStep[];
+export declare const parseMelodyPattern: (source: string) => MelodyStep[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibuca/synth8-core",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "type": "module",
   "license": "MIT",
   "main": "./dist/index.js",