triangle-types 1.0.136 → 1.0.138

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 (17) hide show
  1. package/dist/src/types/federal_congress/FederalCongress.d.ts +1 -1
  2. package/dist/src/types/federal_elections/FederalElection.d.ts +5 -6
  3. package/dist/src/types/federal_elections/FederalElection.js +13 -37
  4. package/dist/src/types/federal_elections/FederalElectionCandidate.d.ts +2 -2
  5. package/dist/src/types/federal_elections/FederalElectionCandidate.js +2 -2
  6. package/dist/src/types/federal_elections/FederalElectionF1File.js +0 -3
  7. package/dist/src/types/federal_elections/FederalElectionF2File.d.ts +2 -2
  8. package/dist/src/types/federal_elections/FederalElectionF2File.js +2 -2
  9. package/dist/src/types/federal_elections/FederalElectionFileExpenditure.d.ts +1 -2
  10. package/dist/src/types/federal_elections/FederalElectionFileExpenditure.js +1 -2
  11. package/package.json +1 -1
  12. package/src/types/federal_congress/FederalCongress.ts +1 -1
  13. package/src/types/federal_elections/FederalElection.ts +14 -42
  14. package/src/types/federal_elections/FederalElectionCandidate.ts +3 -3
  15. package/src/types/federal_elections/FederalElectionF1File.ts +0 -4
  16. package/src/types/federal_elections/FederalElectionF2File.ts +3 -3
  17. package/src/types/federal_elections/FederalElectionFileExpenditure.ts +2 -3
package/dist/src/types/federal_congress/FederalCongress.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { StateID } from "../regions/State.js";
2
2
  export declare class FederalCongress {
3
3
  readonly federal_congress_id: number;
4
- readonly redistrict_state_ids: StateID;
4
+ readonly redistrict_state_ids: StateID[];
5
5
  constructor(federal_congress: any);
6
6
  static is(federal_congress: any): federal_congress is FederalCongress;
7
7
  }
package/dist/src/types/federal_elections/FederalElection.d.ts CHANGED
@@ -5,16 +5,15 @@ import { StateID } from "../regions/State.js";
5
5
  export declare const federal_election_office_ids: readonly ["H", "S", "P"];
6
6
  export type FederalElectionOfficeID = typeof federal_election_office_ids[number];
7
7
  export declare function is_federal_election_office_id(federal_election_office_id: any): federal_election_office_id is FederalElectionOfficeID;
