elections-types 1.0.76 → 1.0.78

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

@@ -1,5 +1,7 @@
+import { Candidate } from "./Candidate.js";
 import { Committee } from "./Committee.js";
 import { ElectionID } from "./Election.js";
+import { FECF24File } from "./FECF24File.js";
 export declare class Expenditure {
     readonly fec_file_id: number;
     readonly expenditure_id: string;
@@ -18,7 +20,9 @@ export declare class Expenditure {
     static is(expenditure: any): expenditure is Expenditure;
 }
 export declare class ExpenditureAux extends Expenditure {
+    readonly candidate: Candidate;
     readonly committee: Committee;
+    readonly fec_f24_file: FECF24File;
     constructor(expenditure: any);
     static is(expenditure: any): expenditure is ExpenditureAux;
 }

package/dist/src/types/Expenditure.js

@@ -1,5 +1,7 @@
+import { Candidate } from "./Candidate.js";
 import { Committee } from "./Committee.js";
 import { is_election_id } from "./Election.js";
+import { FECF24File } from "./FECF24File.js";
 export class Expenditure {
     fec_file_id;
     expenditure_id;
@@ -47,16 +49,22 @@ export class Expenditure {
     }
 }
 export class ExpenditureAux extends Expenditure {
+    candidate;
     committee;
+    fec_f24_file;
     constructor(expenditure) {
         if (!ExpenditureAux.is(expenditure)) {
             throw Error("Invalid input.");
         }
         super(expenditure);
-        this.committee = expenditure.committee;
+        this.candidate = new Candidate(expenditure.candidate);
+        this.committee = new Committee(expenditure.committee);
+        this.fec_f24_file = new FECF24File(expenditure.fec_f24_file);
     }
     static is(expenditure) {
         return (Expenditure.is(expenditure) &&
-            Committee.is(expenditure.committee));
+            Candidate.is(expenditure.candidate) &&
+            Committee.is(expenditure.committee) &&
+            FECF24File.is(expenditure.fec_f24_file));
     }
 }

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

@@ -1,6 +1,10 @@
 import { AmendmentTypeID, FormTypeID, LongFormTypeID } from "./FormTypeID.js";
+export declare const form_version_ids: readonly ["8.1", "8.2", "8.3", "8.4", "8.5"];
+export type FormVersionID = typeof form_version_ids[number];
+export declare function is_form_version_id(form_version_id: any): form_version_id is FormVersionID;
 export declare class FECFile {
     readonly fec_file_id: number;
+    readonly form_version_id: FormVersionID;
     readonly form_type_id: FormTypeID;
     readonly amendment_type_id: AmendmentTypeID;
     readonly long_form_type_id: LongFormTypeID;

package/dist/src/types/FECFile.js

@@ -1,6 +1,11 @@
 import { is_amendment_type_id, is_form_type_id, is_long_form_type_id } from "./FormTypeID.js";
+export const form_version_ids = ["8.1", "8.2", "8.3", "8.4", "8.5"];
+export function is_form_version_id(form_version_id) {
+    return form_version_ids.includes(form_version_id);
+}
 export class FECFile {
     fec_file_id;
+    form_version_id;
     form_type_id;
     amendment_type_id;
     long_form_type_id;
@@ -10,6 +15,7 @@ export class FECFile {
             throw Error("Invalid input.");
         }
         this.fec_file_id = fec_file.fec_file_id;
+        this.form_version_id = fec_file.form_version_id;
         this.form_type_id = fec_file.form_type_id;
         this.amendment_type_id = fec_file.amendment_type_id;
         this.long_form_type_id = fec_file.long_form_type_id;
@@ -18,6 +24,7 @@ export class FECFile {
     static is(fec_file) {
         return (fec_file !== undefined &&
             typeof fec_file.fec_file_id === "number" &&
+            is_form_version_id(fec_file.form_version_id) &&
             is_form_type_id(fec_file.form_type_id) &&
             is_amendment_type_id(fec_file.amendment_type_id) &&
             is_long_form_type_id(fec_file.long_form_type_id) &&

package/package.json

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

package/src/types/Expenditure.ts

@@ -1,5 +1,7 @@
+import { Candidate } from "./Candidate"
 import { Committee } from "./Committee"
 import { ElectionID, is_election_id } from "./Election"
+import { FECF24File } from "./FECF24File"
 
 export class Expenditure {
     readonly fec_file_id : number
@@ -55,20 +57,26 @@ export class Expenditure {
 }
 
 export class ExpenditureAux extends Expenditure {
+    readonly candidate : Candidate
     readonly committee : Committee
+    readonly fec_f24_file : FECF24File
 
     constructor(expenditure : any) {
         if (!ExpenditureAux.is(expenditure)) {
             throw Error("Invalid input.")
         }
         super(expenditure)
-        this.committee = expenditure.committee
+        this.candidate = new Candidate(expenditure.candidate)
+        this.committee = new Committee(expenditure.committee)
+        this.fec_f24_file = new FECF24File(expenditure.fec_f24_file)
     }
 
     static is(expenditure : any) : expenditure is ExpenditureAux {
         return (
             Expenditure.is(expenditure) &&
-            Committee.is(expenditure.committee)
+            Candidate.is(expenditure.candidate) &&
+            Committee.is(expenditure.committee) &&
+            FECF24File.is(expenditure.fec_f24_file)
         )
     }
 }

package/src/types/FECFile.ts

@@ -1,7 +1,16 @@
 import { AmendmentTypeID, FormTypeID, is_amendment_type_id, is_form_type_id, is_long_form_type_id, LongFormTypeID } from "./FormTypeID"
 
+export const form_version_ids = ["8.1", "8.2", "8.3", "8.4", "8.5"] as const
+
+export type FormVersionID = typeof form_version_ids[number]
+
+export function is_form_version_id(form_version_id : any) : form_version_id is FormVersionID {
+    return form_version_ids.includes(form_version_id)
+}
+
 export class FECFile {
     readonly fec_file_id : number
+    readonly form_version_id : FormVersionID
     readonly form_type_id : FormTypeID
     readonly amendment_type_id : AmendmentTypeID
     readonly long_form_type_id : LongFormTypeID
@@ -13,6 +22,7 @@ export class FECFile {
             throw Error("Invalid input.")
         }
         this.fec_file_id = fec_file.fec_file_id
+        this.form_version_id = fec_file.form_version_id
         this.form_type_id = fec_file.form_type_id
         this.amendment_type_id = fec_file.amendment_type_id
         this.long_form_type_id = fec_file.long_form_type_id
@@ -23,6 +33,7 @@ export class FECFile {
         return (
             fec_file !== undefined &&
             typeof fec_file.fec_file_id === "number" &&
+            is_form_version_id(fec_file.form_version_id) &&
             is_form_type_id(fec_file.form_type_id) &&
             is_amendment_type_id(fec_file.amendment_type_id) &&
             is_long_form_type_id(fec_file.long_form_type_id) &&