move src/kiri/* to src/kiri/core and src/kiri-*/ to src/kiri/* and updated all imports

app.js

@@ -319,10 +319,10 @@ const productionMap = {
     '/lib/mesh/work.js' : '/lib/pack/mesh-work.js',
     '/lib/main/mesh.js' : '/lib/pack/mesh-main.js',
     '/lib/main/kiri.js' : '/lib/pack/kiri-main.js',
-    '/lib/kiri-run/engine.js' : '/lib/pack/kiri-eng.js',
-    '/lib/kiri-run/minion.js' : '/lib/pack/kiri-pool.js',
-    '/lib/kiri-run/worker.js' : '/lib/pack/kiri-work.js',
-    // '/lib/kiri-run/frame.js' : '/lib/pack/kiri-frame.js',
+    '/lib/kiri/run/engine.js' : '/lib/pack/kiri-eng.js',
+    '/lib/kiri/run/minion.js' : '/lib/pack/kiri-pool.js',
+    '/lib/kiri/run/worker.js' : '/lib/pack/kiri-work.js',
+    // '/lib/kiri/run/frame.js' : '/lib/pack/kiri-frame.js',
 };
 
 function handleVersion(req, res, next) {
@@ -400,7 +400,7 @@ function serveWasm(req, res, next) {
 
 // pack/concat device script strings to inject into /code/ scripts
 function generateDevices() {
-    let root = PATH.join(dir,"src","kiri-dev");
+    let root = PATH.join(dir,"src","kiri","dev");
     let devs = {};
     fs.readdirSync(root).forEach(type => {
         let map = devs[type] = devs[type] || {};
@@ -538,10 +538,10 @@ function rewriteHtmlVersion(req, res, next) {
         "/kiri/",
         "/mesh/",
         "/lib/mesh/work.js",
-        "/lib/kiri-run/worker.js",
-        "/lib/kiri-run/minion.js",
-        "/lib/kiri-run/engine.js",
-        "/lib/kiri-run/frame.js"
+        "/lib/kiri/run/worker.js",
+        "/lib/kiri/run/minion.js",
+        "/lib/kiri/run/engine.js",
+        "/lib/kiri/run/frame.js"
     ].indexOf(req.app.path) >= 0) {
         addCorsHeaders(req, res);
     }

bin/esbuild.config.mjs

@@ -101,7 +101,7 @@ async function buildApp() {
 
         // Bundle kiri worker
         await build({
-            entryPoints: [ 'src/kiri-run/worker.js' ],
+            entryPoints: [ 'src/kiri/run/worker.js' ],
             bundle: true,
             outfile: 'src/pack/kiri-work.js',
             format: 'esm',
@@ -118,7 +118,7 @@ async function buildApp() {
 
         // Bundle kiri minion
         await build({
-            entryPoints: [ 'src/kiri-run/minion.js' ],
+            entryPoints: [ 'src/kiri/run/minion.js' ],
             bundle: true,
             outfile: 'src/pack/kiri-pool.js',
             format: 'esm',
@@ -135,7 +135,7 @@ async function buildApp() {
 
         // Bundle kiri engine
         await build({
-            entryPoints: [ 'src/kiri-run/engine.js' ],
+            entryPoints: [ 'src/kiri/run/engine.js' ],
             bundle: true,
             outfile: 'src/pack/kiri-eng.js',
             format: 'esm',

contributing.md

@@ -25,7 +25,7 @@ This is a community driven project, and we welcome any contributions you'd like
 - Open the developer console
 - Run the following code: `kiri.api.conf.get().device`
 - Right click on the object and select `Copy object`
-- Make a new file in the `src/kiri-dev/<mode>` directory, with the name of your machine, no spaces or special characters, and a `.json` extension.
+- Make a new file in the `src/kiri/dev/<mode>` directory, with the name of your machine, no spaces or special characters, and a `.json` extension.
 - Paste the copied object into the new file, and save it.
 - Publish your changes to a git repo
 - Submit a [pull request](https://github.com/GridSpace/grid-apps/compare)

src/cli/kiri-source.json

@@ -23,37 +23,37 @@
     "geo/wasm",
     "data/local",
     "load/stl",
-    "kiri/conf",
-    "kiri/utils",
-    "kiri/slice",
-    "kiri/consts",
-    "kiri/client",
-    "kiri/widget",
-    "kiri/layers",
-    "kiri-mode/cam/driver",
-    "kiri-mode/cam/export",
-    "kiri-mode/cam/ops",
-    "kiri-mode/cam/prepare",
-    "kiri-mode/cam/slice",
-    "kiri-mode/cam/slicer",
-    "kiri-mode/cam/tool",
-    "kiri-mode/cam/topo",
-    "kiri-mode/fdm/driver",
-    "kiri-mode/fdm/export",
-    "kiri-mode/fdm/fill",
-    "kiri-mode/fdm/post",
-    "kiri-mode/fdm/prepare",
-    "kiri-mode/fdm/slice",
-    "kiri-mode/laser/driver",
-    "kiri-mode/sla/driver",
-    "kiri-mode/sla/x_cxdlp",
-    "kiri-mode/sla/x_photon",
-    "kiri-mode/sla/export",
-    "kiri-mode/sla/slice",
-    "kiri/codec",
-    "kiri/print",
-    "kiri/pack",
-    "kiri-run/worker",
-    "kiri-run/engine",
+    "kiri/core/conf",
+    "kiri/core/utils",
+    "kiri/core/slice",
+    "kiri/core/consts",
+    "kiri/core/client",
+    "kiri/core/widget",
+    "kiri/core/layers",
+    "kiri/mode/cam/driver",
+    "kiri/mode/cam/export",
+    "kiri/mode/cam/ops",
+    "kiri/mode/cam/prepare",
+    "kiri/mode/cam/slice",
+    "kiri/mode/cam/slicer",
+    "kiri/mode/cam/tool",
+    "kiri/mode/cam/topo",
+    "kiri/mode/fdm/driver",
+    "kiri/mode/fdm/export",
+    "kiri/mode/fdm/fill",
+    "kiri/mode/fdm/post",
+    "kiri/mode/fdm/prepare",
+    "kiri/mode/fdm/slice",
+    "kiri/mode/laser/driver",
+    "kiri/mode/sla/driver",
+    "kiri/mode/sla/x_cxdlp",
+    "kiri/mode/sla/x_photon",
+    "kiri/mode/sla/export",
+    "kiri/mode/sla/slice",
+    "kiri/core/codec",
+    "kiri/core/print",
+    "kiri/core/pack",
+    "kiri/run/worker",
+    "kiri/run/engine",
     "main/kiri"
-]
+]

src/kiri/core/api.js

@@ -4,29 +4,29 @@ import alerts from './alerts.js';
 import settings from './settings.js'
 import STACKS from './stacks.js';
 
-import { broker } from '../moto/broker.js';
+import { broker } from '../../moto/broker.js';
 import { client as work } from './client.js';
 import { consts, COLOR as color, LISTS as lists, MODES, VIEWS, PATHS } from './consts.js';
 import { device, devices } from './devices.js';
 import { catalog, dialog, event, group, help, hide, image } from './main.js';
 import { modal, mode, probe, process, show, space, util, view } from './main.js';
-import { local as dataLocal } from '../data/local.js';
+import { local as dataLocal } from '../../data/local.js';
 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 '../kiri/stats.js';
+import { stats } from './stats.js';
 import { newWidget } from './widget.js';
 import { widgets } from './widgets.js';
-import { updateTool } from '../kiri-mode/cam/tools.js';
-import { beta, version } from '../moto/license.js';
-import { space as SPACE } from '../moto/space.js';
+import { updateTool } from '../mode/cam/tools.js';
+import { beta, version } from '../../moto/license.js';
+import { space as SPACE } from '../../moto/space.js';
 
 import { LANG } from './lang.js';
 import { LOCAL, SETUP, SECURE } from './main.js';
 import { UI } from './ui.js';
 
-import web from '../moto/webui.js';
+import web from '../../moto/webui.js';
 
 let UC = UI.prefix('kiri').inputAction(settings.conf.update),
     und = undefined,

src/kiri/core/boxes.js

@@ -1,4 +1,4 @@
-import { space } from '../moto/space.js';
+import { space } from '../../moto/space.js';
 
 const { BoxGeometry, Matrix4, MeshPhongMaterial, Quaternion, Vector3, Mesh } = THREE;
 const boxes = [];

src/kiri/core/codec.js

@@ -1,9 +1,8 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { base } from '../geo/base.js';
 import { Layers } from './layers.js';
-import { newPoint } from '../geo/point.js';
-import { Polygon, newPolygon } from '../geo/polygon.js';
+import { newPoint } from '../../geo/point.js';
+import { Polygon, newPolygon } from '../../geo/polygon.js';
 import { Slice, newSlice, Top, newTop } from './slice.js';
 import { Widget, newWidget } from './widget.js';
 

src/kiri/core/consts.js

@@ -142,8 +142,8 @@ const PMODES = {
 };
 
 const PATHS = {
-    work: "/lib/kiri-run/worker.js",
-    pool: "/lib/kiri-run/minion.js"
+    work: "/lib/kiri/run/worker.js",
+    pool: "/lib/kiri/run/minion.js"
 };
 
 const SEED = 'kiri-seed';

src/kiri/core/conv.js

@@ -13,7 +13,7 @@ const gapp = self.gapp;
 
 eval( fs.readFileSync("src/add/array.js").toString() );
 eval( fs.readFileSync("src/data/local.js").toString() );
-eval( fs.readFileSync("src/kiri/conf.js").toString() );
+eval( fs.readFileSync("src/kiri/core/conf.js").toString() );
 
 gapp.main(undefined, undefined, root => {
     let kiri = root.kiri;

src/kiri/core/devices.js

@@ -1,10 +1,10 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { $, h } from '../moto/webui.js';
+import { $, h } from '../../moto/webui.js';
 import { api } from './api.js';
 import { conf } from './conf.js';
-import { space } from '../moto/space.js';
-import { devices as devlist } from '../pack/devices.js';
+import { space } from '../../moto/space.js';
+import { devices as devlist } from '../../pack/devices.js';
 import { settings, conf as setconf } from './settings.js';
 
 export const device = {

src/kiri/core/do.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { api } from './api.js';
-import { space } from '../moto/space.js';
+import { space } from '../../moto/space.js';
 
 const { event } = api;
 

src/kiri/core/export.js

@@ -1,13 +1,13 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { $ } from '../moto/webui.js';
+import { $ } from '../../moto/webui.js';
 import { api } from './api.js';
 import { client } from './client.js';
-import { local } from '../data/local.js';
-import { util } from '../geo/base.js';
+import { local } from '../../data/local.js';
+import { util } from '../../geo/base.js';
 import { MODES } from './consts.js';
-import { LASER as laser_driver } from '../kiri-mode/laser/driver.js';
-import { SLA as sla_client } from '../kiri-mode/sla/client.js';
+import { LASER as laser_driver } from '../mode/laser/driver.js';
+import { SLA as sla_client } from '../mode/sla/client.js';
 
 let printSeq = parseInt(local['kiri-print-seq'] || local['print-seq'] || "0") + 1;
 

src/kiri/core/frame.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { api } from './api.js';
-import { load } from '../load/file.js';
+import { load } from '../../load/file.js';
 import { newWidget } from './widget.js';
 import { VIEWS } from './consts.js';
 

src/kiri/core/function.js

@@ -3,7 +3,7 @@
 import { api } from './api.js';
 import { client } from './client.js';
 import { codec } from './codec.js';
-import { space } from '../moto/space.js';
+import { space } from '../../moto/space.js';
 import { COLOR, PMODES } from './consts.js';
 import { exportFile } from './export.js';
 

src/kiri/core/init.js

@@ -1,21 +1,21 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { $, $c } from '../moto/webui.js';
-import { api } from '../kiri/api.js';
-import { base } from '../geo/base.js';
-import { local as sdb } from '../data/local.js';
-import { space } from '../moto/space.js';
+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 { space } from '../../moto/space.js';
 import { LOCAL, SETUP } from './main.js';
-import { VIEWS, MODES, SEED } from '../kiri/consts.js';
-import { beta, version } from '../moto/license.js';
+import { VIEWS, MODES, SEED } from './consts.js';
+import { beta, version } from '../../moto/license.js';
 import { settings as set_ctrl } from './settings.js';
-import { init as initCAM } from '../kiri-mode/cam/client.js';
-import { init as initDRAG } from '../kiri-mode/drag/client.js';
-import { init as initFDM } from '../kiri-mode/fdm/client.js';
-import { init as initLaser } from '../kiri-mode/laser/client.js';
-import { init as initSLA } from '../kiri-mode/sla/client.js';
-import { init as initWEDM } from '../kiri-mode/wedm/client.js';
-import { init as initWJET } from '../kiri-mode/wjet/client.js';
+import { init as initCAM } from '../mode/cam/client.js';
+import { init as initDRAG } from '../mode/drag/client.js';
+import { init as initFDM } from '../mode/fdm/client.js';
+import { init as initLaser } from '../mode/laser/client.js';
+import { init as initSLA } from '../mode/sla/client.js';
+import { init as initWEDM } from '../mode/wedm/client.js';
+import { init as initWJET } from '../mode/wjet/client.js';
 
 let { CAM, SLA, FDM, LASER, DRAG, WJET, WEDM } = MODES,
     { client, catalog, platform, selection, stats } = api,

src/kiri/core/lang-en.js

@@ -0,0 +1 @@
+../../../web/kiri/lang/en.js

src/kiri/core/layers.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { newPolygon, Polygon } from '../geo/polygon.js';
-import { polygons as POLY } from '../geo/polygons.js';
+import { newPolygon, Polygon } from '../../geo/polygon.js';
+import { polygons as POLY } from '../../geo/polygons.js';
 
 export class Layers {
     constructor() {

src/kiri/core/main.js

@@ -5,23 +5,23 @@ import './frame.js';
 import lang from './lang.js';
 import STACKS from './stacks.js';
 
-import { $ } from '../moto/webui.js';
-import { api } from '../kiri/api.js';
-import { broker } from '../moto/broker.js';
-import { consts } from '../kiri/consts.js';
-import { Index } from '../data/index.js';
-import { local as dataLocal } from '../data/local.js';
+import { $ } from '../../moto/webui.js';
+import { api } from './api.js';
+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 { 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 '../kiri/stats.js';
-import { noop, utils } from '../kiri/utils.js';
-import { version } from '../moto/license.js';
+import { space as SPACE } from '../../moto/space.js';
+import { stats } from './stats.js';
+import { noop, utils } from './utils.js';
+import { version } from '../../moto/license.js';
 import { Widget, newWidget } from './widget.js';
-import { showTools } from '../kiri-mode/cam/tools.js';
+import { showTools } from '../mode/cam/tools.js';
 
 let { parseOpt, o2js, js2o, ls2o } = utils,
     { COLOR, MODES, VIEWS } = consts,

src/kiri/core/platform.js

@@ -1,16 +1,16 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { $, h } from '../moto/webui.js';
+import { $, h } from '../../moto/webui.js';
 import { api } from './api.js';
 import { ajax, js2o } from './utils.js';
-import { base } from '../geo/base.js';
-import { load } from '../load/file.js';
-import { space } from '../moto/space.js';
+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 { COLOR, MODES } from './consts.js';
-import { THREE } from '../ext/three.js';
+import { THREE } from '../../ext/three.js';
 
 const V0 = new THREE.Vector3(0,0,0);
 

src/kiri/core/print.js

@@ -1,9 +1,9 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { arcToPath } from '../geo/paths.js';
+import { arcToPath } from '../../geo/paths.js';
 import { consts } from './consts.js';
-import { newPoint } from '../geo/point.js';
-import { util } from '../geo/base.js';
+import { newPoint } from '../../geo/point.js';
+import { util } from '../../geo/base.js';
 
 const { numOrDefault } = util;
 const { beltfact } = consts;

src/kiri/core/render.js

@@ -1,9 +1,9 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { Layers } from './layers.js';
-import { newPoint } from '../geo/point.js';
-import { newPolygon } from '../geo/polygon.js';
-import { newSlopeFromAngle } from '../geo/slope.js';
+import { newPoint } from '../../geo/point.js';
+import { newPolygon } from '../../geo/polygon.js';
+import { newSlopeFromAngle } from '../../geo/slope.js';
 
 const hsV = 0.9;
 const XAXIS = new THREE.Vector3(1,0,0);

src/kiri/core/selection.js

@@ -1,8 +1,8 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { api } from './api.js';
-import { space } from '../moto/space.js';
-import { THREE } from '../ext/three.js';
+import { space } from '../../moto/space.js';
+import { THREE } from '../../ext/three.js';
 
 const selectedMeshes = [];
 

src/kiri/core/settings.js

@@ -1,14 +1,14 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { $, h } from '../moto/webui.js';
+import { $, h } from '../../moto/webui.js';
 import { api } from './api.js';
 import { conf } from './conf.js';
 import { codec } from './codec.js';
 import { consts } from './consts.js';
-import { space } from '../moto/space.js';
-import { local } from '../data/local.js';
+import { space } from '../../moto/space.js';
+import { local } from '../../data/local.js';
 import { utils } from './utils.js';
-import { version } from '../moto/license.js';
+import { version } from '../../moto/license.js';
 
 const { areEqual, ls2o, js2o } = utils;
 const { COLOR } = consts;

src/kiri/core/slice.js

@@ -1,8 +1,8 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { Layers } from './layers.js';
-import { newPoint } from '../geo/point.js';
-import { polygons as POLY } from '../geo/polygons.js';
+import { newPoint } from '../../geo/point.js';
+import { polygons as POLY } from '../../geo/polygons.js';
 
 let tracker;
 

src/kiri/core/stacks.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { $ } from '../moto/webui.js';
+import { $ } from '../../moto/webui.js';
 import { api } from './api.js';
 import { Stack } from './stack.js';
 

src/kiri/core/stats.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { local } from '../data/local.js';
-import { broker } from '../moto/broker.js';
+import { local } from '../../data/local.js';
+import { broker } from '../../moto/broker.js';
 import { js2o, o2js } from './utils.js';
 
 class Stats {

src/kiri/core/tools.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
 import { api } from './api.js';
-import { THREE } from '../ext/three.js';
+import { THREE } from '../../ext/three.js';
 
 const { Vector3, Quaternion } = THREE;
 const { kiri, moto } = root;

src/kiri/core/ui.js

@@ -1,6 +1,6 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { $ } from '../moto/webui.js';
+import { $ } from '../../moto/webui.js';
 import { api } from './api.js';
 
 let DOC = self.document,

src/kiri/core/utils.js

@@ -1,7 +1,7 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { ajax as moto_ajax } from '../moto/ajax.js';
-import { local as dataLocal } from '../data/local.js';
+import { ajax as moto_ajax } from '../../moto/ajax.js';
+import { local as dataLocal } from '../../data/local.js';
 
 function parseOpt(ov) {
     let opt = {}, kv, kva;

src/kiri/core/widget.js

@@ -1,9 +1,9 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { base } from '../geo/base.js';
+import { base } from '../../geo/base.js';
 import { avgc } from './utils.js';
-import { verticesToPoints } from '../geo/points.js';
-import { util as mesh_util } from '../mesh/util.js';
+import { verticesToPoints } from '../../geo/points.js';
+import { util as mesh_util } from '../../mesh/util.js';
 
 const { inRange, time } = base.util;
 const solid_opacity = 1.0;

src/kiri/core/widgets.js

@@ -1,8 +1,8 @@
 /** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
 
-import { $ } from '../moto/webui.js';
+import { $ } from '../../moto/webui.js';
 import { api } from './api.js';
-import { load } from '../load/file.js';
+import { load } from '../../load/file.js';
 import { Widget, newWidget } from './widget.js';
 
 let WIDGETS = [];