elections-types 1.0.73 → 1.0.74

package/dist/src/index.d.ts

@@ -8,13 +8,13 @@ export * from "./types/CandidateVideo.js";
 export * from "./types/Committee.js";
 export * from "./types/Election.js";
 export * from "./types/ElectionsConfig.js";
+export * from "./types/Expenditure.js";
 export * from "./types/FederalDonation.js";
 export * from "./types/FECFile.js";
 export * from "./types/FECF1File.js";
 export * from "./types/FECF2File.js";
 export * from "./types/FECF3File.js";
 export * from "./types/FECF24File.js";
-export * from "./types/FECReport.js";
 export * from "./types/FormTypeID.js";
 export * from "./types/State.js";
 export * from "./types/Tweet.js";

package/dist/src/index.js

@@ -8,13 +8,13 @@ export * from "./types/CandidateVideo.js";
 export * from "./types/Committee.js";
 export * from "./types/Election.js";
 export * from "./types/ElectionsConfig.js";
+export * from "./types/Expenditure.js";
 export * from "./types/FederalDonation.js";
 export * from "./types/FECFile.js";
 export * from "./types/FECF1File.js";
 export * from "./types/FECF2File.js";
 export * from "./types/FECF3File.js";
 export * from "./types/FECF24File.js";
-export * from "./types/FECReport.js";
 export * from "./types/FormTypeID.js";
 export * from "./types/State.js";
 export * from "./types/Tweet.js";

package/dist/src/types/Candidate.d.ts

@@ -1,6 +1,6 @@
 import { CommitteeAux } from "./Committee.js";
 import { ElectionID, OfficeID } from "./Election.js";
