From ce6d9f8984975f2efcaddd4f5bf45681f68b9eef Mon Sep 17 00:00:00 2001 From: Johannes Zillmann Date: Mon, 29 Mar 2021 08:57:05 +0200 Subject: [PATCH] Package refactoring: Move globals to root --- core/src/Debugger.ts | 2 +- core/src/{transformer => }/GlobalDefinition.ts | 1 - core/src/{transformer => }/GlobalValue.ts | 1 - core/src/{transformer => }/Globals.ts | 2 +- core/src/ItemResult.ts | 2 +- core/src/ParsedPageItem.ts | 8 -------- core/src/PdfPipeline.ts | 2 +- core/src/debug/StageResult.ts | 2 +- core/src/transformer/CacluclateStatistics.ts | 2 +- core/src/transformer/TransformContext.ts | 4 ++-- core/test/{transformer => }/Globals.test.ts | 4 ++-- core/test/debug/StageResults.test.ts | 2 +- 12 files changed, 11 insertions(+), 21 deletions(-) rename core/src/{transformer => }/GlobalDefinition.ts (83%) rename core/src/{transformer => }/GlobalValue.ts (78%) rename core/src/{transformer => }/Globals.ts (96%) delete mode 100644 core/src/ParsedPageItem.ts rename core/test/{transformer => }/Globals.test.ts (94%) diff --git a/core/src/Debugger.ts b/core/src/Debugger.ts index 77acd3c..5542a6d 100644 --- a/core/src/Debugger.ts +++ b/core/src/Debugger.ts @@ -9,7 +9,7 @@ import { asPages } from './debug/Page'; import EvaluationTracker from './transformer/EvaluationTracker'; import ChangeTracker from './debug/ChangeTracker'; import PageViewport from './parse/PageViewport'; -import Globals from './transformer/Globals'; +import Globals from './Globals'; export default class Debugger { private transformers: ItemTransformer[]; diff --git a/core/src/transformer/GlobalDefinition.ts b/core/src/GlobalDefinition.ts similarity index 83% rename from core/src/transformer/GlobalDefinition.ts rename to core/src/GlobalDefinition.ts index 4cdabbc..0a592d0 100644 --- a/core/src/transformer/GlobalDefinition.ts +++ b/core/src/GlobalDefinition.ts @@ -1,4 +1,3 @@ -import { assertDefined, assertNot } from 'src/assert'; import GlobalValue from './GlobalValue'; export default class GlobalDefinition { diff --git a/core/src/transformer/GlobalValue.ts b/core/src/GlobalValue.ts similarity index 78% rename from core/src/transformer/GlobalValue.ts rename to core/src/GlobalValue.ts index 8c6f961..edf6df0 100644 --- a/core/src/transformer/GlobalValue.ts +++ b/core/src/GlobalValue.ts @@ -1,4 +1,3 @@ -import { assertDefined, assertNot } from 'src/assert'; import GlobalDefinition from './GlobalDefinition'; export default class GlobalValue { diff --git a/core/src/transformer/Globals.ts b/core/src/Globals.ts similarity index 96% rename from core/src/transformer/Globals.ts rename to core/src/Globals.ts index 8ba0a5c..caaa6e0 100644 --- a/core/src/transformer/Globals.ts +++ b/core/src/Globals.ts @@ -1,5 +1,5 @@ import GlobalDefinition from './GlobalDefinition'; -import { assertDefined, assertNot } from '../assert'; +import { assertDefined, assertNot } from './assert'; import GlobalValue from './GlobalValue'; export default class Globals { diff --git a/core/src/ItemResult.ts b/core/src/ItemResult.ts index 4c18cc3..0502ee7 100644 --- a/core/src/ItemResult.ts +++ b/core/src/ItemResult.ts @@ -1,5 +1,5 @@ import type Item from './Item'; -import GlobalValue from './transformer/GlobalValue'; +import GlobalValue from './GlobalValue'; export default interface ItemResult { items: Item[]; diff --git a/core/src/ParsedPageItem.ts b/core/src/ParsedPageItem.ts deleted file mode 100644 index c451415..0000000 --- a/core/src/ParsedPageItem.ts +++ /dev/null @@ -1,8 +0,0 @@ -export default interface ParsedPageItem { - str: string; - dir: string; - width: number; - height: number; - transform: number[]; - fontName: string; -} diff --git a/core/src/PdfPipeline.ts b/core/src/PdfPipeline.ts index d3e8d12..82d841d 100644 --- a/core/src/PdfPipeline.ts +++ b/core/src/PdfPipeline.ts @@ -6,7 +6,7 @@ import ParseResult from './ParseResult'; import Debugger from './Debugger'; import { assert } from './assert'; import TransformContext from './transformer/TransformContext'; -import Globals from './transformer/Globals'; +import Globals from './Globals'; export default class PdfPipeline { parser: PdfParser; diff --git a/core/src/debug/StageResult.ts b/core/src/debug/StageResult.ts index 78e68ac..0378f90 100644 --- a/core/src/debug/StageResult.ts +++ b/core/src/debug/StageResult.ts @@ -7,7 +7,7 @@ import ChangeTracker from './ChangeTracker'; import ItemGroup from './ItemGroup'; import EvaluationIndex from '../transformer/EvaluationIndex'; import EvaluationTracker from '../transformer/EvaluationTracker'; -import Globals from '../transformer/Globals'; +import Globals from '../Globals'; export default class StageResult { constructor( diff --git a/core/src/transformer/CacluclateStatistics.ts b/core/src/transformer/CacluclateStatistics.ts index 6c9bf74..d759bb8 100644 --- a/core/src/transformer/CacluclateStatistics.ts +++ b/core/src/transformer/CacluclateStatistics.ts @@ -3,7 +3,7 @@ import ItemResult from '../ItemResult'; import ItemTransformer from './ItemTransformer'; import TransformContext from './TransformContext'; import FontType from '../FontType'; -import GlobalDefinition from './GlobalDefinition'; +import GlobalDefinition from '../GlobalDefinition'; import PageMapping from '../PageMapping'; import PageFactorFinder from '../support/PageFactorFinder'; import { groupByPage, onlyUniques } from '../support/groupingUtils'; diff --git a/core/src/transformer/TransformContext.ts b/core/src/transformer/TransformContext.ts index f8f26c3..5f966fb 100644 --- a/core/src/transformer/TransformContext.ts +++ b/core/src/transformer/TransformContext.ts @@ -1,8 +1,8 @@ import Item from '../Item'; import PageViewport from '../parse/PageViewport'; import EvaluationTracker from './EvaluationTracker'; -import GlobalDefinition from './GlobalDefinition'; -import Globals from './Globals'; +import GlobalDefinition from '../GlobalDefinition'; +import Globals from '../Globals'; export default class TransformContext { pageCount: number; diff --git a/core/test/transformer/Globals.test.ts b/core/test/Globals.test.ts similarity index 94% rename from core/test/transformer/Globals.test.ts rename to core/test/Globals.test.ts index 68050f7..8a95712 100644 --- a/core/test/transformer/Globals.test.ts +++ b/core/test/Globals.test.ts @@ -1,5 +1,5 @@ -import GlobalDefinition from 'src/transformer/GlobalDefinition'; -import Globals from 'src/transformer/Globals'; +import GlobalDefinition from 'src/GlobalDefinition'; +import Globals from 'src/Globals'; const MyGlobalString = new GlobalDefinition('myGlobalString'); const MyGlobalNumber = new GlobalDefinition('myGlobalNumber'); diff --git a/core/test/debug/StageResults.test.ts b/core/test/debug/StageResults.test.ts index 6845de0..219f5b6 100644 --- a/core/test/debug/StageResults.test.ts +++ b/core/test/debug/StageResults.test.ts @@ -6,7 +6,7 @@ import AnnotatedColumn from 'src/debug/AnnotatedColumn'; import Page, { asPages } from 'src/debug/Page'; import { items } from '../testItems'; import LineItemMerger from 'src/debug/LineItemMerger'; -import Globals from 'src/transformer/Globals'; +import Globals from 'src/Globals'; test('itemsUnpacked', async () => { const evaluationTracker = new EvaluationTracker();