From da86956583f93810f8198eb3f53612d5c06150fb Mon Sep 17 00:00:00 2001 From: Alexander Cerutti Date: Mon, 21 Jun 2021 22:06:00 +0200 Subject: [PATCH] Improved spaces, types and casting --- src/pass.ts | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/pass.ts b/src/pass.ts index 688017c..a15ed08 100644 --- a/src/pass.ts +++ b/src/pass.ts @@ -40,13 +40,11 @@ export class Pass { private fieldsKeys: Set = new Set(); private passCore: Schemas.ValidPass; - // Setting these as possibly undefined because we set - // them all in an loop later - public headerFields: FieldsArray | undefined; - public primaryFields: FieldsArray | undefined; - public secondaryFields: FieldsArray | undefined; - public auxiliaryFields: FieldsArray | undefined; - public backFields: FieldsArray | undefined; + public headerFields: FieldsArray; + public primaryFields: FieldsArray; + public secondaryFields: FieldsArray; + public auxiliaryFields: FieldsArray; + public backFields: FieldsArray; private Certificates: Schemas.CertificatesSchema; private [transitType]: string = ""; @@ -93,6 +91,7 @@ export class Pass { const passCoreKeys = Object.keys( this.passCore, ) as (keyof Schemas.ValidPass)[]; + const validatedPassKeys = passCoreKeys.reduce( (acc, current) => { if (this.type === current) { @@ -115,7 +114,11 @@ export class Pass { currentSchema, this.passCore[current] as Schemas.ArrayPassSchema[], ); - return { ...acc, [current]: valid }; + + return { + ...acc, + [current]: valid, + }; } else { return { ...acc, @@ -195,7 +198,7 @@ export class Pass { ); } - const finalBundle = { ...this.bundle } as Schemas.BundleUnit; + const finalBundle: Schemas.BundleUnit = { ...this.bundle }; /** * Iterating through languages and generating pass.string file @@ -488,7 +491,7 @@ export class Pass { return acc; } - return [...acc, validated] as Schemas.Barcode[]; + return [...acc, validated]; }, [], ); @@ -669,17 +672,15 @@ function barcodesFromUncompleteData(message: string): Schemas.Barcode[] { return []; } - return [ - "PKBarcodeFormatQR", - "PKBarcodeFormatPDF417", - "PKBarcodeFormatAztec", - "PKBarcodeFormatCode128", - ].map( - (format) => - Schemas.getValidated( - { format, message }, - Schemas.Barcode, - ) as Schemas.Barcode, + return ( + [ + "PKBarcodeFormatQR", + "PKBarcodeFormatPDF417", + "PKBarcodeFormatAztec", + "PKBarcodeFormatCode128", + ] as Array + ).map((format) => + Schemas.getValidated({ format, message }, Schemas.Barcode), ); }