improve code scoping (#116)

* scope glimmer api

* +

src/components/pages/Benchmark.gts

@@ -1,4 +1,9 @@
-import { buildData, swapRows, updateData, type Item } from '@/utils/data';
+import {
+  buildData,
+  swapRows,
+  updateData,
+  type Item,
+} from '@/utils/benchmark/data';
 import { Component, tracked, cellFor, type Cell } from '@lifeart/gxt';
 import { Header } from './benchmark/Header.gts';
 import { Row } from './benchmark/Row.gts';

src/index.ts

@@ -1,14 +1,14 @@
 import 'glint-environment-gxt';
 import 'decorator-transforms/globals';
 
-import { createBenchmark } from '@/utils/benchmark';
+import { createBenchmark } from '@/utils/benchmark/benchmark';
 import { router } from '@/services/router';
 import {
   enforcePaintEvent,
   ButtonSelectors,
   emitDomClickEvent,
   waitForIdle,
-} from '@/utils/compat';
+} from '@/utils/benchmark/compat';
 
 // @ts-check
 // https://codepen.io/lifeart/pen/abMzEZm?editors=0110

src/server.ts

@@ -4,7 +4,7 @@ import 'decorator-transforms/globals';
 import { URL } from 'node:url';
 import { router } from '@/services/router';
 import { Application } from '@/components/Application.gts';
