elections-types 1.0.74 → 1.0.76

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 "./Expenditure.js";
+import { ExpenditureAux } from "./Expenditure.js";
 import { FECF3File } from "./FECF3File.js";
 import { StateID } from "./State.js";
 export declare class ActivityIndex {
@@ -32,7 +32,7 @@ export declare class Candidate {
 export declare class CandidateAux extends Candidate {
     readonly committees: CommitteeAux[];
     readonly fec_f3_files: FECF3File[];
-    readonly expenditures: Expenditure[];
+    readonly expenditures: ExpenditureAux[];
     constructor(candidate: any);
     static is(candidate: any): candidate is CandidateAux;
 }

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 "./Expenditure.js";
+import { ExpenditureAux } from "./Expenditure.js";
 import { FECF3File } from "./FECF3File.js";
 import { is_state_id } from "./State.js";
 export class ActivityIndex {
@@ -85,7 +85,7 @@ export class CandidateAux extends Candidate {
         super(candidate);
         this.committees = candidate.committees;
         this.fec_f3_files = candidate.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file));
-        this.expenditures = candidate.expenditures.map(expenditure => new Expenditure(expenditure));
+        this.expenditures = candidate.expenditures.map(expenditure => new ExpenditureAux(expenditure));
     }
     static is(candidate) {
         return (Candidate.is(candidate) &&
@@ -94,6 +94,6 @@ export class CandidateAux extends Candidate {
             Array.isArray(candidate.fec_f3_files) &&
             candidate.fec_f3_files.every(FECF3File.is) &&
             Array.isArray(candidate.expenditures) &&
-            candidate.expenditures.every(Expenditure.is));
+            candidate.expenditures.every(ExpenditureAux.is));
     }
 }

package/dist/src/types/Committee.js

@@ -51,9 +51,9 @@ export class CommitteeAux extends Committee {
         super(committee);
         this.candidates = committee.candidates;
         this.fec_f3_files = committee.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file));
