From 683c117bcdf89ab1fa03d3e2f6f19af1bccecc99 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Tue, 17 Sep 2024 10:40:42 -0400
Subject: [PATCH] complete api mapping

---
 src/kiri-mode/cam/tools.js |  5 +++--
 src/kiri/alerts.js         |  5 +++--
 src/kiri/api.js            | 11 +++++++----
 src/kiri/devices.js        | 16 ++++++++++------
 src/kiri/init.js           | 14 ++------------
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/kiri-mode/cam/tools.js b/src/kiri-mode/cam/tools.js
index dd3ea635..52e65b8a 100644
--- a/src/kiri-mode/cam/tools.js
+++ b/src/kiri-mode/cam/tools.js
@@ -18,9 +18,10 @@ gapp.register("kiri-mode.cam.tools", (root, exports) => {
 
     api.show.tools = showTools;
 
-    api.tool = {
+    // extend API
+    Object.assign(api.tool, {
         update: updateTool
-    };
+    });
 
     function settings() {
         return api.conf.get();
diff --git a/src/kiri/alerts.js b/src/kiri/alerts.js
index f3900af7..de674953 100644
--- a/src/kiri/alerts.js
+++ b/src/kiri/alerts.js
@@ -67,10 +67,11 @@ function update(clear) {
     }
 }
 
-api.alerts = {
+// extend API
+Object.assign(api.alerts, {
     hide,
     show,
     update
-};
+});
 
 });
diff --git a/src/kiri/api.js b/src/kiri/api.js
index 09dfae2f..dd4621a7 100644
--- a/src/kiri/api.js
+++ b/src/kiri/api.js
@@ -74,6 +74,7 @@ let { data, kiri, moto, noop } = root,
     und = undefined,
     api = exports({
         ajax,           // via utils
+        alerts: {},     // alerts.js
         busy: {},       // main.js
         catalog: und,   // main.js
         clip,           // <--
@@ -81,12 +82,13 @@ let { data, kiri, moto, noop } = root,
         color: und,     // main.js
         conf: {},       // settings.js
         const: {},      // main.js
+        devel,          // <--
+        device: {},     // devices.js
+        devices: {},    // devices.js
         dialog: {},     // main.js
         doit,           // <--
-        devel,          // <--
         event: {},      // main.js
         feature,        // <--
-        focus: noop,
         function: {},   // function.js
         group: {},      // main.js
         help: {},       // main.js
@@ -94,8 +96,8 @@ let { data, kiri, moto, noop } = root,
         image: {},      // main.js
         js2o,           // via utils
         language: und,  // main.js
-        local,          // <--
         lists,          // <--
+        local,          // <--
         modal: {},      // main.js
         mode: {},       // main.js
         o2js,           // via utils
@@ -107,6 +109,8 @@ let { data, kiri, moto, noop } = root,
         settings: {},   // settings.js
         show: {},       // main.js
         space: {},      // main.js
+        tool: {},       // kiri-mode/cam/tools.js
+        tweak,          // <--
         uc: {},         // main.js
         ui: {},         // main.js
         util: {},       // main.js
@@ -116,7 +120,6 @@ let { data, kiri, moto, noop } = root,
             layer_max: 0
         },
         view: {},       // main.js
-        tweak,
         widgets: {},    // widgets.js
         work: und,      // main.js
     });
diff --git a/src/kiri/devices.js b/src/kiri/devices.js
index 6571f7b5..5069e8cd 100644
--- a/src/kiri/devices.js
+++ b/src/kiri/devices.js
@@ -9,21 +9,25 @@ gapp.register("kiri.devices", (root, exports) => {
     let { kiri } = root,
         { api, conf } = kiri;
 
-    api.show.devices = showDevices;
+    // extend API
+    Object.assign(api.show, {
+        showDevices
+    });
 
-    api.device = {
+    Object.assign(api.device, {
         clone: cloneDevice,
         code: currentDeviceCode,
         get: currentDeviceName,
         set: selectDevice,
         isBelt
-    };
+    });
 
-    api.devices = {
+    Object.assign(api.devices, {
         show: showDevices,
         select: selectDevice,
-        refresh: updateDeviceList
-    };
+        refresh: updateDeviceList,
+        update_laser_state: updateLaserState
+    });
 
     function isBelt() {
         return api.conf.get().device.bedBelt;
diff --git a/src/kiri/init.js b/src/kiri/init.js
index 29254d1c..3d6c353c 100644
--- a/src/kiri/init.js
+++ b/src/kiri/init.js
@@ -214,16 +214,6 @@ gapp.register("kiri.init", (root, exports) => {
         }, 100);
     }
 
-    function parentWithClass(el, classname) {
-        while (el) {
-            if (el.classList.contains(classname)) {
-                return el;
-            }
-            el = el.parentNode;
-        }
-        return el;
-    }
-
     function onBooleanClick(el) {
         // copy some ui elements to target settings
         let settings = api.conf.get();
@@ -236,7 +226,7 @@ gapp.register("kiri.init", (root, exports) => {
         api.conf.update();
         DOC.activeElement.blur();
         api.event.emit("boolean.click");
-        updateLaserState();
+        api.devices.update_laser_state();
         if (el === ui.camStockIndexed) {
             api.space.set_focus();
         }
@@ -763,7 +753,7 @@ gapp.register("kiri.init", (root, exports) => {
     }
 
     function isBelt() {
-        return api.device.isBelt;
+        return api.device.isBelt();
     }
 
     function isNotBelt() {