elections-types 1.0.11 → 1.0.13

package/dist/src/types/Election.d.ts

@@ -9,7 +9,7 @@ export declare class Election {
     readonly name: string;
     readonly office_id: OfficeID;
     readonly state_id: StateID;
-    readonly district?: string;
+    readonly district?: number;
     readonly candidate_ids?: string[];
     readonly committee_ids?: string[];
     constructor(election: any);

package/dist/src/types/Election.js

@@ -3,17 +3,19 @@ const office_ids = ["H", "S"];
 export function is_office_id(office_id) {
     return office_ids.includes(office_id);
 }
+const state_ids_without_district = ["AK", "DE", "ND", "SD", "VT", "WY"];
 export function is_election_id(election_id) {
     const parts = election_id.split("-");
     const year = Number(parts[0]);
     const office_id = parts[1];
     const state_id = parts[2];
     const district = Number(parts[3]);
-    return ((parts.length === 4 && office_id === "H" || parts.length === 3) &&
+    return (parts.length <= 4 &&
         Number.isInteger(year) && year > 1700 && year < 3000 &&
         is_office_id(office_id) &&
         is_state_id(state_id) &&
-        (office_id === "S" || Number.isInteger(district) && district < 100));
+        ((office_id === "S" || state_ids_without_district.includes(state_id)) && district === undefined ||
+            !(office_id === "S" || state_ids_without_district.includes(state_id)) && Number.isInteger(district) && district < 100));
 }
 export class Election {
     election_id;
@@ -41,7 +43,7 @@ export class Election {
             typeof election.name === "string" &&
             is_office_id(election.office_id) &&
             is_state_id(election.state_id) &&
-            (election.district === undefined && typeof election.district === "string") &&
+            (election.district === undefined || typeof election.district === "number") &&
             (election.candidate_ids === undefined || Array.isArray(election.candidate_ids) && election.candidate_ids.every((candidate_id) => typeof candidate_id === "string")) &&
             (election.committee_ids === undefined || Array.isArray(election.committee_ids) && election.committee_ids.every((committee_id) => typeof committee_id === "string")));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "elections-types",
-    "version": "1.0.11",
+    "version": "1.0.13",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/types/Election.ts

@@ -8,6 +8,8 @@ export function is_office_id(office_id : any) : office_id is OfficeID {
     return office_ids.includes(office_id)
 }
 
+const state_ids_without_district : StateID[] = ["AK", "DE", "ND", "SD", "VT", "WY"]
+
 export type ElectionID = string
 
 export function is_election_id(election_id : any) : election_id is ElectionID {
@@ -17,11 +19,12 @@ export function is_election_id(election_id : any) : election_id is ElectionID {
     const state_id = parts[2]
     const district = Number(parts[3])
     return (
-        (parts.length === 4 && office_id === "H" || parts.length === 3) &&
+        parts.length <= 4 &&
         Number.isInteger(year) && year > 1700 && year < 3000 &&
         is_office_id(office_id) &&
         is_state_id(state_id) &&
-        (office_id === "S" || Number.isInteger(district) && district < 100)
+        ((office_id === "S" || state_ids_without_district.includes(state_id)) && district === undefined ||
+        !(office_id === "S" || state_ids_without_district.includes(state_id)) && Number.isInteger(district) && district < 100)
     )
 }
 
@@ -30,7 +33,7 @@ export class Election {
     readonly name : string
     readonly office_id : OfficeID
     readonly state_id : StateID
-    readonly district? : string
+    readonly district? : number
     readonly candidate_ids? : string[]
     readonly committee_ids? : string[]
 
@@ -54,7 +57,7 @@ export class Election {
             typeof election.name === "string" &&
             is_office_id(election.office_id) &&
             is_state_id(election.state_id) &&
-            (election.district === undefined && typeof election.district === "string") &&
+            (election.district === undefined || typeof election.district === "number") &&
             (election.candidate_ids === undefined || Array.isArray(election.candidate_ids) && election.candidate_ids.every((candidate_id : any) => typeof candidate_id === "string")) &&
             (election.committee_ids === undefined || Array.isArray(election.committee_ids) && election.committee_ids.every((committee_id : any) => typeof committee_id === "string"))
         )