Rename FormW2 to just W2.

This matches Schedules.

diff --git a/src/fed2019/Form1040.test.ts b/src/fed2019/Form1040.test.ts
index 741bd5f0f0ac9cb346b44b6646a26f5d3daf70ce..d8d567ffe5d943ab722ce9abe080c814e318eaf0 100644 (file)
--- a/src/fed2019/Form1040.test.ts
+++ b/src/fed2019/Form1040.test.ts
@@ -11,20 +11,20 @@ import ScheduleD, { ScheduleDTaxWorksheet } from './ScheduleD';
 import Form8606 from './Form8606';
 import Form8959 from './Form8959';
 import Form8949 from './Form8949';
-import FormW2 from './FormW2';
+import W2 from './W2';
 
 test('w2 wages', () => {
   const pa = Person.self('A');
   const pb = Person.spouse('B');
   const tr = new TaxReturn(2019);
-  tr.addForm(new FormW2({
+  tr.addForm(new W2({
     employer: 'AA',
     employee: pa,
     wages: 130000.00,
     fedIncomeTax: 0,
     medicareWages: 0,
   }));
-  tr.addForm(new FormW2({
+  tr.addForm(new W2({
     employer: 'BB',
     employee: pb,
     wages: 36.32,
@@ -85,7 +85,7 @@ test('capital gain/loss', () => {
   const p = Person.self('A');
   const tr = new TaxReturn(2019);
   tr.addForm(new Form1040({ filingStatus: FilingStatus.Single }));
-  tr.addForm(new FormW2({
+  tr.addForm(new W2({
     employer: 'Money',
     employee: p,
     wages: 150000
@@ -109,7 +109,7 @@ test('capital gain/loss', () => {
 test('require Form8959', () => {
   const p = Person.self('A');
   const tr = new TaxReturn(2019);
-  tr.addForm(new FormW2({
+  tr.addForm(new W2({
     employer: 'Company',
     employee: p,
     wages: 400000,

diff --git a/src/fed2019/Form1040.ts b/src/fed2019/Form1040.ts
index 45469517ae682d19fb085c30861645f27cf3397a..cf4f193d2d46b9e8631bbca14674a2d2d7189770 100644 (file)
--- a/src/fed2019/Form1040.ts
+++ b/src/fed2019/Form1040.ts
@@ -8,7 +8,7 @@ import Form8959 from './Form8959';
 import Form1099INT from './Form1099INT';
 import Form1099DIV from './Form1099DIV';
 import Form1099R, { Box7Code } from './Form1099R';
-import FormW2 from './FormW2';
+import W2 from './W2';
 import Schedule1 from './Schedule1';
 import Schedule2 from './Schedule2';
 import Schedule3 from './Schedule3';
@@ -28,7 +28,7 @@ export default class Form1040 extends Form<Form1040['_lines'], Form1040Input> {
   readonly name = '1040';
 
   protected readonly _lines = {
-    '1': new AccumulatorLine(FormW2, '1', 'Wages, salaries, tips, etc.'),
+    '1': new AccumulatorLine(W2, '1', 'Wages, salaries, tips, etc.'),
     '2a': new AccumulatorLine(Form1099INT, '8', 'Tax-exempt interest'),
     '2b': new AccumulatorLine(Form1099INT, '1', 'Taxable interest'),
     '3a': new AccumulatorLine(Form1099DIV, '1b', 'Qualified dividends'),
@@ -144,7 +144,7 @@ export default class Form1040 extends Form<Form1040['_lines'], Form1040Input> {
 
     '17': new ComputedLine((tr): number => {
       const fedTaxWithheldBoxes = [
-        new AccumulatorLine(FormW2, '2'),
+        new AccumulatorLine(W2, '2'),
         new AccumulatorLine(Form1099R, '4'),
         new AccumulatorLine(Form1099DIV, '4'),
         new AccumulatorLine(Form1099INT, '4'),

diff --git a/src/fed2019/Form1116.test.ts b/src/fed2019/Form1116.test.ts
index 82f27df5a33d44c09c5c63f2f0f5ddba1fa91c81..2619503269fcf04564f07aea636dabc4d1227d45 100644 (file)
--- a/src/fed2019/Form1116.test.ts
+++ b/src/fed2019/Form1116.test.ts
@@ -6,7 +6,7 @@ import Form1116, { ForeignIncomeCategory } from './Form1116';
 import Form1099B, { GainType } from './Form1099B';
 import Form1099DIV from './Form1099DIV';
 import Form8949 from './Form8949';
-import FormW2 from './FormW2';
+import W2 from './W2';
 import ScheduleD from './ScheduleD';
 
 test('supported income category', () => {
@@ -48,7 +48,7 @@ test('foreign tax credit', () => {
   tr.addForm(new Form1040({
     filingStatus: FilingStatus.MarriedFilingJoint
   }));
-  tr.addForm(new FormW2({
+  tr.addForm(new W2({
     employer: 'ACME',
     employee: p,
     wages: 697000,
@@ -88,7 +88,7 @@ test('no net capital losses in total income', () => {
   tr.addForm(new Form1040({
     filingStatus: FilingStatus.MarriedFilingJoint
   }));
-  tr.addForm(new FormW2({
+  tr.addForm(new W2({
     employer: 'Megacorp',
     employee: p,
     wages: 200000

diff --git a/src/fed2019/Form8959.test.ts b/src/fed2019/Form8959.test.ts
index f158d5942fc2ba3fae7fcba268adf6b5337629e6..684e7cf2e6abafe058f3f019ead920a00cc05c73 100644 (file)
--- a/src/fed2019/Form8959.test.ts
+++ b/src/fed2019/Form8959.test.ts
@@ -1,6 +1,6 @@
 import { Person, TaxReturn } from '../core';
 
-import FormW2 from './FormW2';
+import W2 from './W2';
 import Form8959 from './Form8959';
 import Form1040, { FilingStatus } from './Form1040';
 import Schedule2 from './Schedule2';
@@ -23,7 +23,7 @@ describe('additional medicare tax', () => {
       const p = Person.self('A');
       const tr = new TaxReturn(2019);
       tr.addForm(new Form1040({ filingStatus }));
-      tr.addForm(new FormW2({
+      tr.addForm(new W2({
         employer: 'Acme',
         employee: p,
         wages: 300000,
@@ -58,7 +58,7 @@ describe('no additional medicare tax', () => {
       const p = Person.self('A');
       const tr = new TaxReturn(2019);
       tr.addForm(new Form1040({ filingStatus }));
-      tr.addForm(new FormW2({
+      tr.addForm(new W2({
         employer: 'Acme',
         employee: p,
         wages: 110000,

diff --git a/src/fed2019/Form8959.ts b/src/fed2019/Form8959.ts
index 898c1f735605aee1a5bd4d779b2d9d3ec551623e..b9f7c6bdf525eca0ceecf79cf0e36e58c23ff7c9 100644 (file)
--- a/src/fed2019/Form8959.ts
+++ b/src/fed2019/Form8959.ts
@@ -3,13 +3,13 @@ import { Line, AccumulatorLine, ComputedLine, ReferenceLine } from '../core/Line
 import { clampToZero } from '../core/Math';
 
 import Form1040, { FilingStatus } from './Form1040';
-import FormW2 from './FormW2';
+import W2 from './W2';
 
 export default class Form8959 extends Form<Form8959['_lines']> {
   readonly name = '8959';
 
   protected readonly _lines = {
-    '1': new AccumulatorLine(FormW2, '5', 'Medicare wages'),
+    '1': new AccumulatorLine(W2, '5', 'Medicare wages'),
     // 2 is not supported (Unreported tips from Form 4137)
     // 3 is not supported (Wages from Form 8919)
     '4': new ComputedLine((tr): number => {
@@ -33,7 +33,7 @@ export default class Form8959 extends Form<Form8959['_lines']> {
       return this.getValue(tr, '7');
     }),
 
-    '19': new AccumulatorLine(FormW2, '6', 'Medicare tax withheld'),
+    '19': new AccumulatorLine(W2, '6', 'Medicare tax withheld'),
     '20': new ReferenceLine(Form8959 as any, '1'),
     '21': new ComputedLine((tr): number => {
       return this.getValue(tr, '20') * 0.0145;

diff --git a/src/fed2019/Form8960.test.ts b/src/fed2019/Form8960.test.ts
index 6b752fb0a4e142a9a7231bdfdbb9afc3a840e7fa..753af6b038c4bf501f300134ff220d3b0dfccbf7 100644 (file)
--- a/src/fed2019/Form8960.test.ts
+++ b/src/fed2019/Form8960.test.ts
@@ -1,6 +1,6 @@
 import { Person, TaxReturn } from '../core';
 
-import FormW2 from './FormW2';
+import W2 from './W2';
 import Form1040, { FilingStatus } from './Form1040';
 import Form1099B, { GainType } from './Form1099B';
 import Form1099DIV from './Form1099DIV';
@@ -46,7 +46,7 @@ describe('net investment income tax', () => {
       }));
       tr.addForm(new Form8949);
       tr.addForm(new ScheduleD);
-      tr.addForm(new FormW2({
+      tr.addForm(new W2({
         employer: 'Acme',
         employee: p,
         wages: 300000,
@@ -106,7 +106,7 @@ describe('no net investment income tax', () => {
       }));
       tr.addForm(new Form8949);
       tr.addForm(new ScheduleD);
-      tr.addForm(new FormW2({
+      tr.addForm(new W2({
         employer: 'Acme',
         employee: p,
         wages: 70000,

diff --git a/src/fed2019/FormW2.test.ts b/src/fed2019/FormW2.test.ts
index 37a052f9547f621d397539f4c3d450cf7a0f1eb7..9505f61eedbd3b38adb99ea21ad5e2d83d54a512 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 W2 from './W2';
 
 test('input', () => {
   const p = Person.self('Bob');

diff --git a/src/fed2019/FormW2.ts b/src/fed2019/W2.ts
similarity index 100%
rename from src/fed2019/FormW2.ts
rename to src/fed2019/W2.ts

diff --git a/src/fed2019/index.ts b/src/fed2019/index.ts
index e972492daf2b97f70b211fcc3f60c1cebc8a5ae5..85a5330b2ffe561abf8977e6cb27e8b5082ac770 100644 (file)
--- a/src/fed2019/index.ts
+++ b/src/fed2019/index.ts
@@ -12,11 +12,11 @@ export { default as Schedule1 } from './Schedule1';
 export { default as Schedule2 } from './Schedule2';
 export { default as Schedule3 } from './Schedule3';
 export { default as ScheduleD } from './ScheduleD';
-export { default as W2 } from './FormW2';
+export { default as W2 } from './W2';
 
 export * from './Form1040';
 export * from './Form1099B';
 export * from './Form1099R';
 export * from './Form1116';
 export * from './Form8949';
-export * from './FormW2';
+export * from './W2';