elections-types 1.0.78 → 1.0.79

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

@@ -2,7 +2,7 @@ import { CandidateAux } from "./Candidate.js";
 import { CommitteeAux } from "./Committee.js";
 import { ExpenditureAux } from "./Expenditure.js";
 import { StateID } from "./State.js";
-declare const office_ids: readonly ["H", "S"];
+declare const office_ids: readonly ["H", "S", "P"];
 export type OfficeID = typeof office_ids[number];
 export declare function is_office_id(office_id: any): office_id is OfficeID;
 export type ElectionID = string;
@@ -11,7 +11,7 @@ export declare class Election {
     readonly election_id: ElectionID;
     readonly name: string;
     readonly office_id: OfficeID;
-    readonly state_id: StateID;
+    readonly state_id?: StateID;
     readonly district?: number;
     readonly [x: string]: any;
     constructor(election: Election);

package/dist/src/types/Election.js

@@ -2,7 +2,7 @@ import { CandidateAux } from "./Candidate.js";
 import { CommitteeAux } from "./Committee.js";
 import { ExpenditureAux } from "./Expenditure.js";
 import { is_state_id } from "./State.js";
-const office_ids = ["H", "S"];
+const office_ids = ["H", "S", "P"];
 export function is_office_id(office_id) {
     return office_ids.includes(office_id);
 }
@@ -13,12 +13,28 @@ export function is_election_id(election_id) {
     const office_id = parts[1];
     const state_id = parts[2];
     const district = Number(parts[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" || state_ids_without_district.includes(state_id)) && parts[3] === undefined ||
-            !(office_id === "S" || state_ids_without_district.includes(state_id)) && Number.isInteger(district) && district < 100));
+    if (!(Number.isInteger(year) && year > 1700 && year < 3000 && is_office_id(office_id))) {
+        return false;
+    }
+    if (office_id === "P" && parts.length === 2) {
+        return true;
+    }
+    if (!is_state_id(state_id)) {
+        return false;
+    }
+    if (office_id === "S" && parts.length === 3) {
+        return true;
+    }
+    if (office_id !== "H") {
+        return false;
+    }
+    if (!(state_ids_without_district.includes(state_id) && parts.length === 3 || parts.length === 4)) {
+        return false;
+    }
+    if (!Number.isInteger(district) && district < 100) {
+        return false;
+    }
+    return true;
 }
 export class Election {
     election_id;
@@ -41,7 +57,7 @@ export class Election {
             is_election_id(election.election_id) &&
             typeof election.name === "string" &&
             is_office_id(election.office_id) &&
-            is_state_id(election.state_id) &&
+            (election.state_id === undefined || is_state_id(election.state_id)) &&
             (election.district === undefined || typeof election.district === "number"));
     }
 }

package/package.json

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

package/src/types/Election.ts

@@ -3,7 +3,7 @@ import { Committee, CommitteeAux } from "./Committee"
 import { ExpenditureAux } from "./Expenditure"
 import { is_state_id, state_ids, StateID } from "./State"
 
-const office_ids = ["H", "S"] as const
+const office_ids = ["H", "S", "P"] as const
 
 export type OfficeID = typeof office_ids[number]
 
@@ -21,21 +21,35 @@ export function is_election_id(election_id : any) : election_id is ElectionID {
     const office_id = parts[1]
     const state_id = parts[2]
     const district = Number(parts[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" || state_ids_without_district.includes(state_id)) && parts[3] === undefined ||
-        !(office_id === "S" || state_ids_without_district.includes(state_id)) && Number.isInteger(district) && district < 100)
-    )
+    if (!(Number.isInteger(year) && year > 1700 && year < 3000 && is_office_id(office_id))) {
+        return false
+    }
+    if (office_id === "P" && parts.length === 2) {
+        return true
+    }
+    if (!is_state_id(state_id)) {
+        return false
+    }
+    if (office_id === "S" && parts.length === 3) {
+        return true
+    }
+    if (office_id !== "H") {
+        return false
+    }
+    if (!(state_ids_without_district.includes(state_id) && parts.length === 3 || parts.length === 4)) {
+        return false
+    }
+    if (!Number.isInteger(district) && district < 100) {
+        return false
+    }
+    return true
 }
 
 export class Election {
     readonly election_id : ElectionID
     readonly name : string
     readonly office_id : OfficeID
-    readonly state_id : StateID
+    readonly state_id? : StateID
     readonly district? : number
     readonly [x : string] : any
 
@@ -56,7 +70,7 @@ export class Election {
             is_election_id(election.election_id) &&
             typeof election.name === "string" &&
             is_office_id(election.office_id) &&
-            is_state_id(election.state_id) &&
+            (election.state_id === undefined || is_state_id(election.state_id)) &&
             (election.district === undefined || typeof election.district === "number")
         )
     }