-        this.jfp_committees = committee.jfp_committees;
-        this.jfr_committees = committee.jfr_committees;
-        this.aff_committees = committee.aff_committees;
+        this.jfp_committees = committee.jfp_committees !== undefined ? committee.jfp_committees.map(committee => new Committee(committee)) : undefined;
+        this.jfr_committees = committee.jfr_committees.map(committee => new Committee(committee));
+        this.aff_committees = committee.aff_committees.map(committee => new Committee(committee));
     }
     static is(committee) {
         return (Committee.is(committee) &&

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

@@ -1,6 +1,6 @@
 import { CandidateAux } from "./Candidate.js";
 import { CommitteeAux } from "./Committee.js";
-import { Expenditure } from "./Expenditure.js";
+import { ExpenditureAux } from "./Expenditure.js";
 import { StateID } from "./State.js";
 declare const office_ids: readonly ["H", "S"];
 export type OfficeID = typeof office_ids[number];
@@ -20,7 +20,7 @@ export declare class Election {
 export declare class ElectionAux extends Election {
     readonly candidates: CandidateAux[];
     readonly committees: CommitteeAux[];
-    readonly expenditures: Expenditure[];
+    readonly expenditures: ExpenditureAux[];
     constructor(election: any);
     static is(election: any): election is ElectionAux;
 }

package/dist/src/types/Election.js

@@ -1,6 +1,6 @@
 import { CandidateAux } from "./Candidate.js";
 import { CommitteeAux } from "./Committee.js";
-import { Expenditure } from "./Expenditure.js";
+import { ExpenditureAux } from "./Expenditure.js";
 import { is_state_id } from "./State.js";
 const office_ids = ["H", "S"];
 export function is_office_id(office_id) {
@@ -54,9 +54,9 @@ export class ElectionAux extends Election {
             throw Error("Invalid input.");
         }
         super(election);
-        this.candidates = election.candidates;
-        this.committees = election.committees;
-        this.expenditures = election.expenditures;
+        this.candidates = election.candidates.map(candidate => new CandidateAux(candidate));
+        this.committees = election.committees.map(committee => new CommitteeAux(committee));
+        this.expenditures = election.expenditures.map(expenditure => new ExpenditureAux(expenditure));
     }
     static is(election) {
         return (Election.is(election) &&
@@ -65,6 +65,6 @@ export class ElectionAux extends Election {
             Array.isArray(election.committees) &&
             election.committees.every(CommitteeAux.is) &&
             Array.isArray(election.expenditures) &&
-            election.expenditures.every(Expenditure.is));
+            election.expenditures.every(ExpenditureAux.is));
     }
 }

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

@@ -18,7 +18,7 @@ export declare class Expenditure {
     static is(expenditure: any): expenditure is Expenditure;
 }
 export declare class ExpenditureAux extends Expenditure {
-    readonly committee: Committee[];
+    readonly committee: Committee;
     constructor(expenditure: any);
     static is(expenditure: any): expenditure is ExpenditureAux;
 }

package/package.json

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

package/src/types/Candidate.ts

@@ -1,7 +1,6 @@
 import { Committee, CommitteeAux } from "./Committee"
 import { ElectionID, is_election_id, is_office_id, OfficeID } from "./Election"
-import { Expenditure } from "./Expenditure"
-import { FECF24File } from "./FECF24File"
+import { Expenditure, ExpenditureAux } from "./Expenditure"
 import { FECF3File } from "./FECF3File"
 import { is_state_id, StateID } from "./State"
 
@@ -93,7 +92,7 @@ export class Candidate {
 export class CandidateAux extends Candidate {
     readonly committees : CommitteeAux[]
     readonly fec_f3_files : FECF3File[]
-    readonly expenditures : Expenditure[]
+    readonly expenditures : ExpenditureAux[]
 
     constructor(candidate : any) {
         if (!CandidateAux.is(candidate)) {
@@ -102,7 +101,7 @@ export class CandidateAux extends Candidate {
         super(candidate)
         this.committees = candidate.committees
         this.fec_f3_files = candidate.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file))
-        this.expenditures = candidate.expenditures.map(expenditure => new Expenditure(expenditure))
+        this.expenditures = candidate.expenditures.map(expenditure => new ExpenditureAux(expenditure))
     }
 
     static is(candidate : any) : candidate is CandidateAux {
@@ -113,7 +112,7 @@ export class CandidateAux extends Candidate {
             Array.isArray(candidate.fec_f3_files) &&
             candidate.fec_f3_files.every(FECF3File.is) &&
             Array.isArray(candidate.expenditures) &&
-            candidate.expenditures.every(Expenditure.is)
+            candidate.expenditures.every(ExpenditureAux.is)
         )
     }
 }

package/src/types/Committee.ts

@@ -64,9 +64,9 @@ export class CommitteeAux extends Committee {
         super(committee)
         this.candidates = committee.candidates
         this.fec_f3_files = committee.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file))
-        this.jfp_committees = committee.jfp_committees
-        this.jfr_committees = committee.jfr_committees
-        this.aff_committees = committee.aff_committees
+        this.jfp_committees = committee.jfp_committees !== undefined ? committee.jfp_committees.map(committee => new Committee(committee)) : undefined
+        this.jfr_committees = committee.jfr_committees.map(committee => new Committee(committee))
+        this.aff_committees = committee.aff_committees.map(committee => new Committee(committee))
     }
 
     static is(committee : any) : committee is CommitteeAux {

package/src/types/Election.ts

@@ -1,6 +1,6 @@
 import { Candidate, CandidateAux } from "./Candidate"
 import { Committee, CommitteeAux } from "./Committee"
-import { Expenditure } from "./Expenditure"
+import { ExpenditureAux } from "./Expenditure"
 import { is_state_id, state_ids, StateID } from "./State"
 
 const office_ids = ["H", "S"] as const
@@ -65,16 +65,16 @@ export class Election {
 export class ElectionAux extends Election {
     readonly candidates : CandidateAux[]
     readonly committees : CommitteeAux[]
-    readonly expenditures : Expenditure[]
+    readonly expenditures : ExpenditureAux[]
 
     constructor(election : any) {
         if (!ElectionAux.is(election)) {
             throw Error("Invalid input.")
         }
         super(election)
-        this.candidates = election.candidates
-        this.committees = election.committees
-        this.expenditures = election.expenditures
+        this.candidates = election.candidates.map(candidate => new CandidateAux(candidate))
+        this.committees = election.committees.map(committee => new CommitteeAux(committee))
+        this.expenditures = election.expenditures.map(expenditure => new ExpenditureAux(expenditure))
     }
 
     static is(election : any) : election is ElectionAux {
@@ -85,7 +85,7 @@ export class ElectionAux extends Election {
             Array.isArray(election.committees) &&
             election.committees.every(CommitteeAux.is) &&
             Array.isArray(election.expenditures) &&
-            election.expenditures.every(Expenditure.is)
+            election.expenditures.every(ExpenditureAux.is)
         )
     }
 }

package/src/types/Expenditure.ts

@@ -55,7 +55,7 @@ export class Expenditure {
 }
 
 export class ExpenditureAux extends Expenditure {
-    readonly committee : Committee[]
+    readonly committee : Committee
 
     constructor(expenditure : any) {
         if (!ExpenditureAux.is(expenditure)) {