triangle-types 1.0.313 → 1.0.314

package/dist/src/index.d.ts

@@ -40,6 +40,8 @@ export * from "./types/federal_lobby/FederalLobbyDocumentInterest.js";
 export * from "./types/federal_congress/FederalCongress.js";
 export * from "./types/federal_congress/FederalCongressBill.js";
 export * from "./types/federal_congress/FederalCongressBillAction.js";
+export * from "./types/federal_congress/FederalCongressBillActionCommittee.js";
+export * from "./types/federal_congress/FederalCongressBillActionVote.js";
 export * from "./types/federal_congress/FederalCongressBillDocument.js";
 export * from "./types/federal_congress/FederalCongressBillMember.js";
 export * from "./types/federal_congress/FederalCongressCommittee.js";

package/dist/src/index.js

@@ -40,6 +40,8 @@ export * from "./types/federal_lobby/FederalLobbyDocumentInterest.js";
 export * from "./types/federal_congress/FederalCongress.js";
 export * from "./types/federal_congress/FederalCongressBill.js";
 export * from "./types/federal_congress/FederalCongressBillAction.js";
+export * from "./types/federal_congress/FederalCongressBillActionCommittee.js";
+export * from "./types/federal_congress/FederalCongressBillActionVote.js";
 export * from "./types/federal_congress/FederalCongressBillDocument.js";
 export * from "./types/federal_congress/FederalCongressBillMember.js";
 export * from "./types/federal_congress/FederalCongressCommittee.js";

package/dist/src/types/federal_congress/FederalCongressBillAction.d.ts

@@ -11,7 +11,6 @@ export declare class FederalCongressBillAction {
     readonly date: string;
     readonly description: string;
     readonly federal_congress_committee_ids: string[];
-    readonly federal_congress_vote_ids: string[];
     constructor(federal_congress_bill_action: any);
     static is(federal_congress_bill_action: any): federal_congress_bill_action is FederalCongressBillAction;
 }

package/dist/src/types/federal_congress/FederalCongressBillAction.js

