mercury-lang - npm Package Compare versions

Comparing version 1.2.2 to 1.2.3

data/bind-functions.json

@@ -19,6 +19,9 @@ {
 	"amp" : [
+		"g",
 		"gain",
+		"a",
+		"amplitude",
+		"v",
 		"vol",
 		"volume",
-		"amplitude",
 		"velocity",
@@ -29,2 +32,3 @@ "vel"
 	"beat" : [
+		"b",
 		"rhythm",
@@ -35,2 +39,3 @@ "play"
 	"env" : [
+		"e",
 		"envelope",
@@ -45,2 +50,3 @@ "shape",
 	"note" : [
+		"n",
 		"pitch"
@@ -50,2 +56,3 @@ ],
 	"time" : [
+		"t",
 		"timing"
@@ -63,2 +70,3 @@ ],
 	"pan" : [
+		"p",
 		"panning",
@@ -76,2 +84,3 @@ "spat",
 	"speed" : [
+		"s",
 		"rate",
@@ -90,3 +99,5 @@ "playback"
 		"effect",
-		"fx"
+		"fx",
+		"cc",
+		"change"
 	],
@@ -105,2 +116,3 @@
 	"wave2" : [
+		"w",
 		"osc2",
@@ -107,0 +119,0 @@ "add_osc"

package.json

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

README.md

 # 🌕 Mercury Parser
 
-This Package does not generate any sound or visuals. This package only parses Mercury code and returns a JSON formatted parse tree. This is used in the [Mercury](https://github.com/tmhglnd/mercury) environment to translate the code to sound and visual objects. In a future version this will be used in a browser-based Mercury.
+This Package does not generate any sound or visuals. This package only parses Mercury code and returns a JSON formatted parse tree. This is used in the [Mercury](https://github.com/tmhglnd/mercury) environment to translate the code to sound and visual objects. This is also used in the [Mercury-Playground](https://github.com/tmhglnd/mercury-playground), a browser based lite version of the environment.
+
 ## 📟 Mercury? 
@@ -5,0 +6,0 @@

test/test-mini.txt

@@ -7,2 +7,4 @@ set tempo 143
 new sample kick_min %(1/16) ^(1 1/32 2) @(kick) *(1.1)
-	set kick !(euclid(16 5)) ~(drive 4)
+	set kick !(euclid(16 5)) ~(drive 4)
+
+new sample violin_g t(3/16) b(0.9) n(7 1) e(5 150) g(0.4) p(-0.3) s(0.5)

test/test-synth.txt

@@ -33,3 +33,3 @@ set volume 0.9 5000
 	set myMidi time(1/8) length(150) out(2) 
-	set myMidi fx(15 100) fx(22 60)
+	set myMidi change(15 100) cc(22 60)
 
@@ -36,0 +36,0 @@ set all fx(reverb 1 20) fx(chip 0.5)

test/tree/test-grammar.json

@@ -71,9 +71,9 @@ {
         "snare",
+        "hat",
         "kick",
-        "kick",
-        "kick",
         "snare",
         "hat",
         "snare",
-        "snare"
+        "hat",
+        "kick"
       ],
@@ -140,7 +140,7 @@ "arpMel": [
       "bsLine2": [
+        0,
+        6,
+        3,
         10,
-        3,
-        13,
-        6,
-        0
+        13
       ],
@@ -173,3 +173,3 @@ "bsLine3": [
     "objects": {
-      "LPBK20G7": {
+      "Z290EG1F": {
         "object": "synth",
@@ -203,7 +203,7 @@ "type": "saw",
           "name": [
-            "LPBK20G7"
+            "Z290EG1F"
           ]
         }
       },
-      "X8A64FG3": {
+      "QQDRIX5J": {
         "object": "sample",
@@ -236,7 +236,7 @@ "type": "hat_min",
           "name": [
-            "X8A64FG3"
+            "QQDRIX5J"
           ]
         }
       },
-      "0PIVSNHF": {
+      "HO4X75A9": {
         "object": "sample",
@@ -274,7 +274,7 @@ "type": [
           "name": [
-            "0PIVSNHF"
+            "HO4X75A9"
           ]
         }
       },
-      "7RZ4Z8E5": {
+      "QUVG6ERG": {
         "object": "synth",
@@ -311,3 +311,3 @@ "type": [
           "name": [
-            "7RZ4Z8E5"
+            "QUVG6ERG"
           ]
@@ -314,0 +314,0 @@ }

test/tree/test-mini.json

@@ -34,3 +34,3 @@ {
     "objects": {
-      "YYXSI0DN": {
+      "341QBXP8": {
         "object": "synth",
@@ -89,3 +89,3 @@ "type": "saw",
           "name": [
-            "YYXSI0DN"
+            "341QBXP8"
           ]
@@ -148,2 +148,41 @@ }
         }
+      },
+      "O4POYH8Q": {
+        "object": "sample",
+        "type": "violin_g",
+        "functions": {
+          "group": [],
+          "time": [
+            "3/16"
+          ],
+          "speed": [
+            0.5
+          ],
+          "env": [
+            5,
+            150
+          ],
+          "beat": [
+            0.9
+          ],
+          "amp": [
+            0.4
+          ],
+          "stretch": [
+            0,
+            1,
+            1
+          ],
+          "add_fx": [],
+          "note": [
+            7,
+            1
+          ],
+          "pan": [
+            -0.3
+          ],
+          "name": [
+            "O4POYH8Q"
+          ]
+        }
       }
@@ -406,2 +445,90 @@ },
         }
+      },
+      {
+        "@object": {
+          "@new": {
+            "@inst": "sample",
+            "@type": {
+              "@identifier": "violin_g"
+            },
+            "@functions": [
+              {
+                "@function": {
+                  "@name": "time",
+                  "@args": [
+                    {
+                      "@division": "3/16"
+                    }
+                  ]
+                }
+              },
+              {
+                "@function": {
+                  "@name": "beat",
+                  "@args": [
+                    {
+                      "@number": 0.9
+                    }
+                  ]
+                }
+              },
+              {
+                "@function": {
+                  "@name": "note",
+                  "@args": [
+                    {
+                      "@number": 7
+                    },
+                    {
+                      "@number": 1
+                    }
+                  ]
+                }
+              },
+              {
+                "@function": {
+                  "@name": "env",
+                  "@args": [
+                    {
+                      "@number": 5
+                    },
+                    {
+                      "@number": 150
+                    }
+                  ]
+                }
+              },
+              {
+                "@function": {
+                  "@name": "amp",
+                  "@args": [
+                    {
+                      "@number": 0.4
+                    }
+                  ]
+                }
+              },
+              {
+                "@function": {
+                  "@name": "pan",
+                  "@args": [
+                    {
+                      "@number": -0.3
+                    }
+                  ]
+                }
+              },
+              {
+                "@function": {
+                  "@name": "speed",
+                  "@args": [
+                    {
+                      "@number": 0.5
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        }
       }
@@ -408,0 +535,0 @@ ]

test/tree/test-sample.json

@@ -21,3 +21,3 @@ {
     "objects": {
-      "8J6FAS6F": {
+      "O700JIF4": {
         "object": "sample",
@@ -58,3 +58,3 @@ "type": [
           "name": [
-            "8J6FAS6F"
+            "O700JIF4"
           ]
@@ -61,0 +61,0 @@ }

test/tree/test-synth.json

@@ -90,3 +90,3 @@ {
     "objects": {
-      "TQTWSAMV": {
+      "0GBVC53H": {
         "object": "synth",
@@ -146,7 +146,7 @@ "type": [
           "name": [
-            "TQTWSAMV"
+            "0GBVC53H"
           ]
         }
       },
-      "A4ZS1TE3": {
+      "DCO0WELM": {
         "object": "sample",
@@ -193,3 +193,3 @@ "type": [
           "name": [
-            "A4ZS1TE3"
+            "DCO0WELM"
           ]
@@ -196,0 +196,0 @@ }

No alert changes

Improved metrics

Total package byte prevSize

2318030

increased by0.13%

Lines of code

12744

increased by1.1%

Number of lines in readme file

229

increased by0.44%

No dependency changes