Merge pull request #591 from intechstudio/feat/GridProtocol

🚩PR: Reverted reverted Protocol merge, fixed GridProtocol refactor

src/renderer/main/modals/AddVirtualModule.svelte

@@ -1,14 +1,14 @@
 <script>
+  import { ModuleType } from "./../../protocol/grid-protocol.ts";
   import { Analytics } from "./../../runtime/analytics.js";
   import { runtime } from "../../runtime/runtime.store";
   import { MeltSelect } from "@intechstudio/grid-uikit";
   import MoltenPushButton from "../panels/preferences/MoltenPushButton.svelte";
   import MoltenModal from "./MoltenModal.svelte";
-  import { VirtualModuleTypes } from "../../runtime/virtual-engine";
   import { modal } from "./modal.store";
 
   let selected = 0;
-  let options = Object.keys(VirtualModuleTypes).map((key, index) =>
+  let options = Object.keys(ModuleType).map((key, index) =>
     Object({ title: key, value: index })
   );
 
@@ -32,7 +32,7 @@
   }
 </script>
 
-<MoltenModal>
+<MoltenModal width={400}>
   <div slot="content">
     <div class="flex w-full text-4xl opacity-90 pb-2">
       Welcome to Virtual Mode!

src/renderer/main/modals/Monaco.svelte

@@ -3,8 +3,8 @@
   import { watchResize } from "svelte-watch-resize";
   import MoltenPushButton from "./../panels/preferences/MoltenPushButton.svelte";
   import { onDestroy, onMount } from "svelte";
+  import { grid } from "../../protocol/grid-protocol";
   import { modal } from "./modal.store";
-  import grid from "../../protocol/grid-protocol.js";
   import MoltenModal from "./MoltenModal.svelte";
 
   import { debug_monitor_store } from "../panels/DebugMonitor/DebugMonitor.store";
@@ -91,7 +91,7 @@
         scriptLength = editedList.toConfigScript().length;
 
         //Check the minified config length
-        if (scriptLength >= grid.properties.CONFIG_LENGTH) {
+        if (scriptLength >= grid.getProperty("CONFIG_LENGTH")) {
           throw new LengthError("Config limit reached.");
         }
 
@@ -213,7 +213,7 @@
           <span
             >{`Character Count: ${
               typeof scriptLength === "undefined" ? "?" : scriptLength
-            }/${grid.properties.CONFIG_LENGTH - 1} (max)`}</span
+            }/${grid.getProperty("CONFIG_LENGTH") - 1} (max)`}</span
           >
         </div>
       </div>

src/renderer/main/panels/DebugMonitor/DebugMonitor.svelte

@@ -11,7 +11,7 @@
   } from "./DebugMonitor.store";
   import { appSettings } from "../../../runtime/app-helper.store";
   import { fade } from "svelte/transition";
-  import grid from "../../../protocol/grid-protocol";
+  import { grid } from "../../../protocol/grid-protocol";
   import { writable, readable } from "svelte/store";
   import PolyLineGraph from "../../user-interface/PolyLineGraph.svelte";
   import { incoming_messages } from "../../../serialport/message-stream.store";
@@ -158,9 +158,9 @@
         <div class="text-white">
           <span
             class:text-error={$configScriptLength >=
-              grid.properties.CONFIG_LENGTH}
+              grid.getProperty("CONFIG_LENGTH")}
             class:text-yellow-400={$configScriptLength >
-              (grid.properties.CONFIG_LENGTH / 3) * 2}
+              (grid.getProperty("CONFIG_LENGTH") / 3) * 2}
             >{$configScriptLength}
           </span>
         </div>

src/renderer/main/panels/MidiMonitor/MidiMonitor.svelte

@@ -9,7 +9,7 @@
     debug_stream,
     MusicalNotes,
   } from "./MidiMonitor.store";
-  import grid from "../../../protocol/grid-protocol";
+  import { grid } from "../../../protocol/grid-protocol";
   import SvgIcon from "../../user-interface/SvgIcon.svelte";
   import { configManager } from "../../panels/configuration/Configuration.store";
 
@@ -346,10 +346,11 @@
               <div class="flex flex-row">
                 <div class="pr-2">Char Count:</div>
                 <div
-                  class={$configScriptLength >= grid.properties.CONFIG_LENGTH
+                  class={$configScriptLength >=
+                  grid.getProperty("CONFIG_LENGTH")
                     ? "text-error"
                     : $configScriptLength >=
-                      (grid.properties.CONFIG_LENGTH / 3) * 2
+                      (grid.getProperty("CONFIG_LENGTH") / 3) * 2
                     ? "text-yellow-400"
                     : "text-white"}
                 >

src/renderer/main/panels/configuration/Configuration.store.js

@@ -38,7 +38,7 @@ export function lastOpenedActionblocksRemove(short) {
 import stringManipulation from "../../user-interface/_string-operations";
 import * as luamin from "lua-format";
 
-import grid from "../../../protocol/grid-protocol.js";
+import { grid } from "../../../protocol/grid-protocol";
 import { v4 as uuidv4 } from "uuid";
 
 const luaminOptions = {
@@ -305,7 +305,7 @@ export class ConfigList extends Array {
   //Throws error if limit is reached
   checkLength() {
     const length = this.toConfigScript().length;
-    if (length > grid.properties.CONFIG_LENGTH) {
+    if (length > grid.getProperty("CONFIG_LENGTH")) {
       const target = ConfigTarget.getCurrent();
       throw {
         type: "lengthError",

src/renderer/main/panels/configuration/EventPanel.svelte

@@ -13,7 +13,7 @@
   import { get } from "svelte/store";
   import { ConfigTarget } from "./Configuration.store.js";
   import { MeltRadio } from "@intechstudio/grid-uikit";
-  import { CEEAT } from "../../../protocol/grid-protocol.js";
+  import { CEEAT } from "../../../protocol/grid-protocol";
 
   const dispatch = createEventDispatcher();
 

src/renderer/main/user-interface/_string-operations.js

@@ -1,4 +1,4 @@
-import grid from "../../protocol/grid-protocol.js";
+import { grid } from "../../protocol/grid-protocol";
 
 const stringManipulation = {
   initialize: function (inputSet = []) {
@@ -426,4 +426,4 @@ export function debounce(callback, delay) {
   };
 }
 
-stringManipulation.initialize(grid.properties.LUA);
+stringManipulation.initialize(grid.getProperty("LUA"));