refactor: introduce EnumRecord ensuring iterable and length-property (#…

…50)
wowserhq · Apr 9, 2024 · 84bea0a · 84bea0a
1 parent e592aa6
commit 84bea0a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/src/ui/components/UIRoot.ts b/src/ui/components/UIRoot.ts
@@ -2,7 +2,7 @@ import DrawLayerType from '../DrawLayerType';
 import Screen from '../../gfx/Screen';
 import ScreenLayer from '../../gfx/ScreenLayer';
 import { EdgeRect } from '../../math';
-import { LinkedList, NDCtoDDCWidth, NDCtoDDCHeight } from '../../utils';
+import { EnumRecord, LinkedList, NDCtoDDCWidth, NDCtoDDCHeight } from '../../utils';
 
 import Frame, { FrameFlag } from './simple/Frame';
 import FramePointType from './abstract/FramePointType';
@@ -16,7 +16,7 @@ class UIRoot extends LayoutFrame {
     frame: Frame | null,
     anchor: FramePointType
   };
-  strata: Record<FrameStrataType, FrameStrata> & Iterable<FrameStrata>;
+  strata: EnumRecord<FrameStrataType, FrameStrata>;
   frames: LinkedList<Frame>;
   destroyedFrames: LinkedList<Frame>;
   screenLayer: ScreenLayer;
@@ -112,7 +112,7 @@ class UIRoot extends LayoutFrame {
   onLayerUpdate(elapsedSecs: number) {
     // TODO: Clean-up destroyed frames
 
-    console.log('root pre-render', this);
+    console.log('root pre-render');
 
     LayoutFrame.resizePending();
 

diff --git a/src/ui/components/abstract/FrameStrataLevel.ts b/src/ui/components/abstract/FrameStrataLevel.ts
@@ -1,14 +1,14 @@
 import DrawLayerType from '../../DrawLayerType';
 import Frame from '../simple/Frame';
 import RenderBatch from '../../rendering/RenderBatch';
-import { LinkedList } from '../../../utils';
+import { EnumRecord, LinkedList } from '../../../utils';
 
 class FrameStrataLevel {
   index: number;
   pendingFrames: LinkedList<Frame>;
   frames: LinkedList<Frame>;
   pendingFrame?: Frame;
-  batches: Record<DrawLayerType, RenderBatch> & Iterable<RenderBatch>;
+  batches: EnumRecord<DrawLayerType, RenderBatch>;
   batchDirty: number;
   renderList: LinkedList<RenderBatch>;
 

diff --git a/src/ui/components/abstract/LayoutFrame.ts b/src/ui/components/abstract/LayoutFrame.ts
@@ -7,6 +7,7 @@ import {
   areClose,
 } from '../../../math';
 import {
+  EnumRecord,
   LinkedList,
   LinkedListLink,
   LinkedListNode,
@@ -59,7 +60,7 @@ class LayoutFrame {
   resizeCounter: number;
   _resizePendingLink?: LinkedListLink<LayoutFrame>;
 
-  points: Record<FramePointType, FramePoint | null> & Iterable<FramePoint | null>;
+  points: EnumRecord<FramePointType, FramePoint | null>;
 
   constructor() {
     this.layoutFlags = 0;

diff --git a/src/ui/components/simple/Frame.ts b/src/ui/components/simple/Frame.ts
@@ -9,6 +9,7 @@ import ScriptRegion from '../abstract/ScriptRegion';
 import UIContext from '../../UIContext';
 import XMLNode from '../../XMLNode';
 import {
+  EnumRecord,
   LinkedList,
   LinkedListLink,
   LinkedListNode,
@@ -53,7 +54,7 @@ class Frame extends ScriptRegion {
   strataType: FrameStrataType;
   level: number;
 
-  layersEnabled: Record<DrawLayerType, boolean> & Iterable<boolean>;
+  layersEnabled: EnumRecord<DrawLayerType, boolean>;
   backdrop: Backdrop | null;
 
   regions: LinkedList<Region>;

diff --git a/src/utils/types.ts b/src/utils/types.ts
@@ -1,3 +1,5 @@
+export type EnumRecord<E extends string | number | symbol, V> = Record<E, V> & Iterable<V> & { length: number };
+
 // See: https://github.com/microsoft/TypeScript/issues/5863#issuecomment-1336204919
 export type ThisConstructor<
   T extends { prototype: unknown } = { prototype: unknown },