@moneylion/engine-api 1.1.0 → 1.3.0

package/README.md

@@ -92,3 +92,11 @@ This is a relatively normal NPM and Typescript project.
 1. `npm install` to install dependencies
 2. `npm run build` to build the project
 3. `npm test` to run the tests
+
+# Publishing to NPM
+
+Run the following steps to publish the library to NPM.
+
+0. Update the version number in `package.json`. Commit this change.
+1. `npm run build` - This will run Typescript to compile the Javascript.
+2. `npm publish --access=public`. This will publish the library.

package/dist/client.d.ts

@@ -10,12 +10,14 @@ type HttpMethod = "GET" | "POST" | "PATCH" | "DELETE";
 export declare class Client {
     private host;
     private auth_token;
+    private fetch_impl;
+    private timeout_ms;
     /**
      * Construct a new client instance.
      * @param host - The API host URL. Example: https://www.example.com. Should not include a trailing slash.
      * @param auth_token - The auth token used for authenticating with the API.
      */
-    constructor(host: string | undefined, auth_token: string);
+    constructor(host: string | undefined, auth_token: string, timeout_ms?: number, fetch_impl?: typeof fetch);
     /**
      * Make a GET request.
      *
@@ -62,7 +64,7 @@ export declare class Client {
 export declare class ApiError extends Error {
     /** The HTTP status code.
      */
-    failureStatus: number;
+    failureStatus?: number;
     /** The url that was requested.
      */
     url: string;
@@ -72,7 +74,13 @@ export declare class ApiError extends Error {
     /** The serialized body.
      */
     body?: string;
-    constructor(failureStatus: number, failureReason: string, url: string, method: HttpMethod, body?: string);
+    constructor({ failureStatus, failureReason, url, method, body }: {
+        failureStatus?: number;
+        failureReason: string;
+        url: string;
+        method: HttpMethod;
+        body?: string;
+    });
 }
 /**
  * An error that the caller has made in the request.
@@ -88,4 +96,6 @@ export declare class ServerError extends ApiError {
  */
 export declare class AuthenticationError extends ApiError {
 }
+export declare class TimeoutError extends ApiError {
+}
 export {};

package/dist/client.js

@@ -21,9 +21,11 @@ export class Client {
      * @param host - The API host URL. Example: https://www.example.com. Should not include a trailing slash.
      * @param auth_token - The auth token used for authenticating with the API.
      */
-    constructor(host = "https://api.evenfinancial.com", auth_token) {
+    constructor(host = "https://api.evenfinancial.com", auth_token, timeout_ms = 10 * 1000, fetch_impl = fetch) {
         this.host = host;
         this.auth_token = auth_token;
+        this.fetch_impl = fetch_impl;
+        this.timeout_ms = timeout_ms;
     }
     /**
      * Make a GET request.
@@ -72,24 +74,56 @@ export class Client {
      */
     request(endpoint, method, body) {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = `${this.host}/${endpoint}`;
-            const response = yield fetch(url, {
-                method: method,
-                headers: {
-                    "Content-Type": "application/json",
-                    "Accept": "application/json",
-                    "Authorization": `Bearer ${this.auth_token}`,
-                },
-                body: body,
+            const timeout = new Promise((resolve) => {
+                setTimeout(() => resolve(undefined), this.timeout_ms);
             });
+            const url = `${this.host}/${endpoint}`;
+            const response = yield Promise.race([
+                this.fetch_impl(url, {
+                    method: method,
+                    headers: {
+                        "Content-Type": "application/json",
+                        "Accept": "application/json",
+                        "Authorization": `Bearer ${this.auth_token}`,
+                    },
+                    body: body,
+                }),
+                timeout
+            ]);
+            if (response === undefined) {
+                throw new TimeoutError({
+                    failureReason: "Client Timeout",
+                    url,
+                    method,
+                    body
+                });
+            }
             if (response.status >= 500) {
-                throw new ServerError(response.status, response.statusText, url, method, body);
+                throw new ServerError({
+                    failureStatus: response.status,
+                    failureReason: response.statusText,
+                    url,
+                    method,
+                    body
+                });
             }
             if (response.status >= 400) {
                 if (response.status === 401 || response.status === 403) {
-                    throw new AuthenticationError(response.status, response.statusText, url, method, body);
+                    throw new AuthenticationError({
+                        failureStatus: response.status,
+                        failureReason: response.statusText,
+                        url,
+                        method,
+                        body
+                    });
                 }
-                throw new ClientError(response.status, response.statusText, url, method, body);
+                throw new ClientError({
+                    failureStatus: response.status,
+                    failureReason: response.statusText,
+                    url,
+                    method,
+                    body
+                });
             }
             /* node-fetch types json() as Promise<unknown> to ensure the consumer makes a decision about the
              * type. We are deciding here to treat it as an object so that consumers of this method can introspect
@@ -103,7 +137,7 @@ export class Client {
 /** The generic error class used to represent error status codes such as 400 Bad Request.
  */
 export class ApiError extends Error {
-    constructor(failureStatus, failureReason, url, method, body) {
+    constructor({ failureStatus, failureReason, url, method, body }) {
         super(failureReason);
         this.failureStatus = failureStatus;
         this.url = url;
@@ -125,3 +159,5 @@ export class ServerError extends ApiError {
  */
 export class AuthenticationError extends ApiError {
 }
+export class TimeoutError extends ApiError {
+}

package/dist/client.test.js

@@ -1,5 +1,5 @@
 import { describe, expect, test, beforeAll, afterEach, afterAll, } from "@jest/globals";
-import { Client, AuthenticationError, ClientError, ServerError, } from "./client";
+import { Client, AuthenticationError, ClientError, ServerError, TimeoutError, } from "./client";
 import { setupServer } from "msw/node";
 import { http, HttpResponse } from "msw";
 const successBody = { response: "Okay" };
@@ -75,4 +75,12 @@ describe("Client", () => {
         const response = client.request("network_error", "GET");
         return expect(response).rejects.toThrow(TypeError);
     });
+    test("Timeout error is raised when a timeout occurs", () => {
+        const fetch_impl = () => new Promise((_, reject) => {
+            setTimeout(() => reject(new Error("this should be impossible")), 100);
+        });
+        const client = new Client(testEndpoint, "good_token", 1, fetch_impl);
+        const response = client.request("timeout_error", "GET");
+        return expect(response).rejects.toThrow(TimeoutError);
+    });
 });

package/dist/decoders.d.ts

@@ -21,7 +21,10 @@ export declare const originatorImageDecoder: Decoder<components["schemas"]["Orig
 export declare const originatorDecoder: Decoder<FixNull<components["schemas"]["Originator"]>>;
 export declare const aprTypeDecoder: Decoder<components["schemas"]["AprType"]>;
 type OldLoanOffer = components["schemas"]["LoanOffer"];
-type LoanOffer = FixNull<OldLoanOffer>;
+type TempLoanOfferWithNulledFields = {
+    [P in keyof OldLoanOffer]: P extends "termLength" | "termUnit" ? OldLoanOffer[P] | null | undefined : OldLoanOffer[P];
+};
+type LoanOffer = FixNull<TempLoanOfferWithNulledFields>;
 export declare const loanOfferDecoder: Decoder<LoanOffer>;
 export declare const mortgageLoanTypeDecoder: Decoder<components["schemas"]["MortgageLoanType"]>;
 export declare const mortgageAdjustmentTypeDecoder: Decoder<components["schemas"]["MortgageAdjustmentType"]>;
@@ -34,7 +37,10 @@ export declare const savingsOfferDecoder: Decoder<FixNull<components["schemas"][
 export declare const specialOfferDecoder: Decoder<FixNull<components["schemas"]["SpecialOffer"]>>;
 export declare const pendingResponseDecoder: Decoder<FixNull<components["schemas"]["PendingResponse"]>>;
 type OldRateTable = components["schemas"]["RateTable"];
-export type FixedRateTable = FixNull<OldRateTable>;
+type TempRateTableWithNulledFields = {
+    [P in keyof OldRateTable]: P extends "loanOffers" ? Array<LoanOffer> : OldRateTable[P];
+};
+export type FixedRateTable = FixNull<TempRateTableWithNulledFields>;
 export declare const rateTableDecoder: Decoder<FixedRateTable>;
 export declare const leadUuidDecoder: Decoder<components["schemas"]["LeadUuid"]>;
 export {};

package/dist/decoders.js

@@ -119,8 +119,8 @@ export const loanOfferDecoder = object({
     sponsored: boolean(),
     maxAmount: number(),
     minAmount: optional(number()),
-    termLength: number(),
-    termUnit: termUnitDecoder,
+    termLength: optional(number()),
+    termUnit: optional(termUnitDecoder),
     displayTermUnit: optional(string()),
     termDescription: optional(string()),
     maxApr: optional(number()),

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@moneylion/engine-api",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "Interface to engine.tech API",
   "type": "module",
   "main": "dist/index.js",
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "tsc",
     "lint": "prettier . --check && eslint src/",
@@ -26,7 +28,8 @@
     "msw": "^2.2.10",
     "openapi-typescript": "^6.7.5",
     "prettier": "3.2.5",
-    "ts-jest": "^29.1.2"
+    "ts-jest": "^29.1.2",
+    "typescript": "^5.2.2"
   },
   "engines": {
     "node": ">=18"

package/dist/builders.d.ts

@@ -1,206 +0,0 @@
-import { components } from "./generated/schema";
-export type LeadCreateData = components["schemas"]["LeadCreateData"];
-export declare class LeadCreateBuilder {
-    private leadData;
-    constructor(startingData?: LeadCreateData);
-    build(): {
-        productTypes?: ("credit_card" | "insurance" | "life_insurance" | "loan" | "mortgage" | "savings" | "other")[] | undefined;
-        uuid?: string | undefined;
-        sessionUuid?: string | undefined;
-        loanInformation?: {
-            purpose?: "other" | "unknown" | "auto" | "auto_purchase" | "auto_refinance" | "baby" | "boat" | "business" | "car_repair" | "cosmetic" | "credit_card_refi" | "debt_consolidation" | "emergency" | "engagement" | "green" | "home_improvement" | "home_purchase" | "home_refi" | "household_expenses" | "large_purchases" | "life_event" | "medical_dental" | "motorcycle" | "moving_relocation" | "rv" | "special_occasion" | "student_loan" | "student_loan_refi" | "taxes" | "vacation" | "wedding" | undefined;
-            loanAmount?: number | undefined;
-        } | undefined;
-        personalInformation?: {
-            firstName?: string | undefined;
-            lastName?: string | undefined;
-            aliasFirstName?: string | undefined;
-            aliasLastName?: string | undefined;
-            email?: string | undefined;
-            city?: string | undefined;
-            state?: "AK" | "AL" | "AR" | "AZ" | "CA" | "CO" | "CT" | "DC" | "DE" | "FL" | "GA" | "HI" | "IA" | "ID" | "IL" | "IN" | "KS" | "KY" | "LA" | "MA" | "MD" | "ME" | "MI" | "MN" | "MO" | "MS" | "MT" | "NC" | "ND" | "NE" | "NH" | "NJ" | "NM" | "NV" | "NY" | "OH" | "OK" | "OR" | "PA" | "PR" | "RI" | "SC" | "SD" | "TN" | "TX" | "UT" | "VA" | "VI" | "VT" | "WA" | "WI" | "WV" | "WY" | undefined;
-            workPhone?: string | undefined;
-            primaryPhone?: string | undefined;
-            bestTimeToCall?: "morning" | "afternoon" | "evening" | "night" | undefined;
-            address1?: string | undefined;
-            address2?: string | undefined;
-            addressMoveInDate?: string | undefined;
-            zipcode?: string | undefined;
-            monthsAtAddress?: number | undefined;
-            driversLicenseNumber?: string | undefined;
-            driversLicenseState?: string | undefined;
-            ipAddress?: string | undefined;
-            activeMilitary?: boolean | undefined;
-            militaryVeteran?: boolean | undefined;
-            dateOfBirth?: string | undefined;
-            educationLevel?: "other" | "high_school" | "associate" | "bachelors" | "masters" | "doctorate" | "other_grad_degree" | "certificate" | "did_not_graduate" | "still_enrolled" | undefined;
-            ssn?: string | undefined;
-            citizenshipStatus?: "other" | "citizen" | "permanent_resident" | undefined;
-        } | undefined;
-        personalReferenceInformation?: {
-            firstName?: string | undefined;
-            lastName?: string | undefined;
-            primaryPhone?: string | undefined;
-            relationType?: "other" | "parent" | "employer" | "spouse" | "guardian" | "sibling" | "relative" | "friend" | undefined;
-        } | undefined;
-        mortgageInformation?: {
-            propertyType?: "rent" | "condo" | "multi_unit" | "single_family" | "townhouse" | undefined;
-            propertyValue?: number | undefined;
-            mortgageBalance?: number | undefined;
-            lenderName?: string | undefined;
-            hasFHALoan?: boolean | undefined;
-            currentWithLoan?: boolean | undefined;
-            propertyStatus?: "own_outright" | "own_with_mortgage" | "rent" | undefined;
-            mortgageType?: "purchase" | "refinance" | undefined;
-            mortgageAmount?: number | undefined;
-            downPaymentAmount?: number | undefined;
-            propertyState?: string | undefined;
-            propertyCounty?: string | undefined;
-            propertyAddress1?: string | undefined;
-            propertyAddress2?: string | undefined;
-            propertyZipcode?: string | undefined;
-            propertyCity?: string | undefined;
-            refinanceAmount?: number | undefined;
-            cashOutAmount?: number | undefined;
-            occupancyType?: "primary" | "secondary" | "investment" | undefined;
-            refinanceType?: "cash_out" | "rate_term" | undefined;
-            propertySearchStatus?: "found" | "not_found" | undefined;
-            numUnits?: number | undefined;
-            closingDate?: string | undefined;
-            purchaseStatus?: "no_offer" | "offer_accepted" | "offer_pending" | "under_contract" | undefined;
-            purchaseDate?: string | undefined;
-            monthlyHoaFee?: number | undefined;
-            mortgageCompany?: string | undefined;
-            mortgageEscrowAmount?: number | undefined;
-        } | undefined;
-        creditCardInformation?: {
-            allowAnnualFee?: boolean | undefined;
-            cardPurposes?: ("balance_transfer" | "cash_back" | "earning_rewards" | "improve_credit" | "low_interest" | "new_to_credit" | "student" | "travel_incentives")[] | undefined;
-        } | undefined;
-        savingsInformation?: {
-            minDepositAmount?: number | undefined;
-            maxDepositAmount?: number | undefined;
-        } | undefined;
-        creditInformation?: {
-            providedCreditRating?: "excellent" | "good" | "fair" | "poor" | "limited" | "unknown" | undefined;
-            providedNumericCreditScore?: number | undefined;
-        } | undefined;
-        financialInformation?: {
-            employmentStatus?: "other" | "employed" | "employed_full_time" | "employed_part_time" | "military" | "not_employed" | "self_employed" | "retired" | undefined;
-            employmentPayFrequency?: "monthly" | "weekly" | "biweekly" | "twice_monthly" | undefined;
-            annualIncome?: number | undefined;
-            monthlyNetIncome?: number | undefined;
-            bankName?: string | undefined;
-            bankRoutingNumber?: string | undefined;
-            bankAccountType?: "savings" | "other" | "checking" | undefined;
-            creditCardDebt?: number | undefined;
-            monthsAtBank?: number | undefined;
-            bankAccountNumber?: string | undefined;
-            monthlyDebt?: number | undefined;
-            totalAssets?: number | undefined;
-            monthlyHousingPayment?: number | undefined;
-            availableAssets?: number | undefined;
-            additionalIncome?: number | undefined;
-            additionalIncomeFrequency?: "monthly" | "weekly" | "biweekly" | "twice_monthly" | undefined;
-            hasDirectDeposit?: boolean | undefined;
-            totalUnsecuredDebt?: number | undefined;
-        } | undefined;
-        employmentInformation?: {
-            employerName?: string | undefined;
-            employerAddress?: string | undefined;
-            employerAddress2?: string | undefined;
-            employerCity?: string | undefined;
-            employerPhone?: string | undefined;
-            employerState?: string | undefined;
-            employerZip?: string | undefined;
-            jobTitle?: string | undefined;
-            monthsEmployed?: number | undefined;
-            directDeposit?: boolean | undefined;
-            payDate1?: string | undefined;
-            payDate2?: string | undefined;
-            startDate?: string | undefined;
-        } | undefined;
-        legalInformation?: {
-            consentsToFcra?: boolean | undefined;
-            consentsToSms?: boolean | undefined;
-            consentsToTcpa?: boolean | undefined;
-            fcraLanguage?: string | undefined;
-            tcpaLanguage?: string | undefined;
-        } | undefined;
-        educationInformation?: {
-            educationLevel?: "other" | "high_school" | "associate" | "bachelors" | "masters" | "doctorate" | "other_grad_degree" | "certificate" | "did_not_graduate" | "still_enrolled" | undefined;
-            graduateDegreeType?: "other" | "doctor_of_medicine" | "doctor_of_osteopathic_medicine" | "doctor_of_optometry" | "doctor_of_dental_medicine" | "dentariae_medicinae_doctoris" | "doctor_of_dental_surgery" | "doctor_of_veterinary_medicine" | "doctor_of_pharmacy" | "veterinariae_medicinae_doctoris" | "master_of_arts" | "master_of_science" | "master_of_research" | "master_of_research_project" | "master_of_studies" | "master_of_business_administration" | "master_of_library_science" | "master_of_public_administration" | "master_of_public_health" | "master_of_laws" | "master_of_arts_liberal_studies" | "master_of_fine_arts" | "master_of_music" | "master_of_education" | "master_of_engineering" | "master_of_architecture" | "juris_doctor" | undefined;
-            universityAttended?: string | undefined;
-            universityOpeId?: string | undefined;
-            graduationDate?: string | undefined;
-            graduateGraduationDate?: string | undefined;
-            graduateLastAttendedDate?: string | undefined;
-            graduateUniversityAttended?: string | undefined;
-            graduateUniversityOpeId?: string | undefined;
-            undergraduateGraduationDate?: string | undefined;
-            undergraduateLastAttendedDate?: string | undefined;
-            undergraduateUniversityAttended?: string | undefined;
-            undergraduateUniversityOpeId?: string | undefined;
-        } | undefined;
-        coApplicantInformation?: {
-            firstName?: string | undefined;
-            lastName?: string | undefined;
-            dateOfBirth?: string | undefined;
-            annualIncome?: number | undefined;
-            streetAddress1?: string | undefined;
-            streetAddress2?: string | undefined;
-            city?: string | undefined;
-            state?: "AK" | "AL" | "AR" | "AZ" | "CA" | "CO" | "CT" | "DC" | "DE" | "FL" | "GA" | "HI" | "IA" | "ID" | "IL" | "IN" | "KS" | "KY" | "LA" | "MA" | "MD" | "ME" | "MI" | "MN" | "MO" | "MS" | "MT" | "NC" | "ND" | "NE" | "NH" | "NJ" | "NM" | "NV" | "NY" | "OH" | "OK" | "OR" | "PA" | "PR" | "RI" | "SC" | "SD" | "TN" | "TX" | "UT" | "VA" | "VI" | "VT" | "WA" | "WI" | "WV" | "WY" | undefined;
-            zipcode?: string | undefined;
-        } | undefined;
-        healthInformation?: {
-            gender?: "male" | "female" | undefined;
-            heightInInches?: number | undefined;
-            weightInPounds?: number | undefined;
-            tobaccoSmoker?: boolean | undefined;
-        } | undefined;
-        refinanceLoans?: {
-            accountNumber?: string | undefined;
-            incomeBasedRepayment?: boolean | undefined;
-            interestRate?: number | undefined;
-            loanAmount?: number | undefined;
-            loanServicer?: string | undefined;
-            loanType?: "federal_student_loan" | "private_student_loan" | undefined;
-            nextPaymentAmount?: number | undefined;
-            nextPaymentDate?: string | undefined;
-        }[] | undefined;
-        identificationInformation?: {
-            idNumber?: string | undefined;
-            idState?: string | undefined;
-            idType?: "driver_license" | "state_id" | "passport" | undefined;
-        } | undefined;
-        clientTags?: {
-            [key: string]: string[];
-        } | undefined;
-        sessionInformation?: {
-            ipAddress?: string | undefined;
-            userAgent?: string | undefined;
-        } | undefined;
-        formCompleted?: boolean | undefined;
-        referralCompanyUuid?: string | undefined;
-        trackingUuid?: string | undefined;
-    };
-    productTypes(types: components["schemas"]["ProductType"][]): this;
-    loanInformation(loanInfo: components["schemas"]["LeadLoanInformation"]): this;
-    personalInformation(personalInfo: components["schemas"]["LeadPersonalInformation"]): this;
-    personalReferenceInformation(pRefInfo: components["schemas"]["PersonalReferenceInformation"]): this;
-    mortgageInformation(mortgageInfo: components["schemas"]["LeadMortgageInformation"]): this;
-    creditCardInformation(creditCardInformation: components["schemas"]["LeadCreditCardInformation"]): this;
-    savingsInformation(savingsInformation: components["schemas"]["LeadSavingsInformation"]): this;
-    creditInformation(creditInformation: components["schemas"]["LeadCreditInformation"]): this;
-    financialInformation(financialInformation: components["schemas"]["LeadFinancialInformation"]): this;
-    employmentInformation(employmentInformation: components["schemas"]["LeadEmploymentInformation"]): this;
-    legalInformation(legalInformation: components["schemas"]["LeadLegalInformation"]): this;
-    educationInformation(educationInformation: components["schemas"]["LeadEducationInformation"]): this;
-    coApplicantInformation(coApplicantInformation: components["schemas"]["LeadCoApplicantInformation"]): this;
-    healthInformation(healthInformation: components["schemas"]["LeadHealthInformation"]): this;
-    refinanceLoans(refinanceLoans: components["schemas"]["RefinanceLoanInformation"][]): this;
-    identificationInformation(identificationInformation: components["schemas"]["LeadIdentificationInformation"]): this;
-    clientTags(clientTags: components["schemas"]["ClientTags"]): this;
-    sessionInformation(sessionInformation: components["schemas"]["LeadSessionInformation"]): this;
-}

package/dist/builders.js

@@ -1,80 +0,0 @@
-export class LeadCreateBuilder {
-    constructor(startingData = {}) {
-        this.leadData = startingData;
-    }
-    build() {
-        return this.leadData;
-    }
-    productTypes(types) {
-        this.leadData.productTypes = types;
-        return this;
-    }
-    loanInformation(loanInfo) {
-        this.leadData.loanInformation = loanInfo;
-        return this;
-    }
-    personalInformation(personalInfo) {
-        this.leadData.personalInformation = personalInfo;
-        return this;
-    }
-    personalReferenceInformation(pRefInfo) {
-        this.leadData.personalReferenceInformation = pRefInfo;
-        return this;
-    }
-    mortgageInformation(mortgageInfo) {
-        this.leadData.mortgageInformation = mortgageInfo;
-        return this;
-    }
-    creditCardInformation(creditCardInformation) {
-        this.leadData.creditCardInformation = creditCardInformation;
-        return this;
-    }
-    savingsInformation(savingsInformation) {
-        this.leadData.savingsInformation = savingsInformation;
-        return this;
-    }
-    creditInformation(creditInformation) {
-        this.leadData.creditInformation = creditInformation;
-        return this;
-    }
-    financialInformation(financialInformation) {
-        this.leadData.financialInformation = financialInformation;
-        return this;
-    }
-    employmentInformation(employmentInformation) {
-        this.leadData.employmentInformation = employmentInformation;
-        return this;
-    }
-    legalInformation(legalInformation) {
-        this.leadData.legalInformation = legalInformation;
-        return this;
-    }
-    educationInformation(educationInformation) {
-        this.leadData.educationInformation = educationInformation;
-        return this;
-    }
-    coApplicantInformation(coApplicantInformation) {
-        this.leadData.coApplicantInformation = coApplicantInformation;
-        return this;
-    }
-    healthInformation(healthInformation) {
-        this.leadData.healthInformation = healthInformation;
-        return this;
-    }
-    refinanceLoans(refinanceLoans) {
-        this.leadData.refinanceLoans = refinanceLoans;
-        return this;
-    }
-    identificationInformation(identificationInformation) {
-        this.leadData.identificationInformation = identificationInformation;
-        return this;
-    }
-    clientTags(clientTags) {
-        this.leadData.clientTags = clientTags;
-        return this;
-    }
-    sessionInformation(sessionInformation) {
-        this.leadData.sessionInformation = sessionInformation;
-        return this;
-    }
-}