cabbage-react 1.0.0-beta.32 → 1.0.0-beta.33

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("react");console.log("Cabbage: loading cabbage.js");class p{static sendParameterUpdate(n,e=null){const a={command:"parameterChange",obj:JSON.stringify(n)};e!==null?e.postMessage(a):(console.log("Cabbage: sending parameter change from UI",a),window.sendMessageFromUI(a))}static sendCustomCommand(n,e=null){const a={command:n,text:JSON.stringify({})};console.log("Cabbage: sending custom command from UI",a),e!==null?e.postMessage(a):window.sendMessageFromUI(a)}static sendWidgetUpdate(n,e=null){console.log("Cabbage: sending widget update from UI",n.props);const a={command:"widgetStateUpdate",obj:JSON.stringify(n.props)};e!==null?e.postMessage(a):window.sendMessageFromUI(a)}static sendMidiMessageFromUI(n,e,a,t=null){var o={statusByte:n,dataByte1:e,dataByte2:a};const i={command:"midiMessage",obj:JSON.stringify(o)};console.log("Cabbage: sending midi message from UI",o),t!==null?t.postMessage(i):window.sendMessageFromUI(i)}static MidiMessageFromHost(n,e,a){console.log("Cabbage: Got MIDI Message"+n+":"+e+":"+a)}static triggerFileOpenDialog(n,e){var a={channel:e};const t={command:"fileOpen",obj:JSON.stringify(a)};n!==null?n.postMessage(t):window.sendMessageFromUI(t)}}const v=g=>{const[n,e]=d.useState();return d.useEffect(()=>{const a=t=>{const{data:o}=t;if(o.channel===g&&o.data&&o.command==="widgetUpdate"){const i=JSON.parse(o.data);console.log(`[Cabbage-React] ${o.command}: Received properties for channel: ${o.channel}`,i),e(i)}};return window.addEventListener("message",a),()=>{window.removeEventListener("message",a)}},[]),{properties:n}},w=(g,n)=>{const{properties:e}=v(g),[a,t]=d.useState(),[o,i]=d.useState(),C=l=>{t(l);const r={paramIdx:n,channelType:o,channel:g,value:l};p.sendParameterUpdate(r,null)};return d.useEffect(()=>{var r;if((e==null?void 0:e.channel)!==g)return;const l=(r=e==null?void 0:e.range)==null?void 0:r.defaultValue;a===void 0&&l!==void 0&&(console.log(`[Cabbage-React]: Received initial value for channel "${e==null?void 0:e.channel}"`,l),t(l),typeof l=="number"?i("number"):typeof l=="string"&&i("string"))},[e]),d.useEffect(()=>{const l=r=>{var c,m,u,f,b;const{data:s}=r;if(s.command==="widgetUpdate"){if(s.channel!==g)return;console.log(`[Cabbage-React] ${s.command}: Received initial value for channel "${s.channel}"`,s.value),s.value!==void 0&&(t(s.value),typeof s.value=="number"?i("number"):typeof s.value=="string"&&i("string"))}((c=s.data)==null?void 0:c.paramIdx)===n&&s.command==="parameterChange"&&((m=s==null?void 0:s.data)==null?void 0:m.value)!==void 0&&(console.log(`[Cabbage-React] ${s.command}: Received value change for paramIdx: ${(u=s.data)==null?void 0:u.paramIdx}`,(f=s==null?void 0:s.data)==null?void 0:f.value),t((b=s==null?void 0:s.data)==null?void 0:b.value))};return window.addEventListener("message",l),()=>{window.removeEventListener("message",l)}},[]),{value:a,setValue:C}};exports.Cabbage=p;exports.useCabbageProperties=v;exports.useCabbageState=w;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("react");console.log("Cabbage: loading cabbage.js");class p{static sendParameterUpdate(s,e=null){const a={command:"parameterChange",obj:JSON.stringify(s)};e!==null?e.postMessage(a):(console.log("Cabbage: sending parameter change from UI",a),window.sendMessageFromUI(a))}static sendCustomCommand(s,e=null){const a={command:s,text:JSON.stringify({})};console.log("Cabbage: sending custom command from UI",a),e!==null?e.postMessage(a):window.sendMessageFromUI(a)}static sendWidgetUpdate(s,e=null){console.log("Cabbage: sending widget update from UI",s.props);const a={command:"widgetStateUpdate",obj:JSON.stringify(s.props)};e!==null?e.postMessage(a):window.sendMessageFromUI(a)}static sendMidiMessageFromUI(s,e,a,t=null){var o={statusByte:s,dataByte1:e,dataByte2:a};const i={command:"midiMessage",obj:JSON.stringify(o)};console.log("Cabbage: sending midi message from UI",o),t!==null?t.postMessage(i):window.sendMessageFromUI(i)}static MidiMessageFromHost(s,e,a){console.log("Cabbage: Got MIDI Message"+s+":"+e+":"+a)}static triggerFileOpenDialog(s,e){var a={channel:e};const t={command:"fileOpen",obj:JSON.stringify(a)};s!==null?s.postMessage(t):window.sendMessageFromUI(t)}}const C=l=>{const[s,e]=r.useState();return r.useEffect(()=>{const a=t=>{const{data:o}=t;if(o.channel===l&&o.data&&o.command==="widgetUpdate"){const i=JSON.parse(o.data);console.log(`[Cabbage-React] ${o.command}: Received properties for channel: ${o.channel}`,i),e(i)}};return window.addEventListener("message",a),()=>{window.removeEventListener("message",a)}},[]),{properties:s}},w=(l,s)=>{const{properties:e}=C(l),[a,t]=r.useState(),[o,i]=r.useState(),h=n=>{t(n);const g={paramIdx:s,channelType:o,channel:l,value:n};p.sendParameterUpdate(g,null)},f=n=>{if(typeof n=="number")return"number";if(typeof n=="string")return"string"};return r.useEffect(()=>{var g;if((e==null?void 0:e.channel)!==l)return;const n=(g=e==null?void 0:e.range)==null?void 0:g.defaultValue;if(a===void 0&&n!==void 0){console.log(`[Cabbage-React]: Received default value for channel "${e==null?void 0:e.channel}"`,n),t(n);const d=f(n);d&&i(d)}},[e]),r.useEffect(()=>{const n=g=>{console.log("event",g);const{command:d,channel:b,value:m}=g.data;if(d==="widgetUpdate"){if(b!==l)return;if(console.log(`[Cabbage-React] ${d}: Received initial value for channel "${b}"`,m),m!==void 0){t(m);const c=f(m);c&&i(c)}}if(d==="parameterChange"){const{paramIdx:c,value:u}=g.data.data||{};c===s&&u!==void 0&&(console.log(`[Cabbage-React] ${d}: Received value change for paramIdx: ${c}`,u),t(u))}};return window.addEventListener("message",n),()=>{window.removeEventListener("message",n)}},[]),{value:a,setValue:h}};exports.Cabbage=p;exports.useCabbageProperties=C;exports.useCabbageState=w;

