triangle-types 1.0.185 → 1.0.187

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.
@@ -1,15 +1,18 @@
1
+ import { LALFileVoter } from "../lal/LALFileVoter.js";
1
2
  import { StateID } from "../regions/State.js";
2
3
  import { StateVoterFeature } from "./StateVoterFeature.js";
3
4
  import { StateVoterTarget } from "./StateVoterTarget.js";
4
5
  export declare class StateVoter {
5
6
  readonly state_id: StateID;
6
7
  readonly voter_id: string;
7
- readonly lal_file_voter_id: string;
8
+ readonly lal_file_id: string;
9
+ readonly lal_voter_id: string;
8
10
  readonly [x: string]: any;
9
11
  constructor(state_voter: any);
10
12
  static is(state_voter: any): state_voter is StateVoter;
11
13
  }
12
14
  export declare class StateVoterAux extends StateVoter {
15
+ readonly lal_file_voter: LALFileVoter;
13
16
  readonly features: StateVoterFeature[];
14
17
  readonly targets: StateVoterTarget[];
15
18
  constructor(state_voter: any);
@@ -1,26 +1,31 @@
1
+ import { LALFileVoter } from "../lal/LALFileVoter.js";
1
2
  import { is_state_id } from "../regions/State.js";
2
3
  import { StateVoterFeature } from "./StateVoterFeature.js";
3
4
  import { StateVoterTarget } from "./StateVoterTarget.js";
4
5
  export class StateVoter {
5
6
  state_id;
6
7
  voter_id;
7
- lal_file_voter_id;
8
+ lal_file_id;
9
+ lal_voter_id;
8
10
  constructor(state_voter) {
9
11
  if (!StateVoter.is(state_voter)) {
10
12
  throw Error("Invalid input.");
11
13
  }
12
14
  this.state_id = state_voter.state_id;
13
15
  this.voter_id = state_voter.voter_id;
14
- this.lal_file_voter_id = state_voter.lal_file_voter_id;
16
+ this.lal_file_id = state_voter.lal_file_id;
17
+ this.lal_voter_id = state_voter.lal_voter_id;
15
18
  }
16
19
  static is(state_voter) {
17
20
  return (state_voter !== undefined &&
18
21
  is_state_id(state_voter.state_id) &&
19
22
  typeof state_voter.voter_id === "string" &&
20
- typeof state_voter.lal_file_voter_id === "string");
23
+ typeof state_voter.lal_file_id === "string" &&
24
+ typeof state_voter.lal_voter_id === "string");
21
25
  }
22
26
  }
23
27
  export class StateVoterAux extends StateVoter {
28
+ lal_file_voter;
24
29
  features;
25
30
  targets;
26
31
  // readonly turnouts : VoterTurnout[]
@@ -29,11 +34,13 @@ export class StateVoterAux extends StateVoter {
29
34
  throw Error("Invalid input.");
30
35
  }
31
36
  super(state_voter);
37
+ this.lal_file_voter = state_voter.lal_file_voter;
32
38
  this.features = state_voter.features;
33
39
  this.targets = state_voter.targets;
34
40
  }
35
41
  static is(state_voter) {
36
42
  return (StateVoter.is(state_voter) &&
43
+ LALFileVoter.is(state_voter.lal_file_voter) &&
37
44
  Array.isArray(state_voter.features) && state_voter.features.every(StateVoterFeature.is) &&
38
45
  Array.isArray(state_voter.targets) && state_voter.targets.every(StateVoterTarget.is));
39
46
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "triangle-types",
3
- "version": "1.0.185",
3
+ "version": "1.0.187",
4
4
  "main": "dist/src/index.js",
5
5
  "types": "dist/src/index.d.ts",
6
6
  "scripts": {
@@ -1,3 +1,4 @@
1
+ import { LALFileVoter } from "../lal/LALFileVoter"
1
2
  import { is_state_id, StateID } from "../regions/State"
2
3
  import { StateVoterFeature } from "./StateVoterFeature"
3
4
  import { StateVoterTarget } from "./StateVoterTarget"
@@ -5,7 +6,8 @@ import { StateVoterTarget } from "./StateVoterTarget"
5
6
  export class StateVoter {
6
7
  readonly state_id : StateID
7
8
  readonly voter_id : string
8
- readonly lal_file_voter_id : string
9
+ readonly lal_file_id : string
10
+ readonly lal_voter_id : string
9
11
  readonly [x : string] : any
10
12
 
11
13
  constructor(state_voter : any) {
@@ -14,7 +16,8 @@ export class StateVoter {
14
16
  }
15
17
  this.state_id = state_voter.state_id
16
18
  this.voter_id = state_voter.voter_id
17
- this.lal_file_voter_id = state_voter.lal_file_voter_id
19
+ this.lal_file_id = state_voter.lal_file_id
20
+ this.lal_voter_id = state_voter.lal_voter_id
18
21
  }
19
22
 
20
23
  static is(state_voter : any) : state_voter is StateVoter {
@@ -22,12 +25,14 @@ export class StateVoter {
22
25
  state_voter !== undefined &&
23
26
  is_state_id(state_voter.state_id) &&
24
27
  typeof state_voter.voter_id === "string" &&
25
- typeof state_voter.lal_file_voter_id === "string"
28
+ typeof state_voter.lal_file_id === "string" &&
29
+ typeof state_voter.lal_voter_id === "string"
26
30
  )
27
31
  }
28
32
  }
29
33
 
30
34
  export class StateVoterAux extends StateVoter {
35
+ readonly lal_file_voter : LALFileVoter
31
36
  readonly features : StateVoterFeature[]
32
37
  readonly targets : StateVoterTarget[]
33
38
  // readonly turnouts : VoterTurnout[]
@@ -37,6 +42,7 @@ export class StateVoterAux extends StateVoter {
37
42
  throw Error("Invalid input.")
38
43
  }
39
44
  super(state_voter)
45
+ this.lal_file_voter = state_voter.lal_file_voter
40
46
  this.features = state_voter.features
41
47
  this.targets = state_voter.targets
42
48
  }
@@ -44,6 +50,7 @@ export class StateVoterAux extends StateVoter {
44
50
  static is(state_voter : any) : state_voter is StateVoter {
45
51
  return (
46
52
  StateVoter.is(state_voter) &&
53
+ LALFileVoter.is(state_voter.lal_file_voter) &&
47
54
  Array.isArray(state_voter.features) && state_voter.features.every(StateVoterFeature.is) &&
48
55
  Array.isArray(state_voter.targets) && state_voter.targets.every(StateVoterTarget.is)
49
56
  )