elections-types 1.0.65 → 1.0.67

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/src/types/Candidate.d.ts +2 -2
  2. package/dist/src/types/Candidate.js +5 -5
  3. package/dist/src/types/CandidateCommittee.d.ts +0 -6
  4. package/dist/src/types/CandidateCommittee.js +16 -15
  5. package/dist/src/types/Committee.d.ts +7 -8
  6. package/dist/src/types/Committee.js +14 -18
  7. package/package.json +1 -1
  8. package/src/types/Candidate.ts +4 -5
  9. package/src/types/CandidateCommittee.ts +16 -16
  10. package/src/types/Committee.ts +18 -20
package/dist/src/types/Candidate.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { CandidateCommitteeAux } from "./CandidateCommittee.js";
1
+ import { CommitteeAux } from "./Committee.js";
2
2
  import { ElectionID, OfficeID } from "./Election.js";
3
3
  import { FECF3File } from "./FECF3File.js";
4
4
  import { StateID } from "./State.js";
@@ -30,7 +30,7 @@ export declare class Candidate {
30
30
  static is(candidate: any): candidate is Candidate;
31
31
  }
32
32
  export declare class CandidateAux extends Candidate {
33
- readonly candidate_committees: CandidateCommitteeAux[];
33
+ readonly committees: CommitteeAux[];
34
34
  readonly fec_f3_files: FECF3File[];
35
35
  constructor(candidate: any);
36
36
  static is(candidate: any): candidate is CandidateAux;
package/dist/src/types/Candidate.js CHANGED
@@ -1,4 +1,4 @@
1
- import { CandidateCommitteeAux } from "./CandidateCommittee.js";
1
+ import { CommitteeAux } from "./Committee.js";
2
2
  import { is_election_id, is_office_id } from "./Election.js";
3
3
  import { FECF3File } from "./FECF3File.js";
4
4
  import { is_state_id } from "./State.js";
@@ -77,20 +77,20 @@ export class Candidate {
77
77
  }
78
78
  }
79
79
  export class CandidateAux extends Candidate {
80
- candidate_committees;
80
+ committees;
81
81
  fec_f3_files;
82
82
  constructor(candidate) {
83
83
  if (!CandidateAux.is(candidate)) {
84
84
  throw Error("Invalid input.");
85
85
  }
86
86
  super(candidate);
87
- this.candidate_committees = candidate.candidate_committees;
87
+ this.committees = candidate.committees;
88
88
  this.fec_f3_files = candidate.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file));
89
89
  }
90
90
  static is(candidate) {
91
91
  return (Candidate.is(candidate) &&
92
- Array.isArray(candidate.candidate_committees) &&
93
- candidate.candidate_committees.every(CandidateCommitteeAux.is) &&
92
+ Array.isArray(candidate.committees) &&
93
+ candidate.committees.every(CommitteeAux.is) &&
94
94
  Array.isArray(candidate.fec_f3_files) &&
95
95
  candidate.fec_f3_files.every(FECF3File.is));
96
96
  }
package/dist/src/types/CandidateCommittee.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- import { CommitteeAux } from "./Committee.js";
2
1
  export declare class CandidateCommittee {
3
2
  readonly candidate_id: string;
4
3
  readonly committee_id: string;
@@ -6,8 +5,3 @@ export declare class CandidateCommittee {
6
5
  constructor(candidate_committee: CandidateCommittee);
7
6
  static is(candidate_committee: any): candidate_committee is CandidateCommittee;
8
7
  }
9
- export declare class CandidateCommitteeAux extends CandidateCommittee {
10
- readonly committee: CommitteeAux;
11
- constructor(candidate_committee: any);
12
- static is(candidate_committee: any): candidate_committee is CandidateCommitteeAux;
13
- }
package/dist/src/types/CandidateCommittee.js CHANGED
@@ -1,4 +1,3 @@
1
- import { CommitteeAux } from "./Committee.js";
2
1
  export class CandidateCommittee {
3
2
  candidate_id;
4
3
  committee_id;
@@ -15,17 +14,19 @@ export class CandidateCommittee {
15
14
  typeof candidate_committee.committee_id === "string");
16
15
  }
17
16
  }
