triage-types 1.0.45 → 1.0.46

package/dist/src/types/state_permits/NC/NCStatePermit.js

@@ -1,50 +1,18 @@
-import { is_state_id } from "../../State.js";
-export class NCStatePermit {
-    state_permit_id;
+import { StatePermit } from "../StatePermit.js";
+export class NCStatePermit extends StatePermit {
     state_id;
-    permit_id;
-    state_facility_id;
-    issue_date;
-    expiration_date;
-    status;
-    type_id;
-    subtype_id;
     s3_raw_filenames;
-    s3_filename;
-    s3_text_filename;
-    source_ids;
     constructor(state_permit) {
         if (!NCStatePermit.is(state_permit)) {
             throw Error("Invalid input.");
         }
-        this.state_permit_id = state_permit.state_permit_id;
+        super(state_permit);
         this.state_id = state_permit.state_id;
-        this.permit_id = state_permit.permit_id;
-        this.state_facility_id = state_permit.state_facility_id;
-        this.issue_date = state_permit.issue_date;
-        this.expiration_date = state_permit.expiration_date;
-        this.status = state_permit.status;
-        this.type_id = state_permit.type_id;
-        this.subtype_id = state_permit.subtype_id;
         this.s3_raw_filenames = state_permit.s3_raw_filenames;
-        this.s3_filename = state_permit.s3_filename;
-        this.s3_text_filename = state_permit.s3_text_filename;
-        this.source_ids = state_permit.source_ids;
     }
     static is(state_permit) {
-        return (state_permit !== undefined &&
-            typeof state_permit.state_permit_id === "string" &&
-            is_state_id(state_permit.state_id) && state_permit.state_id === "NC" &&
-            typeof state_permit.permit_id === "string" &&
-            typeof state_permit.state_facility_id === "string" &&
-            (state_permit.issue_date === undefined || typeof state_permit.issue_date === "string") &&
-            (state_permit.expiration_date === undefined || typeof state_permit.expiration_date === "string") &&
-            (state_permit.status === undefined || typeof state_permit.status === "string") &&
-            (state_permit.type_id === undefined || typeof state_permit.type_id === "string") &&
-            (state_permit.subtype_id === undefined || typeof state_permit.subtype_id === "string") &&
-            (state_permit.s3_raw_filenames === undefined || Array.isArray(state_permit.s3_raw_filenames) && state_permit.s3_raw_filenames.map((s3_filename) => typeof s3_filename === "string")) &&
-            (state_permit.s3_filename === undefined || typeof state_permit.s3_filename === "string") &&
-            (state_permit.s3_text_filename === undefined || typeof state_permit.s3_text_filename === "string") &&
-            (state_permit.source_ids === undefined || Array.isArray(state_permit.source_ids) && state_permit.source_ids.map((source_id) => typeof source_id === "string")));
+        return (StatePermit.is(state_permit) &&
+            state_permit.state_id === "NC" &&
+            (state_permit.s3_raw_filenames === undefined || Array.isArray(state_permit.s3_raw_filenames) && state_permit.s3_raw_filenames.every((s3_filename) => typeof s3_filename === "string")));
     }
 }

package/dist/src/types/state_permits/StateFacility.d.ts

@@ -0,0 +1,20 @@
+import { StateID } from "../State.js";
+import { StatePermitAux } from "./StatePermit.js";
+export declare class StateFacility {
+    readonly state_facility_id: string;
+    readonly state_id: StateID;
+    readonly facility_id: string;
+    readonly name: string;
+    readonly is_active?: boolean;
+    readonly type_id: string;
+    readonly site_address_city?: string;
+    readonly site_address_county?: string;
+    readonly [x: string]: any;
+    constructor(state_facility: StateFacility);
+    static is(state_facility: any): state_facility is StateFacility;
+}
+export declare class StateFacilityAux extends StateFacility {
+    readonly state_permits: StatePermitAux[];
+    constructor(state_facility: StateFacilityAux);
+    static is(state_facility: any): state_facility is StateFacilityAux;
+}

package/dist/src/types/state_permits/StateFacility.js

@@ -0,0 +1,49 @@
+import { is_state_id } from "../State.js";
+import { StatePermitAux } from "./StatePermit.js";
+export class StateFacility {
+    state_facility_id;
+    state_id;
+    facility_id;
+    name;
+    is_active;
+    type_id;
+    site_address_city;
+    site_address_county;
+    constructor(state_facility) {
+        if (!StateFacility.is(state_facility)) {
+            throw Error("Invalid input.");
+        }
+        this.state_facility_id = state_facility.state_facility_id;
+        this.state_id = state_facility.state_id;
+        this.facility_id = state_facility.facility_id;
+        this.name = state_facility.name;
+        this.is_active = state_facility.is_active;
+        this.type_id = state_facility.type_id;
+        this.site_address_city = state_facility.site_address_city;
+    }
+    static is(state_facility) {
+        return (state_facility !== undefined &&
+            is_state_id(state_facility.state_id) &&
+            typeof state_facility.state_facility_id === "string" &&
+            typeof state_facility.facility_id === "string" &&
+            typeof state_facility.name === "string" &&
+            (state_facility.is_active === undefined || typeof state_facility.is_active === "boolean") &&
+            typeof state_facility.type_id === "string" &&
+            (state_facility.site_address_city === undefined || typeof state_facility.site_address_city === "string"));
+    }
+}
+export class StateFacilityAux extends StateFacility {
+    state_permits;
+    constructor(state_facility) {
+        if (!StateFacilityAux.is(state_facility)) {
+            throw Error("Invalid input.");
+        }
+        super(state_facility);
+        this.state_permits = state_facility.state_permits;
+    }
+    static is(state_facility) {
+        return (StateFacility.is(state_facility) &&
+            Array.isArray(state_facility.state_permits) &&
+            state_facility.state_permits.every(StatePermitAux.is));
+    }
+}

package/dist/src/types/state_permits/StatePermit.d.ts

@@ -0,0 +1,26 @@
+import { StateID } from "../State.js";
+import { StateFacility } from "./StateFacility.js";
+export declare class StatePermit {
+    readonly state_permit_id: string;
+    readonly state_id: StateID;
+    readonly permit_id: string;
+    readonly state_facility_id: string;
+    readonly issue_date?: string;
+    readonly expiration_date?: string;
+    readonly status?: string;
+    readonly type_id?: string;
+    readonly subtype_id?: string;
+    readonly s3_filename?: string;
+    readonly s3_text_filename?: string;
+    readonly source_ids?: string[];
+    readonly [x: string]: any;
+    constructor(state_permit: StatePermit);
+    static is(state_permit: any): state_permit is StatePermit;
+}
+export declare class StatePermitAux extends StatePermit {
+    readonly state_facility: StateFacility;
+    readonly s3_url?: string;
+    readonly s3_text_url?: string;
+    constructor(state_permit: StatePermitAux);
+    static is(state_permit: any): state_permit is StatePermitAux;
+}

package/dist/src/types/state_permits/StatePermit.js

@@ -0,0 +1,67 @@
+import { is_state_id } from "../State.js";
+export class StatePermit {
+    state_permit_id;
+    state_id;
+    permit_id;
+    state_facility_id;
+    issue_date;
+    expiration_date;
+    status;
+    type_id;
+    subtype_id;
+    s3_filename;
+    s3_text_filename;
+    source_ids;
+    constructor(state_permit) {
+        if (!StatePermit.is(state_permit)) {
+            throw Error("Invalid input.");
+        }
+        this.state_permit_id = state_permit.state_permit_id;
+        this.state_id = state_permit.state_id;
+        this.permit_id = state_permit.permit_id;
+        this.state_facility_id = state_permit.state_facility_id;
+        this.issue_date = state_permit.issue_date;
+        this.expiration_date = state_permit.expiration_date;
+        this.status = state_permit.status;
+        this.type_id = state_permit.type_id;
+        this.subtype_id = state_permit.subtype_id;
+        this.s3_filename = state_permit.s3_filename;
+        this.s3_text_filename = state_permit.s3_text_filename;
+        this.source_ids = state_permit.source_ids;
+    }
+    static is(state_permit) {
+        return (state_permit !== undefined &&
+            typeof state_permit.state_permit_id === "string" &&
+            is_state_id(state_permit.state_id) &&
+            typeof state_permit.permit_id === "string" &&
+            typeof state_permit.state_facility_id === "string" &&
+            (state_permit.issue_date === undefined || typeof state_permit.issue_date === "string") &&
+            (state_permit.expiration_date === undefined || typeof state_permit.expiration_date === "string") &&
+            (state_permit.status === undefined || typeof state_permit.status === "string") &&
+            (state_permit.type_id === undefined || typeof state_permit.type_id === "string") &&
+            (state_permit.subtype_id === undefined || typeof state_permit.subtype_id === "string") &&
+            (state_permit.s3_filename === undefined || typeof state_permit.s3_filename === "string") &&
+            (state_permit.s3_text_filename === undefined || typeof state_permit.s3_text_filename === "string") &&
+            (state_permit.source_ids === undefined || Array.isArray(state_permit.source_ids) && state_permit.source_ids.every((source_id) => typeof source_id === "string")));
+    }
+}
+export class StatePermitAux extends StatePermit {
+    state_facility;
+    s3_url;
+    s3_text_url;
+    constructor(state_permit) {
+        if (!StatePermitAux.is(state_permit)) {
+            throw Error("Invalid input.");
+        }
+        super(state_permit);
+        this.state_facility = state_permit.state_facility;
+        this.s3_url = state_permit.s3_url;
+        this.s3_text_url = state_permit.s3_text_url;
+    }
+    static is(state_permit) {
+        return (StatePermit.is(state_permit) &&
+            StatePermitAux.is(state_permit.state_facility) &&
+            (state_permit.s3_url === undefined || typeof state_permit.s3_url === "string") &&
+            (state_permit.s3_text_url === undefined || typeof state_permit.s3_text_url === "string"));
+    }
+}

package/dist/src/types/state_permits/StatePermitSource.d.ts

@@ -0,0 +1,20 @@
+import { StateID } from "../State.js";
+import { StatePermitAux } from "./StatePermit.js";
+import { StatePermitSourcePollutant } from "./StatePermitSourcePollutant.js";
+export declare class StatePermitSource {
+    readonly state_permit_source_id: string;
+    readonly state_id: StateID;
+    readonly state_permit_id: string;
+    readonly source_id: string;
+    readonly type_id: string;
+    readonly pollutant_ids?: string[];
+    readonly [x: string]: any;
+    constructor(state_permit_source: StatePermitSource);
+    static is(state_permit_source: any): state_permit_source is StatePermitSource;
+}
+export declare class StatePermitSourceAux extends StatePermitSource {
+    readonly state_permit: StatePermitAux;
+    readonly state_permit_source_pollutants: StatePermitSourcePollutant[];
+    constructor(state_permit_source: StatePermitSourceAux);
+    static is(state_permit_source: any): state_permit_source is StatePermitSourceAux;
+}

package/dist/src/types/state_permits/StatePermitSource.js

@@ -0,0 +1,49 @@
+import { is_state_id } from "../State.js";
+import { StatePermitAux } from "./StatePermit.js";
+import { StatePermitSourcePollutant } from "./StatePermitSourcePollutant.js";
+export class StatePermitSource {
+    state_permit_source_id;
+    state_id;
+    state_permit_id;
+    source_id;
+    type_id;
+    pollutant_ids;
+    constructor(state_permit_source) {
+        if (!StatePermitSource.is(state_permit_source)) {
+            throw Error("Invalid input.");
+        }
+        this.state_permit_source_id = state_permit_source.state_permit_source_id;
+        this.state_id = state_permit_source.state_id;
+        this.state_permit_id = state_permit_source.state_permit_id;
+        this.source_id = state_permit_source.source_id;
+        this.type_id = state_permit_source.type_id;
+        this.pollutant_ids = state_permit_source.pollutant_ids;
+    }
+    static is(state_permit_source) {
+        return (state_permit_source !== undefined &&
+            typeof state_permit_source.state_permit_source_id === "string" &&
+            is_state_id(state_permit_source.state_id) &&
+            typeof state_permit_source.state_permit_id === "string" &&
+            typeof state_permit_source.source_id === "string" &&
+            typeof state_permit_source.type_id === "string" &&
+            (state_permit_source.pollutant_ids === undefined || Array.isArray(state_permit_source.pollutant_ids) && state_permit_source.pollutant_ids.every((pollutant_id) => typeof pollutant_id === "string")));
+    }
+}
+export class StatePermitSourceAux extends StatePermitSource {
+    state_permit;
+    state_permit_source_pollutants;
+    constructor(state_permit_source) {
+        if (!StatePermitSourceAux.is(state_permit_source)) {
+            throw Error("Invalid input.");
+        }
+        super(state_permit_source);
+        this.state_permit = state_permit_source.state_permit;
+        this.state_permit_source_pollutants = state_permit_source.state_permit_source_pollutants;
+    }
+    static is(state_permit_source) {
+        return (StatePermitSource.is(state_permit_source) &&
+            StatePermitAux.is(state_permit_source.state_permit) &&
+            Array.isArray(state_permit_source.state_permit_source_pollutants) &&
+            state_permit_source.state_permit_source_pollutants.every(StatePermitSourcePollutant.is));
+    }
+}

package/dist/src/types/state_permits/StatePermitSourcePollutant.d.ts

@@ -0,0 +1,11 @@
+import { StateID } from "../State.js";
+export declare class StatePermitSourcePollutant {
+    readonly state_permit_source_pollutant_id: string;
+    readonly state_id: StateID;
+    readonly state_permit_id: string;
+    readonly state_permit_source_id: string;
+    readonly pollutant_id: string;
+    readonly [x: string]: any;
+    constructor(state_permit_source_pollutant: StatePermitSourcePollutant);
+    static is(state_permit_source_pollutant: any): state_permit_source_pollutant is StatePermitSourcePollutant;
+}

package/dist/src/types/state_permits/StatePermitSourcePollutant.js

@@ -0,0 +1,26 @@
+import { is_state_id } from "../State.js";
+export class StatePermitSourcePollutant {
+    state_permit_source_pollutant_id;
+    state_id;
+    state_permit_id;
+    state_permit_source_id;
+    pollutant_id;
+    constructor(state_permit_source_pollutant) {
+        if (!StatePermitSourcePollutant.is(state_permit_source_pollutant)) {
+            throw Error("Invalid input.");
+        }
+        this.state_permit_source_pollutant_id = state_permit_source_pollutant.state_permit_source_pollutant_id;
+        this.state_id = state_permit_source_pollutant.state_id;
+        this.state_permit_id = state_permit_source_pollutant.state_permit_id;
+        this.state_permit_source_id = state_permit_source_pollutant.state_permit_source_id;
+        this.pollutant_id = state_permit_source_pollutant.pollutant_id;
+    }
+    static is(state_permit_source_pollutant) {
+        return (state_permit_source_pollutant !== undefined &&
+            typeof state_permit_source_pollutant.state_permit_source_pollutant_id === "string" &&
+            is_state_id(state_permit_source_pollutant.state_id) && state_permit_source_pollutant.state_id === "AR" &&
+            typeof state_permit_source_pollutant.state_permit_id === "string" &&
+            typeof state_permit_source_pollutant.state_permit_source_id === "string" &&
+            typeof state_permit_source_pollutant.pollutant_id === "string");
+    }
+}

package/dist/src/types/state_permits/TN/TNStateFacility.d.ts

@@ -1,11 +1,6 @@
-import { StateID } from "../../State.js";
-export declare class TNStateFacility {
-    readonly state_facility_id: string;
-    readonly state_id: StateID;
-    readonly facility_id: string;
-    readonly name: string;
-    readonly site_address_city: string;
-    readonly site_address_county: string;
+import { StateFacility } from "../StateFacility.js";
+export declare class TNStateFacility extends StateFacility {
+    readonly state_id: "TN";
     readonly [x: string]: any;
     constructor(state_facility: TNStateFacility);
     static is(state_facility: any): state_facility is TNStateFacility;

package/dist/src/types/state_permits/TN/TNStateFacility.js

@@ -1,29 +1,15 @@
-import { is_state_id } from "../../State.js";
-export class TNStateFacility {
-    state_facility_id;
+import { StateFacility } from "../StateFacility.js";
+export class TNStateFacility extends StateFacility {
     state_id;
-    facility_id;
-    name;
-    site_address_city;
-    site_address_county;
     constructor(state_facility) {
         if (!TNStateFacility.is(state_facility)) {
             throw Error("Invalid input.");
         }
-        this.state_facility_id = state_facility.state_facility_id;
+        super(state_facility);
         this.state_id = state_facility.state_id;
-        this.facility_id = state_facility.facility_id;
-        this.name = state_facility.name;
-        this.site_address_city = state_facility.site_address_city;
-        this.site_address_county = state_facility.site_address_county;
     }
     static is(state_facility) {
-        return (state_facility !== undefined &&
-            is_state_id(state_facility.state_id) && state_facility.state_id === "TN" &&
-            typeof state_facility.state_facility_id === "string" &&
-            typeof state_facility.facility_id === "string" &&
-            typeof state_facility.name === "string" &&
-            (state_facility.site_address_city === undefined || typeof state_facility.site_address_city === "string") &&
-            (state_facility.site_address_county === undefined || typeof state_facility.site_address_county === "string"));
+        return (StateFacility.is(state_facility) &&
+            state_facility.state_id === "TN");
     }
 }

package/dist/src/types/state_permits/TN/TNStatePermit.d.ts

@@ -1,19 +1,8 @@
-import { StateID } from "../../State.js";
-export declare class TNStatePermit {
-    readonly state_permit_id: string;
-    readonly state_id: StateID;
-    readonly permit_id: string;
-    readonly state_facility_id: string;
-    readonly issue_date?: string;
+import { StatePermit } from "../StatePermit.js";
+export declare class TNStatePermit extends StatePermit {
+    readonly state_id: "TN";
     readonly effective_date?: string;
-    readonly expiration_date?: string;
-    readonly status?: string;
-    readonly type_id?: string;
-    readonly subtype_id?: string;
     readonly s3_raw_filenames?: string;
-    readonly s3_filename?: string;
-    readonly s3_text_filename?: string;
-    readonly source_ids?: string[];
     readonly [x: string]: any;
     constructor(state_permit: TNStatePermit);
     static is(state_permit: any): state_permit is TNStatePermit;

package/dist/src/types/state_permits/TN/TNStatePermit.js

@@ -1,53 +1,21 @@
-import { is_state_id } from "../../State.js";
-export class TNStatePermit {
-    state_permit_id;
+import { StatePermit } from "../StatePermit.js";
+export class TNStatePermit extends StatePermit {
     state_id;
-    permit_id;
-    state_facility_id;
-    issue_date;
     effective_date;
-    expiration_date;
-    status;
-    type_id;
-    subtype_id;
     s3_raw_filenames;
-    s3_filename;
-    s3_text_filename;
-    source_ids;
     constructor(state_permit) {
         if (!TNStatePermit.is(state_permit)) {
             throw Error("Invalid input.");
         }
-        this.state_permit_id = state_permit.state_permit_id;
+        super(state_permit);
         this.state_id = state_permit.state_id;
-        this.permit_id = state_permit.permit_id;
-        this.state_facility_id = state_permit.state_facility_id;
-        this.issue_date = state_permit.issue_date;
-        this.expiration_date = state_permit.expiration_date;
         this.effective_date = state_permit.effective_date;
-        this.status = state_permit.status;
-        this.type_id = state_permit.type_id;
-        this.subtype_id = state_permit.subtype_id;
-        this.s3_filename = state_permit.s3_filename;
         this.s3_raw_filenames = state_permit.s3_raw_filenames;
-        this.s3_text_filename = state_permit.s3_text_filename;
-        this.source_ids = state_permit.source_ids;
     }
     static is(state_permit) {
-        return (state_permit !== undefined &&
-            typeof state_permit.state_permit_id === "string" &&
-            is_state_id(state_permit.state_id) && state_permit.state_id === "TN" &&
-            typeof state_permit.permit_id === "string" &&
-            typeof state_permit.state_facility_id === "string" &&
-            (state_permit.issue_date === undefined || typeof state_permit.issue_date === "string") &&
-            (state_permit.expiration_date === undefined || typeof state_permit.expiration_date === "string") &&
+        return (StatePermit.is(state_permit) &&
+            state_permit.state_id === "TN" &&
             (state_permit.effective_date === undefined || typeof state_permit.effective_date === "string") &&
-            (state_permit.status === undefined || typeof state_permit.status === "string") &&
-            (state_permit.type_id === undefined || typeof state_permit.type_id === "string") &&
-            (state_permit.subtype_id === undefined || typeof state_permit.subtype_id === "string") &&
-            (state_permit.s3_filename === undefined || typeof state_permit.s3_filename === "string") &&
-            (state_permit.s3_raw_filenames === undefined || Array.isArray(state_permit.s3_raw_filenames) && state_permit.s3_raw_filenames.map((s3_filename) => typeof s3_filename === "string")) &&
-            (state_permit.s3_text_filename === undefined || typeof state_permit.s3_text_filename === "string") &&
-            (state_permit.source_ids === undefined || Array.isArray(state_permit.source_ids) && state_permit.source_ids.map((source_id) => typeof source_id === "string")));
+            (state_permit.s3_raw_filenames === undefined || Array.isArray(state_permit.s3_raw_filenames) && state_permit.s3_raw_filenames.every((s3_filename) => typeof s3_filename === "string")));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triage-types",
-    "version": "1.0.45",
+    "version": "1.0.46",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/index.ts

@@ -7,6 +7,11 @@ export * from "./types/federal_dockets/FederalDocketDocument"
 export * from "./types/federal_dockets/FederalDocketComment"
 export * from "./types/federal_dockets/FederalDocketCommentAttachment"
 
+export * from "./types/state_permits/StateFacility"
+export * from "./types/state_permits/StatePermit"
+export * from "./types/state_permits/StatePermitSource"
+export * from "./types/state_permits/StatePermitSourcePollutant"
+
 export * from "./types/state_permits/AR/ARStateFacility"
 export * from "./types/state_permits/AR/ARStatePermit"
 export * from "./types/state_permits/AR/ARStatePermitSource"

package/src/types/state_permits/AR/ARStateFacility.ts

@@ -1,59 +1,21 @@
-import { is_state_id, StateID } from "../../State"
-import { ARStatePermitAux } from "./ARStatePermit"
+import { StateFacility } from "../StateFacility"
 
-export class ARStateFacility {
-    readonly state_facility_id : string
-    readonly state_id : StateID
-    readonly facility_id : string
-    readonly name : string
-    readonly is_active : boolean
-    readonly type_id : string
-    readonly site_address_city? : string
+export class ARStateFacility extends StateFacility {
+    readonly state_id : "AR"
     readonly [x : string] : any
 
     constructor(state_facility : ARStateFacility) {
         if (!ARStateFacility.is(state_facility)) {
             throw Error("Invalid input.")
         }
-        this.state_facility_id = state_facility.state_facility_id
+        super(state_facility)
         this.state_id = state_facility.state_id
-        this.facility_id = state_facility.facility_id
-        this.name = state_facility.name
-        this.is_active = state_facility.is_active
-        this.type_id = state_facility.type_id
-        this.site_address_city = state_facility.site_address_city
     }
 
     static is(state_facility : any) : state_facility is ARStateFacility {
         return (
-            state_facility !== undefined &&
-            is_state_id(state_facility.state_id) && state_facility.state_id === "AR" &&
-            typeof state_facility.state_facility_id === "string" &&
-            typeof state_facility.facility_id === "string" &&
-            typeof state_facility.name === "string" &&
-            typeof state_facility.is_active === "boolean" &&
-            typeof state_facility.type_id === "string" &&
-            (state_facility.site_address_city=== undefined || typeof state_facility.site_address_city === "string")
-        )
-    }
-}
-
-export class ARStateFacilityAux extends ARStateFacility {
-    readonly state_permits : ARStatePermitAux[]
-
-    constructor(state_facility : ARStateFacilityAux) {
-        if (!ARStateFacilityAux.is(state_facility)) {
-            throw Error("Invalid input.")
-        }
-        super(state_facility)
-        this.state_permits = state_facility.state_permits.map(state_permit => state_permit)
-    }
-
-    static is(state_facility : any) : state_facility is ARStateFacilityAux {
-        return (
-            ARStateFacility.is(state_facility) &&
-            Array.isArray(state_facility.state_permits) &&
-            state_facility.state_permits.every(ARStatePermitAux.is)
+            StateFacility.is(state_facility) &&
+            state_facility.state_id === "AR"
         )
     }
 }

package/src/types/state_permits/AR/ARStatePermit.ts

@@ -1,58 +1,24 @@
-import { is_state_id, StateID } from "../../State"
-import { ARStateFacility } from "./ARStateFacility"
-import { ARStatePermitSourceAux } from "./ARStatePermitSource"
+import { StatePermit } from "../StatePermit"
 
-export class ARStatePermit {
-    readonly state_permit_id : string 
-    readonly state_id : StateID
-    readonly permit_id : string
-    readonly state_facility_id : string
-    readonly issue_date? : string
-    readonly expiration_date? : string
+export class ARStatePermit extends StatePermit {
+    readonly state_id : "AR"
     readonly void_date? : string
-    readonly status? : string
-    readonly type_id? : string
-    readonly subtype_id? : string
-    readonly s3_filename? : string
-    readonly s3_text_filename? : string
-    readonly source_ids? : string[]
     readonly [x : string] : any
 
     constructor(state_permit : ARStatePermit) {
         if (!ARStatePermit.is(state_permit)) {
             throw Error("Invalid input.")
         }
-        this.state_permit_id = state_permit.state_permit_id
+        super(state_permit)
         this.state_id = state_permit.state_id
-        this.permit_id = state_permit.permit_id
-        this.state_facility_id = state_permit.state_facility_id
-        this.issue_date = state_permit.issue_date
-        this.expiration_date = state_permit.expiration_date
         this.void_date = state_permit.void_date
-        this.status = state_permit.status
-        this.type_id = state_permit.type_id
-        this.subtype_id = state_permit.subtype_id
-        this.s3_filename = state_permit.s3_filename
-        this.s3_text_filename = state_permit.s3_text_filename
-        this.source_ids = state_permit.source_ids
     }
 
     static is(state_permit : any) : state_permit is ARStatePermit {
         return (
-            state_permit !== undefined &&
-            typeof state_permit.state_permit_id === "string" &&
-            is_state_id(state_permit.state_id) && state_permit.state_id === "AR" &&
-            typeof state_permit.permit_id === "string" &&
-            typeof state_permit.state_facility_id === "string" &&
-            (state_permit.issue_date === undefined || typeof state_permit.issue_date === "string") &&
-            (state_permit.expiration_date === undefined || typeof state_permit.expiration_date === "string") &&
-            (state_permit.void_date === undefined || typeof state_permit.void_date === "string") &&
-            (state_permit.status === undefined || typeof state_permit.status === "string") &&
-            (state_permit.type_id === undefined || typeof state_permit.type_id === "string") &&
-            (state_permit.subtype_id === undefined || typeof state_permit.subtype_id === "string") &&
-            (state_permit.s3_filename === undefined || typeof state_permit.s3_filename === "string") &&
-            (state_permit.s3_text_filename === undefined || typeof state_permit.s3_text_filename === "string") &&
-            (state_permit.source_ids === undefined || Array.isArray(state_permit.source_ids) && state_permit.source_ids.map((source_id : any) => typeof source_id === "string"))
+            StatePermit.is(state_permit) &&
+            state_permit.state_id === "AR" &&
+            (state_permit.void_date === undefined || typeof state_permit.void_date === "string")
         )
     }
 }
@@ -95,29 +61,4 @@ export class ARStateWaterPermit extends ARStatePermit {
             (state_permit.freq_fish_tissue === undefined || typeof state_permit.freq_fish_tissue === "string")
         )
     }
-}
-
-export class ARStatePermitAux extends ARStatePermit {
-    readonly state_facility : ARStateFacility
-    readonly s3_url? : string
-    readonly s3_text_url? : string
-
-    constructor(state_permit : ARStatePermitAux) {
-        if (!ARStatePermitAux.is(state_permit)) {
-            throw Error("Invalid input.")
-        }
-        super(state_permit)
-        this.state_facility = state_permit.state_facility
-        this.s3_url = state_permit.s3_url
-        this.s3_text_url = state_permit.s3_text_url
-    }
-
-    static is(state_permit : any) : state_permit is ARStatePermitAux {
-        return (
-            ARStatePermit.is(state_permit) &&
-            ARStateFacility.is(state_permit.state_facility) &&
-            (state_permit.s3_url === undefined || typeof state_permit.s3_url === "string") &&
-            (state_permit.s3_text_url === undefined || typeof state_permit.s3_text_url === "string")
-        )
-    }
 }