-import { Expenditure } from "./FECF24File.js";
+import { Expenditure } from "./Expenditure.js";
 import { FECF3File } from "./FECF3File.js";
 import { StateID } from "./State.js";
 export declare class ActivityIndex {

package/dist/src/types/Candidate.js

@@ -1,6 +1,6 @@
 import { CommitteeAux } from "./Committee.js";
 import { is_election_id, is_office_id } from "./Election.js";
-import { Expenditure } from "./FECF24File.js";
+import { Expenditure } from "./Expenditure.js";
 import { FECF3File } from "./FECF3File.js";
 import { is_state_id } from "./State.js";
 export class ActivityIndex {

package/dist/src/types/Election.d.ts

@@ -1,6 +1,6 @@
 import { CandidateAux } from "./Candidate.js";
 import { CommitteeAux } from "./Committee.js";
-import { Expenditure } from "./FECF24File.js";
+import { Expenditure } from "./Expenditure.js";
 import { StateID } from "./State.js";
 declare const office_ids: readonly ["H", "S"];
 export type OfficeID = typeof office_ids[number];

package/dist/src/types/Election.js

@@ -1,6 +1,6 @@
 import { CandidateAux } from "./Candidate.js";
 import { CommitteeAux } from "./Committee.js";
-import { Expenditure } from "./FECF24File.js";
+import { Expenditure } from "./Expenditure.js";
 import { is_state_id } from "./State.js";
 const office_ids = ["H", "S"];
 export function is_office_id(office_id) {

package/dist/src/types/Expenditure.d.ts

@@ -0,0 +1,24 @@
+import { Committee } from "./Committee.js";
+import { ElectionID } from "./Election.js";
+export declare class Expenditure {
+    readonly fec_file_id: number;
+    readonly expenditure_id: string;
+    readonly committee_id: string;
+    readonly date: string;
+    readonly payee: string;
+    readonly election_stage: string;
+    readonly election_id: ElectionID;
+    readonly candidate_id: string;
+    readonly amount: number;
+    readonly cumulative_amount: number;
+    readonly purpose: string;
+    readonly is_support: boolean;
+    readonly [x: string]: any;
+    constructor(expenditure: any);
+    static is(expenditure: any): expenditure is Expenditure;
+}
+export declare class ExpenditureAux extends Expenditure {
+    readonly committee: Committee[];
+    constructor(expenditure: any);
+    static is(expenditure: any): expenditure is ExpenditureAux;
+}

package/dist/src/types/Expenditure.js

@@ -0,0 +1,62 @@
+import { Committee } from "./Committee.js";
+import { is_election_id } from "./Election.js";
+export class Expenditure {
+    fec_file_id;
+    expenditure_id;
+    committee_id;
+    date;
+    payee;
+    election_stage;
+    election_id;
+    candidate_id;
+    amount;
+    cumulative_amount;
+    purpose;
+    is_support;
+    constructor(expenditure) {
+        if (!Expenditure.is(expenditure)) {
+            throw Error("Invalid input.");
+        }
+        this.fec_file_id = expenditure.fec_file_id;
+        this.expenditure_id = expenditure.expenditure_id;
+        this.committee_id = expenditure.committee_id;
+        this.date = expenditure.date;
+        this.payee = expenditure.payee;
+        this.election_stage = expenditure.election_stage;
+        this.election_id = expenditure.election_id;
+        this.candidate_id = expenditure.candidate_id;
+        this.amount = expenditure.amount;
+        this.cumulative_amount = expenditure.cumulative_amount;
+        this.purpose = expenditure.purpose;
+        this.is_support = expenditure.is_support;
+    }
+    static is(expenditure) {
+        return (expenditure !== undefined &&
+            typeof expenditure.fec_file_id === "number" &&
+            typeof expenditure.expenditure_id === "string" &&
+            typeof expenditure.committee_id === "string" &&
+            typeof expenditure.date === "string" &&
+            typeof expenditure.payee === "string" &&
+            typeof expenditure.election_stage === "string" &&
+            is_election_id(expenditure.election_id) &&
+            typeof expenditure.candidate_id === "string" &&
+            typeof expenditure.amount === "number" &&
+            typeof expenditure.cumulative_amount === "number" &&
+            typeof expenditure.purpose === "string" &&
+            typeof expenditure.is_support === "boolean");
+    }
+}
+export class ExpenditureAux extends Expenditure {
+    committee;
+    constructor(expenditure) {
+        if (!ExpenditureAux.is(expenditure)) {
+            throw Error("Invalid input.");
+        }
+        super(expenditure);
+        this.committee = expenditure.committee;
+    }
+    static is(expenditure) {
+        return (Expenditure.is(expenditure) &&
+            Committee.is(expenditure.committee));
+    }
+}

package/dist/src/types/FECF24File.d.ts

@@ -1,20 +1,5 @@
-import { ElectionID } from "./Election.js";
+import { Expenditure } from "./Expenditure.js";
 import { FECFile } from "./FECFile.js";
-export declare class Expenditure {
-    readonly fec_file_id: number;
-    readonly expenditure_id: string;
-    readonly date: string;
-    readonly payee: string;
-    readonly election_stage: string;
-    readonly election_id: ElectionID;
-    readonly candidate_id: string;
-    readonly amount: number;
-    readonly cumulative_amount: number;
-    readonly purpose: string;
-    readonly is_support: boolean;
-    constructor(expenditure: any);
-    static is(expenditure: any): expenditure is Expenditure;
-}
 export declare class FECF24File extends FECFile {
     readonly committee_id: string;
     readonly first_fec_file_id: number;

package/dist/src/types/FECF24File.js

@@ -1,48 +1,5 @@
-import { is_election_id } from "./Election.js";
+import { Expenditure } from "./Expenditure.js";
 import { FECFile } from "./FECFile.js";
-export class Expenditure {
-    fec_file_id;
-    expenditure_id;
-    date;
-    payee;
-    election_stage;
-    election_id;
-    candidate_id;
-    amount;
-    cumulative_amount;
-    purpose;
-    is_support;
-    constructor(expenditure) {
-        if (!Expenditure.is(expenditure)) {
-            throw Error("Invalid input.");
-        }
-        this.fec_file_id = expenditure.fec_file_id;
-        this.expenditure_id = expenditure.expenditure_id;
-        this.date = expenditure.date;
-        this.payee = expenditure.payee;
-        this.election_stage = expenditure.election_stage;
-        this.election_id = expenditure.election_id;
-        this.candidate_id = expenditure.candidate_id;
-        this.amount = expenditure.amount;
-        this.cumulative_amount = expenditure.cumulative_amount;
-        this.purpose = expenditure.purpose;
-        this.is_support = expenditure.is_support;
-    }
-    static is(expenditure) {
-        return (expenditure !== undefined &&
-            typeof expenditure.fec_file_id === "number" &&
-            typeof expenditure.expenditure_id === "string" &&
-            typeof expenditure.date === "string" &&
-            typeof expenditure.payee === "string" &&
-            typeof expenditure.election_stage === "string" &&
-            is_election_id(expenditure.election_id) &&
-            typeof expenditure.candidate_id === "string" &&
-            typeof expenditure.amount === "number" &&
-            typeof expenditure.cumulative_amount === "number" &&
-            typeof expenditure.purpose === "string" &&
-            typeof expenditure.is_support === "boolean");
-    }
-}
 export class FECF24File extends FECFile {
     committee_id;
     first_fec_file_id;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "elections-types",
-    "version": "1.0.73",
+    "version": "1.0.74",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/index.ts

@@ -8,13 +8,13 @@ export * from "./types/CandidateVideo"
 export * from "./types/Committee"
 export * from "./types/Election"
 export * from "./types/ElectionsConfig"
+export * from "./types/Expenditure"
 export * from "./types/FederalDonation"
 export * from "./types/FECFile"
 export * from "./types/FECF1File"
 export * from "./types/FECF2File"
 export * from "./types/FECF3File"
 export * from "./types/FECF24File"
-export * from "./types/FECReport"
 export * from "./types/FormTypeID"
 export * from "./types/State"
 export * from "./types/Tweet"

package/src/types/Candidate.ts

@@ -1,8 +1,8 @@
 import { Committee, CommitteeAux } from "./Committee"
 import { ElectionID, is_election_id, is_office_id, OfficeID } from "./Election"
-import { Expenditure, FECF24File } from "./FECF24File"
+import { Expenditure } from "./Expenditure"
+import { FECF24File } from "./FECF24File"
 import { FECF3File } from "./FECF3File"
-import { FECReport } from "./FECReport"
 import { is_state_id, StateID } from "./State"
 
 export class ActivityIndex {

package/src/types/Committee.ts

@@ -1,7 +1,6 @@
 import { Candidate } from "./Candidate"
 import { CandidateCommittee } from "./CandidateCommittee"
 import { FECF3File } from "./FECF3File"
-import { FECReport } from "./FECReport"
 
 export const designations = ["P", "A", "U", "J", "D", "B"] as const
 

package/src/types/Election.ts

@@ -1,6 +1,6 @@
 import { Candidate, CandidateAux } from "./Candidate"
 import { Committee, CommitteeAux } from "./Committee"
-import { Expenditure } from "./FECF24File"
+import { Expenditure } from "./Expenditure"
 import { is_state_id, state_ids, StateID } from "./State"
 
 const office_ids = ["H", "S"] as const

package/src/types/Expenditure.ts

@@ -0,0 +1,74 @@
+import { Committee } from "./Committee"
+import { ElectionID, is_election_id } from "./Election"
+
+export class Expenditure {
+    readonly fec_file_id : number
+    readonly expenditure_id : string
+    readonly committee_id : string
+    readonly date : string
+    readonly payee : string
+    readonly election_stage : string
+    readonly election_id : ElectionID
+    readonly candidate_id : string
+    readonly amount : number
+    readonly cumulative_amount : number
+    readonly purpose : string
+    readonly is_support : boolean
+    readonly [x : string] : any
+        
+    constructor(expenditure : any) {
+        if (!Expenditure.is(expenditure)) {
+            throw Error("Invalid input.")
+        }
+        this.fec_file_id = expenditure.fec_file_id
+        this.expenditure_id = expenditure.expenditure_id
+        this.committee_id = expenditure.committee_id
+        this.date = expenditure.date
+        this.payee = expenditure.payee
+        this.election_stage = expenditure.election_stage
+        this.election_id = expenditure.election_id
+        this.candidate_id = expenditure.candidate_id
+        this.amount = expenditure.amount
+        this.cumulative_amount = expenditure.cumulative_amount
+        this.purpose = expenditure.purpose
+        this.is_support = expenditure.is_support
+    }
+
+    static is(expenditure : any) : expenditure is Expenditure {
+        return (
+            expenditure !== undefined &&
+            typeof expenditure.fec_file_id === "number" &&
+            typeof expenditure.expenditure_id === "string" &&
+            typeof expenditure.committee_id === "string" &&
+            typeof expenditure.date === "string" &&
+            typeof expenditure.payee === "string" &&
+            typeof expenditure.election_stage === "string" &&
+            is_election_id(expenditure.election_id) &&
+            typeof expenditure.candidate_id === "string" &&
+            typeof expenditure.amount === "number" &&
+            typeof expenditure.cumulative_amount === "number" &&
+            typeof expenditure.purpose === "string" &&
+            typeof expenditure.is_support === "boolean"
+        )
+    }
+
+}
+
+export class ExpenditureAux extends Expenditure {
+    readonly committee : Committee[]
+
+    constructor(expenditure : any) {
+        if (!ExpenditureAux.is(expenditure)) {
+            throw Error("Invalid input.")
+        }
+        super(expenditure)
+        this.committee = expenditure.committee
+    }
+
+    static is(expenditure : any) : expenditure is ExpenditureAux {
+        return (
+            Expenditure.is(expenditure) &&
+            Committee.is(expenditure.committee)
+        )
+    }
+}

package/src/types/FECF24File.ts

@@ -1,55 +1,6 @@
-import { ElectionID, is_election_id } from "./Election"
+import { Expenditure } from "./Expenditure"
 import { FECFile } from "./FECFile"
 
-export class Expenditure {
-    readonly fec_file_id : number
-    readonly expenditure_id : string
-    readonly date : string
-    readonly payee : string
-    readonly election_stage : string
-    readonly election_id : ElectionID
-    readonly candidate_id : string
-    readonly amount : number
-    readonly cumulative_amount : number
-    readonly purpose : string
-    readonly is_support : boolean
-        
-    constructor(expenditure : any) {
-        if (!Expenditure.is(expenditure)) {
-            throw Error("Invalid input.")
-        }
-        this.fec_file_id = expenditure.fec_file_id
-        this.expenditure_id = expenditure.expenditure_id
-        this.date = expenditure.date
-        this.payee = expenditure.payee
-        this.election_stage = expenditure.election_stage
-        this.election_id = expenditure.election_id
-        this.candidate_id = expenditure.candidate_id
-        this.amount = expenditure.amount
-        this.cumulative_amount = expenditure.cumulative_amount
-        this.purpose = expenditure.purpose
-        this.is_support = expenditure.is_support
-    }
-
-    static is(expenditure : any) : expenditure is Expenditure {
-        return (
-            expenditure !== undefined &&
-            typeof expenditure.fec_file_id === "number" &&
-            typeof expenditure.expenditure_id === "string" &&
-            typeof expenditure.date === "string" &&
-            typeof expenditure.payee === "string" &&
-            typeof expenditure.election_stage === "string" &&
-            is_election_id(expenditure.election_id) &&
-            typeof expenditure.candidate_id === "string" &&
-            typeof expenditure.amount === "number" &&
-            typeof expenditure.cumulative_amount === "number" &&
-            typeof expenditure.purpose === "string" &&
-            typeof expenditure.is_support === "boolean"
-        )
-    }
-
-}
-
 export class FECF24File extends FECFile {
     readonly committee_id : string
     readonly first_fec_file_id : number

package/src/types/FECIndependentExpenditureReport.ts

@@ -1,81 +0,0 @@
-// export class IndependentExpenditure {
-//     readonly transaction_id : string
-//     readonly date : string
-//     readonly payee : string
-//     readonly election_stage : string
-//     readonly election_id : string
-//     readonly amount : number
-//     readonly cumulative_amount : number
-//     readonly purpose : string
-//     readonly candidate_id : string
-//     readonly support : string
-
-//     constructor(independent_expenditure : any) {
-//         if (!IndependentExpenditure.is(independent_expenditure)) {
-//             throw Error("Invalid input.")
-//         }
-//         this.transaction_id = independent_expenditure.transaction_id
-//         this.date = independent_expenditure.date
-//         this.payee = independent_expenditure.payee
-//         this.election_stage = independent_expenditure.election_stage
-//         this.election_id = independent_expenditure.election_id
-//         this.amount = independent_expenditure.amount
-//         this.cumulative_amount = independent_expenditure.cumulative_amount
-//         this.purpose = independent_expenditure.purpose
-//         this.candidate_id = independent_expenditure.candidate_id
-//         this.support = independent_expenditure.support
-//     }
-
-//     static is(independent_expenditure : any) : independent_expenditure is IndependentExpenditure {
-//         return (
-//             independent_expenditure !== undefined &&
-//             typeof independent_expenditure.independent_expenditure === "string" &&
-//             typeof independent_expenditure.date === "string" &&
-//             typeof independent_expenditure.payee === "string" &&
-//             typeof independent_expenditure.election_stage === "string" &&
-//             typeof independent_expenditure.election_id === "string" &&
-//             typeof independent_expenditure.amount === "number" &&
-//             typeof independent_expenditure.cumulative_amount === "number" &&
-//             typeof independent_expenditure.purpose === "string" &&
-//             typeof independent_expenditure.candidate_id === "string" &&
-//             typeof independent_expenditure.support === "string"
-//         )
-//     }
-// }
-
-// export class FECIndependentExpenditureReport {
-//     readonly committee_id : string
-//     readonly first_file_number : number
-//     readonly report_type : string
-//     readonly first_report_date : string
-//     readonly report_date : string
-//     readonly transaction_ids : string[]
-//     readonly expenditures_by_transaction_id : Record<string, IndependentExpenditure>
-
-//     constructor(fec_independent_expenditure_report : any) {
-//         if (!FECIndependentExpenditureReport.is(fec_independent_expenditure_report)) {
-//             throw Error("Invalid input.")
-//         }
-//         this.committee_id = fec_independent_expenditure_report.committee_id
-//         this.first_file_number = fec_independent_expenditure_report.first_file_number
-//         this.report_type = fec_independent_expenditure_report.report_type
-//         this.first_report_date = fec_independent_expenditure_report.first_report_date
-//         this.report_date = fec_independent_expenditure_report.report_date
-//         this.transaction_ids = fec_independent_expenditure_report.transaction_ids
-//         this.expenditures_by_transaction_id = fec_independent_expenditure_report.expenditures_by_transaction_id
-//     }
-
-//     static is(fec_independent_expenditure_report : any) : fec_independent_expenditure_report is FECIndependentExpenditureReport {
-//         return (
-//             fec_independent_expenditure_report !== undefined &&
-//             typeof fec_independent_expenditure_report.committee_id === "string" &&
-//             typeof fec_independent_expenditure_report.first_file_number === "number" &&
-//             typeof fec_independent_expenditure_report.report_type === "string" &&
-//             typeof fec_independent_expenditure_report.first_report_date === "string" &&
-//             typeof fec_independent_expenditure_report.report_date === "string" &&
-//             Array.isArray(fec_independent_expenditure_report.transaction_ids) && fec_independent_expenditure_report.transaction_ids.map((transaction_id : any) => typeof transaction_id === "string") &&
-//             typeof fec_independent_expenditure_report.expenditures_by_transaction_id === "object" &&
-//             Object.entries(fec_independent_expenditure_report.expenditures_by_transaction_id).every(([key, value]) => typeof key === "string" && IndependentExpenditure.is(value))
-//         )
-//     }
-// }

package/src/types/FECReport.ts

@@ -1,32 +0,0 @@
-export class FECReport {
-    readonly committee_id : string
-    readonly report_type : string
-    readonly file_number : number
-    readonly cash_on_hand : number
-    readonly cumulative_receipts : number
-    readonly new_receipts : number
-
-    constructor(fec_report : any) {
-        if (!FECReport.is(fec_report)) {
-            throw Error("Invalid input.")
-        }
-        this.committee_id = fec_report.committee_id
-        this.report_type = fec_report.report_type
-        this.file_number = fec_report.file_number
-        this.cash_on_hand = fec_report.cash_on_hand
-        this.cumulative_receipts = fec_report.cumulative_receipts
-        this.new_receipts = fec_report.new_receipts
-    }
-
-    static is(fec_report : any) : fec_report is FECReport {
-        return (
-            fec_report !== undefined &&
-            typeof fec_report.committee_id === "string" &&
-            typeof fec_report.report_type === "string" &&
-            typeof fec_report.file_number === "number" &&
-            typeof fec_report.cash_on_hand === "number" &&
-            typeof fec_report.cumulative_receipts === "number" &&
-            typeof fec_report.new_receipts === "number"
-        )
-    }
-}