18
- export class CandidateCommitteeAux extends CandidateCommittee {
19
- committee;
20
- constructor(candidate_committee) {
21
- if (!CandidateCommitteeAux.is(candidate_committee)) {
22
- throw Error("Invalid input.");
23
- }
24
- super(candidate_committee);
25
- this.committee = candidate_committee.committee;
26
- }
27
- static is(candidate_committee) {
28
- return (CandidateCommittee.is(candidate_committee) &&
29
- CommitteeAux.is(candidate_committee.committee));
30
- }
31
- }
17
+ // export class CandidateCommitteeAux extends CandidateCommittee {
18
+ // readonly committee : CommitteeAux
19
+ // constructor(candidate_committee : any) {
20
+ // if (!CandidateCommitteeAux.is(candidate_committee)) {
21
+ // throw Error("Invalid input.")
22
+ // }
23
+ // super(candidate_committee)
24
+ // this.committee = candidate_committee.committee
25
+ // }
26
+ // static is(candidate_committee : any) : candidate_committee is CandidateCommitteeAux {
27
+ // return (
28
+ // CandidateCommittee.is(candidate_committee) &&
29
+ // CommitteeAux.is(candidate_committee.committee)
30
+ // )
31
+ // }
32
+ // }
package/dist/src/types/Committee.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Candidate } from "./Candidate.js";
2
- import { FECReport } from "./FECReport.js";
2
+ import { FECF3File } from "./FECF3File.js";
3
3
  export declare const designations: readonly ["P", "A", "U", "J", "D", "B"];
4
4
  export type CommitteeDesignation = typeof designations[number];
5
5
  export declare function is_committee_designation(designation: any): designation is CommitteeDesignation;
@@ -9,20 +9,19 @@ export declare class Committee {
9
9
  readonly url?: string;
10
10
  readonly designation?: CommitteeDesignation;
11
11
  readonly fec_file_id?: number;
12
- readonly sponsor_candidate_ids?: string[];
13
12
  readonly jfp_committee_ids?: string[];
14
- readonly jfr_committee_ids?: string[];
15
- readonly aff_committee_ids?: string[];
16
- readonly candidate_ids?: string[];
17
- readonly election_ids?: string[];
13
+ readonly jfr_committee_ids: string[];
14
+ readonly aff_committee_ids: string[];
18
15
  readonly [x: string]: any;
19
16
  constructor(committee: Committee);
20
17
  static is(committee: any): committee is Committee;
21
18
  }
22
19
  export declare class CommitteeAux extends Committee {
23
20
  readonly candidates: Candidate[];
24
- readonly fec_reports: FECReport[];
25
- readonly jfp_committees: Committee[];
21
+ readonly fec_f3_files: FECF3File[];
22
+ readonly jfp_committees?: Committee[];
23
+ readonly jfr_committees: Committee[];
24
+ readonly aff_committees: Committee[];
26
25
  constructor(committee: any);
27
26
  static is(committee: any): committee is CommitteeAux;
28
27
  }
package/dist/src/types/Committee.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Candidate } from "./Candidate.js";
2
- import { FECReport } from "./FECReport.js";
2
+ import { FECF3File } from "./FECF3File.js";
3
3
  export const designations = ["P", "A", "U", "J", "D", "B"];