-import { render as renderSSR } from '@/utils/ssr';
+import { render as renderSSR } from '@/utils/ssr/ssr';
 
 export async function render(url: string) {
   const urlInstance = new URL(url);

src/tests/utils.ts

@@ -1,8 +1,8 @@
 import { type ComponentReturnType, renderComponent } from '@/utils/component';
 import { getDocument } from '@/utils/dom-api';
-import { withRehydration } from '@/utils/rehydration';
+import { withRehydration } from '@/utils/ssr/rehydration';
 import { getRoot, resetNodeCounter, setRoot, resetRoot } from '@/utils/dom';
-import { renderInBrowser } from '@/utils/ssr';
+import { renderInBrowser } from '@/utils/ssr/ssr';
 import { runDestructors } from '@/utils/component';
 
 export async function cleanupRender() {

src/utils/benchmark.ts → src/utils/benchmark/benchmark.ts

@@ -1,7 +1,7 @@
 import { Application } from '@/components/Application.gts';
-import { withRehydration } from '@/utils/rehydration';
+import { withRehydration } from '@/utils/ssr/rehydration';
 import { getDocument } from '@/utils/dom-api';
-import { measureRender } from '@/utils/measure-render';
+import { measureRender } from '@/utils/benchmark/measure-render';
 import { setResolveRender } from '@/utils/runtime';
 
 export function createBenchmark() {

src/utils/component.ts

@@ -1,4 +1,4 @@
-import { DestructorFn, Destructors } from '@/utils/destroyable';
+import { DestructorFn, Destructors } from '@/utils/glimmer/destroyable';
 import type {
   TemplateContext,
   Context,

src/utils/if.ts → src/utils/control-flow/if.ts

@@ -12,7 +12,7 @@ import {
   deepFnValue,
 } from '@/utils/reactive';
 import { opcodeFor } from '@/utils/vm';
-import { associateDestroyable } from './component';
+import { associateDestroyable } from '../component';
 import { api } from '@/utils/dom-api';
 import {
   $DEBUG_REACTIVE_CONTEXTS,
@@ -21,7 +21,7 @@ import {
   isFn,
   isPrimitive,
   IFS_FOR_HMR,
-} from './shared';
+} from '../shared';
 
 export function ifCondition(
   ctx: Component<any>,

src/utils/list.ts → src/utils/control-flow/list.ts

@@ -19,8 +19,8 @@ import {
   isPrimitive,
   isTagLike,
   LISTS_FOR_HMR,
-} from './shared';
-import { isRehydrationScheduled } from './rehydration';
+} from '../shared';
+import { isRehydrationScheduled } from '../ssr/rehydration';
 
 export function getFirstNode(
   rawItem:

src/utils/dom.ts

@@ -20,14 +20,14 @@ import { checkOpcode, opcodeFor } from '@/utils/vm';
 import {
   SyncListComponent,
   AsyncListComponent,
-} from '@/utils/list';
-import { ifCondition } from '@/utils/if';
+} from '@/utils/control-flow/list';
+import { ifCondition } from '@/utils/control-flow/if';
 import {
   DestructorFn,
   Destructors,
   destroy,
   registerDestructor,
-} from './destroyable';
+} from './glimmer/destroyable';
 import { api } from '@/utils/dom-api';
 import {
   isFn,
@@ -43,7 +43,7 @@ import {
   IN_SSR_ENV,
   COMPONENTS_HMR,
 } from './shared';
-import { isRehydrationScheduled } from './rehydration';
+import { isRehydrationScheduled } from './ssr/rehydration';
 import { createHotReload } from './hmr';
 
 // EMPTY DOM PROPS

src/utils/caching-primitives.ts → src/utils/glimmer/caching-primitives.ts

@@ -1,5 +1,5 @@
 import { type Cell, formula } from '@lifeart/gxt';
-import { opcodeFor, evaluateOpcode } from './vm';
+import { opcodeFor, evaluateOpcode } from '../vm';
 
 interface Cache {
   tag: ReturnType<typeof formula>;

src/utils/glimmer-validator.ts → src/utils/glimmer/glimmer-validator.ts

@@ -6,7 +6,7 @@ import {
   isRendering,
   setIsRendering,
   cell,
-} from './reactive';
+} from '../reactive';
 
 export { cellFor as tagFor } from '@lifeart/gxt';
 

src/utils/storage-primitives.ts → src/utils/glimmer/storage-primitives.ts

@@ -1,5 +1,5 @@
 import { cell, type Cell } from '@lifeart/gxt';
-import { isFn } from './shared';
+import { isFn } from '../shared';
 interface Storage<T> {
   cell: Cell<T>;
   update(value: T): void;

src/utils/hmr.ts

@@ -1,4 +1,4 @@
-import { getFirstNode } from '@/utils/list';
+import { getFirstNode } from '@/utils/control-flow/list';
 import { COMPONENTS_HMR, IFS_FOR_HMR, LISTS_FOR_HMR } from './shared';
 import {
   renderElement,

src/utils/index.ts

@@ -12,7 +12,7 @@ export {
   Component,
   type ComponentReturnType,
 } from '@/utils/component';
-export { registerDestructor } from '@/utils/destroyable';
+export { registerDestructor } from '@/utils/glimmer/destroyable';
 export { hbs, scope } from '@/utils/template';
 export { effect } from '@/utils/vm';
 export * from '@/utils/dom';

src/utils/ember-inspector.ts → src/utils/inspector/ember-inspector.ts

@@ -1,9 +1,9 @@
 import * as backburner from 'backburner.js';
-import { getRoot } from './dom';
-import { $_debug_args, RENDER_TREE, getBounds } from './shared';
-import { Component } from '.';
-import { Cell, MergedCell, getCells, getMergedCells } from './reactive';
-import { $args } from './shared';
+import { getRoot } from '../dom';
+import { $_debug_args, RENDER_TREE, getBounds } from '../shared';
+import { Component } from '..';
+import { Cell, MergedCell, getCells, getMergedCells } from '../reactive';
+import { $args } from '../shared';
 import { inspect } from '@/utils/inspector';
 
 const genericProxy = new Proxy(

src/utils/runtime.ts

@@ -5,7 +5,7 @@ import {
   executeTag,
   relatedTags,
 } from '@/utils/reactive';
-import { isRehydrationScheduled } from './rehydration';
+import { isRehydrationScheduled } from './ssr/rehydration';
 
 let revalidateScheduled = false;
 type voidFn = () => void;

src/utils/shared.ts

@@ -5,7 +5,7 @@ import {
   type ComponentReturnType,
 } from '@/utils/component';
 import { type AnyCell } from './reactive';
-import { type BasicListComponent } from './list';
+import { type BasicListComponent } from './control-flow/list';
 
 export const isTag = Symbol('isTag');
 export const $template = 'template' as const;

src/utils/rehydration.ts → src/utils/ssr/rehydration.ts

@@ -1,6 +1,6 @@
 import { type ComponentReturnType } from '@/utils/component';
 import { getNodeCounter, resetNodeCounter } from '@/utils/dom';
-import { api as rehydrationDomApi } from '@/utils/rehydration-dom-api';
+import { api as rehydrationDomApi } from '@/utils/ssr/rehydration-dom-api';
 import { api as domApi } from '@/utils/dom-api';
 const withRehydrationStack: HTMLElement[] = [];
 const commentsToRehydrate: Comment[] = [];

src/utils/ssr.ts → src/utils/ssr/ssr.ts

@@ -3,7 +3,7 @@ import {
   runDestructors,
   type ComponentReturnType,
 } from '@/utils/component';
-import { setDocument, getDocument } from './dom-api';
+import { setDocument, getDocument } from '../dom-api';
 import { getRoot, resetNodeCounter, resetRoot } from '@/utils/dom';
 
 type EnvironmentParams = {

tsconfig.json

@@ -26,7 +26,7 @@
       "@/utils/*": ["./src/utils/*"],
       "@/services/*": ["./src/services/*"],
       "@lifeart/gxt/test-utils": ["./src/tests/utils"],
-      "@lifeart/gxt/ember-inspector": ["./src/utils/ember-inspector"],
+      "@lifeart/gxt/ember-inspector": ["./src/utils/inspector/ember-inspector"],
       "@lifeart/gxt": ["./src/utils/index"]
     },
     "types": ["vite/client", "./types"]

vite.config.mts

@@ -95,8 +95,8 @@ export default defineConfig(({ mode }) => ({
           entry: [
             path.join(currentPath, "src", "utils", "index.ts"),
             path.join(currentPath, "plugins", "compiler.ts"),
-            path.join(currentPath, "src", "utils", "ember-inspector.ts"),
-            path.join(currentPath, "src", "utils", "glimmer-compat.ts"),
+            path.join(currentPath, "src", "utils", "inspector", "ember-inspector.ts"),
+            path.join(currentPath, "src", "utils", "glimmer", "glimmer-compat.ts"),
             path.join(currentPath, "src", "tests", "utils.ts"),
           ],
           name: "gxt",
@@ -161,7 +161,7 @@ export default defineConfig(({ mode }) => ({
       "@lifeart/gxt/ember-inspector": path.join(
         currentPath,
         "src",
-        "utils",
+        "utils","inspector",
         "ember-inspector.ts",
       ),
       "@lifeart/gxt/test-utils": path.join(