triangle-types 1.0.58 → 1.0.59

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,10 +1,18 @@
1
1
  import { StateID } from "../State.js";
2
+ import { PrismTarget } from "./PrismTarget.js";
2
3
  export declare class Prism {
3
4
  readonly prism_id: string;
4
5
  readonly state_id: StateID;
6
+ readonly name: string;
5
7
  readonly federal_congress_district_id?: string;
6
8
  readonly state_legislature_house_district_id?: string;
7
9
  readonly state_legislature_senate_district_id?: string;
10
+ readonly [x: string]: any;
11
+ constructor(prism: any);
12
+ static is(prism: any): prism is Prism;
13
+ }
14
+ export declare class PrismAux extends Prism {
15
+ readonly targets: PrismTarget[];
8
16
  constructor(prism: any);
9
17
  static is(prism: any): prism is Prism;
10
18
  }
@@ -1,7 +1,9 @@
1
1
  import { is_state_id } from "../State.js";
2
+ import { PrismTarget } from "./PrismTarget.js";
2
3
  export class Prism {
3
4
  prism_id;
4
5
  state_id;
6
+ name;
5
7
  federal_congress_district_id;
6
8
  state_legislature_house_district_id;
7
9
  state_legislature_senate_district_id;
@@ -11,6 +13,7 @@ export class Prism {
11
13
  }
12
14
  this.prism_id = prism.prism_id;
13
15
  this.state_id = prism.state_id;
16
+ this.name = prism.name;
14
17
  this.federal_congress_district_id = prism.federal_congress_district_id;
15
18
  this.state_legislature_house_district_id = prism.state_legislature_house_district_id;
16
19
  this.state_legislature_senate_district_id = prism.state_legislature_senate_district_id;
@@ -19,27 +22,23 @@ export class Prism {
19
22
  return (prism !== undefined &&
20
23
  typeof prism.prism_id === "string" &&
21
24
  is_state_id(prism.state_id) &&
25
+ typeof prism.name === "string" &&
22
26
  (prism.federal_congress_district_id === undefined || typeof prism.federal_congress_district_id === "string") &&
23
27
  (prism.state_legislature_house_district_id === undefined || typeof prism.state_legislature_house_district_id === "string") &&
24
28
  (prism.state_legislature_senate_district_id === undefined || typeof prism.state_legislature_senate_district_id === "string"));
25
29
  }
26
30
  }
27
- // export class PrismAux extends Prism {
28
- // readonly scores : PrismScore[]
29
- // readonly turnouts : PrismTurnout[]
30
- // constructor(prism : any) {
31
- // if (!PrismAux.is(prism)) {
32
- // throw Error("Invalid input.")
33
- // }
34
- // super(prism)
35
- // this.scores = prism.scores
36
- // this.turnouts = prism.turnouts
37
- // }
38
- // static is(prism : any) : prism is Prism {
39
- // return (
40
- // Prism.is(prism) &&
41
- // Array.isArray(prism.scores) && prism.scores.every(PrismScore.is) &&
42
- // Array.isArray(prism.turnouts) && prism.turnouts.every(PrismTurnout.is)
43
- // )
44
- // }
45
- // }
31
+ export class PrismAux extends Prism {
32
+ targets;
33
+ constructor(prism) {
34
+ if (!PrismAux.is(prism)) {
35
+ throw Error("Invalid input.");
36
+ }
37
+ super(prism);
38
+ this.targets = prism.targets;
39
+ }
40
+ static is(prism) {
41
+ return (Prism.is(prism) &&
42
+ Array.isArray(prism.targets) && prism.targets.every(PrismTarget.is));
43
+ }
44
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "triangle-types",
3
- "version": "1.0.58",
3
+ "version": "1.0.59",
4
4
  "main": "dist/src/index.js",
5
5
  "types": "dist/src/index.d.ts",
6
6
  "scripts": {
@@ -1,11 +1,14 @@
1
1
  import { is_state_id, StateID } from "../State"
2
+ import { PrismTarget } from "./PrismTarget"
2
3
 
3
4
  export class Prism {
4
5
  readonly prism_id : string
5
6
  readonly state_id : StateID
7
+ readonly name : string
6
8
  readonly federal_congress_district_id? : string
7
9
  readonly state_legislature_house_district_id? : string
8
10
  readonly state_legislature_senate_district_id? : string
11
+ readonly [x : string] : any
9
12
 
10
13
  constructor(prism : any) {
11
14
  if (!Prism.is(prism)) {
@@ -13,6 +16,7 @@ export class Prism {
13
16
  }
14
17
  this.prism_id = prism.prism_id
15
18
  this.state_id = prism.state_id
19
+ this.name = prism.name
16
20
  this.federal_congress_district_id = prism.federal_congress_district_id
17
21
  this.state_legislature_house_district_id = prism.state_legislature_house_district_id
18
22
  this.state_legislature_senate_district_id = prism.state_legislature_senate_district_id
@@ -23,6 +27,7 @@ export class Prism {
23
27
  prism !== undefined &&
24
28
  typeof prism.prism_id === "string" &&
25
29
  is_state_id(prism.state_id) &&
30
+ typeof prism.name === "string" &&
26
31
  (prism.federal_congress_district_id === undefined || typeof prism.federal_congress_district_id === "string") &&
27
32
  (prism.state_legislature_house_district_id === undefined || typeof prism.state_legislature_house_district_id === "string") &&
28
33
  (prism.state_legislature_senate_district_id === undefined || typeof prism.state_legislature_senate_district_id === "string")
@@ -30,24 +35,21 @@ export class Prism {
30
35
  }
31
36
  }
32
37
 
33
- // export class PrismAux extends Prism {
34
- // readonly scores : PrismScore[]
35
- // readonly turnouts : PrismTurnout[]
38
+ export class PrismAux extends Prism {
39
+ readonly targets : PrismTarget[]
36
40
 
37
- // constructor(prism : any) {
38
- // if (!PrismAux.is(prism)) {
39
- // throw Error("Invalid input.")
40
- // }
41
- // super(prism)
42
- // this.scores = prism.scores
43
- // this.turnouts = prism.turnouts
44
- // }
41
+ constructor(prism : any) {
42
+ if (!PrismAux.is(prism)) {
43
+ throw Error("Invalid input.")
44
+ }
45
+ super(prism)
46
+ this.targets = prism.targets
47
+ }
45
48
 
46
- // static is(prism : any) : prism is Prism {
47
- // return (
48
- // Prism.is(prism) &&
49
- // Array.isArray(prism.scores) && prism.scores.every(PrismScore.is) &&
50
- // Array.isArray(prism.turnouts) && prism.turnouts.every(PrismTurnout.is)
51
- // )
52
- // }
53
- // }
49
+ static is(prism : any) : prism is Prism {
50
+ return (
51
+ Prism.is(prism) &&
52
+ Array.isArray(prism.targets) && prism.targets.every(PrismTarget.is)
53
+ )
54
+ }
55
+ }