triangle-types 1.0.51 → 1.0.52

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,3 +1,5 @@
1
+ import { VoterTarget } from "./VoterTarget.js";
2
+ import { VoterTurnout } from "./VoterTurnout.js";
1
3
  export declare class Voter {
2
4
  readonly voter_id: string;
3
5
  readonly state_id: string;
@@ -40,3 +42,9 @@ export declare class Voter {
40
42
  constructor(voter: any);
41
43
  static is(voter: any): voter is Voter;
42
44
  }
45
+ export declare class VoterAux extends Voter {
46
+ readonly targets: VoterTarget[];
47
+ readonly turnouts: VoterTurnout[];
48
+ constructor(voter: any);
49
+ static is(voter: any): voter is Voter;
50
+ }
@@ -1,3 +1,5 @@
1
+ import { VoterTarget } from "./VoterTarget.js";
2
+ import { VoterTurnout } from "./VoterTurnout.js";
1
3
  export class Voter {
2
4
  voter_id;
3
5
  state_id;
@@ -119,22 +121,20 @@ export class Voter {
119
121
  (voter.marital_status === undefined || typeof voter.marital_status === "string"));
120
122
  }
121
123
  }
122
- // export class VoterAux extends Voter {
123
- // readonly scores : VoterScore[]
124
- // readonly turnouts : VoterTurnout[]
125
- // constructor(voter : any) {
126
- // if (!VoterAux.is(voter)) {
127
- // throw Error("Invalid input.")
128
- // }
129
- // super(voter)
130
- // this.scores = voter.scores
131
- // this.turnouts = voter.turnouts
132
- // }
133
- // static is(voter : any) : voter is Voter {
134
- // return (
135
- // Voter.is(voter) &&
136
- // Array.isArray(voter.scores) && voter.scores.every(VoterScore.is) &&
137
- // Array.isArray(voter.turnouts) && voter.turnouts.every(VoterTurnout.is)
138
- // )
139
- // }
140
- // }
124
+ export class VoterAux extends Voter {
125
+ targets;
126
+ turnouts;
127
+ constructor(voter) {
128
+ if (!VoterAux.is(voter)) {
129
+ throw Error("Invalid input.");
130
+ }
131
+ super(voter);
132
+ this.targets = voter.targets;
133
+ this.turnouts = voter.turnouts;
134
+ }
135
+ static is(voter) {
136
+ return (Voter.is(voter) &&
137
+ Array.isArray(voter.targets) && voter.targets.every(VoterTarget.is) &&
138
+ Array.isArray(voter.turnouts) && voter.turnouts.every(VoterTurnout.is));
139
+ }
140
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "triangle-types",
3
- "version": "1.0.51",
3
+ "version": "1.0.52",
4
4
  "main": "dist/src/index.js",
5
5
  "types": "dist/src/index.d.ts",
6
6
  "scripts": {
@@ -1,3 +1,6 @@
1
+ import { VoterTarget } from "./VoterTarget"
2
+ import { VoterTurnout } from "./VoterTurnout"
3
+
1
4
  export class Voter {
2
5
  readonly voter_id : string
3
6
  readonly state_id : string
@@ -125,24 +128,24 @@ export class Voter {
125
128
  }
126
129
  }
127
130
 
128
- // export class VoterAux extends Voter {
129
- // readonly scores : VoterScore[]
130
- // readonly turnouts : VoterTurnout[]
131
+ export class VoterAux extends Voter {
132
+ readonly targets : VoterTarget[]
133
+ readonly turnouts : VoterTurnout[]
131
134
 
132
- // constructor(voter : any) {
133
- // if (!VoterAux.is(voter)) {
134
- // throw Error("Invalid input.")
135
- // }
136
- // super(voter)
137
- // this.scores = voter.scores
138
- // this.turnouts = voter.turnouts
139
- // }
135
+ constructor(voter : any) {
136
+ if (!VoterAux.is(voter)) {
137
+ throw Error("Invalid input.")
138
+ }
139
+ super(voter)
140
+ this.targets = voter.targets
141
+ this.turnouts = voter.turnouts
142
+ }
140
143
 
141
- // static is(voter : any) : voter is Voter {
142
- // return (
143
- // Voter.is(voter) &&
144
- // Array.isArray(voter.scores) && voter.scores.every(VoterScore.is) &&
145
- // Array.isArray(voter.turnouts) && voter.turnouts.every(VoterTurnout.is)
146
- // )
147
- // }
148
- // }
144
+ static is(voter : any) : voter is Voter {
145
+ return (
146
+ Voter.is(voter) &&
147
+ Array.isArray(voter.targets) && voter.targets.every(VoterTarget.is) &&
148
+ Array.isArray(voter.turnouts) && voter.turnouts.every(VoterTurnout.is)
149
+ )
150
+ }
151
+ }