@@ -23,7 +23,6 @@ export class FederalCongressBillAction {
     date;
     description;
     federal_congress_committee_ids;
-    federal_congress_vote_ids;
     constructor(federal_congress_bill_action) {
         if (!FederalCongressBillAction.is(federal_congress_bill_action)) {
             throw Error("Invalid input.");
@@ -36,7 +35,6 @@ export class FederalCongressBillAction {
         this.date = federal_congress_bill_action.date;
         this.description = federal_congress_bill_action.description;
         this.federal_congress_committee_ids = federal_congress_bill_action.federal_congress_committee_ids;
-        this.federal_congress_vote_ids = federal_congress_bill_action.federal_congress_vote_ids;
     }
     static is(federal_congress_bill_action) {
         return (federal_congress_bill_action !== undefined &&
@@ -47,7 +45,6 @@ export class FederalCongressBillAction {
             (federal_congress_bill_action.bill_action_type_id === undefined || is_federal_congress_bill_action_type_id(federal_congress_bill_action.bill_action_type_id)) &&
             typeof federal_congress_bill_action.date === "string" &&
             typeof federal_congress_bill_action.description === "string" &&
-            (Array.isArray(federal_congress_bill_action.federal_congress_committee_ids) && federal_congress_bill_action.federal_congress_committee_ids.every((federal_congress_committee_id) => typeof federal_congress_committee_id === "string")) &&
-            (Array.isArray(federal_congress_bill_action.federal_congress_vote_ids) && federal_congress_bill_action.federal_congress_vote_ids.every((federal_congress_vote_id) => typeof federal_congress_vote_id === "string")));
+            (Array.isArray(federal_congress_bill_action.federal_congress_committee_ids) && federal_congress_bill_action.federal_congress_committee_ids.every((federal_congress_committee_id) => typeof federal_congress_committee_id === "string")));
     }
 }

package/dist/src/types/federal_congress/FederalCongressBillActionCommittee.d.ts

@@ -0,0 +1,11 @@
+import { FederalCongressBillTypeID } from "./FederalCongressBill.js";
+export declare class FederalCongressBillActionCommittee {
+    readonly federal_congress_id: number;
+    readonly bill_type_id: FederalCongressBillTypeID;
+    readonly bill_id: number;
+    readonly action_id: number;
+    readonly federal_congress_committee_id: string;
+    readonly [x: string]: any;
+    constructor(federal_congress_bill: FederalCongressBillActionCommittee);
+    static is(federal_congress_bill: any): federal_congress_bill is FederalCongressBillActionCommittee;
+}

package/dist/src/types/federal_congress/FederalCongressBillActionCommittee.js

@@ -0,0 +1,26 @@
+import { is_federal_congress_bill_type_id } from "./FederalCongressBill.js";
+export class FederalCongressBillActionCommittee {
+    federal_congress_id;
+    bill_type_id;
+    bill_id;
+    action_id;
+    federal_congress_committee_id;
+    constructor(federal_congress_bill) {
+        if (!FederalCongressBillActionCommittee.is(federal_congress_bill)) {
+            throw Error("Invalid input.");
+        }
+        this.federal_congress_id = federal_congress_bill.federal_congress_id;
+        this.bill_type_id = federal_congress_bill.bill_type_id;
+        this.bill_id = federal_congress_bill.bill_id;
+        this.action_id = federal_congress_bill.action_id;
+        this.federal_congress_committee_id = federal_congress_bill.federal_congress_committee_id;
+    }
+    static is(federal_congress_bill) {
+        return (federal_congress_bill !== undefined &&
+            typeof federal_congress_bill.federal_congress_id === "number" &&
+            is_federal_congress_bill_type_id(federal_congress_bill.bill_type_id) &&
+            typeof federal_congress_bill.bill_id === "number" &&
+            typeof federal_congress_bill.action_id === "number" &&
+            typeof federal_congress_bill.federal_congress_committee_id === "string");
+    }
+}

package/dist/src/types/federal_congress/FederalCongressBillActionVote.d.ts

@@ -0,0 +1,14 @@
+import { FederalCongressBillTypeID } from "./FederalCongressBill.js";
+import { FederalCongressChamberID } from "./FederalCongressVote.js";
+export declare class FederalCongressBillActionVote {
+    readonly federal_congress_id: number;
+    readonly bill_type_id: FederalCongressBillTypeID;
+    readonly bill_id: number;
+    readonly action_id: number;
+    readonly session_id: number;
+    readonly chamber_id: FederalCongressChamberID;
+    readonly vote_id: number;
+    readonly [x: string]: any;
+    constructor(federal_congress_bill: FederalCongressBillActionVote);
+    static is(federal_congress_bill: any): federal_congress_bill is FederalCongressBillActionVote;
+}

package/dist/src/types/federal_congress/FederalCongressBillActionVote.js

@@ -0,0 +1,33 @@
+import { is_federal_congress_bill_type_id } from "./FederalCongressBill.js";
+import { is_federal_congress_chamber_id } from "./FederalCongressVote.js";
+export class FederalCongressBillActionVote {
+    federal_congress_id;
+    bill_type_id;
+    bill_id;
+    action_id;
+    session_id;
+    chamber_id;
+    vote_id;
+    constructor(federal_congress_bill) {
+        if (!FederalCongressBillActionVote.is(federal_congress_bill)) {
+            throw Error("Invalid input.");
+        }
+        this.federal_congress_id = federal_congress_bill.federal_congress_id;
+        this.bill_type_id = federal_congress_bill.bill_type_id;
+        this.bill_id = federal_congress_bill.bill_id;
+        this.action_id = federal_congress_bill.action_id;
+        this.session_id = federal_congress_bill.session_id;
+        this.chamber_id = federal_congress_bill.chamber_id;
+        this.vote_id = federal_congress_bill.vote_id;
+    }
+    static is(federal_congress_bill) {
+        return (federal_congress_bill !== undefined &&
+            typeof federal_congress_bill.federal_congress_id === "number" &&
+            is_federal_congress_bill_type_id(federal_congress_bill.bill_type_id) &&
+            typeof federal_congress_bill.bill_id === "number" &&
+            typeof federal_congress_bill.action_id === "number" &&
+            typeof federal_congress_bill.session_id === "number" &&
+            is_federal_congress_chamber_id(federal_congress_bill.chamber_id) &&
+            typeof federal_congress_bill.vote_id === "number");
+    }
+}

package/dist/src/types/federal_congress/FederalCongressCommittee.d.ts

@@ -1,10 +1,11 @@
+import { FederalCongressChamberID } from "./FederalCongressVote.js";
 declare const federal_congress_committee_type_ids: readonly ["COMMISSION OR CAUCUS", "JOINT", "OTHER", "SELECT", "STANDING", "SUBCOMMITTEE"];
 export type FederalCongressCommitteeTypeID = typeof federal_congress_committee_type_ids[number];
 export declare function is_federal_congress_committee_type_id(federal_congress_committee_type_id: any): federal_congress_committee_type_id is FederalCongressCommitteeTypeID;
 export declare class FederalCongressCommittee {
     readonly federal_congress_committee_id: string;
     readonly name: string;
-    readonly chamber_id: string;
+    readonly chamber_id: FederalCongressChamberID;
     readonly super_federal_congress_committee_id?: string;
     readonly sub_federal_congress_committee_ids: string[];
     constructor(federal_congress_committee: any);

package/dist/src/types/federal_congress/FederalCongressCommittee.js

@@ -1,3 +1,4 @@
+import { is_federal_congress_chamber_id } from "./FederalCongressVote.js";
 const federal_congress_committee_type_ids = [
     "COMMISSION OR CAUCUS", "JOINT", "OTHER", "SELECT", "STANDING", "SUBCOMMITTEE"
 ];
@@ -28,7 +29,7 @@ export class FederalCongressCommittee {
         return (federal_congress_committee !== undefined &&
             typeof federal_congress_committee.federal_congress_committee_id === "string" &&
             typeof federal_congress_committee.name === "string" &&
-            typeof federal_congress_committee.chamber_id === "string" &&
+            is_federal_congress_chamber_id(federal_congress_committee.chamber_id === "string") &&
             // typeof federal_congress_committee.is_active === "boolean" &&
             // (federal_congress_committee.url === undefined || typeof federal_congress_committee.url === "string") &&
             (federal_congress_committee.super_federal_congress_committee_id === undefined || typeof federal_congress_committee.super_federal_congress_committee_id === "string") &&

package/dist/src/types/federal_congress/FederalCongressDistrict.d.ts

@@ -1,9 +1,10 @@
 import { Geom } from "../jurisdictions/Geom.js";
 import { StateID } from "../jurisdictions/State.js";
+import { FederalCongressChamberID } from "./FederalCongressVote.js";
 export declare class FederalCongressDistrict {
     readonly federal_congress_district_id: string;
     readonly federal_congress_id: number;
-    readonly chamber_id: string;
+    readonly chamber_id: FederalCongressChamberID;
     readonly state_id: StateID;
     readonly district_id: number;
     readonly name: string;

package/dist/src/types/federal_congress/FederalCongressDistrict.js

@@ -1,5 +1,6 @@
 import { Geom } from "../jurisdictions/Geom.js";
 import { is_state_id } from "../jurisdictions/State.js";
+import { is_federal_congress_chamber_id } from "./FederalCongressVote.js";
 export class FederalCongressDistrict {
     federal_congress_district_id;
     federal_congress_id;
@@ -24,7 +25,7 @@ export class FederalCongressDistrict {
         return (federal_congress_district !== undefined &&
             typeof federal_congress_district.federal_congress_district_id === "string" &&
             typeof federal_congress_district.federal_congress_id === "number" &&
-            typeof federal_congress_district.chamber_id === "string" &&
+            is_federal_congress_chamber_id(federal_congress_district.chamber_id) &&
             is_state_id(federal_congress_district.state_id) &&
             typeof federal_congress_district.district_id === "number" &&
             typeof federal_congress_district.name === "string" &&

package/dist/src/types/federal_congress/FederalCongressVote.d.ts

@@ -1,31 +1,18 @@
-declare const federal_congress_vote_chamber_ids: readonly ["H", "S"];
-export type FederalCongressVoteChamberID = typeof federal_congress_vote_chamber_ids[number];
-export declare function is_federal_congress_vote_chamber_id(federal_congress_vote_chamber_id: any): federal_congress_vote_chamber_id is FederalCongressVoteChamberID;
+declare const federal_congress_chamber_ids: readonly ["H", "S"];
+export type FederalCongressChamberID = typeof federal_congress_chamber_ids[number];
+export declare function is_federal_congress_chamber_id(federal_congress_chamber_id: any): federal_congress_chamber_id is FederalCongressChamberID;
 export declare class FederalCongressVote {
     readonly federal_congress_vote_id: string;
     readonly federal_congress_id: number;
     readonly session_id: number;
-    readonly chamber_id: FederalCongressVoteChamberID;
+    readonly chamber_id: FederalCongressChamberID;
     readonly vote_id: number;
     readonly time: string;
-    readonly federal_congress_bill_id?: string;
-    readonly [x: string]: any;
-    constructor(federal_congress_vote: any);
-    static is(federal_congress_vote: any): federal_congress_vote is FederalCongressVote;
-}
-export declare class FederalCongressHouseVote extends FederalCongressVote {
-    readonly chamber_id: "H";
-    readonly question: string;
-    readonly vote_type_id: string;
-    readonly outcome: string;
-    constructor(federal_congress_vote: any);
-    static is(federal_congress_vote: any): federal_congress_vote is FederalCongressHouseVote;
-}
-export declare class FederalCongressSenateVote extends FederalCongressVote {
-    readonly chamber_id: "S";
     readonly question: string;
+    readonly vote_type_id?: string;
     readonly outcome: string;
+    readonly [x: string]: any;
     constructor(federal_congress_vote: any);
-    static is(federal_congress_vote: any): federal_congress_vote is FederalCongressSenateVote;
+    static is(federal_congress_vote: any): federal_congress_vote is FederalCongressVote;
 }
 export {};

package/dist/src/types/federal_congress/FederalCongressVote.js

@@ -1,8 +1,8 @@
-const federal_congress_vote_chamber_ids = [
+const federal_congress_chamber_ids = [
     "H", "S"
 ];
-export function is_federal_congress_vote_chamber_id(federal_congress_vote_chamber_id) {
-    return federal_congress_vote_chamber_ids.includes(federal_congress_vote_chamber_id);
+export function is_federal_congress_chamber_id(federal_congress_chamber_id) {
+    return federal_congress_chamber_ids.includes(federal_congress_chamber_id);
 }
 export class FederalCongressVote {
     federal_congress_vote_id;
@@ -11,7 +11,9 @@ export class FederalCongressVote {
     chamber_id;
     vote_id;
     time;
-    federal_congress_bill_id;
+    question;
+    vote_type_id;
+    outcome;
     constructor(federal_congress_vote) {
         if (!FederalCongressVote.is(federal_congress_vote)) {
             throw Error("Invalid input.");
@@ -22,59 +24,20 @@ export class FederalCongressVote {
         this.chamber_id = federal_congress_vote.chamber_id;
         this.vote_id = federal_congress_vote.vote_id;
         this.time = federal_congress_vote.time;
-        this.federal_congress_bill_id = federal_congress_vote.federal_congress_bill_id;
+        this.question = federal_congress_vote.question;
+        this.vote_type_id = federal_congress_vote.vote_type_id;
+        this.outcome = federal_congress_vote.outcome;
     }
     static is(federal_congress_vote) {
         return (federal_congress_vote !== undefined &&
             typeof federal_congress_vote.federal_congress_vote_id === "string" &&
             typeof federal_congress_vote.federal_congress_id === "number" &&
             typeof federal_congress_vote.session_id === "number" &&
-            is_federal_congress_vote_chamber_id(federal_congress_vote.chamber_id) &&
+            is_federal_congress_chamber_id(federal_congress_vote.chamber_id) &&
             typeof federal_congress_vote.vote_id === "number" &&
             typeof federal_congress_vote.time === "string" &&
-            (federal_congress_vote.federal_congress_bill_id === undefined || typeof federal_congress_vote.federal_congress_bill_id === "string"));
-    }
-}
-export class FederalCongressHouseVote extends FederalCongressVote {
-    chamber_id;
-    question;
-    vote_type_id;
-    outcome;
-    constructor(federal_congress_vote) {
-        if (!FederalCongressHouseVote.is(federal_congress_vote)) {
-            throw Error("Invalid input.");
-        }
-        super(federal_congress_vote);
-        this.chamber_id = federal_congress_vote.chamber_id;
-        this.question = federal_congress_vote.question;
-        this.vote_type_id = federal_congress_vote.vote_type_id;
-        this.outcome = federal_congress_vote.outcome;
-    }
-    static is(federal_congress_vote) {
-        return (federal_congress_vote !== undefined &&
-            federal_congress_vote.chamber_id === "H" &&
-            typeof federal_congress_vote.question === "string" &&
-            typeof federal_congress_vote.vote_type_id === "string" &&
-            typeof federal_congress_vote.outcome === "string");
-    }
-}
-export class FederalCongressSenateVote extends FederalCongressVote {
-    chamber_id;
-    question;
-    outcome;
-    constructor(federal_congress_vote) {
-        if (!FederalCongressSenateVote.is(federal_congress_vote)) {
-            throw Error("Invalid input.");
-        }
-        super(federal_congress_vote);
-        this.chamber_id = federal_congress_vote.chamber_id;
-        this.question = federal_congress_vote.question;
-        this.outcome = federal_congress_vote.outcome;
-    }
-    static is(federal_congress_vote) {
-        return (federal_congress_vote !== undefined &&
-            federal_congress_vote.chamber_id === "S" &&
             typeof federal_congress_vote.question === "string" &&
+            (federal_congress_vote.vote_type_id === undefined || typeof federal_congress_vote.vote_type_id === "string") &&
             typeof federal_congress_vote.outcome === "string");
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-types",
-    "version": "1.0.313",
+    "version": "1.0.314",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "scripts": {

package/src/index.ts

@@ -47,6 +47,8 @@ export * from "./types/federal_lobby/FederalLobbyDocumentInterest"
 export * from "./types/federal_congress/FederalCongress"
 export * from "./types/federal_congress/FederalCongressBill"
 export * from "./types/federal_congress/FederalCongressBillAction"
+export * from "./types/federal_congress/FederalCongressBillActionCommittee"
+export * from "./types/federal_congress/FederalCongressBillActionVote"
 export * from "./types/federal_congress/FederalCongressBillDocument"
 export * from "./types/federal_congress/FederalCongressBillMember"
 export * from "./types/federal_congress/FederalCongressCommittee"

package/src/types/federal_congress/FederalCongressBillAction.ts

@@ -28,7 +28,6 @@ export class FederalCongressBillAction {
     readonly date : string
     readonly description : string
     readonly federal_congress_committee_ids : string[]
-    readonly federal_congress_vote_ids : string[]
 
     constructor(federal_congress_bill_action : any) {
         if (!FederalCongressBillAction.is(federal_congress_bill_action)) {
@@ -42,7 +41,6 @@ export class FederalCongressBillAction {
         this.date = federal_congress_bill_action.date
         this.description = federal_congress_bill_action.description
         this.federal_congress_committee_ids = federal_congress_bill_action.federal_congress_committee_ids
-        this.federal_congress_vote_ids = federal_congress_bill_action.federal_congress_vote_ids
     }
 
     static is(federal_congress_bill_action : any) : federal_congress_bill_action is FederalCongressBillAction {
@@ -55,8 +53,7 @@ export class FederalCongressBillAction {
             (federal_congress_bill_action.bill_action_type_id === undefined || is_federal_congress_bill_action_type_id(federal_congress_bill_action.bill_action_type_id)) &&
             typeof federal_congress_bill_action.date === "string" &&
             typeof federal_congress_bill_action.description === "string" &&
-            (Array.isArray(federal_congress_bill_action.federal_congress_committee_ids) && federal_congress_bill_action.federal_congress_committee_ids.every((federal_congress_committee_id : any) => typeof federal_congress_committee_id === "string")) &&
-            (Array.isArray(federal_congress_bill_action.federal_congress_vote_ids) && federal_congress_bill_action.federal_congress_vote_ids.every((federal_congress_vote_id : any) => typeof federal_congress_vote_id === "string"))
+            (Array.isArray(federal_congress_bill_action.federal_congress_committee_ids) && federal_congress_bill_action.federal_congress_committee_ids.every((federal_congress_committee_id : any) => typeof federal_congress_committee_id === "string"))
         )
     }
 

package/src/types/federal_congress/FederalCongressBillActionCommittee.ts

@@ -0,0 +1,33 @@
+import { FederalCongressBillTypeID, is_federal_congress_bill_type_id } from "./FederalCongressBill"
+import { FederalCongressChamberID, is_federal_congress_chamber_id } from "./FederalCongressVote"
+
+export class FederalCongressBillActionCommittee {
+    readonly federal_congress_id : number
+    readonly bill_type_id : FederalCongressBillTypeID
+    readonly bill_id : number
+    readonly action_id : number
+    readonly federal_congress_committee_id : string
+    readonly [x : string] : any
+
+    constructor(federal_congress_bill : FederalCongressBillActionCommittee) {
+        if (!FederalCongressBillActionCommittee.is(federal_congress_bill)) {
+            throw Error("Invalid input.")
+        }
+        this.federal_congress_id = federal_congress_bill.federal_congress_id
+        this.bill_type_id = federal_congress_bill.bill_type_id
+        this.bill_id = federal_congress_bill.bill_id
+        this.action_id = federal_congress_bill.action_id
+        this.federal_congress_committee_id = federal_congress_bill.federal_congress_committee_id
+    }
+
+    static is(federal_congress_bill : any) : federal_congress_bill is FederalCongressBillActionCommittee {
+        return (
+            federal_congress_bill !== undefined &&
+            typeof federal_congress_bill.federal_congress_id === "number" &&
+            is_federal_congress_bill_type_id(federal_congress_bill.bill_type_id) &&
+            typeof federal_congress_bill.bill_id === "number" &&
+            typeof federal_congress_bill.action_id === "number" &&
+            typeof federal_congress_bill.federal_congress_committee_id === "string"
+        )
+    }
+}

package/src/types/federal_congress/FederalCongressBillActionVote.ts

@@ -0,0 +1,39 @@
+import { FederalCongressBillTypeID, is_federal_congress_bill_type_id } from "./FederalCongressBill"
+import { FederalCongressChamberID, is_federal_congress_chamber_id } from "./FederalCongressVote"
+
+export class FederalCongressBillActionVote {
+    readonly federal_congress_id : number
+    readonly bill_type_id : FederalCongressBillTypeID
+    readonly bill_id : number
+    readonly action_id : number
+    readonly session_id : number
+    readonly chamber_id : FederalCongressChamberID
+    readonly vote_id : number
+    readonly [x : string] : any
+
+    constructor(federal_congress_bill : FederalCongressBillActionVote) {
+        if (!FederalCongressBillActionVote.is(federal_congress_bill)) {
+            throw Error("Invalid input.")
+        }
+        this.federal_congress_id = federal_congress_bill.federal_congress_id
+        this.bill_type_id = federal_congress_bill.bill_type_id
+        this.bill_id = federal_congress_bill.bill_id
+        this.action_id = federal_congress_bill.action_id
+        this.session_id = federal_congress_bill.session_id
+        this.chamber_id = federal_congress_bill.chamber_id
+        this.vote_id = federal_congress_bill.vote_id
+    }
+
+    static is(federal_congress_bill : any) : federal_congress_bill is FederalCongressBillActionVote {
+        return (
+            federal_congress_bill !== undefined &&
+            typeof federal_congress_bill.federal_congress_id === "number" &&
+            is_federal_congress_bill_type_id(federal_congress_bill.bill_type_id) &&
+            typeof federal_congress_bill.bill_id === "number" &&
+            typeof federal_congress_bill.action_id === "number" &&
+            typeof federal_congress_bill.session_id === "number" &&
+            is_federal_congress_chamber_id(federal_congress_bill.chamber_id) &&
+            typeof federal_congress_bill.vote_id === "number"
+        )
+    }
+}

package/src/types/federal_congress/FederalCongressCommittee.ts

@@ -1,3 +1,5 @@
+import { FederalCongressChamberID, is_federal_congress_chamber_id } from "./FederalCongressVote"
+
 const federal_congress_committee_type_ids = [
     "COMMISSION OR CAUCUS", "JOINT", "OTHER", "SELECT", "STANDING", "SUBCOMMITTEE"
 ] as const
@@ -11,7 +13,7 @@ export function is_federal_congress_committee_type_id(federal_congress_committee
 export class FederalCongressCommittee {
     readonly federal_congress_committee_id : string
     readonly name : string
-    readonly chamber_id : string
+    readonly chamber_id : FederalCongressChamberID
     // readonly is_active : boolean
     // readonly url? : string
     readonly super_federal_congress_committee_id? : string
@@ -36,7 +38,7 @@ export class FederalCongressCommittee {
             federal_congress_committee !== undefined &&
             typeof federal_congress_committee.federal_congress_committee_id === "string" &&
             typeof federal_congress_committee.name === "string" &&
-            typeof federal_congress_committee.chamber_id === "string" &&
+            is_federal_congress_chamber_id(federal_congress_committee.chamber_id === "string") &&
             // typeof federal_congress_committee.is_active === "boolean" &&
             // (federal_congress_committee.url === undefined || typeof federal_congress_committee.url === "string") &&
             (federal_congress_committee.super_federal_congress_committee_id === undefined || typeof federal_congress_committee.super_federal_congress_committee_id === "string") &&

package/src/types/federal_congress/FederalCongressDistrict.ts

@@ -1,10 +1,11 @@
 import { Geom } from "../jurisdictions/Geom"
 import { is_state_id, state_ids, StateID } from "../jurisdictions/State"
+import { FederalCongressChamberID, is_federal_congress_chamber_id } from "./FederalCongressVote"
 
 export class FederalCongressDistrict {
     readonly federal_congress_district_id : string
     readonly federal_congress_id : number
-    readonly chamber_id : string
+    readonly chamber_id : FederalCongressChamberID
     readonly state_id : StateID
     readonly district_id : number
     readonly name : string
@@ -30,7 +31,7 @@ export class FederalCongressDistrict {
             federal_congress_district !== undefined &&
             typeof federal_congress_district.federal_congress_district_id === "string" &&
             typeof federal_congress_district.federal_congress_id === "number" &&
-            typeof federal_congress_district.chamber_id === "string" &&
+            is_federal_congress_chamber_id(federal_congress_district.chamber_id) &&
             is_state_id(federal_congress_district.state_id) &&
             typeof federal_congress_district.district_id === "number" &&
             typeof federal_congress_district.name === "string" &&

package/src/types/federal_congress/FederalCongressVote.ts

@@ -1,11 +1,13 @@
-const federal_congress_vote_chamber_ids = [
+import { FederalCongressBillTypeID, is_federal_congress_bill_type_id } from "./FederalCongressBill"
+
+const federal_congress_chamber_ids = [
     "H", "S"
 ] as const
 
-export type FederalCongressVoteChamberID = typeof federal_congress_vote_chamber_ids[number]
+export type FederalCongressChamberID = typeof federal_congress_chamber_ids[number]
 
-export function is_federal_congress_vote_chamber_id(federal_congress_vote_chamber_id : any) : federal_congress_vote_chamber_id is FederalCongressVoteChamberID {
-    return federal_congress_vote_chamber_ids.includes(federal_congress_vote_chamber_id)
+export function is_federal_congress_chamber_id(federal_congress_chamber_id : any) : federal_congress_chamber_id is FederalCongressChamberID {
+    return federal_congress_chamber_ids.includes(federal_congress_chamber_id)
 }
 
 
@@ -13,10 +15,12 @@ export class FederalCongressVote {
     readonly federal_congress_vote_id : string
     readonly federal_congress_id : number
     readonly session_id : number
-    readonly chamber_id : FederalCongressVoteChamberID
+    readonly chamber_id : FederalCongressChamberID
     readonly vote_id : number
     readonly time : string
-    readonly federal_congress_bill_id? : string
+    readonly question : string
+    readonly vote_type_id? : string
+    readonly outcome : string
     readonly [x : string] : any
 
     constructor(federal_congress_vote : any) {
@@ -29,7 +33,9 @@ export class FederalCongressVote {
         this.chamber_id = federal_congress_vote.chamber_id
         this.vote_id = federal_congress_vote.vote_id
         this.time = federal_congress_vote.time
-        this.federal_congress_bill_id = federal_congress_vote.federal_congress_bill_id
+        this.question = federal_congress_vote.question
+        this.vote_type_id = federal_congress_vote.vote_type_id
+        this.outcome = federal_congress_vote.outcome
     }
 
     static is(federal_congress_vote : any) : federal_congress_vote is FederalCongressVote {
@@ -38,64 +44,13 @@ export class FederalCongressVote {
             typeof federal_congress_vote.federal_congress_vote_id === "string" &&
             typeof federal_congress_vote.federal_congress_id === "number" &&
             typeof federal_congress_vote.session_id === "number" &&
-            is_federal_congress_vote_chamber_id(federal_congress_vote.chamber_id) &&
+            is_federal_congress_chamber_id(federal_congress_vote.chamber_id) &&
             typeof federal_congress_vote.vote_id === "number" &&
             typeof federal_congress_vote.time === "string" &&
-            (federal_congress_vote.federal_congress_bill_id === undefined || typeof federal_congress_vote.federal_congress_bill_id === "string")
-        )
-    }
-
-}
-
-export class FederalCongressHouseVote extends FederalCongressVote {
-    readonly chamber_id : "H"
-    readonly question : string
-    readonly vote_type_id : string
-    readonly outcome : string
-
-    constructor(federal_congress_vote : any) {
-        if (!FederalCongressHouseVote.is(federal_congress_vote)) {
-            throw Error("Invalid input.")
-        }
-        super(federal_congress_vote)
-        this.chamber_id = federal_congress_vote.chamber_id
-        this.question = federal_congress_vote.question
-        this.vote_type_id = federal_congress_vote.vote_type_id
-        this.outcome = federal_congress_vote.outcome
-    }
-
-    static is(federal_congress_vote : any) : federal_congress_vote is FederalCongressHouseVote {
-        return (
-            federal_congress_vote !== undefined &&
-            federal_congress_vote.chamber_id === "H" &&
             typeof federal_congress_vote.question === "string" &&
-            typeof federal_congress_vote.vote_type_id === "string" &&
+            (federal_congress_vote.vote_type_id === undefined || typeof federal_congress_vote.vote_type_id === "string") &&
             typeof federal_congress_vote.outcome === "string"
         )
     }
-}
 
-export class FederalCongressSenateVote extends FederalCongressVote {
-    readonly chamber_id : "S"
-    readonly question : string
-    readonly outcome : string
-
-    constructor(federal_congress_vote : any) {
-        if (!FederalCongressSenateVote.is(federal_congress_vote)) {
-            throw Error("Invalid input.")
-        }
-        super(federal_congress_vote)
-        this.chamber_id = federal_congress_vote.chamber_id
-        this.question = federal_congress_vote.question
-        this.outcome = federal_congress_vote.outcome
-    }
-
-    static is(federal_congress_vote : any) : federal_congress_vote is FederalCongressSenateVote {
-        return (
-            federal_congress_vote !== undefined &&
-            federal_congress_vote.chamber_id === "S" &&
-            typeof federal_congress_vote.question === "string" &&
-            typeof federal_congress_vote.outcome === "string"
-        )
-    }
 }