@zentered/issue-forms-body-parser 1.1.2 → 1.2.0

package/dist/index.js

@@ -51888,9 +51888,25 @@ function getDateTimeFormat(timeZone) {
   return dtfCache[timeZone]
 }
 
+;// CONCATENATED MODULE: ./node_modules/date-fns-tz/esm/_lib/newDateUTC/index.js
+/**
+ * Use instead of `new Date(Date.UTC(...))` to support years below 100 which doesn't work
+ * otherwise due to the nature of the
+ * [`Date` constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#interpretation_of_two-digit_years.
+ *
+ * For `Date.UTC(...)`, use `newDateUTC(...).getTime()`.
+ */
+function newDateUTC(fullYear, month, day, hour, minute, second, millisecond) {
+  var utcDate = new Date(0)
+  utcDate.setUTCFullYear(fullYear, month, day)
+  utcDate.setUTCHours(hour, minute, second, millisecond)
+  return utcDate
+}
+
 ;// CONCATENATED MODULE: ./node_modules/date-fns-tz/esm/_lib/tzParseTimezone/index.js
 
 
+
 var MILLISECONDS_IN_HOUR = 3600000
 var MILLISECONDS_IN_MINUTE = 60000
 
@@ -51961,23 +51977,30 @@ function tzParseTimezone(timezoneString, date, isUtcDate) {
 }
 
 function toUtcDate(date) {
-  return new Date(
-    Date.UTC(
-      date.getFullYear(),
-      date.getMonth(),
-      date.getDate(),
-      date.getHours(),
-      date.getMinutes(),
-      date.getSeconds(),
-      date.getMilliseconds()
-    )
+  return newDateUTC(
+    date.getFullYear(),
+    date.getMonth(),
+    date.getDate(),
+    date.getHours(),
+    date.getMinutes(),
+    date.getSeconds(),
+    date.getMilliseconds()
   )
 }
 
 function calcOffset(date, timezoneString) {
   var tokens = tzTokenizeDate(date, timezoneString)
 
-  var asUTC = Date.UTC(tokens[0], tokens[1] - 1, tokens[2], tokens[3] % 24, tokens[4], tokens[5])
+  // ms dropped because it's not provided by tzTokenizeDate
+  var asUTC = newDateUTC(
+    tokens[0],
+    tokens[1] - 1,
+    tokens[2],
+    tokens[3] % 24,
+    tokens[4],
+    tokens[5],
+    0
+  ).getTime()
 
   var asTS = date.getTime()
   var over = asTS % 1000
@@ -52013,10 +52036,7 @@ function fixOffset(date, offset, timezoneString) {
 }
 
 function validateTimezone(hours, minutes) {
-  return (
-    (hours === 12 && (minutes == null || minutes === 0)) ||
-    (-11 <= hours && hours <= 11 && (minutes == null || (0 <= minutes && minutes < 59)))
-  )
+  return -23 <= hours && hours <= 23 && (minutes == null || (0 <= minutes && minutes <= 59))
 }
 
 var validIANATimezoneCache = {}
@@ -52497,6 +52517,7 @@ function validateTime(hours, minutes, seconds) {
 
 
 
+
 /**
  * @name zonedTimeToUtc
  * @category Time Zone Helpers
@@ -52530,7 +52551,7 @@ function zonedTimeToUtc(date, timeZone, options) {
 
   var d = toDate(date, options)
 
-  var utc = Date.UTC(
+  var utc = newDateUTC(
     d.getFullYear(),
     d.getMonth(),
     d.getDate(),
@@ -52538,7 +52559,7 @@ function zonedTimeToUtc(date, timeZone, options) {
     d.getMinutes(),
     d.getSeconds(),
     d.getMilliseconds()
-  )
+  ).getTime()
 
   var offsetMilliseconds = tzParseTimezone(timeZone, new Date(utc))
 
@@ -52705,7 +52726,7 @@ function formatTimezone(offset, dirtyDelimeter) {
   var sign = offset > 0 ? '-' : '+'
   var absOffset = Math.abs(offset)
   var hours = addLeadingZeros(Math.floor(absOffset / 60), 2)
-  var minutes = addLeadingZeros(absOffset % 60, 2)
+  var minutes = addLeadingZeros(Math.floor(absOffset % 60), 2)
   return sign + hours + delimeter + minutes
 }
 
@@ -53166,6 +53187,7 @@ function formatInTimeZone(date, timeZone, formatStr, options) {
 
 
 
+
 // if the system time is not UTC, we need to convert it to UTC
 
 const loc = 'UTC'
@@ -53180,17 +53202,30 @@ const commonDateFormats = [
   'dd.MM.yy'
 ]
 
-const commonTimeFormats = ['HH:mm', 'hh:mm a', 'hh:mm A']
+const commonTimeFormats = ['HH:mm', 'HH.mm', 'hh:mm a', 'hh:mm A']
+
+function parseDuration(text) {
+  const duration = {
+    hours: 0,
+    minutes: 0
+  }
+
+  const pieces = text.replace('m', '').split('h')
+  duration.hours = parseInt(pieces[0]) ? parseInt(pieces[0]) : 0
+  duration.minutes = parseInt(pieces[1]) ? parseInt(pieces[1]) : 0
+  return duration
+}
 
 function parse_parseDate(text) {
   const match = commonDateFormats.map((format) => {
     return (0,date_fns.isMatch)(text, format)
   })
   if (match.indexOf(true) > -1) {
-    return zonedTimeToUtc(
+    const date = zonedTimeToUtc(
       (0,date_fns.parse)(text, commonDateFormats[match.indexOf(true)], new Date()),
       loc
     ).toJSON()
+    return date.split('T')[0]
   } else {
     return null
   }
@@ -53252,10 +53287,12 @@ async function parseMD(body) {
     const current = tokens.children[idx]
     const hasNext = idx + 1 < tokens.children.length
 
-    const obj = {}
     if (current.type === 'heading') {
-      obj.id = slugify(current.children[0].value)
-      obj.title = current.children[0].value
+      // issue-form answers start with a h3 heading, ignore everything else
+      const obj = {
+        id: slugify(current.children[0].value),
+        title: current.children[0].value
+      }
       if (hasNext) {
         const next = tokens.children[idx + 1]
         if (next.type === 'list') {
@@ -53273,9 +53310,12 @@ async function parseMD(body) {
         if (time) {
           obj.time = time
         }
+        if (obj.id === 'duration') {
+          obj.duration = parseDuration(obj.text)
+        }
       }
+      r.push(obj)
     }
-    r.push(obj)
   }
 
   return r

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zentered/issue-forms-body-parser",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "private": false,
   "description": "Parser for GitHub Issue Form body, also available as GitHub Action",
   "keywords": [
@@ -55,10 +55,10 @@
   },
   "dependencies": {
     "@actions/core": "^1.6.0",
-    "@actions/github": "^5.0.0",
+    "@actions/github": "^5.0.1",
     "@sindresorhus/slugify": "^2.1.0",
     "date-fns": "^2.28.0",
-    "date-fns-tz": "^1.3.0",
+    "date-fns-tz": "^1.3.3",
     "remark-gfm": "^3.0.1",
     "remark-parse": "^10.0.1",
     "remark-stringify": "^10.0.2",
@@ -68,15 +68,15 @@
     "@commitlint/config-conventional": "^16.2.1",
     "@vercel/ncc": "^0.33.3",
     "commitlint": "^16.2.3",
-    "eslint": "^8.11.0",
+    "eslint": "^8.12.0",
     "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-node": "^11.1.0",
     "husky": "^7.0.4",
     "license-checker": "^25.0.1",
     "npm-run-all": "^4.1.5",
     "pinst": "^3.0.0",
-    "prettier": "^2.6.0",
-    "tap": "^16.0.0"
+    "prettier": "^2.6.2",
+    "tap": "^16.0.1"
   },
   "release": {
     "branches": [

package/src/parse.js

@@ -6,6 +6,7 @@ import remarkGfm from 'remark-gfm'
 import slugify from '@sindresorhus/slugify'
 import remarkStringify from 'remark-stringify'
 import { parse, isMatch } from 'date-fns'
+
 // if the system time is not UTC, we need to convert it to UTC
 import { zonedTimeToUtc, formatInTimeZone } from 'date-fns-tz/esm'
 const loc = 'UTC'
@@ -20,17 +21,30 @@ const commonDateFormats = [
   'dd.MM.yy'
 ]
 
-const commonTimeFormats = ['HH:mm', 'hh:mm a', 'hh:mm A']
+const commonTimeFormats = ['HH:mm', 'HH.mm', 'hh:mm a', 'hh:mm A']
+
+function parseDuration(text) {
+  const duration = {
+    hours: 0,
+    minutes: 0
+  }
+
+  const pieces = text.replace('m', '').split('h')
+  duration.hours = parseInt(pieces[0]) ? parseInt(pieces[0]) : 0
+  duration.minutes = parseInt(pieces[1]) ? parseInt(pieces[1]) : 0
+  return duration
+}
 
 function parseDate(text) {
   const match = commonDateFormats.map((format) => {
     return isMatch(text, format)
   })
   if (match.indexOf(true) > -1) {
-    return zonedTimeToUtc(
+    const date = zonedTimeToUtc(
       parse(text, commonDateFormats[match.indexOf(true)], new Date()),
       loc
     ).toJSON()
+    return date.split('T')[0]
   } else {
     return null
   }
@@ -92,10 +106,12 @@ export default async function parseMD(body) {
     const current = tokens.children[idx]
     const hasNext = idx + 1 < tokens.children.length
 
-    const obj = {}
     if (current.type === 'heading') {
-      obj.id = slugify(current.children[0].value)
-      obj.title = current.children[0].value
+      // issue-form answers start with a h3 heading, ignore everything else
+      const obj = {
+        id: slugify(current.children[0].value),
+        title: current.children[0].value
+      }
       if (hasNext) {
         const next = tokens.children[idx + 1]
         if (next.type === 'list') {
@@ -113,9 +129,12 @@ export default async function parseMD(body) {
         if (time) {
           obj.time = time
         }
+        if (obj.id === 'duration') {
+          obj.duration = parseDuration(obj.text)
+        }
       }
+      r.push(obj)
     }
-    r.push(obj)
   }
 
   return r

package/test/parse-issue.test.js

@@ -23,10 +23,15 @@ test('parse(md) should parse GitHub Issue Form data into useful, structured data
       id: 'date',
       title: 'Date',
       text: '11.03.2022\n',
-      date: '2022-03-11T00:00:00.000Z'
+      date: '2022-03-11'
     },
     { id: 'time', title: 'Time', text: '16:00\n', time: '16:00' },
-    { id: 'duration', title: 'Duration', text: '2h\n' },
+    {
+      id: 'duration',
+      title: 'Duration',
+      text: '2h\n',
+      duration: { hours: 2, minutes: 0 }
+    },
     {
       id: 'list-item-checked',
       title: 'List Item Checked',
@@ -90,3 +95,15 @@ test('parse(md) should parse GitHub Issue Form data into useful, structured data
   // console.log(JSON.stringify(actual, null, 0))
   t.deepEqual(actual, expected)
 })
+
+test('parse(md) return nothing', async (t) => {
+  const expected = []
+
+  const md = await readFile(
+    join(process.cwd(), 'test', 'test-issue-2.md'),
+    'utf8'
+  )
+  const actual = await fn(md)
+  // console.log(JSON.stringify(actual, null, 0))
+  t.deepEqual(actual, expected)
+})

package/test/test-issue-2.md

@@ -0,0 +1,10 @@
+---
+startDate: 10.03.2022
+startTime: 10.00
+duration: 1h
+location: online
+---
+
+Let's chat about tech, coding and Cyprus.
+
+https://discord.gg/qA7wHjbs?event=948887583507755048