package/dist/index.mjs

@@ -1,31 +1,31 @@
-import { useState as r, useEffect as m } from "react";
+import { useState as u, useEffect as f } from "react";
 console.log("Cabbage: loading cabbage.js");
-class w {
-  static sendParameterUpdate(s, e = null) {
+class h {
+  static sendParameterUpdate(n, e = null) {
     const a = {
       command: "parameterChange",
-      obj: JSON.stringify(s)
+      obj: JSON.stringify(n)
     };
     e !== null ? e.postMessage(a) : (console.log("Cabbage: sending parameter change from UI", a), window.sendMessageFromUI(a));
   }
-  static sendCustomCommand(s, e = null) {
+  static sendCustomCommand(n, e = null) {
     const a = {
-      command: s,
+      command: n,
       text: JSON.stringify({})
     };
     console.log("Cabbage: sending custom command from UI", a), e !== null ? e.postMessage(a) : window.sendMessageFromUI(a);
   }
-  static sendWidgetUpdate(s, e = null) {
-    console.log("Cabbage: sending widget update from UI", s.props);
+  static sendWidgetUpdate(n, e = null) {
+    console.log("Cabbage: sending widget update from UI", n.props);
     const a = {
       command: "widgetStateUpdate",
-      obj: JSON.stringify(s.props)
+      obj: JSON.stringify(n.props)
     };
     e !== null ? e.postMessage(a) : window.sendMessageFromUI(a);
   }
-  static sendMidiMessageFromUI(s, e, a, t = null) {
+  static sendMidiMessageFromUI(n, e, a, t = null) {
     var o = {
-      statusByte: s,
+      statusByte: n,
       dataByte1: e,
       dataByte2: a
     };
@@ -35,10 +35,10 @@ class w {
     };
     console.log("Cabbage: sending midi message from UI", o), t !== null ? t.postMessage(i) : window.sendMessageFromUI(i);
   }
-  static MidiMessageFromHost(s, e, a) {
-    console.log("Cabbage: Got MIDI Message" + s + ":" + e + ":" + a);
+  static MidiMessageFromHost(n, e, a) {
+    console.log("Cabbage: Got MIDI Message" + n + ":" + e + ":" + a);
   }
-  static triggerFileOpenDialog(s, e) {
+  static triggerFileOpenDialog(n, e) {
     var a = {
       channel: e
     };
@@ -46,12 +46,12 @@ class w {
       command: "fileOpen",
       obj: JSON.stringify(a)
     };
-    s !== null ? s.postMessage(t) : window.sendMessageFromUI(t);
+    n !== null ? n.postMessage(t) : window.sendMessageFromUI(t);
   }
 }
-const C = (g) => {
-  const [s, e] = r();
-  return m(() => {
+const w = (g) => {
+  const [n, e] = u();
+  return f(() => {
     const a = (t) => {
       const { data: o } = t;
       if (o.channel === g && o.data && o.command === "widgetUpdate") {
@@ -66,53 +66,67 @@ const C = (g) => {
       window.removeEventListener("message", a);
     };
   }, []), {
-    properties: s
+    properties: n
   };
-}, M = (g, s) => {
-  const { properties: e } = C(g), [a, t] = r(), [o, i] = r(), v = (l) => {
-    t(l);
-    const d = {
-      paramIdx: s,
+}, v = (g, n) => {
+  const { properties: e } = w(g), [a, t] = u(), [o, i] = u(), C = (s) => {
+    t(s);
+    const l = {
+      paramIdx: n,
       channelType: o,
       channel: g,
-      value: l
+      value: s
     };
-    w.sendParameterUpdate(d, null);
+    h.sendParameterUpdate(l, null);
+  }, b = (s) => {
+    if (typeof s == "number") return "number";
+    if (typeof s == "string") return "string";
   };
-  return m(() => {
-    var d;
+  return f(() => {
+    var l;
     if ((e == null ? void 0 : e.channel) !== g) return;
-    const l = (d = e == null ? void 0 : e.range) == null ? void 0 : d.defaultValue;
-    a === void 0 && l !== void 0 && (console.log(
-      `[Cabbage-React]: Received initial value for channel "${e == null ? void 0 : e.channel}"`,
-      l
-    ), t(l), typeof l == "number" ? i("number") : typeof l == "string" && i("string"));
-  }, [e]), m(() => {
-    const l = (d) => {
-      var c, u, f, b, p;
-      const { data: n } = d;
-      if (n.command === "widgetUpdate") {
-        if (n.channel !== g) return;
-        console.log(
-          `[Cabbage-React] ${n.command}: Received initial value for channel "${n.channel}"`,
-          n.value
-        ), n.value !== void 0 && (t(n.value), typeof n.value == "number" ? i("number") : typeof n.value == "string" && i("string"));
+    const s = (l = e == null ? void 0 : e.range) == null ? void 0 : l.defaultValue;
+    if (a === void 0 && s !== void 0) {
+      console.log(
+        `[Cabbage-React]: Received default value for channel "${e == null ? void 0 : e.channel}"`,
+        s
+      ), t(s);
+      const d = b(s);
+      d && i(d);
+    }
+  }, [e]), f(() => {
+    const s = (l) => {
+      console.log("event", l);
+      const { command: d, channel: p, value: c } = l.data;
+      if (d === "widgetUpdate") {
+        if (p !== g) return;
+        if (console.log(
+          `[Cabbage-React] ${d}: Received initial value for channel "${p}"`,
+          c
+        ), c !== void 0) {
+          t(c);
+          const r = b(c);
+          r && i(r);
+        }
+      }
+      if (d === "parameterChange") {
+        const { paramIdx: r, value: m } = l.data.data || {};
+        r === n && m !== void 0 && (console.log(
+          `[Cabbage-React] ${d}: Received value change for paramIdx: ${r}`,
+          m
+        ), t(m));
       }
-      ((c = n.data) == null ? void 0 : c.paramIdx) === s && n.command === "parameterChange" && ((u = n == null ? void 0 : n.data) == null ? void 0 : u.value) !== void 0 && (console.log(
-        `[Cabbage-React] ${n.command}: Received value change for paramIdx: ${(f = n.data) == null ? void 0 : f.paramIdx}`,
-        (b = n == null ? void 0 : n.data) == null ? void 0 : b.value
-      ), t((p = n == null ? void 0 : n.data) == null ? void 0 : p.value));
     };
-    return window.addEventListener("message", l), () => {
-      window.removeEventListener("message", l);
+    return window.addEventListener("message", s), () => {
+      window.removeEventListener("message", s);
     };
   }, []), {
     value: a,
-    setValue: v
+    setValue: C
   };
 };
 export {
-  w as Cabbage,
-  C as useCabbageProperties,
-  M as useCabbageState
+  h as Cabbage,
+  w as useCabbageProperties,
+  v as useCabbageState
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cabbage-react",
-	"version": "1.0.0-beta.32",
+	"version": "1.0.0-beta.33",
 	"type": "module",
 	"keywords": [
 		"cabbage",