mercury-lang - npm Package Compare versions

Comparing version 1.9.4 to 1.9.6

package.json

 {
   "name": "mercury-lang",
-  "version": "1.9.4",
+  "version": "1.9.6",
   "description": "Parser for the mercury live coding language",
@@ -5,0 +5,0 @@ "main": "index.js",

test/grammar.test.js

@@ -167,2 +167,3 @@ //
 				'speed' : [ 1 ],
+				'note' : [ 'off' ],
 				'env' : [ -1 ],
@@ -172,3 +173,3 @@ 'beat' : [ 1, -1 ],
 				'pan' : [ 0 ],
-				'note' : [ 0, 2 ],
+				'note' : [ "off" ],
 				'tune' : [ 60 ],
@@ -197,3 +198,2 @@ 'stretch': [0, 1, 1],
 				'note' : [ 0, 0 ],
-				'pan' : [ 0 ],
 				'env' : [ 250 ],
@@ -222,3 +222,3 @@ 'out' : [ 1 ],
 				'beat' : [ 1, -1 ],
-				'note' : null,
+				'note' : [ 'off' ],
 				'pan' : [ 0 ],
@@ -246,3 +246,3 @@ 'env' : [ -1 ],
 				'speed' : [ 1 ],
-				'note' : [ 0, 2 ],
+				'note' : [ 'off' ],
 				'tune' : [ 60 ],
@@ -298,3 +298,2 @@ 'env' : [ -1 ],
 				'note' : [ 0, 0 ],
-				'pan' : [ 0 ],
 				'env' : [ 1, 250 ],
@@ -337,3 +336,3 @@ 'group' : [],
 				'speed' : [ 1 ],
-				'note' : [ 0, 2 ],
+				'note' : [ "off" ],
 				'tune' : [ 60 ],
@@ -384,5 +383,4 @@ 'env' : [ -1 ],
 				'amp' : [ 1 ],
+				'note' : [ 0, 0 ],
 				'env' : [ 1, 250 ],
-				'note' : [ 0, 0 ],
-				'pan' : [ 0 ],
 				'add_fx' : []
@@ -455,2 +453,47 @@ }
 
+// test('Instruments with Array Synth/Sample names', () => {
+// 	let expected = {
+// 		'bob' : {
+// 			'object' : 'synth',
+// 			'type' : [ 'square', 'saw', 'saw', 'square', 'sine' ],
+// 			'functions' : {
+// 				'name' : ['bob'],
+// 				'group' : [],
+// 				'time' : [ '1/1', 0 ],
+// 				'note' : [ 0, 0 ],
+// 				'env' : [ 1, 250 ],
+// 				'beat' : [ 1, -1 ],
+// 				'pan' : [ 0 ],
+// 				'amp' : [ 0.7 ],
+// 				'wave2' : [ 'saw', 0 ],
+// 				'add_fx' : [],
+// 			}
+// 		},
+// 		'alice' : {
+// 			'object' : 'sample',
+// 			'type' : [ ['s', 'h' ], ['s', 'h' ], 'k', ['s', 'h' ], 'k' ],
+// 			'functions' : {
+// 				'name' : ['alice'],
+// 				'group' : [],
+// 				'time' : [ '1/1', 0 ],
+// 				'speed' : [ 1 ],
+// 				'note' : [ "off" ],
+// 				'tune' : [ 60 ],
+// 				'env' : [ -1 ],
+// 				'pan' : [ 0 ],
+// 				'beat' : [ 1, -1 ],
+// 				'amp' : [ 0.9 ],
+// 				'stretch': [ 0, 1, 1 ],
+// 				'add_fx' : [],
+// 			}
+// 		}
+// 	}
+
+// 	let code = `
+// 	set randomSeed 4832
+// 	new synth choose(5 [saw sine square]) name(bob)
+// 	new sample choose(5 [k [s h]]) name(alice)`;
+// 	expect(Mercury(code).parseTree.objects).toStrictEqual(expected);
+// });
+
 test('Silence code', () => {
@@ -457,0 +500,0 @@ expect(Mercury(`silence`).parseTree.global.silence).toStrictEqual(true);

No alert changes

Improved metrics

Total package byte prevSize

2369471

increased by0.06%

Lines of code

18432

increased by0.22%

No dependency changes