From a752c188553d273e147815d3d05ac14feca83f57 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Wed, 24 Dec 2025 21:14:46 -0500
Subject: [PATCH] start ui code re-organization

---
 src/kiri/core/api.js                     | 10 +++++-----
 src/kiri/core/codec.js                   |  2 +-
 src/kiri/core/init.js                    | 11 +++++------
 src/kiri/core/main.js                    | 10 +++++-----
 src/kiri/core/platform.js                |  2 +-
 src/kiri/core/render.js                  |  2 +-
 src/kiri/core/slice.js                   |  2 +-
 src/kiri/mode/cam/cl-trace.js            |  4 ++--
 src/kiri/mode/cam/init-ui.js             |  4 ++--
 src/kiri/mode/fdm/init-ui.js             |  4 ++--
 src/kiri/mode/laser/driver.js            |  2 +-
 src/kiri/{core => ui}/alerts.js          |  2 +-
 src/kiri/{core/ui.js => ui/component.js} |  2 +-
 src/kiri/{core => ui}/do.js              |  2 +-
 src/kiri/{core => ui}/files.js           |  0
 src/kiri/{core => ui}/frame.js           |  8 ++++----
 src/kiri/{core => ui}/interact.js        |  0
 src/kiri/{core => ui}/keyboard.js        |  0
 src/kiri/{core => ui}/lang.js            |  0
 src/kiri/{core => ui}/layers.js          |  0
 src/kiri/{core => ui}/modal.js           |  0
 src/kiri/{core => ui}/pack.js            |  0
 src/kiri/{core => ui}/slider.js          |  0
 src/kiri/{core => ui}/stack.js           |  0
 src/kiri/{core => ui}/stacks.js          |  2 +-
 src/kiri/{core => ui}/stats.js           |  2 +-
 src/kiri/{core => ui}/tools.js           |  0
 src/main/kiri.js                         |  2 +-
 28 files changed, 36 insertions(+), 37 deletions(-)
 rename src/kiri/{core => ui}/alerts.js (97%)
 rename src/kiri/{core/ui.js => ui/component.js} (99%)
 rename src/kiri/{core => ui}/do.js (98%)
 rename src/kiri/{core => ui}/files.js (100%)
 rename src/kiri/{core => ui}/frame.js (95%)
 rename src/kiri/{core => ui}/interact.js (100%)
 rename src/kiri/{core => ui}/keyboard.js (100%)
 rename src/kiri/{core => ui}/lang.js (100%)
 rename src/kiri/{core => ui}/layers.js (100%)
 rename src/kiri/{core => ui}/modal.js (100%)
 rename src/kiri/{core => ui}/pack.js (100%)
 rename src/kiri/{core => ui}/slider.js (100%)
 rename src/kiri/{core => ui}/stack.js (100%)
 rename src/kiri/{core => ui}/stacks.js (99%)
 rename src/kiri/{core => ui}/stats.js (96%)
 rename src/kiri/{core => ui}/tools.js (100%)

diff --git a/src/kiri/core/api.js b/src/kiri/core/api.js
index 4d8b328f..b5064edd 100644
--- a/src/kiri/core/api.js
+++ b/src/kiri/core/api.js
@@ -1,8 +1,8 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import alerts from './alerts.js';
+import alerts from '../ui/alerts.js';
 import settings from './settings.js'
-import STACKS from './stacks.js';
+import STACKS from '../ui/stacks.js';
 
 import { broker } from '../../moto/broker.js';
 import { client as work } from './client.js';
@@ -15,7 +15,7 @@ import { noop, ajax, o2js, js2o } from './utils.js';
 import { functions } from './function.js';
 import { platform } from './platform.js';
 import { selection } from './selection.js';
-import { stats } from './stats.js';
+import { stats } from '../ui/stats.js';
 import { newWidget } from './widget.js';
 import { widgets } from './widgets.js';
 import { updateTool } from '../mode/cam/tools.js';
@@ -23,9 +23,9 @@ import { beta, version } from '../../moto/license.js';
 import { space as SPACE } from '../../moto/space.js';
 import { types as load } from '../../load/file.js';
 
-import { LANG } from './lang.js';
+import { LANG } from '../ui/lang.js';
 import { LOCAL, SETUP, SECURE } from './main.js';
-import { UI } from './ui.js';
+import { UI } from '../ui/component.js';
 
 import web from '../../moto/webui.js';
 
