Simplify core imports.

diff --git a/src/fed2019/Form1040.test.ts b/src/fed2019/Form1040.test.ts
index 6653c46167de932b7b2931c05c90376a45ee957c..741bd5f0f0ac9cb346b44b6646a26f5d3daf70ce 100644 (file)
--- 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 a6f865befee8797cca734e4367b6e0ebe38d9ec3..45469517ae682d19fb085c30861645f27cf3397a 100644 (file)
--- 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 ba3d2ebd87707c87e2143b59bebbe5562d4ecbf4..dbd8de234e2b87d42cf1504d1541c8ad2e0b0cd3 100644 (file)
--- 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 53ee8cd950ab05d3d068bd40192e56875540ab19..fbbfe6b4124aa59d90775152c38d013d2cafc559 100644 (file)
--- 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 1e93e560793afb45abb9d635b2b0808b0ee2ce0c..0d8865a64206fd3c5853483f4b7165c0829c9889 100644 (file)
--- 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 cfe2f372fd28927061adfb3c0650ddb85cc027db..f1ba8337bceb20be0dcaa49b71dd45d455579b96 100644 (file)
--- 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 6a4d705b32c722b7d0a7733bf844a5111b581407..82f27df5a33d44c09c5c63f2f0f5ddba1fa91c81 100644 (file)
--- 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 e9c0aae71b59b264788ac5ef43915916828a6c04..7e90a868f34cfa09521b9c8317d4adc2e89c2266 100644 (file)
--- 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 2e276d4177c7fcd05f9e7cf2fac1c38f6da3ee8c..b7bd8a2a00c20ffbb532cf3cec3c32dc2b2f304c 100644 (file)
--- 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 95fde541e28134f1f3f357b3a19eb53802b20b82..0aa2604826d0be6884503a6cafa9966709c1a7e5 100644 (file)
--- 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 ffc82b7da38be364923a96e3622c9f9da82412df..1fb5e556bef9cec3510212465eb59cf18e08f75d 100644 (file)
--- 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 1c581c3f41e11f237a2e87de1f3aeceed7fa13da..32967f98e5882fc1ff18c5bf20772ffdb1f1dbc9 100644 (file)
--- 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 a17117eeb7e5912beec439aaa2035b1671dc5fc2..f158d5942fc2ba3fae7fcba268adf6b5337629e6 100644 (file)
--- 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 b4e38890f0fc36a1a49feae76d8c616088e1b074..898c1f735605aee1a5bd4d779b2d9d3ec551623e 100644 (file)
--- 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 3eebf66c8b294d0dd3a143343d44f15c63bb6133..6b752fb0a4e142a9a7231bdfdbb9afc3a840e7fa 100644 (file)
--- 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 6bd1e0c221e4fa6bbeff6719e2389e24602c7b71..86524f0c2f66af6bb6d320ede4f8a1a139f29ecc 100644 (file)
--- 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 5b260d2e20eef56bcdba73c8cafe13a1f58e42f7..37a052f9547f621d397539f4c3d450cf7a0f1eb7 100644 (file)
--- 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 a554c5b8a43ce5ee3f809616ba1a74254ce2193d..9d82c4dc65b474d754300e42285e44f3e6978e52 100644 (file)
--- 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 88fd60bd8e4774012f64c31cc3865f50e6a41d43..e99e72c02b7bfa85022c9d04d81bea8d649c4996 100644 (file)
--- 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 7bd817e32bdbe0287e4aa99374418299a65f9426..9b36469e1f4f4ac9032f7617a37a9e76e59ada40 100644 (file)
--- 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 ec0103cd2181d6d32681f48d61e7365f45fc3b77..ca2c46f50110ce437e2d9a5b0fdf08039d961bb3 100644 (file)
--- 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 25b2ecd5ae1b41d41cc18b9a9d6f4b8036dfa701..e0b5efc95aeb2207bbeba1453b67579541c66087 100644 (file)
--- 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 1e36975a3c670e7eb158de3ac42d1b65e1370115..36db26523292d352445472488fa06fc8454e3755 100644 (file)
--- 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 748ce5afebea34b1e9e6b592de170c5a19f72415..e7661a180818f34b4a1762c03ffae4910ec6ad6f 100644 (file)
--- 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';