Merge branch 'strict'

src/fieldsArray.ts

@@ -11,6 +11,8 @@ const fieldsDebug = debug("passkit:fields");
 const poolSymbol = Symbol("pool");
 
 export default class FieldsArray extends Array {
+	private [poolSymbol]: Set<string>;
+
 	constructor(pool: Set<string>, ...args: any[]) {
 		super(...args);
 		this[poolSymbol] = pool;

src/parser.ts

@@ -107,7 +107,7 @@ export async function getModelFolderContents(model: string): Promise<Partitioned
 		if (!isModelInitialized) {
 			throw new Error(formatMessage(
 				"MODEL_UNINITIALIZED",
-				path.parse(this.model).name
+				path.parse(model).name
 			));
 		}
 
@@ -231,6 +231,8 @@ export function getModelBufferContents(model: BundleUnit): PartitionedBundle {
  * @param options
  */
 
+type flatCertificates = Omit<Certificates, "signerKey"> & { signerKey: string; [key: string]: string };
+
 export async function readCertificatesFromOptions(options: Certificates): Promise<FinalCertificates> {
 	if (!(options && Object.keys(options).length && isValid(options, "certificatesSchema"))) {
 		throw new Error(formatMessage("CP_NO_CERTS"));
@@ -240,11 +242,13 @@ export async function readCertificatesFromOptions(options: Certificates): Promis
 	// all the real contents and don't care of passphrase
 	const flattenedDocs = Object.assign({}, options, {
 		signerKey: (
-			typeof options.signerKey === "string"
+			options.signerKey && typeof options.signerKey === "string" &&
-			? options.signerKey
+			options.signerKey || (
-			: options.signerKey.keyFile
+				options.signerKey &&
+				options.signerKey.keyFile
 			)
-	});
+		)
+	}) as flatCertificates;
 
 	// We read the contents
 	const rawContentsPromises = Object.keys(flattenedDocs)

src/pass.ts

@@ -30,13 +30,15 @@ export class Pass {
 	private [passProps]: schema.ValidPass = {};
 	private type: keyof schema.ValidPassType;
 	private fieldsKeys: Set<string> = new Set<string>();
-	private passCore: schema.ValidPass = {};
+	private passCore: schema.ValidPass;
 
-	public headerFields: FieldsArray;
+	// Setting these as possibly undefined because we set
-	public primaryFields: FieldsArray;
+	// them all in an loop later
-	public secondaryFields: FieldsArray;
+	public headerFields: FieldsArray | undefined;
-	public auxiliaryFields: FieldsArray;
+	public primaryFields: FieldsArray | undefined;
-	public backFields: FieldsArray;
+	public secondaryFields: FieldsArray | undefined;
+	public auxiliaryFields: FieldsArray | undefined;
+	public backFields: FieldsArray | undefined;
 
 	private Certificates: schema.FinalCertificates;
 	private [transitType]: string = "";
@@ -72,7 +74,8 @@ export class Pass {
 		}
 
 		// Parsing and validating pass.json keys
-		const validatedPassKeys = Object.keys(this.passCore).reduce((acc, current) => {
+		const passCoreKeys = Object.keys(this.passCore) as (keyof schema.ValidPass)[];
+		const validatedPassKeys = passCoreKeys.reduce((acc, current) => {
 			if (this.type === current) {
 				// We want to exclude type keys (eventTicket,
 				// boardingPass, ecc.) and their content
@@ -86,10 +89,13 @@ export class Pass {
 				return { ...acc, [current]: this.passCore[current] };
 			}
 
-			const currentSchema = propsSchemaMap.get(current);
+			const currentSchema = propsSchemaMap.get(current)!;
 
 			if (Array.isArray(this.passCore[current])) {
-				const valid = getValidInArray(currentSchema, this.passCore[current]);
+				const valid = getValidInArray<schema.ArrayPassSchema>(
+					currentSchema,
+					this.passCore[current] as schema.ArrayPassSchema[]
+				);
 				return { ...acc, [current]: valid };
 			} else {
 				return {
@@ -201,7 +207,7 @@ export class Pass {
 		* and returning the compiled manifest
 		*/
 		const archive = new ZipFile();
-		const manifest = Object.keys(finalBundle).reduce((acc, current) => {
+		const manifest = Object.keys(finalBundle).reduce<schema.Manifest>((acc, current) => {
 			let hashFlow = forge.md.sha1.create();
 
 			hashFlow.update(finalBundle[current].toString("binary"));
@@ -508,7 +514,7 @@ export class Pass {
 	 * @returns {Buffer}
 	 */
 
-	private _sign(manifest: { [key: string]: string }): Buffer {
+	private _sign(manifest: schema.Manifest): Buffer {
 		const signature = forge.pkcs7.createSignedData();
 
 		signature.content = forge.util.createBuffer(JSON.stringify(manifest), "utf8");
@@ -581,8 +587,8 @@ export class Pass {
 			 * and then delete it from the passFile.
 			 */
 
-			["backgroundColor", "foregroundColor", "labelColor"]
+			const passColors = ["backgroundColor", "foregroundColor", "labelColor"] as Array<keyof schema.PassColors>;
-				.filter(v => this[passProps][v] && !isValidRGB(this[passProps][v]))
+			passColors.filter(v => this[passProps][v] && !isValidRGB(this[passProps][v]))
 				.forEach(v => delete this[passProps][v]);
 
 			Object.assign(passFile, this[passProps]);
@@ -634,7 +640,7 @@ function barcodesFromUncompleteData(message: string): schema.Barcode[] {
 		"PKBarcodeFormatPDF417",
 		"PKBarcodeFormatAztec",
 		"PKBarcodeFormatCode128"
-	].map(format => schema.getValidated({ format, message }, "barcode"));
+	].map(format => schema.getValidated({ format, message }, "barcode") as schema.Barcode);
 }
 
 function processRelevancySet<T>(key: string, data: T[]): T[] {

src/schema.ts

@@ -3,6 +3,10 @@ import debug from "debug";
 
 const schemaDebug = debug("Schema");
 
+export interface Manifest {
+	[key: string]: string;
+}
+
 export interface Certificates {
 	wwdr?: string;
 	signerCert?: string;
@@ -71,7 +75,7 @@ export interface OverridesSupportedOptions {
 	teamIdentifier?: string;
 	appLaunchURL?: string;
 	associatedStoreIdentifiers?: Array<number>;
-	userInfo?: Object | Array<any>;
+	userInfo?: { [key: string]: any };
 	webServiceURL?: string;
 	authenticationToken?: string;
 	sharingProhibited?: boolean;
@@ -294,7 +298,7 @@ export interface ValidPassType {
 	storeCard?: PassFields;
 }
 
-export interface ValidPass extends OverridesSupportedOptions, ValidPassType {
+interface PassInterfacesProps {
 	barcode?: Barcode;
 	barcodes?: Barcode[];
 	beacons?: Beacon[];
@@ -306,6 +310,12 @@ export interface ValidPass extends OverridesSupportedOptions, ValidPassType {
 	voided?: boolean;
 }
 
+type AllPassProps = PassInterfacesProps & ValidPassType & OverridesSupportedOptions;
+export type ValidPass = {
+	[K in keyof AllPassProps]: AllPassProps[K];
+};
+export type PassColors = Pick<OverridesSupportedOptions, "backgroundColor" | "foregroundColor" | "labelColor">;
+
 export interface Barcode {
 	altText?: string;
 	messageEncoding?: string;
@@ -464,6 +474,7 @@ const schemas = {
 };
 
 export type Schema = keyof typeof schemas;
+export type ArrayPassSchema = Beacon | Location | Barcode;
 
 function resolveSchemaName(name: Schema) {
 	return schemas[name] || undefined;
@@ -500,7 +511,7 @@ export function isValid(opts: any, schemaName: Schema): boolean {
  * @returns {object} the filtered value or empty object
  */
 
-export function getValidated<T extends Object>(opts: any, schemaName: Schema): T {
+export function getValidated<T extends Object>(opts: any, schemaName: Schema): T | null {
 	const resolvedSchema = resolveSchemaName(schemaName);
 
 	if (!resolvedSchema) {

src/utils.ts

@@ -11,7 +11,7 @@ import { sep } from "path";
  * @returns {Boolean} True if valid rgb, false otherwise
  */
 
-export function isValidRGB(value: string): boolean {
+export function isValidRGB(value?: string): boolean {
 	if (!value || typeof value !== "string") {
 		return false;
 	}
@@ -89,10 +89,14 @@ export function generateStringFile(lang: { [index: string]: string }): Buffer {
  * @param origin
  */
 
-export function splitBufferBundle(origin: Object): [PartitionedBundle["l10nBundle"], PartitionedBundle["bundle"]] {
+type PartitionedBundleElements = [PartitionedBundle["l10nBundle"], PartitionedBundle["bundle"]];
-	const keys = Object.keys(origin);
+
-	return keys.reduce(([ l10n, bundle ], current) => {
+export function splitBufferBundle(origin: any): PartitionedBundleElements {
-		if (current.includes(".lproj")) {
+	return Object.keys(origin).reduce<PartitionedBundleElements>(([ l10n, bundle ], current) => {
+		if (!current.includes(".lproj")) {
+			return [ l10n, { ...bundle, [current]: origin[current] }];
+		}
+
 		const pathComponents = current.split(sep);
 		const lang = pathComponents[0];
 		const file = pathComponents.slice(1).join("/");
@@ -100,9 +104,6 @@ export function splitBufferBundle(origin: Object): [PartitionedBundle["l10nBundl
 		(l10n[lang] || (l10n[lang] = {}))[file] = origin[current];
 
 		return [ l10n, bundle ];
-		} else {
-			return [ l10n, { ...bundle, [current]: origin[current] }];
-		}
 	}, [{},{}]);
 }