Package refactoring: Move globals to root

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[];

core/src/GlobalDefinition.ts

@@ -1,4 +1,3 @@
-import { assertDefined, assertNot } from 'src/assert';
 import GlobalValue from './GlobalValue';
 
 export default class GlobalDefinition<T> {

core/src/GlobalValue.ts

@@ -1,4 +1,3 @@
-import { assertDefined, assertNot } from 'src/assert';
 import GlobalDefinition from './GlobalDefinition';
 
 export default class GlobalValue<T> {

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 {

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[];

core/src/ParsedPageItem.ts

@@ -1,8 +0,0 @@
-export default interface ParsedPageItem {
-  str: string;
-  dir: string;
-  width: number;
-  height: number;
-  transform: number[];
-  fontName: string;
-}

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;

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(

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';

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;

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<string>('myGlobalString');
 const MyGlobalNumber = new GlobalDefinition<number>('myGlobalNumber');

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();