8
- export declare const state_ids_without_district: StateID[];
9
- export type FederalElectionID = string;
10
- export declare function is_federal_election_id(federal_election_id: any): federal_election_id is FederalElectionID;
11
8
  export declare class FederalElection {
12
- readonly federal_election_id: FederalElectionID;
9
+ readonly federal_election_id: string;
13
10
  readonly year: number;
14
- readonly name: string;
15
- readonly federal_congress_id?: number;
16
11
  readonly federal_election_office_id: FederalElectionOfficeID;
17
12
  readonly state_id?: StateID;
13
+ readonly district_id?: number;
14
+ readonly is_special: boolean;
15
+ readonly name: string;
16
+ readonly federal_congress_id?: number;
18
17
  readonly federal_congress_district_id?: string;
19
18
  readonly [x: string]: any;
20
19
  constructor(federal_election: FederalElection);
package/dist/src/types/federal_elections/FederalElection.js CHANGED
@@ -6,43 +6,15 @@ export const federal_election_office_ids = ["H", "S", "P"];
6
6
  export function is_federal_election_office_id(federal_election_office_id) {
7
7
  return federal_election_office_ids.includes(federal_election_office_id);
8
8
  }
9
- export const state_ids_without_district = ["AK", "DE", "ND", "SD", "VT", "WY"];
10
- export function is_federal_election_id(federal_election_id) {
11
- const parts = federal_election_id.split("-");
12
- const year = Number(parts[0]);
13
- const federal_election_office_id = parts[1];
14
- const state_id = parts[2];
15
- const district_id = Number(parts[3]);
16
- if (!(Number.isInteger(year) && year > 1700 && year < 3000 && is_federal_election_office_id(federal_election_office_id))) {
17
- return false;
18
- }
19
- if (federal_election_office_id === "P" && parts.length === 2) {
20
- return true;
21
- }
22
- if (!is_state_id(state_id)) {
23
- return false;
24
- }
25
- if (federal_election_office_id === "S" && parts.length === 3) {
26
- return true;
27
- }
28
- if (federal_election_office_id !== "H") {
29
- return false;
30
- }
31
- if (!(state_ids_without_district.includes(state_id) && parts.length === 3 || parts.length === 4)) {
32
- return false;
33
- }
34
- if (!Number.isInteger(district_id) && district_id < 100) {
35
- return false;
36
- }
37
- return true;
38
- }
39
9
  export class FederalElection {
40
10
  federal_election_id;
41
11
  year;
42
- name;
43
- federal_congress_id;
44
12
  federal_election_office_id;
45
13
  state_id;
14
+ district_id;
15
+ is_special;
16
+ name;
17
+ federal_congress_id;
46
18
  federal_congress_district_id;
47
19
  constructor(federal_election) {
48
20
  if (!FederalElection.is(federal_election)) {
@@ -50,20 +22,24 @@ export class FederalElection {
50
22
  }
51
23
  this.federal_election_id = federal_election.federal_election_id;
52
24
  this.year = federal_election.year;
53
- this.name = federal_election.name;
54
- this.federal_congress_id = federal_election.federal_congress_id;
55
25
  this.federal_election_office_id = federal_election.federal_election_office_id;
56
26
  this.state_id = federal_election.state_id;
27
+ this.district_id = federal_election.district_id;
28
+ this.is_special = federal_election.is_special;
29
+ this.name = federal_election.name;
30
+ this.federal_congress_id = federal_election.federal_congress_id;
57
31
  this.federal_congress_district_id = federal_election.federal_congress_district_id;
58
32
  }
59
33
  static is(federal_election) {
60
34
  return (federal_election !== undefined &&
61
- is_federal_election_id(federal_election.federal_election_id) &&
35
+ typeof federal_election.federal_election_id === "string" &&
62
36
  typeof federal_election.year === "number" &&
63
- typeof federal_election.name === "string" &&
64
- (federal_election.federal_congress_id === undefined || typeof federal_election.federal_congress_id === "number") &&
65
37
  is_federal_election_office_id(federal_election.federal_election_office_id) &&
66
38
  (federal_election.state_id === undefined || is_state_id(federal_election.state_id)) &&
39
+ (federal_election.district_id === undefined || typeof federal_election.district_id === "number") &&
40
+ typeof federal_election.is_special === "boolean" &&
41
+ typeof federal_election.name === "string" &&
42
+ (federal_election.federal_congress_id === undefined || typeof federal_election.federal_congress_id === "number") &&
67
43
  (federal_election.federal_congress_district_id === undefined || typeof federal_election.federal_congress_district_id === "string"));
68
44
  }
69
45
  }
package/dist/src/types/federal_elections/FederalElectionCandidate.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { FederalElectionCommitteeAux } from "./FederalElectionCommittee.js";
2
- import { FederalElectionID, FederalElectionOfficeID } from "./FederalElection.js";
2
+ import { FederalElectionOfficeID } from "./FederalElection.js";
3
3
  import { FederalElectionFileExpenditureAux } from "./FederalElectionFileExpenditure.js";
4
4
  import { FederalElectionF3File } from "./FederalElectionF3File.js";
5
5
  import { StateID } from "../regions/State.js";
@@ -9,7 +9,7 @@ export declare class FederalElectionCandidate {
9
9
  readonly federal_election_office_id: FederalElectionOfficeID;
10
10
  readonly state_id: StateID;
11
11
  readonly district_id?: number;
12
- readonly federal_election_id: FederalElectionID;
12
+ readonly federal_election_id: string;
13
13
  readonly party_id?: string;
14
14
  readonly federal_election_file_id?: number;
15
15
  readonly scout_id?: string;
package/dist/src/types/federal_elections/FederalElectionCandidate.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { FederalElectionCommitteeAux } from "./FederalElectionCommittee.js";
2
- import { is_federal_election_id, is_federal_election_office_id } from "./FederalElection.js";
2
+ import { is_federal_election_office_id } from "./FederalElection.js";
3
3
  import { FederalElectionFileExpenditureAux } from "./FederalElectionFileExpenditure.js";
4
4
  import { FederalElectionF3File } from "./FederalElectionF3File.js";
5
5
  import { is_state_id } from "../regions/State.js";
@@ -55,7 +55,7 @@ export class FederalElectionCandidate {
55
55
  is_federal_election_office_id(federal_election_candidate.federal_election_office_id) &&
56
56
  is_state_id(federal_election_candidate.state_id) &&
57
57
  (federal_election_candidate.district_id === undefined || typeof federal_election_candidate.district_id === "number") &&
58
- is_federal_election_id(federal_election_candidate.federal_election_id) &&
58
+ typeof federal_election_candidate.federal_election_id === "string" &&
59
59
  (federal_election_candidate.party_id === undefined || typeof federal_election_candidate.party_id === "string") &&
60
60
  (federal_election_candidate.federal_election_file_id === undefined || typeof federal_election_candidate.federal_election_file_id === "number" && !isNaN(federal_election_candidate.federal_election_file_id)) &&
61
61
  (federal_election_candidate.scout_id === undefined || typeof federal_election_candidate.scout_id === "string"));
package/dist/src/types/federal_elections/FederalElectionF1File.js CHANGED
@@ -6,7 +6,6 @@ export class FederalElectionF1File extends FederalElectionFile {
6
6
  url;
7
7
  report_date;
8
8
  designation;
9
- // readonly federal_election_id? : FederalElectionID
10
9
  federal_election_candidate_id;
11
10
  jfp_federal_election_committee_ids;
12
11
  jfr_federal_election_committee_ids;
@@ -22,7 +21,6 @@ export class FederalElectionF1File extends FederalElectionFile {
22
21
  this.url = federal_election_file.url;
23
22
  this.report_date = federal_election_file.report_date;
24
23
  this.designation = federal_election_file.designation;
25
- // this.federal_election_id = federal_election_file.federal_election_id
26
24
  this.federal_election_candidate_id = federal_election_file.federal_election_candidate_id;
27
25
  this.jfp_federal_election_committee_ids = federal_election_file.jfp_federal_election_committee_ids;
28
26
  this.jfr_federal_election_committee_ids = federal_election_file.jfr_federal_election_committee_ids;
@@ -37,7 +35,6 @@ export class FederalElectionF1File extends FederalElectionFile {
37
35
  (federal_election_file.url === undefined || typeof federal_election_file.url === "string") &&
38
36
  typeof federal_election_file.report_date === "string" &&
39
37
  is_federal_election_committee_designation(federal_election_file.designation) &&
40
- // (federal_election_file.federal_election_id === undefined || is_federal_election_id(federal_election_file.federal_election_id)) &&
41
38
  (federal_election_file.federal_election_candidate_id === undefined || typeof federal_election_file.federal_election_candidate_id === "string") &&
42
39
  (federal_election_file.jfp_federal_election_committee_ids === undefined || Array.isArray(federal_election_file.jfp_federal_election_committee_ids) && federal_election_file.jfp_federal_election_committee_ids.every((federal_election_committee_id) => typeof federal_election_committee_id === "string")) &&
43
40
  (Array.isArray(federal_election_file.jfr_federal_election_committee_ids) && federal_election_file.jfr_federal_election_committee_ids.every((federal_election_committee_id) => typeof federal_election_committee_id === "string")) &&
package/dist/src/types/federal_elections/FederalElectionF2File.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { FederalElectionID, FederalElectionOfficeID } from "./FederalElection.js";
1
+ import { FederalElectionOfficeID } from "./FederalElection.js";
2
2
  import { FederalElectionFile } from "./FederalElectionFile.js";
3
3
  import { StateID } from "../regions/State.js";
4
4
  export declare class FederalElectionF2File extends FederalElectionFile {
@@ -7,7 +7,7 @@ export declare class FederalElectionF2File extends FederalElectionFile {
7
7
  readonly federal_election_office_id: FederalElectionOfficeID;
8
8
  readonly state_id: StateID;
9
9
  readonly district_id?: number;
10
- readonly federal_election_id: FederalElectionID;
10
+ readonly federal_election_id: string;
11
11
  readonly party_id?: string;
12
12
  readonly report_date: string;
13
13
  constructor(federal_election_file: any);
package/dist/src/types/federal_elections/FederalElectionF2File.js CHANGED
@@ -1,4 +1,4 @@
1
- import { is_federal_election_id, is_federal_election_office_id } from "./FederalElection.js";
1
+ import { is_federal_election_office_id } from "./FederalElection.js";
2
2
  import { FederalElectionFile } from "./FederalElectionFile.js";
3
3
  import { is_state_id } from "../regions/State.js";
4
4
  export class FederalElectionF2File extends FederalElectionFile {
@@ -32,7 +32,7 @@ export class FederalElectionF2File extends FederalElectionFile {
32
32
  is_federal_election_office_id(federal_election_file.federal_election_office_id) &&
33
33
  is_state_id(federal_election_file.state_id) &&
34
34
  (federal_election_file.district_id === undefined || typeof federal_election_file.district_id === "number") &&
35
- is_federal_election_id(federal_election_file.federal_election_id) &&
35
+ typeof federal_election_file.federal_election_id === "string" &&
36
36
  (federal_election_file.party_id === undefined || typeof federal_election_file.party_id === "string") &&
37
37
  typeof federal_election_file.report_date === "string");
38
38
  }
package/dist/src/types/federal_elections/FederalElectionFileExpenditure.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import { FederalElectionCandidate } from "./FederalElectionCandidate.js";
2
2
  import { FederalElectionCommittee } from "./FederalElectionCommittee.js";
3
- import { FederalElectionID } from "./FederalElection.js";
4
3
  import { FederalElectionF24File } from "./FederalElectionF24File.js";
5
4
  export declare class FederalElectionFileExpenditure {
6
5
  readonly federal_election_file_id: number;
@@ -9,7 +8,7 @@ export declare class FederalElectionFileExpenditure {
9
8
  readonly date: string;
10
9
  readonly payee: string;
11
10
  readonly election_stage: string;
12
- readonly federal_election_id: FederalElectionID;
11
+ readonly federal_election_id: string;
13
12
  readonly federal_election_candidate_id: string;
14
13
  readonly amount: number;
15
14
  readonly cumulative_amount: number;
package/dist/src/types/federal_elections/FederalElectionFileExpenditure.js CHANGED
@@ -1,6 +1,5 @@
1
1
  import { FederalElectionCandidate } from "./FederalElectionCandidate.js";
2
2
  import { FederalElectionCommittee } from "./FederalElectionCommittee.js";
3
- import { is_federal_election_id } from "./FederalElection.js";
4
3
  import { FederalElectionF24File } from "./FederalElectionF24File.js";
5
4
  export class FederalElectionFileExpenditure {
6
5
  federal_election_file_id;
@@ -40,7 +39,7 @@ export class FederalElectionFileExpenditure {
40
39
  typeof federal_election_file_expenditure.date === "string" &&
41
40
  typeof federal_election_file_expenditure.payee === "string" &&
42
41
  typeof federal_election_file_expenditure.election_stage === "string" &&
43
- is_federal_election_id(federal_election_file_expenditure.federal_election_id) &&
42
+ typeof federal_election_file_expenditure.federal_election_id === "string" &&
44
43
  typeof federal_election_file_expenditure.federal_election_candidate_id === "string" &&
45
44
  typeof federal_election_file_expenditure.amount === "number" &&
46
45
  typeof federal_election_file_expenditure.cumulative_amount === "number" &&
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "triangle-types",
3
- "version": "1.0.136",
3
+ "version": "1.0.138",
4
4
  "main": "dist/src/index.js",
5
5
  "types": "dist/src/index.d.ts",
6
6
  "scripts": {
package/src/types/federal_congress/FederalCongress.ts CHANGED
@@ -2,7 +2,7 @@ import { is_state_id, StateID } from "../regions/State"
2
2
 
3
3
  export class FederalCongress {
4
4
  readonly federal_congress_id : number
5
- readonly redistrict_state_ids : StateID
5
+ readonly redistrict_state_ids : StateID[]
6
6
 
7
7
  constructor(federal_congress : any) {
8
8
  if (!FederalCongress.is(federal_congress)) {
package/src/types/federal_elections/FederalElection.ts CHANGED
@@ -11,47 +11,15 @@ export function is_federal_election_office_id(federal_election_office_id : any)
11
11
  return federal_election_office_ids.includes(federal_election_office_id)
12
12
  }
13
13
 
14
- export const state_ids_without_district : StateID[] = ["AK", "DE", "ND", "SD", "VT", "WY"]
15
-
16
- export type FederalElectionID = string
17
-
18
- export function is_federal_election_id(federal_election_id : any) : federal_election_id is FederalElectionID {
19
- const parts = federal_election_id.split("-")
20
- const year = Number(parts[0])
21
- const federal_election_office_id = parts[1]
22
- const state_id = parts[2]
23
- const district_id = Number(parts[3])
24
- if (!(Number.isInteger(year) && year > 1700 && year < 3000 && is_federal_election_office_id(federal_election_office_id))) {
25
- return false
26
- }
27
- if (federal_election_office_id === "P" && parts.length === 2) {
28
- return true
29
- }
30
- if (!is_state_id(state_id)) {
31
- return false
32
- }
33
- if (federal_election_office_id === "S" && parts.length === 3) {
34
- return true
35
- }
36
- if (federal_election_office_id !== "H") {
37
- return false
38
- }
39
- if (!(state_ids_without_district.includes(state_id) && parts.length === 3 || parts.length === 4)) {
40
- return false
41
- }
42
- if (!Number.isInteger(district_id) && district_id < 100) {
43
- return false
44
- }
45
- return true
46
- }
47
-
48
14
  export class FederalElection {
49
- readonly federal_election_id : FederalElectionID
15
+ readonly federal_election_id : string
50
16
  readonly year : number
51
- readonly name : string
52
- readonly federal_congress_id? : number
53
17
  readonly federal_election_office_id : FederalElectionOfficeID
54
18
  readonly state_id? : StateID
19
+ readonly district_id? : number
20
+ readonly is_special : boolean
21
+ readonly name : string
22
+ readonly federal_congress_id? : number
55
23
  readonly federal_congress_district_id? : string
56
24
  readonly [x : string] : any
57
25
 
@@ -61,22 +29,26 @@ export class FederalElection {
61
29
  }
62
30
  this.federal_election_id = federal_election.federal_election_id
63
31
  this.year = federal_election.year
64
- this.name = federal_election.name
65
- this.federal_congress_id = federal_election.federal_congress_id
66
32
  this.federal_election_office_id = federal_election.federal_election_office_id
67
33
  this.state_id = federal_election.state_id
34
+ this.district_id = federal_election.district_id
35
+ this.is_special = federal_election.is_special
36
+ this.name = federal_election.name
37
+ this.federal_congress_id = federal_election.federal_congress_id
68
38
  this.federal_congress_district_id = federal_election.federal_congress_district_id
69
39
  }
70
40
 
71
41
  static is(federal_election : any) : federal_election is FederalElection {
72
42
  return (
73
43
  federal_election !== undefined &&
74
- is_federal_election_id(federal_election.federal_election_id) &&
44
+ typeof federal_election.federal_election_id === "string" &&
75
45
  typeof federal_election.year === "number" &&
76
- typeof federal_election.name === "string" &&
77
- (federal_election.federal_congress_id === undefined || typeof federal_election.federal_congress_id === "number") &&
78
46
  is_federal_election_office_id(federal_election.federal_election_office_id) &&
79
47
  (federal_election.state_id === undefined || is_state_id(federal_election.state_id)) &&
48
+ (federal_election.district_id === undefined || typeof federal_election.district_id === "number") &&
49
+ typeof federal_election.is_special === "boolean" &&
50
+ typeof federal_election.name === "string" &&
51
+ (federal_election.federal_congress_id === undefined || typeof federal_election.federal_congress_id === "number") &&
80
52
  (federal_election.federal_congress_district_id === undefined || typeof federal_election.federal_congress_district_id === "string")
81
53
  )
82
54
  }
package/src/types/federal_elections/FederalElectionCandidate.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { FederalElectionCommitteeAux } from "./FederalElectionCommittee"
2
- import { FederalElectionID, is_federal_election_id, is_federal_election_office_id, FederalElectionOfficeID } from "./FederalElection"
2
+ import { is_federal_election_office_id, FederalElectionOfficeID } from "./FederalElection"
3
3
  import { FederalElectionFileExpenditureAux } from "./FederalElectionFileExpenditure"
4
4
  import { FederalElectionF3File } from "./FederalElectionF3File"
5
5
  import { is_state_id, StateID } from "../regions/State"
@@ -34,7 +34,7 @@ export class FederalElectionCandidate {
34
34
  readonly federal_election_office_id : FederalElectionOfficeID
35
35
  readonly state_id : StateID
36
36
  readonly district_id? : number
37
- readonly federal_election_id : FederalElectionID
37
+ readonly federal_election_id : string
38
38
  readonly party_id? : string
39
39
  readonly federal_election_file_id? : number
40
40
  readonly scout_id? : string
@@ -64,7 +64,7 @@ export class FederalElectionCandidate {
64
64
  is_federal_election_office_id(federal_election_candidate.federal_election_office_id) &&
65
65
  is_state_id(federal_election_candidate.state_id) &&
66
66
  (federal_election_candidate.district_id === undefined || typeof federal_election_candidate.district_id === "number") &&
67
- is_federal_election_id(federal_election_candidate.federal_election_id) &&
67
+ typeof federal_election_candidate.federal_election_id === "string" &&
68
68
  (federal_election_candidate.party_id === undefined || typeof federal_election_candidate.party_id === "string") &&
69
69
  (federal_election_candidate.federal_election_file_id === undefined || typeof federal_election_candidate.federal_election_file_id === "number" && !isNaN(federal_election_candidate.federal_election_file_id)) &&
70
70
  (federal_election_candidate.scout_id === undefined || typeof federal_election_candidate.scout_id === "string")
package/src/types/federal_elections/FederalElectionF1File.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  import { FederalElectionCommitteeDesignation, is_federal_election_committee_designation } from "./FederalElectionCommittee"
2
- import { FederalElectionID, is_federal_election_id } from "./FederalElection"
3
2
  import { FederalElectionFile } from "./FederalElectionFile"
4
3
 
5
4
  export class FederalElectionF1File extends FederalElectionFile {
@@ -8,7 +7,6 @@ export class FederalElectionF1File extends FederalElectionFile {
8
7
  readonly url? : string
9
8
  readonly report_date : string
10
9
  readonly designation : FederalElectionCommitteeDesignation
11
- // readonly federal_election_id? : FederalElectionID
12
10
  readonly federal_election_candidate_id? : string
13
11
  readonly jfp_federal_election_committee_ids? : string[]
14
12
  readonly jfr_federal_election_committee_ids : string[]
@@ -25,7 +23,6 @@ export class FederalElectionF1File extends FederalElectionFile {
25
23
  this.url = federal_election_file.url
26
24
  this.report_date = federal_election_file.report_date
27
25
  this.designation = federal_election_file.designation
28
- // this.federal_election_id = federal_election_file.federal_election_id
29
26
  this.federal_election_candidate_id = federal_election_file.federal_election_candidate_id
30
27
  this.jfp_federal_election_committee_ids = federal_election_file.jfp_federal_election_committee_ids
31
28
  this.jfr_federal_election_committee_ids = federal_election_file.jfr_federal_election_committee_ids
@@ -42,7 +39,6 @@ export class FederalElectionF1File extends FederalElectionFile {
42
39
  (federal_election_file.url === undefined || typeof federal_election_file.url === "string") &&
43
40
  typeof federal_election_file.report_date === "string" &&
44
41
  is_federal_election_committee_designation(federal_election_file.designation) &&
45
- // (federal_election_file.federal_election_id === undefined || is_federal_election_id(federal_election_file.federal_election_id)) &&
46
42
  (federal_election_file.federal_election_candidate_id === undefined || typeof federal_election_file.federal_election_candidate_id === "string") &&
47
43
  (federal_election_file.jfp_federal_election_committee_ids === undefined || Array.isArray(federal_election_file.jfp_federal_election_committee_ids) && federal_election_file.jfp_federal_election_committee_ids.every((federal_election_committee_id : any) => typeof federal_election_committee_id === "string")) &&
48
44
  (Array.isArray(federal_election_file.jfr_federal_election_committee_ids) && federal_election_file.jfr_federal_election_committee_ids.every((federal_election_committee_id : any) => typeof federal_election_committee_id === "string")) &&
package/src/types/federal_elections/FederalElectionF2File.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { FederalElectionID, is_federal_election_id, is_federal_election_office_id, FederalElectionOfficeID } from "./FederalElection"
1
+ import { is_federal_election_office_id, FederalElectionOfficeID } from "./FederalElection"
2
2
  import { FederalElectionFile } from "./FederalElectionFile"
3
3
  import { is_state_id, StateID } from "../regions/State"
4
4
 
@@ -8,7 +8,7 @@ export class FederalElectionF2File extends FederalElectionFile {
8
8
  readonly federal_election_office_id : FederalElectionOfficeID
9
9
  readonly state_id : StateID
10
10
  readonly district_id? : number
11
- readonly federal_election_id : FederalElectionID
11
+ readonly federal_election_id : string
12
12
  readonly party_id? : string
13
13
  readonly report_date : string
14
14
 
@@ -36,7 +36,7 @@ export class FederalElectionF2File extends FederalElectionFile {
36
36
  is_federal_election_office_id(federal_election_file.federal_election_office_id) &&
37
37
  is_state_id(federal_election_file.state_id) &&
38
38
  (federal_election_file.district_id === undefined || typeof federal_election_file.district_id === "number") &&
39
- is_federal_election_id(federal_election_file.federal_election_id) &&
39
+ typeof federal_election_file.federal_election_id === "string" &&
40
40
  (federal_election_file.party_id === undefined || typeof federal_election_file.party_id === "string") &&
41
41
  typeof federal_election_file.report_date === "string"
42
42
  )
package/src/types/federal_elections/FederalElectionFileExpenditure.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import { FederalElectionCandidate } from "./FederalElectionCandidate"
2
2
  import { FederalElectionCommittee } from "./FederalElectionCommittee"
3
- import { FederalElectionID, is_federal_election_id } from "./FederalElection"
4
3
  import { FederalElectionF24File } from "./FederalElectionF24File"
5
4
 
6
5
  export class FederalElectionFileExpenditure {
@@ -10,7 +9,7 @@ export class FederalElectionFileExpenditure {
10
9
  readonly date : string
11
10
  readonly payee : string
12
11
  readonly election_stage : string
13
- readonly federal_election_id : FederalElectionID
12
+ readonly federal_election_id : string
14
13
  readonly federal_election_candidate_id : string
15
14
  readonly amount : number
16
15
  readonly cumulative_amount : number
@@ -45,7 +44,7 @@ export class FederalElectionFileExpenditure {
45
44
  typeof federal_election_file_expenditure.date === "string" &&
46
45
  typeof federal_election_file_expenditure.payee === "string" &&
47
46
  typeof federal_election_file_expenditure.election_stage === "string" &&
48
- is_federal_election_id(federal_election_file_expenditure.federal_election_id) &&
47
+ typeof federal_election_file_expenditure.federal_election_id === "string" &&
49
48
  typeof federal_election_file_expenditure.federal_election_candidate_id === "string" &&
50
49
  typeof federal_election_file_expenditure.amount === "number" &&
51
50
  typeof federal_election_file_expenditure.cumulative_amount === "number" &&