Merge pull request #23 from postmanlabs/feature/fix-typeerrors

Fixed type errors happening frequently.

.eslintrc

@@ -1,6 +1,6 @@
 {
     "parserOptions": {
-        "ecmaVersion": 2015
+        "ecmaVersion": 2020
     },
     "plugins": [
         "security",

.github/workflows/Integration.yml

@@ -10,6 +10,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '14.x'
+          node-version: '16.x'
       - run: npm ci
       - run: npm run test

.github/workflows/draft-new-release.yml

@@ -0,0 +1,78 @@
+name: Draft new release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: The version you want to release. Must be a valid semver version.
+        required: true
+        type: string
+
+jobs:
+  draft-new-release:
+    if: startsWith(github.event.inputs.version, 'v')
+    name: Draft a new release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Create release branch
+        run: git checkout -b release/${{ github.event.inputs.version }}
+
+      - name: Update changelog
+        uses: thomaseizinger/[email protected]
+        with:
+          version: ${{ github.event.inputs.version }}
+
+      - name: Initialize mandatory git config
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email [email protected]
+
+      - name: Bump version
+        run: npm version ${{ github.event.inputs.version }} --git-tag-version false
+
+      - name: Commit changelog and manifest files
+        id: make-commit
+        run: |
+          git add CHANGELOG.md package.json package-lock.json
+          git commit --message "Prepare release ${{ github.event.inputs.version }}"
+          echo "::set-output name=commit::$(git rev-parse HEAD)"
+      
+      - name: Push new branch
+        run: git push origin release/${{ github.event.inputs.version }}
+
+      - name: Create pull request for main
+        uses: thomaseizinger/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          head: release/${{ github.event.inputs.version }}
+          base: main
+          title: "Release version ${{ github.event.inputs.version }}"
+          reviewers: ${{ github.actor }}
+          body: |
+            Hi @${{ github.actor }}!
+
+            This PR was created in response to a manual trigger of the release workflow here: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}.
+            I've updated the changelog and bumped the versions in the manifest files in this commit: ${{ steps.make-commit.outputs.commit }}.
+
+      - name: Create pull request for development
+        uses: thomaseizinger/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          head: release/${{ github.event.inputs.version }}
+          base: development
+          title: "Release version ${{ github.event.inputs.version }}"
+          reviewers: ${{ github.actor }}
+          body: |
+            Hi @${{ github.actor }}!
+
+            This PR was created in response to a manual trigger of the release workflow here: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}.
+            I've updated the changelog and bumped the versions in the manifest files in this commit: ${{ steps.make-commit.outputs.commit }}.

.github/workflows/publish-new-release.yml

@@ -0,0 +1,46 @@
+name: "Publish new release"
+
+on:
+  pull_request:
+    branches:
+      - main
+    types:
+      - closed
+
+jobs:
+  release:
+    name: Publish new release
+    runs-on: ubuntu-latest
+    # only merged pull requests that begin with 'release/' or 'hotfix/' must trigger this job
+    if: github.event.pull_request.merged == true &&
+      (contains(github.event.pull_request.head.ref, 'release/') || contains(github.event.pull_request.head.ref, 'hotfix/'))
+    permissions:
+      contents: write
+
+    steps:
+      - name: Extract version from branch name (for release branches)
+        if: contains(github.event.pull_request.head.ref, 'release/')
+        run: |
+          BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
+          VERSION=${BRANCH_NAME#release/}
+
+          echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
+
+      - name: Extract version from branch name (for hotfix branches)
+        if: contains(github.event.pull_request.head.ref, 'hotfix/')
+        run: |
+          BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
+          VERSION=${BRANCH_NAME#hotfix/}
+
+          echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
+
+      - name: Create Release
+        uses: thomaseizinger/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          target_commitish: ${{ github.event.pull_request.merge_commit_sha }}
+          tag_name: ${{ env.RELEASE_VERSION }}
+          name: ${{ env.RELEASE_VERSION }}
+          draft: false
+          prerelease: false

lib/HARToPostmanCollectionBodyMapper.js

@@ -157,18 +157,18 @@ function isMimeType(mimeType, expectedMimeType) {
  * @returns {array} the list of parameters in the url
  */
 function getParamsFromEncoded(harRequest) {
-  const urlParamsArray = harRequest.postData.params,
-    urlParamsAsText = harRequest.postData.text;
+  const urlParamsArray = harRequest?.postData?.params,
+    urlParamsAsText = harRequest?.postData?.text;
   let params = [];
-  if (urlParamsArray.length > 0) {
+  if (urlParamsArray?.length > 0) {
     params = urlParamsArray.map((param) => {
       return {
         key: param.name,
         value: param.value
       };
     });
   }
-  else if (urlParamsAsText) {
+  else if (typeof urlParamsAsText === 'string') {
     params = urlParamsAsText.split('&')
       .map((keyValueAsText) => {
         let [key, value] = keyValueAsText.split('=');
@@ -190,11 +190,11 @@ function getParamsFromEncoded(harRequest) {
  * @returns {boolean} true if request privides from a har generated in safari
  */
 function isSafariUrlEncoded(harRequest) {
-  const hasNoParams = harRequest.postData.params !== undefined &&
-    harRequest.postData.params.length === 0,
-    hasNoMimeType = harRequest.postData.mimeType === '',
+  const hasNoParams = harRequest?.postData?.params !== undefined &&
+    harRequest.postData.params?.length === 0,
+    hasNoMimeType = harRequest?.postData?.mimeType === '',
     paramsInTextPattern = new RegExp('\\w*=[\\w\\s]+', 'g'),
-    contentText = harRequest.postData.text,
+    contentText = harRequest?.postData?.text || '',
     paramsInTextByPattern = contentText.match(paramsInTextPattern),
     paramsInTextBySplit = contentText.split('&'),
     textContainsParams = paramsInTextByPattern &&
@@ -215,7 +215,7 @@ function isSafariUrlEncoded(harRequest) {
 function mapBody(harRequest, options) {
   let handledBody;
   if (harRequest.bodySize > 0) {
-    const mimeType = harRequest.postData.mimeType;
+    const mimeType = harRequest?.postData?.mimeType;
     if (isMimeType(mimeType, SUPPORTED_BODY_TYPES.applicationJson)) {
       handledBody = mapBodyFromJson(harRequest, options);
     }
@@ -251,8 +251,8 @@ function mapBody(harRequest, options) {
  */
 function mapBodyResponse(harResponse, options) {
   let handledBody;
-  if (harResponse.content.size > 0) {
-    const mimeType = harResponse.content.mimeType;
+  if (harResponse?.content?.size > 0) {
+    const mimeType = harResponse?.content?.mimeType;
 
     switch (mimeType) {
       case SUPPORTED_BODY_TYPES.applicationJson:

lib/utils/urlUtils.js

@@ -47,7 +47,13 @@ function decodeURL(url) {
   if (url === undefined) {
     return '';
   }
-  return decodeURIComponent((String(url)).replace(/\+/g, '%20'));
+
+  try {
+    return decodeURIComponent((String(url)).replace(/\+/g, '%20'));
+  }
+  catch (e) {
+    return String(url);
+  }
 }
 
 module.exports = {