From 487b304c15e82fff700813b3684878028742df93 Mon Sep 17 00:00:00 2001 From: Johannes Zillmann Date: Wed, 31 Mar 2021 10:00:21 +0200 Subject: [PATCH] Move EvaluationIndex to debug package (Not a 100% correct but somewhat more pleasing) --- core/src/Debugger.ts | 2 +- core/src/{transformer => debug}/EvaluationIndex.ts | 0 core/src/{transformer => debug}/EvaluationTracker.ts | 0 core/src/debug/ItemMerger.ts | 2 +- core/src/debug/LineItemMerger.ts | 2 +- core/src/debug/Page.ts | 2 +- core/src/debug/StageResult.ts | 4 ++-- core/src/transformer/TransformContext.ts | 2 +- core/test/debug/LineItemMerger.test.ts | 2 +- core/test/debug/Page.test.ts | 2 +- core/test/debug/StageResults.test.ts | 2 +- core/test/transformer/testContext.ts | 3 ++- 12 files changed, 12 insertions(+), 11 deletions(-) rename core/src/{transformer => debug}/EvaluationIndex.ts (100%) rename core/src/{transformer => debug}/EvaluationTracker.ts (100%) diff --git a/core/src/Debugger.ts b/core/src/Debugger.ts index 5542a6d..762f1e1 100644 --- a/core/src/Debugger.ts +++ b/core/src/Debugger.ts @@ -6,7 +6,7 @@ import ColumnAnnotation from './debug/ColumnAnnotation'; import AnnotatedColumn from './debug/AnnotatedColumn'; import { detectChanges } from './debug/detectChanges'; import { asPages } from './debug/Page'; -import EvaluationTracker from './transformer/EvaluationTracker'; +import EvaluationTracker from './debug/EvaluationTracker'; import ChangeTracker from './debug/ChangeTracker'; import PageViewport from './parse/PageViewport'; import Globals from './Globals'; diff --git a/core/src/transformer/EvaluationIndex.ts b/core/src/debug/EvaluationIndex.ts similarity index 100% rename from core/src/transformer/EvaluationIndex.ts rename to core/src/debug/EvaluationIndex.ts diff --git a/core/src/transformer/EvaluationTracker.ts b/core/src/debug/EvaluationTracker.ts similarity index 100% rename from core/src/transformer/EvaluationTracker.ts rename to core/src/debug/EvaluationTracker.ts diff --git a/core/src/debug/ItemMerger.ts b/core/src/debug/ItemMerger.ts index b04e09a..e41941a 100644 --- a/core/src/debug/ItemMerger.ts +++ b/core/src/debug/ItemMerger.ts @@ -1,4 +1,4 @@ -import type EvaluationTracker from '../transformer/EvaluationTracker'; +import type EvaluationTracker from './EvaluationTracker'; import type ChangeTracker from './ChangeTracker'; import type Item from '../Item'; diff --git a/core/src/debug/LineItemMerger.ts b/core/src/debug/LineItemMerger.ts index 4c05746..4943677 100644 --- a/core/src/debug/LineItemMerger.ts +++ b/core/src/debug/LineItemMerger.ts @@ -1,6 +1,6 @@ import ItemMerger from './ItemMerger'; import Item from '../Item'; -import EvaluationTracker from '../transformer/EvaluationTracker'; +import EvaluationTracker from './EvaluationTracker'; import ChangeTracker from './ChangeTracker'; export default class LineItemMerger extends ItemMerger { diff --git a/core/src/debug/Page.ts b/core/src/debug/Page.ts index e1160dc..e85e915 100644 --- a/core/src/debug/Page.ts +++ b/core/src/debug/Page.ts @@ -1,6 +1,6 @@ import Item from '../Item'; import { groupByElement, groupByPage } from '../support/groupingUtils'; -import EvaluationTracker from '../transformer/EvaluationTracker'; +import EvaluationTracker from './EvaluationTracker'; import ChangeTracker from './ChangeTracker'; import ItemGroup from './ItemGroup'; import ItemMerger from './ItemMerger'; diff --git a/core/src/debug/StageResult.ts b/core/src/debug/StageResult.ts index 0378f90..fd0455c 100644 --- a/core/src/debug/StageResult.ts +++ b/core/src/debug/StageResult.ts @@ -5,8 +5,8 @@ import Page, { asPages } from './Page'; import ChangeIndex from './ChangeIndex'; import ChangeTracker from './ChangeTracker'; import ItemGroup from './ItemGroup'; -import EvaluationIndex from '../transformer/EvaluationIndex'; -import EvaluationTracker from '../transformer/EvaluationTracker'; +import EvaluationIndex from './EvaluationIndex'; +import EvaluationTracker from './EvaluationTracker'; import Globals from '../Globals'; export default class StageResult { diff --git a/core/src/transformer/TransformContext.ts b/core/src/transformer/TransformContext.ts index 5f966fb..9931edb 100644 --- a/core/src/transformer/TransformContext.ts +++ b/core/src/transformer/TransformContext.ts @@ -1,6 +1,6 @@ import Item from '../Item'; import PageViewport from '../parse/PageViewport'; -import EvaluationTracker from './EvaluationTracker'; +import EvaluationTracker from '../debug/EvaluationTracker'; import GlobalDefinition from '../GlobalDefinition'; import Globals from '../Globals'; diff --git a/core/test/debug/LineItemMerger.test.ts b/core/test/debug/LineItemMerger.test.ts index a75557c..5c11412 100644 --- a/core/test/debug/LineItemMerger.test.ts +++ b/core/test/debug/LineItemMerger.test.ts @@ -1,5 +1,5 @@ import LineItemMerger from 'src/debug/LineItemMerger'; -import EvaluationTracker from 'src/transformer/EvaluationTracker'; +import EvaluationTracker from 'src/debug/EvaluationTracker'; import ChangeTracker from 'src/debug/ChangeTracker'; import Item from 'src/Item'; import { items, realisticItems } from '../testItems'; diff --git a/core/test/debug/Page.test.ts b/core/test/debug/Page.test.ts index df2856e..06c88c6 100644 --- a/core/test/debug/Page.test.ts +++ b/core/test/debug/Page.test.ts @@ -3,7 +3,7 @@ import Page, { asPages } from 'src/debug/Page'; import ItemGroup from 'src/debug/ItemGroup'; import ItemMerger from 'src/debug/ItemMerger'; import { items } from 'test/testItems'; -import EvaluationTracker from 'src/transformer/EvaluationTracker'; +import EvaluationTracker from 'src/debug/EvaluationTracker'; import ChangeTracker from 'src/debug/ChangeTracker'; test('empty', async () => { diff --git a/core/test/debug/StageResults.test.ts b/core/test/debug/StageResults.test.ts index 219f5b6..24ca78f 100644 --- a/core/test/debug/StageResults.test.ts +++ b/core/test/debug/StageResults.test.ts @@ -1,6 +1,6 @@ import StageResult from 'src/debug/StageResult'; import { toDescriptor } from 'src/TransformDescriptor'; -import EvaluationTracker from 'src/transformer/EvaluationTracker'; +import EvaluationTracker from 'src/debug/EvaluationTracker'; import ChangeTracker from 'src/debug/ChangeTracker'; import AnnotatedColumn from 'src/debug/AnnotatedColumn'; import Page, { asPages } from 'src/debug/Page'; diff --git a/core/test/transformer/testContext.ts b/core/test/transformer/testContext.ts index b4164e5..481e123 100644 --- a/core/test/transformer/testContext.ts +++ b/core/test/transformer/testContext.ts @@ -1,5 +1,6 @@ +import Globals from 'src/Globals'; import TransformContext from 'src/transformer/TransformContext'; export function emptyContext(): TransformContext { - return new TransformContext(new Map(), []); + return new TransformContext(new Map(), [], new Globals()); }