diff --git a/src/kiri/core/codec.js b/src/kiri/core/codec.js
index ec0da847..fa625720 100644
--- a/src/kiri/core/codec.js
+++ b/src/kiri/core/codec.js
@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { Layers } from './layers.js';
+import { Layers } from '../ui/layers.js';
 import { newPoint } from '../../geo/point.js';
 import { Polygon, newPolygon } from '../../geo/polygon.js';
 import { Slice, newSlice, Top, newTop } from './slice.js';
diff --git a/src/kiri/core/init.js b/src/kiri/core/init.js
index efc25321..b363c334 100644
--- a/src/kiri/core/init.js
+++ b/src/kiri/core/init.js
@@ -4,15 +4,16 @@ import { $, $c } from '../../moto/webui.js';
 import { api } from './api.js';
 import { base } from '../../geo/base.js';
 import { local as sdb } from '../../data/local.js';
-import { slider } from './slider.js';
-import { keyboard } from './keyboard.js';
-import { modal } from './modal.js';
-import { interact } from './interact.js';
+import { slider } from '../ui/slider.js';
+import { keyboard } from '../ui/keyboard.js';
+import { modal } from '../ui/modal.js';
+import { interact } from '../ui/interact.js';
 import { space } from '../../moto/space.js';
 import { LOCAL, SETUP } from './main.js';
 import { VIEWS, MODES, SEED } from './consts.js';
 import { beta, version } from '../../moto/license.js';
 import { settings as set_ctrl } from './settings.js';
+import STACKS from '../ui/stacks.js';
 import { init as initCAM } from '../mode/cam/init-ui.js';
 import { init as initDRAG } from '../mode/drag/init-ui.js';
 import { init as initFDM } from '../mode/fdm/init-ui.js';
@@ -24,8 +25,6 @@ import { menu as menuCAM } from '../mode/cam/init-menu.js';
 import { menu as menuFDM } from '../mode/fdm/init-menu.js';
 import { menu as menuLaser } from '../mode/laser/init-menu.js';
 import { menu as menuSLA } from '../mode/sla/init-menu.js';
-import STACKS from './stacks.js';
-import './tools.js';
 
 let { CAM, SLA, FDM, LASER, DRAG, WJET, WEDM } = MODES,
     { client, catalog, platform, selection, stats } = api,
diff --git a/src/kiri/core/main.js b/src/kiri/core/main.js
index 46367ca1..29450427 100644
--- a/src/kiri/core/main.js
+++ b/src/kiri/core/main.js
@@ -1,10 +1,10 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import './frame.js';
+import '../ui/frame.js';
 import '../../ext/base64.js';
 
-import STACKS from './stacks.js';
-import { modal } from './modal.js';
+import STACKS from '../ui/stacks.js';
+import { modal } from '../ui/modal.js';
 
 import { $ } from '../../moto/webui.js';
 import { api } from './api.js';
@@ -12,13 +12,13 @@ import { broker } from '../../moto/broker.js';
 import { consts } from './consts.js';
 import { Index } from '../../data/index.js';
 import { local as dataLocal } from '../../data/local.js';
-import { openFiles } from './files.js';
+import { openFiles } from '../ui/files.js';
 import { platform } from './platform.js';
 import { selection } from './selection.js';
 import { settings } from './settings.js';
 import { showDevices } from './devices.js';
 import { space as SPACE } from '../../moto/space.js';
-import { stats } from './stats.js';
+import { stats } from '../ui/stats.js';
 import { noop, utils } from './utils.js';
 import { version } from '../../moto/license.js';
 import { Widget, newWidget } from './widget.js';
diff --git a/src/kiri/core/platform.js b/src/kiri/core/platform.js
index e349dfb2..dae6cd2b 100644
--- a/src/kiri/core/platform.js
+++ b/src/kiri/core/platform.js
@@ -7,7 +7,7 @@ import { base } from '../../geo/base.js';
 import { load } from '../../load/file.js';
 import { space } from '../../moto/space.js';
 import { Widget, newWidget } from './widget.js';
-import { Packer } from './pack.js';
+import { Packer } from '../ui/pack.js';
 
 import { COLOR, MODES } from './consts.js';
 import { THREE } from '../../ext/three.js';
diff --git a/src/kiri/core/render.js b/src/kiri/core/render.js
index 7dfb7e97..456f3146 100644
--- a/src/kiri/core/render.js
+++ b/src/kiri/core/render.js
@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { Layers } from './layers.js';
+import { Layers } from '../ui/layers.js';
 import { newPoint } from '../../geo/point.js';
 import { newPolygon } from '../../geo/polygon.js';
 import { newSlopeFromAngle } from '../../geo/slope.js';
