Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies and minimum Node.js version #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update dependencies and minimum Node.js version #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa0d1a4
Update minimum node version to 16
corys Nov 3, 2023
e44f607
Bump version to 2.2.0
corys Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ chartSupplements.currentCycleEffectiveDates().then(c => {

// The `getNextCycle` option will get the next cycle if it is available when set to true
// If it is omitted or set to false, the current cycle will be queried
chartSupplements.list(['PANC', 'PADK'], { getNextCycle: false, }).then(results => {
chartSupplements.list(['PANC', 'PADK'], { getNextCycle: false }).then(results => {
console.log(JSON.stringify(results, null, 2))
})
31 changes: 15 additions & 16 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ chartSupplements.currentCycleEffectiveDates = async () => {
.retry(3)

const $ = cheerio.load(response.text)
var currentCycle = $('select#cycle > option:contains(Current)').text()
const currentCycle = $('select#cycle > option:contains(Current)').text()
return parseEffectiveDates(currentCycle.replace(/(\n|\t)/gm, ''))
}

Expand Down Expand Up @@ -68,12 +68,12 @@ const fetchCycle = async (cycle = 'Current') => {
chartSupplements.fetchCycle = fetchCycle

chartSupplements.getCycleEffectiveDates = async (cycle = 'Current') => {
const { text: currentCycle, } = await fetchCycle(cycle)
const { text: currentCycle } = await fetchCycle(cycle)
return parseEffectiveDates(currentCycle.replace(/(\n|\t)/gm, ''))
}

chartSupplements.currentCycleEffectiveDates = async () => {
const { text: currentCycle, } = await fetchCycle()
const { text: currentCycle } = await fetchCycle()
if (!currentCycle) {
console.warn('Could not retrieve current cycle effective dates')
return
Expand Down Expand Up @@ -129,7 +129,7 @@ const listOne = async (icao, options) => {
}

// Build up a base set of query params
let urlParams = [ `ident=${icao}`, ]
const urlParams = [`ident=${icao}`]
// The searchCycle is optional as the API assumes the latest already
// and this function uses the latest cycle
if (searchCycle) {
Expand Down Expand Up @@ -200,24 +200,23 @@ const parse = async (html, isNextCycle) => {
if (!!noResultsFound && noResultsFound === 'No results found.') {
console.warn(noResultsFound)
return null
}
else if (!$resultsTable.html()) {
} else if (!$resultsTable.html()) {
console.error('Unable to parse the #resultsTable page element')
return null
}

const { effectiveStartDate, effectiveEndDate, } = await chartSupplements.getCycleEffectiveDates(isNextCycle ? 'Next': 'Current')
const { effectiveStartDate, effectiveEndDate } = await chartSupplements.getCycleEffectiveDates(isNextCycle ? 'Next' : 'Current')

const results = $resultsTable
.find('tr')
.toArray()
.map(row => {
var row = extractRow($(row))
if (!row) {
return row
const chart = extractRow($(row))
if (!chart) {
return chart
}
return {
...row,
...chart,
effectiveStartDate,
effectiveEndDate
}
Expand All @@ -231,15 +230,15 @@ const parseEffectiveDates = str => {
if (!str) {
return null
}
const [ startMonthDay, remainder ] = str.split('-')
const [ endMonthDay, yearAndCycle ] = remainder.split(',')
const [ year, _ ] = yearAndCycle.split('[')
const [startMonthDay, remainder] = str.split('-')
const [endMonthDay, yearAndCycle] = remainder.split(',')
const [year] = yearAndCycle.split('[')

const effectiveStartDate = new Date(`${startMonthDay.trim()} ${year}`)
effectiveStartDate.setUTCHours(0,0,0,0)
effectiveStartDate.setUTCHours(0, 0, 0, 0)

const effectiveEndDate = new Date(`${endMonthDay.trim()} ${year}`)
effectiveEndDate.setUTCHours(0,0,0,0)
effectiveEndDate.setUTCHours(0, 0, 0, 0)

return { effectiveStartDate, effectiveEndDate }
}
Loading