4
4
  export function is_committee_designation(designation) {
5
5
  return designations.includes(designation);
@@ -10,12 +10,9 @@ export class Committee {
10
10
  url;
11
11
  designation;
12
12
  fec_file_id;
13
- sponsor_candidate_ids;
14
13
  jfp_committee_ids;
15
14
  jfr_committee_ids;
16
15
  aff_committee_ids;
17
- candidate_ids;
18
- election_ids;
19
16
  constructor(committee) {
20
17
  if (!Committee.is(committee)) {
21
18
  throw Error("Invalid input.");
@@ -25,12 +22,9 @@ export class Committee {
25
22
  this.url = committee.url;
26
23
  this.designation = committee.designation;
27
24
  this.fec_file_id = committee.fec_file_id;
28
- this.sponsor_candidate_ids = committee.sponsor_candidate_ids;
29
25
  this.jfp_committee_ids = committee.jfp_committee_ids;
30
26
  this.jfr_committee_ids = committee.jfr_committee_ids;
31
27
  this.aff_committee_ids = committee.aff_committee_ids;
32
- this.candidate_ids = committee.candidate_ids;
33
- this.election_ids = committee.election_ids;
34
28
  }
35
29
  static is(committee) {
36
30
  return (committee !== undefined &&
@@ -39,34 +33,36 @@ export class Committee {
39
33
  (committee.url === undefined || typeof committee.url === "string") &&
40
34
  (committee.designation === undefined || is_committee_designation(committee.designation)) &&
41
35
  (committee.fec_file_id === undefined || typeof committee.fec_file_id === "number" && !isNaN(committee.fec_file_id)) &&
42
- (committee.sponsor_candidate_ids === undefined || Array.isArray(committee.sponsor_candidate_ids) && committee.sponsor_candidate_ids.every((committee_id) => typeof committee_id === "string")) &&
43
36
  (committee.jfp_committee_ids === undefined || Array.isArray(committee.jfp_committee_ids) && committee.jfp_committee_ids.every((committee_id) => typeof committee_id === "string")) &&
44
- (committee.jfr_committee_ids === undefined || Array.isArray(committee.jfr_committee_ids) && committee.jfr_committee_ids.every((committee_id) => typeof committee_id === "string")) &&
45
- (committee.aff_committee_ids === undefined || Array.isArray(committee.aff_committee_ids) && committee.aff_committee_ids.every((committee_id) => typeof committee_id === "string")) &&
46
- (committee.candidate_ids === undefined || Array.isArray(committee.candidate_ids) && committee.candidate_ids.every((committee_id) => typeof committee_id === "string")) &&
47
- (committee.election_ids === undefined || Array.isArray(committee.election_ids) && committee.election_ids.every((committee_id) => typeof committee_id === "string")));
37
+ (Array.isArray(committee.jfr_committee_ids) && committee.jfr_committee_ids.every((committee_id) => typeof committee_id === "string")) &&
38
+ (Array.isArray(committee.aff_committee_ids) && committee.aff_committee_ids.every((committee_id) => typeof committee_id === "string")));
48
39
  }
49
40
  }
50
41
  export class CommitteeAux extends Committee {
51
42
  candidates;
52
- fec_reports;
43
+ fec_f3_files;
53
44
  jfp_committees;
45
+ jfr_committees;
46
+ aff_committees;
54
47
  constructor(committee) {
55
48
  if (!CommitteeAux.is(committee)) {
56
49
  throw Error("Invalid input.");
57
50
  }
58
51
  super(committee);
59
52
  this.candidates = committee.candidates;
60
- this.fec_reports = committee.fec_reports;
53
+ this.fec_f3_files = committee.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file));
61
54
  this.jfp_committees = committee.jfp_committees;
55
+ this.jfr_committees = committee.jfr_committees;
56
+ this.aff_committees = committee.aff_committees;
62
57
  }
63
58
  static is(committee) {
64
59
  return (Committee.is(committee) &&
65
60
  Array.isArray(committee.candidates) &&
66
61
  committee.candidates.every(Candidate.is) &&
67
- Array.isArray(committee.fec_reports) &&
68
- committee.fec_reports.every(FECReport.is) &&
69
- Array.isArray(committee.jfp_committees) &&
70
- committee.jfp_committees.every(Committee.is));
62
+ Array.isArray(committee.fec_f3_files) &&
63
+ committee.fec_f3_files.every(FECF3File.is) &&
64
+ (committee.jfp_committees === undefined || Array.isArray(committee.jfp_committees) && committee.jfp_committees.every(Committee.is)) &&
65
+ (Array.isArray(committee.jfr_committees) && committee.jfr_committees.every(Committee.is)) &&
66
+ (Array.isArray(committee.aff_committees) && committee.aff_committees.every(Committee.is)));
71
67
  }
72
68
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "elections-types",
3
- "version": "1.0.65",
3
+ "version": "1.0.67",
4
4
  "main": "dist/src/index.js",
5
5
  "types": "dist/src/index.d.ts",
6
6
  "directories": {
package/src/types/Candidate.ts CHANGED
@@ -1,4 +1,3 @@
1
- import { CandidateCommitteeAux } from "./CandidateCommittee"
2
1
  import { Committee, CommitteeAux } from "./Committee"
3
2
  import { ElectionID, is_election_id, is_office_id, OfficeID } from "./Election"
4
3
  import { FECF24File } from "./FECF24File"
@@ -95,7 +94,7 @@ export class Candidate {
95
94
  }
96
95
 
97
96
  export class CandidateAux extends Candidate {
98
- readonly candidate_committees : CandidateCommitteeAux[]
97
+ readonly committees : CommitteeAux[]
99
98
  readonly fec_f3_files : FECF3File[]
100
99
 
101
100
  constructor(candidate : any) {
@@ -103,15 +102,15 @@ export class CandidateAux extends Candidate {
103
102
  throw Error("Invalid input.")
104
103
  }
105
104
  super(candidate)
106
- this.candidate_committees = candidate.candidate_committees
105
+ this.committees = candidate.committees
107
106
  this.fec_f3_files = candidate.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file))
108
107
  }
109
108
 
110
109
  static is(candidate : any) : candidate is CandidateAux {
111
110
  return (
112
111
  Candidate.is(candidate) &&
113
- Array.isArray(candidate.candidate_committees) &&
114
- candidate.candidate_committees.every(CandidateCommitteeAux.is) &&
112
+ Array.isArray(candidate.committees) &&
113
+ candidate.committees.every(CommitteeAux.is) &&
115
114
  Array.isArray(candidate.fec_f3_files) &&
116
115
  candidate.fec_f3_files.every(FECF3File.is)
117
116
  )
package/src/types/CandidateCommittee.ts CHANGED
@@ -22,21 +22,21 @@ export class CandidateCommittee {
22
22
  }
23
23
  }
24
24
 
25
- export class CandidateCommitteeAux extends CandidateCommittee {
26
- readonly committee : CommitteeAux
25
+ // export class CandidateCommitteeAux extends CandidateCommittee {
26
+ // readonly committee : CommitteeAux
27
27
 
28
- constructor(candidate_committee : any) {
29
- if (!CandidateCommitteeAux.is(candidate_committee)) {
30
- throw Error("Invalid input.")
31
- }
32
- super(candidate_committee)
33
- this.committee = candidate_committee.committee
34
- }
28
+ // constructor(candidate_committee : any) {
29
+ // if (!CandidateCommitteeAux.is(candidate_committee)) {
30
+ // throw Error("Invalid input.")
31
+ // }
32
+ // super(candidate_committee)
33
+ // this.committee = candidate_committee.committee
34
+ // }
35
35
 
36
- static is(candidate_committee : any) : candidate_committee is CandidateCommitteeAux {
37
- return (
38
- CandidateCommittee.is(candidate_committee) &&
39
- CommitteeAux.is(candidate_committee.committee)
40
- )
41
- }
42
- }
36
+ // static is(candidate_committee : any) : candidate_committee is CandidateCommitteeAux {
37
+ // return (
38
+ // CandidateCommittee.is(candidate_committee) &&
39
+ // CommitteeAux.is(candidate_committee.committee)
40
+ // )
41
+ // }
42
+ // }
package/src/types/Committee.ts CHANGED
@@ -1,4 +1,6 @@
1
1
  import { Candidate } from "./Candidate"
2
+ import { CandidateCommittee } from "./CandidateCommittee"
3
+ import { FECF3File } from "./FECF3File"
2
4
  import { FECReport } from "./FECReport"
3
5
 
4
6
  export const designations = ["P", "A", "U", "J", "D", "B"] as const
@@ -15,12 +17,9 @@ export class Committee {
15
17
  readonly url? : string
16
18
  readonly designation? : CommitteeDesignation
17
19
  readonly fec_file_id? : number
18
- readonly sponsor_candidate_ids? : string[]
19
20
  readonly jfp_committee_ids? : string[]
20
- readonly jfr_committee_ids? : string[]
21
- readonly aff_committee_ids? : string[]
22
- readonly candidate_ids? : string[]
23
- readonly election_ids? : string[]
21
+ readonly jfr_committee_ids : string[]
22
+ readonly aff_committee_ids : string[]
24
23
  readonly [x : string] : any
25
24
 
26
25
  constructor(committee : Committee) {
@@ -32,12 +31,9 @@ export class Committee {
32
31
  this.url = committee.url
33
32
  this.designation = committee.designation
34
33
  this.fec_file_id = committee.fec_file_id
35
- this.sponsor_candidate_ids = committee.sponsor_candidate_ids
36
34
  this.jfp_committee_ids = committee.jfp_committee_ids
37
35
  this.jfr_committee_ids = committee.jfr_committee_ids
38
36
  this.aff_committee_ids = committee.aff_committee_ids
39
- this.candidate_ids = committee.candidate_ids
40
- this.election_ids = committee.election_ids
41
37
  }
42
38
 
43
39
  static is(committee : any) : committee is Committee {
@@ -48,20 +44,19 @@ export class Committee {
48
44
  (committee.url === undefined || typeof committee.url === "string") &&
49
45
  (committee.designation === undefined || is_committee_designation(committee.designation)) &&
50
46
  (committee.fec_file_id === undefined || typeof committee.fec_file_id === "number" && !isNaN(committee.fec_file_id)) &&
51
- (committee.sponsor_candidate_ids === undefined || Array.isArray(committee.sponsor_candidate_ids) && committee.sponsor_candidate_ids.every((committee_id : any) => typeof committee_id === "string")) &&
52
47
  (committee.jfp_committee_ids === undefined || Array.isArray(committee.jfp_committee_ids) && committee.jfp_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
53
- (committee.jfr_committee_ids === undefined || Array.isArray(committee.jfr_committee_ids) && committee.jfr_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
54
- (committee.aff_committee_ids === undefined || Array.isArray(committee.aff_committee_ids) && committee.aff_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
55
- (committee.candidate_ids === undefined || Array.isArray(committee.candidate_ids) && committee.candidate_ids.every((committee_id : any) => typeof committee_id === "string")) &&
56
- (committee.election_ids === undefined || Array.isArray(committee.election_ids) && committee.election_ids.every((committee_id : any) => typeof committee_id === "string"))
48
+ (Array.isArray(committee.jfr_committee_ids) && committee.jfr_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
49
+ (Array.isArray(committee.aff_committee_ids) && committee.aff_committee_ids.every((committee_id : any) => typeof committee_id === "string"))
57
50
  )
58
51
  }
59
52
  }
60
53
 
61
54
  export class CommitteeAux extends Committee {
62
55
  readonly candidates : Candidate[]
63
- readonly fec_reports : FECReport[]
64
- readonly jfp_committees : Committee[]
56
+ readonly fec_f3_files : FECF3File[]
57
+ readonly jfp_committees? : Committee[]
58
+ readonly jfr_committees : Committee[]
59
+ readonly aff_committees : Committee[]
65
60
 
66
61
  constructor(committee : any) {
67
62
  if (!CommitteeAux.is(committee)) {
@@ -69,8 +64,10 @@ export class CommitteeAux extends Committee {
69
64
  }
70
65
  super(committee)
71
66
  this.candidates = committee.candidates
72
- this.fec_reports = committee.fec_reports
67
+ this.fec_f3_files = committee.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file))
73
68
  this.jfp_committees = committee.jfp_committees
69
+ this.jfr_committees = committee.jfr_committees
70
+ this.aff_committees = committee.aff_committees
74
71
  }
75
72
 
76
73
  static is(committee : any) : committee is CommitteeAux {
@@ -78,10 +75,11 @@ export class CommitteeAux extends Committee {
78
75
  Committee.is(committee) &&
79
76
  Array.isArray(committee.candidates) &&
80
77
  committee.candidates.every(Candidate.is) &&
81
- Array.isArray(committee.fec_reports) &&
82
- committee.fec_reports.every(FECReport.is) &&
83
- Array.isArray(committee.jfp_committees) &&
84
- committee.jfp_committees.every(Committee.is)
78
+ Array.isArray(committee.fec_f3_files) &&
79
+ committee.fec_f3_files.every(FECF3File.is) &&
80
+ (committee.jfp_committees === undefined || Array.isArray(committee.jfp_committees) && committee.jfp_committees.every(Committee.is)) &&
81
+ (Array.isArray(committee.jfr_committees) && committee.jfr_committees.every(Committee.is)) &&
82
+ (Array.isArray(committee.aff_committees) && committee.aff_committees.every(Committee.is))
85
83
  )
86
84
  }
87
85
  }