From 5e87f8cbecdc1f367f0cb0fc8cf65bd87f0600a3 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Tue, 10 Mar 2020 00:02:54 -0400 Subject: [PATCH] Simplify core imports. --- src/fed2019/Form1040.test.ts | 3 +-- src/fed2019/Form1040.ts | 3 +-- src/fed2019/Form1099B.ts | 4 +--- src/fed2019/Form1099DIV.ts | 3 +-- src/fed2019/Form1099INT.ts | 3 +-- src/fed2019/Form1099R.ts | 4 +--- src/fed2019/Form1116.test.ts | 3 +-- src/fed2019/Form1116.ts | 4 +--- src/fed2019/Form8606.test.ts | 3 +-- src/fed2019/Form8606.ts | 4 +--- src/fed2019/Form8949.test.ts | 3 +-- src/fed2019/Form8949.ts | 4 +--- src/fed2019/Form8959.test.ts | 3 +-- src/fed2019/Form8959.ts | 3 +-- src/fed2019/Form8960.test.ts | 3 +-- src/fed2019/Form8960.ts | 3 +-- src/fed2019/FormW2.test.ts | 4 ++-- src/fed2019/FormW2.ts | 3 +-- src/fed2019/Schedule1.test.ts | 3 +-- src/fed2019/Schedule1.ts | 3 +-- src/fed2019/Schedule2.ts | 3 +-- src/fed2019/Schedule3.test.ts | 3 +-- src/fed2019/Schedule3.ts | 3 +-- src/fed2019/ScheduleD.ts | 4 +--- 24 files changed, 25 insertions(+), 54 deletions(-) diff --git a/src/fed2019/Form1040.test.ts b/src/fed2019/Form1040.test.ts index 6653c46..741bd5f 100644 --- a/src/fed2019/Form1040.test.ts +++ b/src/fed2019/Form1040.test.ts @@ -1,5 +1,4 @@ -import { Person } from '../core'; -import { TaxReturn } from '../core'; +import { Person, TaxReturn } from '../core'; import { NotFoundError } from '../core/Errors'; import Form1040, { FilingStatus } from './Form1040'; diff --git a/src/fed2019/Form1040.ts b/src/fed2019/Form1040.ts index a6f865b..4546951 100644 --- a/src/fed2019/Form1040.ts +++ b/src/fed2019/Form1040.ts @@ -1,5 +1,4 @@ -import Form, { FormClass } from '../core/Form'; -import { TaxReturn } from '../core'; +import { Form, TaxReturn } from '../core'; import { Line, AccumulatorLine, ComputedLine, ReferenceLine, sumLineOfForms } from '../core/Line'; import { UnsupportedFeatureError } from '../core/Errors'; import { reduceBySum } from '../core/Math'; diff --git a/src/fed2019/Form1099B.ts b/src/fed2019/Form1099B.ts index ba3d2eb..dbd8de2 100644 --- a/src/fed2019/Form1099B.ts +++ b/src/fed2019/Form1099B.ts @@ -1,6 +1,4 @@ -import { Form } from '../core'; -import { Person } from '../core'; -import { TaxReturn } from '../core'; +import { Form, Person, TaxReturn } from '../core'; import { InputLine } from '../core/Line'; export enum GainType { diff --git a/src/fed2019/Form1099DIV.ts b/src/fed2019/Form1099DIV.ts index 53ee8cd..fbbfe6b 100644 --- a/src/fed2019/Form1099DIV.ts +++ b/src/fed2019/Form1099DIV.ts @@ -1,6 +1,5 @@ -import { Form } from '../core'; +import { Form, Person } from '../core'; import { InputLine } from '../core/Line'; -import { Person } from '../core'; export interface Form1099DIVInput { payer: string; diff --git a/src/fed2019/Form1099INT.ts b/src/fed2019/Form1099INT.ts index 1e93e56..0d8865a 100644 --- a/src/fed2019/Form1099INT.ts +++ b/src/fed2019/Form1099INT.ts @@ -1,6 +1,5 @@ -import { Form } from '../core'; +import { Form, Person } from '../core'; import { InputLine } from '../core/Line'; -import { Person } from '../core'; export interface Form1099INTInput { payer: string; diff --git a/src/fed2019/Form1099R.ts b/src/fed2019/Form1099R.ts index cfe2f37..f1ba833 100644 --- a/src/fed2019/Form1099R.ts +++ b/src/fed2019/Form1099R.ts @@ -1,6 +1,4 @@ -import { Form } from '../core'; -import { Person } from '../core'; -import { TaxReturn } from '../core'; +import { Form, Person, TaxReturn } from '../core'; import { InputLine } from '../core/Line'; export enum Box7Code { diff --git a/src/fed2019/Form1116.test.ts b/src/fed2019/Form1116.test.ts index 6a4d705..82f27df 100644 --- a/src/fed2019/Form1116.test.ts +++ b/src/fed2019/Form1116.test.ts @@ -1,5 +1,4 @@ -import { TaxReturn } from '../core'; -import { Person } from '../core'; +import { Person, TaxReturn } from '../core'; import { UnsupportedFeatureError } from '../core/Errors'; import Form1040, { FilingStatus } from './Form1040'; diff --git a/src/fed2019/Form1116.ts b/src/fed2019/Form1116.ts index e9c0aae..7e90a86 100644 --- a/src/fed2019/Form1116.ts +++ b/src/fed2019/Form1116.ts @@ -1,6 +1,4 @@ -import { Form } from '../core'; -import { TaxReturn } from '../core'; -import { Person } from '../core'; +import { Form, Person, TaxReturn } from '../core'; import { ComputedLine, InputLine, ReferenceLine } from '../core/Line'; import { UnsupportedFeatureError } from '../core/Errors'; import { reduceBySum } from '../core/Math'; diff --git a/src/fed2019/Form8606.test.ts b/src/fed2019/Form8606.test.ts index 2e276d4..b7bd8a2 100644 --- a/src/fed2019/Form8606.test.ts +++ b/src/fed2019/Form8606.test.ts @@ -1,5 +1,4 @@ -import { TaxReturn } from '../core'; -import { Person } from '../core'; +import { Person, TaxReturn } from '../core'; import Form1040, { FilingStatus } from './Form1040'; import Form8606 from './Form8606'; diff --git a/src/fed2019/Form8606.ts b/src/fed2019/Form8606.ts index 95fde54..0aa2604 100644 --- a/src/fed2019/Form8606.ts +++ b/src/fed2019/Form8606.ts @@ -1,6 +1,4 @@ -import { Form } from '../core'; -import { TaxReturn } from '../core'; -import { Person } from '../core'; +import { Form, Person, TaxReturn } from '../core'; import { Line, AccumulatorLine, ComputedLine, InputLine, ReferenceLine } from '../core/Line'; import { clampToZero } from '../core/Math'; diff --git a/src/fed2019/Form8949.test.ts b/src/fed2019/Form8949.test.ts index ffc82b7..1fb5e55 100644 --- a/src/fed2019/Form8949.test.ts +++ b/src/fed2019/Form8949.test.ts @@ -1,5 +1,4 @@ -import { TaxReturn } from '../core'; -import { Person } from '../core'; +import { Person, TaxReturn } from '../core'; import Form1040, { FilingStatus } from './Form1040'; import Form1099B, { GainType } from './Form1099B'; diff --git a/src/fed2019/Form8949.ts b/src/fed2019/Form8949.ts index 1c581c3..32967f9 100644 --- a/src/fed2019/Form8949.ts +++ b/src/fed2019/Form8949.ts @@ -1,6 +1,4 @@ -import { Form } from '../core'; -import { Person } from '../core'; -import { TaxReturn } from '../core'; +import { Form, Person, TaxReturn } from '../core'; import { Line, InputLine, ComputedLine, sumLineOfForms } from '../core/Line'; import Form1099B, { GainType } from './Form1099B'; diff --git a/src/fed2019/Form8959.test.ts b/src/fed2019/Form8959.test.ts index a17117e..f158d59 100644 --- a/src/fed2019/Form8959.test.ts +++ b/src/fed2019/Form8959.test.ts @@ -1,5 +1,4 @@ -import { Person } from '../core'; -import { TaxReturn } from '../core'; +import { Person, TaxReturn } from '../core'; import FormW2 from './FormW2'; import Form8959 from './Form8959'; diff --git a/src/fed2019/Form8959.ts b/src/fed2019/Form8959.ts index b4e3889..898c1f7 100644 --- a/src/fed2019/Form8959.ts +++ b/src/fed2019/Form8959.ts @@ -1,5 +1,4 @@ -import { Form } from '../core'; -import { TaxReturn } from '../core'; +import { Form, TaxReturn } from '../core'; import { Line, AccumulatorLine, ComputedLine, ReferenceLine } from '../core/Line'; import { clampToZero } from '../core/Math'; diff --git a/src/fed2019/Form8960.test.ts b/src/fed2019/Form8960.test.ts index 3eebf66..6b752fb 100644 --- a/src/fed2019/Form8960.test.ts +++ b/src/fed2019/Form8960.test.ts @@ -1,5 +1,4 @@ -import { Person } from '../core'; -import { TaxReturn } from '../core'; +import { Person, TaxReturn } from '../core'; import FormW2 from './FormW2'; import Form1040, { FilingStatus } from './Form1040'; diff --git a/src/fed2019/Form8960.ts b/src/fed2019/Form8960.ts index 6bd1e0c..86524f0 100644 --- a/src/fed2019/Form8960.ts +++ b/src/fed2019/Form8960.ts @@ -1,5 +1,4 @@ -import { Form } from '../core'; -import { TaxReturn } from '../core'; +import { Form, TaxReturn } from '../core'; import { ComputedLine, ReferenceLine } from '../core/Line'; import { clampToZero } from '../core/Math'; diff --git a/src/fed2019/FormW2.test.ts b/src/fed2019/FormW2.test.ts index 5b260d2..37a052f 100644 --- a/src/fed2019/FormW2.test.ts +++ b/src/fed2019/FormW2.test.ts @@ -1,6 +1,6 @@ +import { Person, TaxReturn } from '../core'; + import W2 from './FormW2'; -import { Person } from '../core'; -import { TaxReturn } from '../core'; test('input', () => { const p = Person.self('Bob'); diff --git a/src/fed2019/FormW2.ts b/src/fed2019/FormW2.ts index a554c5b..9d82c4d 100644 --- a/src/fed2019/FormW2.ts +++ b/src/fed2019/FormW2.ts @@ -1,6 +1,5 @@ -import { Form } from '../core'; +import { Form, Person } from '../core'; import { Line, InputLine } from '../core/Line'; -import { Person } from '../core'; export enum Box13 { StatutoryEmployee, diff --git a/src/fed2019/Schedule1.test.ts b/src/fed2019/Schedule1.test.ts index 88fd60b..e99e72c 100644 --- a/src/fed2019/Schedule1.test.ts +++ b/src/fed2019/Schedule1.test.ts @@ -1,5 +1,4 @@ -import { TaxReturn } from '../core'; -import { Person } from '../core'; +import { Person, TaxReturn } from '../core'; import { UnsupportedFeatureError } from '../core/Errors'; import Form1040, { FilingStatus } from './Form1040'; diff --git a/src/fed2019/Schedule1.ts b/src/fed2019/Schedule1.ts index 7bd817e..9b36469 100644 --- a/src/fed2019/Schedule1.ts +++ b/src/fed2019/Schedule1.ts @@ -1,5 +1,4 @@ -import { Form } from '../core'; -import { TaxReturn } from '../core'; +import { Form, TaxReturn } from '../core'; import { ComputedLine, InputLine } from '../core/Line'; import { NotFoundError, UnsupportedFeatureError } from '../core/Errors'; import { undefinedToZero } from '../core/Math'; diff --git a/src/fed2019/Schedule2.ts b/src/fed2019/Schedule2.ts index ec0103c..ca2c46f 100644 --- a/src/fed2019/Schedule2.ts +++ b/src/fed2019/Schedule2.ts @@ -1,5 +1,4 @@ -import { Form } from '../core'; -import { TaxReturn } from '../core'; +import { Form, TaxReturn } from '../core'; import { ComputedLine } from '../core/Line'; import { UnsupportedFeatureError } from '../core/Errors'; diff --git a/src/fed2019/Schedule3.test.ts b/src/fed2019/Schedule3.test.ts index 25b2ecd..e0b5efc 100644 --- a/src/fed2019/Schedule3.test.ts +++ b/src/fed2019/Schedule3.test.ts @@ -1,5 +1,4 @@ -import { TaxReturn } from '../core'; -import { Person } from '../core'; +import { Person, TaxReturn } from '../core'; import { NotFoundError } from '../core/Errors'; import Form1040, { FilingStatus } from './Form1040'; diff --git a/src/fed2019/Schedule3.ts b/src/fed2019/Schedule3.ts index 1e36975..36db265 100644 --- a/src/fed2019/Schedule3.ts +++ b/src/fed2019/Schedule3.ts @@ -1,5 +1,4 @@ -import { Form } from '../core'; -import { TaxReturn } from '../core'; +import { Form, TaxReturn } from '../core'; import { AccumulatorLine, ComputedLine, InputLine, ReferenceLine } from '../core/Line'; import { NotFoundError, UnsupportedFeatureError } from '../core/Errors'; diff --git a/src/fed2019/ScheduleD.ts b/src/fed2019/ScheduleD.ts index 748ce5a..e7661a1 100644 --- a/src/fed2019/ScheduleD.ts +++ b/src/fed2019/ScheduleD.ts @@ -1,6 +1,4 @@ -import { Form } from '../core'; -import { Person } from '../core'; -import { TaxReturn } from '../core'; +import { Form, Person, TaxReturn } from '../core'; import { Line, AccumulatorLine, ComputedLine, ReferenceLine, sumLineOfForms } from '../core/Line'; import { clampToZero } from '../core/Math'; import { UnsupportedFeatureError } from '../core/Errors'; -- 2.22.5