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

package/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,59 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '29 21 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

package/README.md

@@ -2,7 +2,6 @@
 
 ![Test](https://github.com/zentered/issue-forms-body-parser/workflows/Test/badge.svg)
 ![Release](https://github.com/zentered/issue-forms-body-parser/workflows/Publish/badge.svg)
-![Semantic Release](https://github.com/zentered/issue-forms-body-parser/workflows/Semantic%20Release/badge.svg)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
 [![zentered.co](https://img.shields.io/badge/%3E-zentered.co-blue.svg?style=flat)](https://zentered.co)
 
@@ -21,9 +20,9 @@ and provides structured data to create calendar entries (ie `.ics` files for
 [calendar subscriptions with GitEvents](https://github.com/gitevents/ics)),
 calling 3rd party APIs, etc.
 
-\_Inspired by:
+_Inspired by:
 [Peter Murray's Issue Forms Body Parser](https://github.com/peter-murray/issue-forms-body-parser)
-with valuable feedback from [Steffen](https://gist.github.com/steffen)\_
+with valuable feedback from [Steffen](https://gist.github.com/steffen)_
 
 ## Features
 
@@ -62,30 +61,47 @@ Cafe Nero Finikoudes, Larnaka
 to structured, usable data:
 
 ```json
-[
-  {
-    "id": "event-description",
+{
+  "event-description": {
+    "order": 0,
     "title": "Event Description",
-    "text": "Let's meet for coffee and chat about tech, coding, Cyprus and the newly formed\nCDC (Cyprus Developer Community).\n"
+    "text": "Let's meet for coffee and chat about tech, coding, Cyprus and the newly formed\nCDC (Cyprus Developer Community)."
   },
-  {
-    "id": "location",
+  "location": {
+    "order": 1,
     "title": "Location",
-    "text": "Cafe Nero Finikoudes, Larnaka\n"
+    "text": "Cafe Nero Finikoudes, Larnaka"
   },
-  {
-    "id": "date",
+  "date": {
+    "order": 2,
     "title": "Date",
-    "text": "11.03.2022\n",
-    "date": "2022-03-11T00:00:00.000Z"
+    "text": "11.03.2022",
+    "date": "2022-03-11"
   },
-  { "id": "time", "title": "Time", "text": "16:00\n", "time": "16:00" }
-]
+  "time": {
+    "order": 3,
+    "title": "Time",
+    "text": "16:00",
+    "time": "16:00"
+  }
+}
 ```
 
 See more examples in [md test cases](./test/test-issue-1.md) and
 [test results](./test/parse-issue-test.md]).
 
+### Parsers
+
+- `date`: checks if the value matches a
+  [common date format](https://github.com/zentered/issue-forms-body-parser/blob/main/src/parsers/date.js#L7)
+  and returns a formatted `date` field (in UTC).
+- `time`: checks if the value matches a
+  [common time format](https://github.com/zentered/issue-forms-body-parser/blob/main/src/parsers/time.js#L7)
+  and returns a formatted `time` field.
+- `lists`: automatically returns lists as arrays
+- `duration`: currently only the format `XXhYYm` is supported as duration, ie.
+  `1h30m` returns a `duration` object with `hours` and `minutes`.
+
 ## Installation & Usage
 
 ### GitHub Actions
@@ -101,7 +117,7 @@ jobs:
     steps:
       - name: Issue Forms Body Parser
         id: parse
-        uses: zentered/issue-forms-body-parser@1.0.0
+        uses: zentered/issue-forms-body-parser@v2.0.0
       - run: echo "${{ JSON.stringify(steps.parse.outputs.data) }}"
 ```
 

package/dist/index.js

@@ -51787,6 +51787,22 @@ function remarkStringify(options) {
 
 /* harmony default export */ const remark_stringify = (remarkStringify);
 
+;// CONCATENATED MODULE: ./node_modules/strip-final-newline/index.js
+function stripFinalNewline(input) {
+	const LF = typeof input === 'string' ? '\n' : '\n'.charCodeAt();
+	const CR = typeof input === 'string' ? '\r' : '\r'.charCodeAt();
+
+	if (input[input.length - 1] === LF) {
+		input = input.slice(0, -1);
+	}
+
+	if (input[input.length - 1] === CR) {
+		input = input.slice(0, -1);
+	}
+
+	return input;
+}
+
 // EXTERNAL MODULE: ./node_modules/date-fns/index.js
 var date_fns = __nccwpck_require__(3314);
 // EXTERNAL MODULE: ./node_modules/date-fns/_lib/cloneObject/index.js
@@ -52566,6 +52582,38 @@ function zonedTimeToUtc(date, timeZone, options) {
   return new Date(utc + offsetMilliseconds)
 }
 
+;// CONCATENATED MODULE: ./src/parsers/date.js
+
+
+;
+
+
+const loc = 'UTC'
+const commonDateFormats = [
+  'yyyy-MM-dd',
+  'dd/MM/yyyy',
+  'dd/MM/yy',
+  'dd-MM-yyyy',
+  'dd-MM-yy',
+  'dd.MM.yyyy',
+  'dd.MM.yy'
+]
+
+function date_parseDate(text) {
+  const match = commonDateFormats.map((format) => {
+    return (0,date_fns.isMatch)(text, format)
+  })
+  if (match.indexOf(true) > -1) {
+    const date = zonedTimeToUtc(
+      (0,date_fns.parse)(text, commonDateFormats[match.indexOf(true)], new Date()),
+      loc
+    ).toJSON()
+    return date.split('T')[0]
+  } else {
+    return null
+  }
+}
+
 // EXTERNAL MODULE: ./node_modules/date-fns/format/index.js
 var format = __nccwpck_require__(2168);
 ;// CONCATENATED MODULE: ./node_modules/date-fns-tz/esm/_lib/tzIntlTimeZoneName/index.js
@@ -53178,74 +53226,65 @@ function formatInTimeZone(date, timeZone, formatStr, options) {
   return format_format(utcToZonedTime(date, timeZone), formatStr, extendedOptions)
 }
 
-;// CONCATENATED MODULE: ./src/parse.js
+;// CONCATENATED MODULE: ./src/parsers/time.js
 
 
 ;
 
 
+const time_loc = 'UTC'
+const commonTimeFormats = ['HH:mm', 'HH.mm', 'hh:mm a', 'hh:mm A']
 
+function time_parseTime(text) {
+  const match = commonTimeFormats.map((format) => {
+    return (0,date_fns.isMatch)(text, format)
+  })
+  if (match.indexOf(true) > -1) {
+    const time = zonedTimeToUtc(
+      (0,date_fns.parse)(text, commonTimeFormats[match.indexOf(true)], new Date()),
+      time_loc
+    )
+    return formatInTimeZone(time, time_loc, 'HH:mm')
+  } else {
+    return null
+  }
+}
 
+;// CONCATENATED MODULE: ./src/parsers/duration.js
 
 
-// if the system time is not UTC, we need to convert it to UTC
-
-const loc = 'UTC'
-
-const commonDateFormats = [
-  'yyyy-MM-dd',
-  'dd/MM/yyyy',
-  'dd/MM/yy',
-  'dd-MM-yyyy',
-  'dd-MM-yy',
-  'dd.MM.yyyy',
-  'dd.MM.yy'
-]
-
-const commonTimeFormats = ['HH:mm', 'HH.mm', 'hh:mm a', 'hh:mm A']
-
 function parseDuration(text) {
+  let matched = false
   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
-}
+  const hoursAndMinutes = new RegExp(/([0-9]+)h([0-9]+)m/)
+  const hours = new RegExp(/([0-9]+)h/)
 
-function parse_parseDate(text) {
-  const match = commonDateFormats.map((format) => {
-    return (0,date_fns.isMatch)(text, format)
-  })
-  if (match.indexOf(true) > -1) {
-    const date = zonedTimeToUtc(
-      (0,date_fns.parse)(text, commonDateFormats[match.indexOf(true)], new Date()),
-      loc
-    ).toJSON()
-    return date.split('T')[0]
-  } else {
-    return null
+  if (text.match(hoursAndMinutes)) {
+    matched = true
+    const [, h, m] = text.match(hoursAndMinutes)
+    duration.hours = parseInt(h)
+    duration.minutes = parseInt(m)
+  } else if (text.match(hours)) {
+    matched = true
+    const [, h] = text.match(hours)
+    duration.hours = parseInt(h)
+    duration.minutes = 0
   }
-}
 
-function parse_parseTime(text) {
-  const match = commonTimeFormats.map((format) => {
-    return (0,date_fns.isMatch)(text, format)
-  })
-  if (match.indexOf(true) > -1) {
-    const time = zonedTimeToUtc(
-      (0,date_fns.parse)(text, commonTimeFormats[match.indexOf(true)], new Date()),
-      loc
-    )
-    return formatInTimeZone(time, loc, 'HH:mm')
+  if (matched) {
+    return duration
   } else {
     return null
   }
 }
 
+;// CONCATENATED MODULE: ./src/parsers/list.js
+
+
 function parseList(list) {
   return list.children
     .map((item) => {
@@ -53276,54 +53315,113 @@ function parseList(list) {
     .filter((x) => !!x)
 }
 
+;// CONCATENATED MODULE: ./src/parsers/index.js
+
+
+;
+
+
+
+
+const parsers_parseDate = date_parseDate
+const parsers_parseTime = time_parseTime
+const parsers_parseDuration = parseDuration
+const parsers_parseList = parseList
+
+;// CONCATENATED MODULE: ./src/parse.js
+
+
+;
+
+
+
+
+
+
+
+
 async function parseMD(body) {
   const tokens = await unified().use(remark_parse).use(remarkGfm).parse(body)
   if (!tokens) {
     return []
   }
 
-  const r = []
-  for (let idx = 0; idx < tokens.children.length; idx = idx + 2) {
-    const current = tokens.children[idx]
-    const hasNext = idx + 1 < tokens.children.length
+  const structuredResponse = {}
+  let currentHeading = null
+  for (const token of tokens.children) {
+    const text = await unified()
+      .use(remarkGfm)
+      .use(remark_stringify)
+      .stringify(token)
+    const cleanText = stripFinalNewline(text)
+
+    // issue forms uses h3 as a heading
+    if (token.type === 'heading' && token.depth === 3) {
+      currentHeading = slugify(token.children[0].value)
+      structuredResponse[currentHeading] = {
+        title: token.children[0].value,
+        content: []
+      }
+    } else if (token.type === 'paragraph' && currentHeading) {
+      const obj = structuredResponse[currentHeading]
+
+      const date = parsers_parseDate(cleanText)
+      const time = parsers_parseTime(cleanText)
+      const duration = parsers_parseDuration(cleanText)
 
-    if (current.type === 'heading') {
-      // 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 (date) {
+        obj.date = date
       }
-      if (hasNext) {
-        const next = tokens.children[idx + 1]
-        if (next.type === 'list') {
-          obj.list = parseList(next).flat()
-        }
-        obj.text = await unified()
-          .use(remarkGfm)
-          .use(remark_stringify)
-          .stringify(next)
-        const date = parse_parseDate(obj.text)
-        const time = parse_parseTime(obj.text)
-        if (date) {
-          obj.date = date
-        }
-        if (time) {
-          obj.time = time
-        }
-        if (obj.id === 'duration') {
-          obj.duration = parseDuration(obj.text)
-        }
+
+      if (time) {
+        obj.time = time
+      }
+
+      if (duration) {
+        obj.duration = duration
       }
-      r.push(obj)
+
+      obj.content.push(cleanText)
+    } else if (token.type === 'list') {
+      const obj = structuredResponse[currentHeading]
+      obj.text = cleanText
+      obj.list = parsers_parseList(token).flat()
+    } else if (token.type === 'html') {
+      const obj = structuredResponse[currentHeading]
+      obj.content.push(token.html)
+    } else if (token.type === 'code') {
+      const obj = structuredResponse[currentHeading]
+      obj.lang = token.lang
+      obj.text = cleanText
+    } else if (token.type === 'heading' && token.depth > 3) {
+      const obj = structuredResponse[currentHeading]
+      obj.content.push(token.children[0].value)
+    } else {
+      console.log('unhandled token type')
+      console.log(token)
     }
   }
 
-  return r
+  for (const key in structuredResponse) {
+    const token = structuredResponse[key]
+    const content = token.content.filter(Boolean)
+    if (content && content.length > 0) {
+      if (content.length === 1) {
+        token.text = content[0]
+      }
+      token.text = content.join('\n\n')
+    }
+    token.content = content
+  }
+
+  return structuredResponse
 }
 
 ;// CONCATENATED MODULE: ./src/index.js
 
 
+;
+
 
 
 async function run() {

package/dist/licenses.txt

@@ -1429,6 +1429,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
+strip-final-newline
+MIT
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 tr46
 MIT
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zentered/issue-forms-body-parser",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "private": false,
   "description": "Parser for GitHub Issue Form body, also available as GitHub Action",
   "keywords": [
@@ -62,6 +62,7 @@
     "remark-gfm": "^3.0.1",
     "remark-parse": "^10.0.1",
     "remark-stringify": "^10.0.2",
+    "strip-final-newline": "^3.0.0",
     "unified": "^10.1.2"
   },
   "devDependencies": {

package/src/index.js

@@ -1,3 +1,5 @@
+'use strict'
+
 import github from '@actions/github'
 import core from '@actions/core'
 import parse from './parse.js'

package/src/parse.js

@@ -5,137 +5,88 @@ import remarkParse from 'remark-parse'
 import remarkGfm from 'remark-gfm'
 import slugify from '@sindresorhus/slugify'
 import remarkStringify from 'remark-stringify'
-import { parse, isMatch } from 'date-fns'
+import stripFinalNewline from 'strip-final-newline'
 
-// 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'
+import {
+  parseDate,
+  parseTime,
+  parseDuration,
+  parseList
+} from './parsers/index.js'
 
-const commonDateFormats = [
-  'yyyy-MM-dd',
-  'dd/MM/yyyy',
-  'dd/MM/yy',
-  'dd-MM-yyyy',
-  'dd-MM-yy',
-  'dd.MM.yyyy',
-  'dd.MM.yy'
-]
+export default async function parseMD(body) {
+  const tokens = await unified().use(remarkParse).use(remarkGfm).parse(body)
+  if (!tokens) {
+    return []
+  }
 
-const commonTimeFormats = ['HH:mm', 'HH.mm', 'hh:mm a', 'hh:mm A']
+  const structuredResponse = {}
+  let currentHeading = null
+  for (const token of tokens.children) {
+    const text = await unified()
+      .use(remarkGfm)
+      .use(remarkStringify)
+      .stringify(token)
+    const cleanText = stripFinalNewline(text)
 
-function parseDuration(text) {
-  const duration = {
-    hours: 0,
-    minutes: 0
-  }
+    // issue forms uses h3 as a heading
+    if (token.type === 'heading' && token.depth === 3) {
+      currentHeading = slugify(token.children[0].value)
+      structuredResponse[currentHeading] = {
+        title: token.children[0].value,
+        content: []
+      }
+    } else if (token.type === 'paragraph' && currentHeading) {
+      const obj = structuredResponse[currentHeading]
 
-  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
-}
+      const date = parseDate(cleanText)
+      const time = parseTime(cleanText)
+      const duration = parseDuration(cleanText)
 
-function parseDate(text) {
-  const match = commonDateFormats.map((format) => {
-    return isMatch(text, format)
-  })
-  if (match.indexOf(true) > -1) {
-    const date = zonedTimeToUtc(
-      parse(text, commonDateFormats[match.indexOf(true)], new Date()),
-      loc
-    ).toJSON()
-    return date.split('T')[0]
-  } else {
-    return null
-  }
-}
+      if (date) {
+        obj.date = date
+      }
 
-function parseTime(text) {
-  const match = commonTimeFormats.map((format) => {
-    return isMatch(text, format)
-  })
-  if (match.indexOf(true) > -1) {
-    const time = zonedTimeToUtc(
-      parse(text, commonTimeFormats[match.indexOf(true)], new Date()),
-      loc
-    )
-    return formatInTimeZone(time, loc, 'HH:mm')
-  } else {
-    return null
-  }
-}
+      if (time) {
+        obj.time = time
+      }
 
-function parseList(list) {
-  return list.children
-    .map((item) => {
-      const listItem = {}
-      if (item.type === 'list') {
-        return parseList(list)
-      } else if (item.type === 'listItem') {
-        listItem.checked = item.checked
-        return item.children
-          .map((child) => {
-            if (child.type === 'paragraph') {
-              listItem.text = child.children
-                .map((c) => {
-                  if (c.type === 'link') {
-                    return c.children[0].value
-                  } else {
-                    return c.value
-                  }
-                })
-                .filter((x) => !!x)
-                .join('')
-              return listItem
-            }
-          })
-          .filter((x) => !!x)
+      if (duration) {
+        obj.duration = duration
       }
-    })
-    .filter((x) => !!x)
-}
 
-export default async function parseMD(body) {
-  const tokens = await unified().use(remarkParse).use(remarkGfm).parse(body)
-  if (!tokens) {
-    return []
+      obj.content.push(cleanText)
+    } else if (token.type === 'list') {
+      const obj = structuredResponse[currentHeading]
+      obj.text = cleanText
+      obj.list = parseList(token).flat()
+    } else if (token.type === 'html') {
+      const obj = structuredResponse[currentHeading]
+      obj.content.push(token.html)
+    } else if (token.type === 'code') {
+      const obj = structuredResponse[currentHeading]
+      obj.lang = token.lang
+      obj.text = cleanText
+    } else if (token.type === 'heading' && token.depth > 3) {
+      const obj = structuredResponse[currentHeading]
+      obj.content.push(token.children[0].value)
+    } else {
+      console.log('unhandled token type')
+      console.log(token)
+    }
   }
 
-  const r = []
-  for (let idx = 0; idx < tokens.children.length; idx = idx + 2) {
-    const current = tokens.children[idx]
-    const hasNext = idx + 1 < tokens.children.length
-
-    if (current.type === 'heading') {
-      // 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') {
-          obj.list = parseList(next).flat()
-        }
-        obj.text = await unified()
-          .use(remarkGfm)
-          .use(remarkStringify)
-          .stringify(next)
-        const date = parseDate(obj.text)
-        const time = parseTime(obj.text)
-        if (date) {
-          obj.date = date
-        }
-        if (time) {
-          obj.time = time
-        }
-        if (obj.id === 'duration') {
-          obj.duration = parseDuration(obj.text)
-        }
+  for (const key in structuredResponse) {
+    const token = structuredResponse[key]
+    const content = token.content.filter(Boolean)
+    if (content && content.length > 0) {
+      if (content.length === 1) {
+        token.text = content[0]
       }
-      r.push(obj)
+      token.text = content.join('\n\n')
     }
+    token.content = content
   }
 
-  return r
+  return structuredResponse
 }

package/src/parsers/date.js

@@ -0,0 +1,30 @@
+'use strict'
+
+import { parse, isMatch } from 'date-fns'
+import { zonedTimeToUtc } from 'date-fns-tz/esm'
+
+const loc = 'UTC'
+const commonDateFormats = [
+  'yyyy-MM-dd',
+  'dd/MM/yyyy',
+  'dd/MM/yy',
+  'dd-MM-yyyy',
+  'dd-MM-yy',
+  'dd.MM.yyyy',
+  'dd.MM.yy'
+]
+
+export default function parseDate(text) {
+  const match = commonDateFormats.map((format) => {
+    return isMatch(text, format)
+  })
+  if (match.indexOf(true) > -1) {
+    const date = zonedTimeToUtc(
+      parse(text, commonDateFormats[match.indexOf(true)], new Date()),
+      loc
+    ).toJSON()
+    return date.split('T')[0]
+  } else {
+    return null
+  }
+}

package/src/parsers/duration.js

@@ -0,0 +1,30 @@
+'use strict'
+
+export default function parseDuration(text) {
+  let matched = false
+  const duration = {
+    hours: 0,
+    minutes: 0
+  }
+
+  const hoursAndMinutes = new RegExp(/([0-9]+)h([0-9]+)m/)
+  const hours = new RegExp(/([0-9]+)h/)
+
+  if (text.match(hoursAndMinutes)) {
+    matched = true
+    const [, h, m] = text.match(hoursAndMinutes)
+    duration.hours = parseInt(h)
+    duration.minutes = parseInt(m)
+  } else if (text.match(hours)) {
+    matched = true
+    const [, h] = text.match(hours)
+    duration.hours = parseInt(h)
+    duration.minutes = 0
+  }
+
+  if (matched) {
+    return duration
+  } else {
+    return null
+  }
+}

package/src/parsers/index.js

@@ -0,0 +1,11 @@
+'use strict'
+
+import date from './date.js'
+import time from './time.js'
+import duration from './duration.js'
+import list from './list.js'
+
+export const parseDate = date
+export const parseTime = time
+export const parseDuration = duration
+export const parseList = list

package/src/parsers/list.js

@@ -0,0 +1,31 @@
+'use strict'
+
+export default function parseList(list) {
+  return list.children
+    .map((item) => {
+      const listItem = {}
+      if (item.type === 'list') {
+        return parseList(list)
+      } else if (item.type === 'listItem') {
+        listItem.checked = item.checked
+        return item.children
+          .map((child) => {
+            if (child.type === 'paragraph') {
+              listItem.text = child.children
+                .map((c) => {
+                  if (c.type === 'link') {
+                    return c.children[0].value
+                  } else {
+                    return c.value
+                  }
+                })
+                .filter((x) => !!x)
+                .join('')
+              return listItem
+            }
+          })
+          .filter((x) => !!x)
+      }
+    })
+    .filter((x) => !!x)
+}

package/src/parsers/time.js

@@ -0,0 +1,22 @@
+'use strict'
+
+import { parse, isMatch } from 'date-fns'
+import { zonedTimeToUtc, formatInTimeZone } from 'date-fns-tz/esm'
+
+const loc = 'UTC'
+const commonTimeFormats = ['HH:mm', 'HH.mm', 'hh:mm a', 'hh:mm A']
+
+export default function parseTime(text) {
+  const match = commonTimeFormats.map((format) => {
+    return isMatch(text, format)
+  })
+  if (match.indexOf(true) > -1) {
+    const time = zonedTimeToUtc(
+      parse(text, commonTimeFormats[match.indexOf(true)], new Date()),
+      loc
+    )
+    return formatInTimeZone(time, loc, 'HH:mm')
+  } else {
+    return null
+  }
+}

package/test/parse-issue.test.js

@@ -8,84 +8,78 @@ import { join } from 'path'
 const test = t.test
 
 test('parse(md) should parse GitHub Issue Form data into useful, structured data', async (t) => {
-  const expected = [
-    {
-      id: 'event-description',
+  const expected = {
+    'event-description': {
       title: 'Event Description',
-      text: "Let's meet for coffee and chat about tech, coding, Cyprus and the newly formed\nCDC (Cyprus Developer Community).\n"
+      content: [
+        'Welcome to the CDC - Cyprus Developer Community! Join us for our monthly Larnaka\nmeet & greet event. Meet likeminded people, discuss topics we would like to hear\nabout in upcoming talks, welcome potential speakers, discuss all things tech and\nhave fun!',
+        'Notice with regards to COVID:',
+        'All attendees must follow measures in accordance with Ministry of Health\ndirectives. <https://www.pio.gov.cy/coronavirus/eng>'
+      ],
+      text: 'Welcome to the CDC - Cyprus Developer Community! Join us for our monthly Larnaka\nmeet & greet event. Meet likeminded people, discuss topics we would like to hear\nabout in upcoming talks, welcome potential speakers, discuss all things tech and\nhave fun!\n\nNotice with regards to COVID:\n\nAll attendees must follow measures in accordance with Ministry of Health\ndirectives. <https://www.pio.gov.cy/coronavirus/eng>'
     },
-    {
-      id: 'location',
+    location: {
       title: 'Location',
-      text: '[Cafe Nero Finikoudes, Larnaka](https://goo.gl/maps/Bzjxdeat3BSdsUSVA)\n'
+      content: [
+        '[Cafe Nero Finikoudes, Larnaka](https://goo.gl/maps/Bzjxdeat3BSdsUSVA)'
+      ],
+      text: '[Cafe Nero Finikoudes, Larnaka](https://goo.gl/maps/Bzjxdeat3BSdsUSVA)'
     },
-    {
-      id: 'date',
+    date: {
       title: 'Date',
-      text: '11.03.2022\n',
-      date: '2022-03-11'
+      content: ['11.03.2022'],
+      date: '2022-03-11',
+      text: '11.03.2022'
     },
-    { id: 'time', title: 'Time', text: '16:00\n', time: '16:00' },
-    {
-      id: 'duration',
+    time: { title: 'Time', content: ['16:00'], time: '16:00', text: '16:00' },
+    duration: {
       title: 'Duration',
-      text: '2h\n',
-      duration: { hours: 2, minutes: 0 }
+      content: ['2h'],
+      duration: { hours: 2, minutes: 0 },
+      text: '2h'
     },
-    {
-      id: 'list-item-checked',
+    'list-item-checked': {
       title: 'List Item Checked',
+      content: [],
+      text: "*   [x] I agree to follow this project's\n    [Code of Conduct](https://berlincodeofconduct.org)",
       list: [
         {
           checked: true,
           text: "I agree to follow this project's\nCode of Conduct"
         }
-      ],
-      text: "*   [x] I agree to follow this project's\n    [Code of Conduct](https://berlincodeofconduct.org)\n"
+      ]
     },
-    {
-      id: 'list-item-unchecked',
+    'list-item-unchecked': {
       title: 'List Item Unchecked',
+      content: [],
+      text: "*   [ ] I agree to follow this project's\n    [Code of Conduct](https://berlincodeofconduct.org)",
       list: [
         {
           checked: false,
           text: "I agree to follow this project's\nCode of Conduct"
         }
-      ],
-      text: "*   [ ] I agree to follow this project's\n    [Code of Conduct](https://berlincodeofconduct.org)\n"
+      ]
     },
-    {
-      id: 'mixed-task-list',
+    'mixed-task-list': {
       title: 'Mixed Task List',
+      content: [],
+      text: '*   [x] checked\n*   [ ] unchecked\n*   [x] checked 2\n*   [x] checked 3\n*   [ ] unchecked 2',
       list: [
         { checked: true, text: 'checked' },
         { checked: false, text: 'unchecked' },
         { checked: true, text: 'checked 2' },
         { checked: true, text: 'checked 3' },
         { checked: false, text: 'unchecked 2' }
-      ],
-      text: '*   [x] checked\n*   [ ] unchecked\n*   [x] checked 2\n*   [x] checked 3\n*   [ ] unchecked 2\n'
+      ]
     },
-    {
-      id: 'complex-list',
-      title: 'Complex List',
-      list: [
-        { checked: null, text: 'one' },
-        { checked: null, text: 'two' }
-      ],
-      text: '*   one\n*   two\n    *   three\n    *   four\n        1.  five\n        2.  six\n'
-    },
-    {
-      id: 'repositories',
+    repositories: {
       title: 'Repositories',
-      text: '```csv\nhttps://example.com/repository-1\nhttps://example.com/repository-2\n```\n'
+      content: [],
+      lang: 'csv',
+      text: '```csv\nhttps://example.com/repository-1\nhttps://example.com/repository-2\n```'
     },
-    {
-      id: 'visibility',
-      title: 'Visibility',
-      text: 'Internal\n'
-    }
-  ]
+    visibility: { title: 'Visibility', content: ['Internal'], text: 'Internal' }
+  }
 
   const md = await readFile(
     join(process.cwd(), 'test', 'test-issue-1.md'),
@@ -93,11 +87,12 @@ test('parse(md) should parse GitHub Issue Form data into useful, structured data
   )
   const actual = await fn(md)
   // console.log(JSON.stringify(actual, null, 0))
-  t.deepEqual(actual, expected)
+
+  t.same(actual, expected)
 })
 
 test('parse(md) return nothing', async (t) => {
-  const expected = []
+  const expected = {}
 
   const md = await readFile(
     join(process.cwd(), 'test', 'test-issue-2.md'),
@@ -105,5 +100,5 @@ test('parse(md) return nothing', async (t) => {
   )
   const actual = await fn(md)
   // console.log(JSON.stringify(actual, null, 0))
-  t.deepEqual(actual, expected)
+  t.same(actual, expected)
 })

package/test/test-issue-1.md

@@ -1,7 +1,16 @@
 ### Event Description
 
-Let's meet for coffee and chat about tech, coding, Cyprus and the newly formed
-CDC (Cyprus Developer Community).
+<img width="1107" alt="The Brewery Larnaka" src="https://user-images.githubusercontent.com/3581331/162574191-3c023b32-34d9-4035-90bf-7297cdccaf06.png">
+
+Welcome to the CDC - Cyprus Developer Community! Join us for our monthly Larnaka
+meet & greet event. Meet likeminded people, discuss topics we would like to hear
+about in upcoming talks, welcome potential speakers, discuss all things tech and
+have fun!
+
+#### Notice with regards to COVID:
+
+All attendees must follow measures in accordance with Ministry of Health
+directives. https://www.pio.gov.cy/coronavirus/eng
 
 ### Location
 
@@ -37,15 +46,6 @@ CDC (Cyprus Developer Community).
 - [x] checked 3
 - [ ] unchecked 2
 
-### Complex List
-
-- one
-- two
-  - three
-  - four
-    1. five
-    2. six
-
 ### Repositories
 
 ```csv