diff --git a/src/kiri/core/slice.js b/src/kiri/core/slice.js
index d684d046..6604399b 100644
--- a/src/kiri/core/slice.js
+++ b/src/kiri/core/slice.js
@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { Layers } from './layers.js';
+import { Layers } from '../ui/layers.js';
 import { newPoint } from '../../geo/point.js';
 import { polygons as POLY } from '../../geo/polygons.js';
 
diff --git a/src/kiri/mode/cam/cl-trace.js b/src/kiri/mode/cam/cl-trace.js
index bd2e9aff..8a77995c 100644
--- a/src/kiri/mode/cam/cl-trace.js
+++ b/src/kiri/mode/cam/cl-trace.js
@@ -3,8 +3,8 @@
 import { api } from '../../core/api.js';
 import { env, clearPops, isDark } from './init-ui.js';
 import { CAM } from './driver-fe.js';
-import { Layers } from '../../core/layers.js';
-import { Stack } from '../../core/stack.js';
+import { Layers } from '../../ui/layers.js';
+import { Stack } from '../../ui/stack.js';
 
 export let traceOn = false;
 export let lastTrace;
diff --git a/src/kiri/mode/cam/init-ui.js b/src/kiri/mode/cam/init-ui.js
index 5b9cea05..b8839152 100644
--- a/src/kiri/mode/cam/init-ui.js
+++ b/src/kiri/mode/cam/init-ui.js
@@ -6,8 +6,8 @@ import { load } from '../../../load/file.js';
 import { animate as anim_2d, animate_clear as anim_2d_clear } from './anim-2d-fe.js';
 import { animate2 as anim_3d, animate_clear2 as anim_3d_clear } from './anim-3d-fe.js';
 import { space as SPACE } from '../../../moto/space.js';
-import { Layers } from '../../core/layers.js';
-import { Stack } from '../../core/stack.js';
+import { Layers } from '../../ui/layers.js';
+import { Stack } from '../../ui/stack.js';
 import { updateStock } from './cl-stock.js';
 import { createPopOps } from './cl-ops.js';
 import { tabAdd, tabDone, tabClear, restoreTabs, rotateTabs, updateTabs, clearTabs, mirrorTabs } from './cl-tab.js';
diff --git a/src/kiri/mode/fdm/init-ui.js b/src/kiri/mode/fdm/init-ui.js
index 466856f9..ea9187a5 100644
--- a/src/kiri/mode/fdm/init-ui.js
+++ b/src/kiri/mode/fdm/init-ui.js
@@ -6,8 +6,8 @@ import { conf } from '../../core/conf.js';
 import { util } from '../../../geo/base.js';
 import { client } from '../../core/client.js';
 import { addbox, delbox, getlastbox } from '../../core/boxes.js';
-import { Layers } from '../../core/layers.js';
-import { Stack } from '../../core/stack.js';
+import { Layers } from '../../ui/layers.js';
+import { Stack } from '../../ui/stack.js';
 import { Widget, newWidget } from '../../core/widget.js';
 import { space } from '../../../moto/space.js';
 
diff --git a/src/kiri/mode/laser/driver.js b/src/kiri/mode/laser/driver.js
index c07e4007..9605d838 100644
--- a/src/kiri/mode/laser/driver.js
+++ b/src/kiri/mode/laser/driver.js
@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { base } from '../../../geo/base.js';
-import { Packer } from '../../core/pack.js';
+import { Packer } from '../../ui/pack.js';
 import { newBounds } from '../../../geo/bounds.js';
 import { newPoint } from '../../../geo/point.js';
 import { newPrint } from '../../core/print.js';
diff --git a/src/kiri/core/alerts.js b/src/kiri/ui/alerts.js
similarity index 97%
rename from src/kiri/core/alerts.js
rename to src/kiri/ui/alerts.js
index 5cf3c46d..e596b985 100644
--- a/src/kiri/core/alerts.js
+++ b/src/kiri/ui/alerts.js
@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from './api.js';
+import { api } from '../core/api.js';
 
 let alerts = [];
 
diff --git a/src/kiri/core/ui.js b/src/kiri/ui/component.js
similarity index 99%
rename from src/kiri/core/ui.js
rename to src/kiri/ui/component.js
index d4edf9e2..994484e9 100644
--- a/src/kiri/core/ui.js
+++ b/src/kiri/ui/component.js
@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $ } from '../../moto/webui.js';
-import { api } from './api.js';
+import { api } from '../core/api.js';
 
 let DOC = self.document,
     inputAction = null,
