marcogll/passkit-generator
1
0
Fork 0
mirror of https://github.com/marcogll/passkit-generator.git synced 2026-03-15 21:25:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved how pass props are loaded from overrides and pass.json

Browse Source
This commit is contained in:
Alexander Cerutti
2019-06-30 02:03:24 +02:00
parent c61921721e
commit 4546774916
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/pass.ts
View File

@@ -72,29 +72,25 @@ export class Pass implements PassIndexSignature {
throw new Error(formatMessage("OVV_KEYS_BADFORMAT")) throw new Error(formatMessage("OVV_KEYS_BADFORMAT"))
} }
this._props = [ this[passProps] = {
...(
[
"barcodes", "barcode", "barcodes", "barcode",
"expirationDate", "voided", "expirationDate", "voided",
"beacons", "locations", "beacons", "locations",
"relevantDate", "nfc" "relevantDate", "nfc"
].reduce<schema.ValidPass>((acc, current) => { ].reduce<schema.ValidPass>((acc, current) =>
if (!this.passCore[current]) { !this.passCore.hasOwnProperty(current) && acc ||
return acc; ({ ...acc, [current]: this.passCore[current] || undefined })
} , {})
),
acc[current] = this.passCore[current]; ...(validOverrides || {})
return acc; };
}, {});
if (Object.keys(validOverrides).length) {
this._props = { ...this._props, ...validOverrides };
}
this.type = Object.keys(this.passCore) this.type = Object.keys(this.passCore)
.find(key => /(boardingPass|eventTicket|coupon|generic|storeCard)/.test(key)) as keyof schema.ValidPassType; .find(key => /(boardingPass|eventTicket|coupon|generic|storeCard)/.test(key)) as keyof schema.ValidPassType;
if (!this.type) { if (!this.type) {
// @TODO: change error message to say it is invalid or missing
throw new Error(formatMessage("NO_PASS_TYPE")); throw new Error(formatMessage("NO_PASS_TYPE"));
} }