diff --git a/src/kiri/core/do.js b/src/kiri/ui/do.js
similarity index 98%
rename from src/kiri/core/do.js
rename to src/kiri/ui/do.js
index b3b998c6..a9f03c81 100644
--- a/src/kiri/core/do.js
+++ b/src/kiri/ui/do.js
@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from './api.js';
+import { api } from '../core/api.js';
 import { space } from '../../moto/space.js';
 
 const { event } = api;
diff --git a/src/kiri/core/files.js b/src/kiri/ui/files.js
similarity index 100%
rename from src/kiri/core/files.js
rename to src/kiri/ui/files.js
diff --git a/src/kiri/core/frame.js b/src/kiri/ui/frame.js
similarity index 95%
rename from src/kiri/core/frame.js
rename to src/kiri/ui/frame.js
index 11f97f69..634b5857 100644
--- a/src/kiri/core/frame.js
+++ b/src/kiri/ui/frame.js
@@ -1,10 +1,10 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { api } from './api.js';
+import { api } from '../core/api.js';
 import { load } from '../../load/file.js';
-import { newWidget } from './widget.js';
-import { VIEWS } from './consts.js';
-import { widgets } from './widgets.js';
+import { newWidget } from '../core/widget.js';
+import { VIEWS } from '../core/consts.js';
+import { widgets } from '../core/widgets.js';
 
 // add frame message api listener
 window.addEventListener('message', msg => {
diff --git a/src/kiri/core/interact.js b/src/kiri/ui/interact.js
similarity index 100%
rename from src/kiri/core/interact.js
rename to src/kiri/ui/interact.js
diff --git a/src/kiri/core/keyboard.js b/src/kiri/ui/keyboard.js
similarity index 100%
rename from src/kiri/core/keyboard.js
rename to src/kiri/ui/keyboard.js
diff --git a/src/kiri/core/lang.js b/src/kiri/ui/lang.js
similarity index 100%
rename from src/kiri/core/lang.js
rename to src/kiri/ui/lang.js
diff --git a/src/kiri/core/layers.js b/src/kiri/ui/layers.js
similarity index 100%
rename from src/kiri/core/layers.js
rename to src/kiri/ui/layers.js
diff --git a/src/kiri/core/modal.js b/src/kiri/ui/modal.js
similarity index 100%
rename from src/kiri/core/modal.js
rename to src/kiri/ui/modal.js
diff --git a/src/kiri/core/pack.js b/src/kiri/ui/pack.js
similarity index 100%
rename from src/kiri/core/pack.js
rename to src/kiri/ui/pack.js
diff --git a/src/kiri/core/slider.js b/src/kiri/ui/slider.js
similarity index 100%
rename from src/kiri/core/slider.js
rename to src/kiri/ui/slider.js
diff --git a/src/kiri/core/stack.js b/src/kiri/ui/stack.js
similarity index 100%
rename from src/kiri/core/stack.js
rename to src/kiri/ui/stack.js
diff --git a/src/kiri/core/stacks.js b/src/kiri/ui/stacks.js
similarity index 99%
rename from src/kiri/core/stacks.js
rename to src/kiri/ui/stacks.js
index a45f862e..541686fb 100644
--- a/src/kiri/core/stacks.js
+++ b/src/kiri/ui/stacks.js
@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { $ } from '../../moto/webui.js';
-import { api } from './api.js';
+import { api } from '../core/api.js';
 import { Stack } from './stack.js';
 
 let freeMem = true,
diff --git a/src/kiri/core/stats.js b/src/kiri/ui/stats.js
similarity index 96%
rename from src/kiri/core/stats.js
rename to src/kiri/ui/stats.js
index d7fcb1a9..5f36f536 100644
--- a/src/kiri/core/stats.js
+++ b/src/kiri/ui/stats.js
@@ -2,7 +2,7 @@
 
 import { local } from '../../data/local.js';
 import { broker } from '../../moto/broker.js';
-import { js2o, o2js } from './utils.js';
+import { js2o, o2js } from '../core/utils.js';
 
 class Stats {
     constructor(db) {
diff --git a/src/kiri/core/tools.js b/src/kiri/ui/tools.js
similarity index 100%
rename from src/kiri/core/tools.js
rename to src/kiri/ui/tools.js
diff --git a/src/main/kiri.js b/src/main/kiri.js
index 918898a5..a733c879 100644
--- a/src/main/kiri.js
+++ b/src/main/kiri.js
@@ -3,7 +3,7 @@
 import '../add/array.js';
 import '../add/class.js';
 import '../add/three.js';
-import '../kiri/core/lang.js';
+import '../kiri/ui/lang.js';
 import '../kiri/core/lang-en.js';
 
 import { broker } from '../moto/broker.js';