fast-uri 1.0.0 → 2.1.0

package/.github/dependabot.yml

@@ -1,16 +1,13 @@
 version: 2
 updates:
-  - package-ecosystem: github-actions
-    directory: '/'
-    ignore:
-      - dependency-name: "actions/*"
-        update-types:
-            ["version-update:semver-minor", "version-update:semver-patch"]
+  - package-ecosystem: "github-actions"
+    directory: "/"
     schedule:
-      interval: daily
+      interval: "monthly"
     open-pull-requests-limit: 10
-  - package-ecosystem: npm
-    directory: '/'
+
+  - package-ecosystem: "npm"
+    directory: "/"
     schedule:
-      interval: daily
+      interval: "weekly"
     open-pull-requests-limit: 10

package/.github/workflows/ci.yml

@@ -10,75 +10,6 @@ on:
       - 'docs/**'
       - '*.md'
 
-env:
-  CI: true
-  COVERALLS: 0
-
 jobs:
   test:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        # Maintenance and active LTS
-        node-version: [10, 12, 14, 16]
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-    name: Node ${{ matrix.node-version }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Use Node.js
-        id: setup_node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install Dependencies
-        id: install
-        run: npm install --ignore-scripts
-
-      - name: Check licenses
-        id: license_check
-        run: |
-          npm run license-checker --if-present
-
-      # Unit and lint tests
-      - name: Tests
-        id: test
-        run: npm run test:ci
-
-      - name: Coveralls Parallel
-        id: coveralls-parallel
-        continue-on-error: true
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.github_token }}
-          parallel: true
-          flag-name: run-${{ matrix.node-version }}-${{ matrix.os }}
-
-      - name: Should Trigger coverallsapp/github-action@master
-        id: coveralls-trigger
-        # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#steps-context
-        # when continue-on-error failed, outcome is failure and conclusion is success
-        if: steps.coveralls-parallel.conclusion == 'success' && steps.coveralls-parallel.outcome != 'success'
-        run: |
-          echo "::set-output name=COVERALLS_TRIGGER::failure"
-          
-  coverage:
-    needs: test
-    runs-on: ubuntu-latest
-    if: needs.test.outputs.COVERALLS != 'failure'
-    steps:
-      - name: Coveralls Finished
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          parallel-finished: true
-
-  automerge:
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: fastify/github-action-merge-dependabot@v3.0.2
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+    uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3

package/.github/workflows/package-manager-ci.yml

@@ -5,6 +5,9 @@ on:
     branches:
       - master
 
+permissions:
+  contents: read
+
 jobs:
   pnpm:
     runs-on: ${{ matrix.os }}
@@ -12,26 +15,25 @@ jobs:
     strategy:
       matrix:
         # Maintenance and active LTS
-        node-version: [10, 12, 14, 16]
-        os: [ubuntu-latest]
+        node-version: [14, 16]
+        os: [ubuntu-18.04]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        with:
+          persist-credentials: false
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
-        id: setup_node
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Install with pnpm
-        id: install_package_manager
         run: |
           curl -L https://unpkg.com/@pnpm/self-installer | node
           pnpm install
 
       - name: Run tests
-        id: test
         run: |
           pnpm run test
 
@@ -41,25 +43,24 @@ jobs:
     strategy:
       matrix:
         # Maintenance and active LTS
-        node-version: [10, 12, 14, 16]
-        os: [ubuntu-latest]
+        node-version: [14, 16]
+        os: [ubuntu-18.04]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        with:
+          persist-credentials: false
 
       - name: Use Node.js
-        id: setup_node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Install with yarn
-        id: install_package_manager
         run: |
           curl -o- -L https://yarnpkg.com/install.sh | bash
           yarn install --ignore-engines
 
       - name: Run tests
-        id: test
         run: |
           yarn run test

package/README.md

@@ -3,7 +3,6 @@
 <div align="center">
 
 [![CI](https://github.com/fastify/fastify/workflows/ci/badge.svg)](https://github.com/fastify/fast-uri/actions/workflows/ci.yml)
-[![Coverage Status](https://coveralls.io/repos/github/fastify/fast-uri/badge.svg?branch=add_coveralls)](https://coveralls.io/github/fastify/fast-uri?branch=main)
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://standardjs.com/)
 
 </div>
@@ -102,7 +101,7 @@ urijs: parse IPv4 x 384,705 ops/sec ±0.34% (99 runs sampled)
 WHATWG URL: parse IPv4 NOT SUPPORTED
 fast-uri: parse IPv6 x 923,519 ops/sec ±0.09% (100 runs sampled)
 urijs: parse IPv6 x 289,070 ops/sec ±0.07% (95 runs sampled)
-WHATWG ULR: parse IPv6 NOT SUPPORTED
+WHATWG URL: parse IPv6 NOT SUPPORTED
 fast-uri: parse URN x 2,596,395 ops/sec ±0.42% (98 runs sampled)
 urijs: parse URN x 1,152,412 ops/sec ±0.09% (97 runs sampled)
 WHATWG URL: parse URN x 1,183,307 ops/sec ±0.38% (100 runs sampled)

package/benchmark.js

@@ -4,48 +4,55 @@ const fasturi = require('./')
 const urijs = require('uri-js')
 
 const base = 'uri://a/b/c/d;p?q'
+
+const domain = 'https://example.com/foo#bar$fiz'
+const ipv4 = '//10.10.10.10'
+const ipv6 = '//[2001:db8::7]'
+const urn = 'urn:foo:a123,456'
+const urnuuid = 'urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6'
+
 // Initialization as there is a lot to parse at first
 // eg: regexes
-fasturi.parse('https://example.com')
-urijs.parse('https://example.com')
+fasturi.parse(domain)
+urijs.parse(domain)
 
 suite.add('fast-uri: parse domain', function () {
-  fasturi.parse('https://example.com')
+  fasturi.parse(domain)
 })
 suite.add('urijs: parse domain', function () {
-  urijs.parse('https://example.com')
+  urijs.parse(domain)
 })
 suite.add('WHATWG URL: parse domain', function () {
   // eslint-disable-next-line
-  new URL('https://example.com')
+  new URL(domain)
 })
 suite.add('fast-uri: parse IPv4', function () {
-  fasturi.parse('//10.10.10.10')
+  fasturi.parse(ipv4)
 })
 suite.add('urijs: parse IPv4', function () {
-  urijs.parse('//10.10.10.10')
+  urijs.parse(ipv4)
 })
 suite.add('fast-uri: parse IPv6', function () {
-  fasturi.parse('//[2001:db8::7]')
+  fasturi.parse(ipv6)
 })
 suite.add('urijs: parse IPv6', function () {
-  urijs.parse('//[2001:db8::7]')
+  urijs.parse(ipv6)
 })
 suite.add('fast-uri: parse URN', function () {
-  fasturi.parse('urn:foo:a123,456')
+  fasturi.parse(urn)
 })
 suite.add('urijs: parse URN', function () {
-  urijs.parse('urn:foo:a123,456')
+  urijs.parse(urn)
 })
 suite.add('WHATWG URL: parse URN', function () {
   // eslint-disable-next-line
-  new URL('urn:foo:a123,456')
+  new URL(urn)
 })
 suite.add('fast-uri: parse URN uuid', function () {
-  fasturi.parse('urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6')
+  fasturi.parse(urnuuid)
 })
 suite.add('urijs: parse URN uuid', function () {
-  urijs.parse('urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6')
+  urijs.parse(urnuuid)
 })
 suite.add('fast-uri: serialize uri', function () {
   fasturi.serialize({

package/index.js

@@ -126,6 +126,10 @@ function serialize (cmpts, opts) {
   if (components.path !== undefined) {
     if (!options.skipEscape) {
       components.path = escape(components.path)
+
+      if (components.scheme !== undefined) {
+        components.path = components.path.split('%3A').join(':')
+      }
     } else {
       components.path = unescape(components.path)
     }
@@ -274,10 +278,10 @@ function parse (uri, opts) {
         parsed.host = unescape(parsed.host)
       }
       if (parsed.path !== undefined && parsed.path.length) {
-        parsed.path = escape(parsed.path)
+        parsed.path = encodeURI(parsed.path)
       }
       if (parsed.fragment !== undefined && parsed.fragment.length) {
-        parsed.fragment = escape(parsed.fragment)
+        parsed.fragment = encodeURI(decodeURI(parsed.fragment))
       }
     }
 

package/lib/utils.js

@@ -101,7 +101,7 @@ function normalizeIPv6 (host, opts = {}) {
       newHost += '%' + ipv6.zone
       escapedHost += '%25' + ipv6.zone
     }
-    return { host: newHost, escapedHost: escapedHost, isIPV6: true }
+    return { host: newHost, escapedHost, isIPV6: true }
   } else {
     return { host, isIPV6: false }
   }

package/package.json

@@ -1,42 +1,42 @@
-{
-  "name": "fast-uri",
-  "description": "Dependency free RFC 3986 URI toolbox",
-  "version": "1.0.0",
-  "main": "index.js",
-  "type": "commonjs",
-  "types": "index.d.ts",
-  "license": "MIT",
-  "author": "Vincent Le Goff <vince.legoff@gmail.com> (https://github.com/zekth)",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/fastify/fast-uri"
-  },
-  "bugs": {
-    "url": "https://github.com/fastify/fast-uri/issues"
-  },
-  "homepage":"https://github.com/fastify/fast-uri",
-  "scripts": {
-    "bench": "node benchmark.js",
-    "lint:fix": "standard --fix",
-    "test:lint": "standard | snazzy",
-    "test:typescript": "tsd",
-    "test:unit": "tap -J test/*.test.js",
-    "test:unit:dev": "tap -J test/*.test.js --coverage-report=html",
-    "test": "npm run test:lint && npm run test:unit && npm run test:typescript",
-    "test:ci": "npm run test:lint && npm run test:unit -- --cov --coverage-report=lcovonly && npm run test:typescript"
-  },
-  "devDependencies": {
-    "benchmark": "^2.1.4",
-    "coveralls": "^3.1.1",
-    "snazzy": "^9.0.0",
-    "standard": "^16.0.4",
-    "tap": "^15.0.10",
-    "tsd": "^0.19.0",
-    "typescript": "^4.4.4",
-    "uri-js": "^4.4.1"
-  },
-  "dependencies": {},
-  "tap": {
-    "check-coverage": false
-  }
-}
+{
+  "name": "fast-uri",
+  "description": "Dependency free RFC 3986 URI toolbox",
+  "version": "2.1.0",
+  "main": "index.js",
+  "type": "commonjs",
+  "types": "index.d.ts",
+  "license": "MIT",
+  "author": "Vincent Le Goff <vince.legoff@gmail.com> (https://github.com/zekth)",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/fastify/fast-uri"
+  },
+  "bugs": {
+    "url": "https://github.com/fastify/fast-uri/issues"
+  },
+  "homepage":"https://github.com/fastify/fast-uri",
+  "scripts": {
+    "bench": "node benchmark.js",
+    "lint:fix": "standard --fix",
+    "test:lint": "standard | snazzy",
+    "test:typescript": "tsd",
+    "test:unit": "tap -J test/*.test.js",
+    "test:unit:dev": "tap -J test/*.test.js --coverage-report=html",
+    "test": "npm run test:lint && npm run test:unit && npm run test:typescript",
+    "test:ci": "npm run test:lint && npm run test:unit -- --cov --coverage-report=lcovonly && npm run test:typescript"
+  },
+  "devDependencies": {
+    "benchmark": "^2.1.4",
+    "coveralls": "^3.1.1",
+    "snazzy": "^9.0.0",
+    "standard": "^17.0.0",
+    "tap": "^16.0.0",
+    "tsd": "^0.20.0",
+    "typescript": "^4.4.4",
+    "uri-js": "^4.4.1"
+  },
+  "dependencies": {},
+  "tap": {
+    "check-coverage": false
+  }
+}

package/test/compatibility.test.js

@@ -32,6 +32,9 @@ test('compatibility Parse', (t) => {
     '//[2606:2800:220:1:248:1893:25c8:1946:43209]',
     'http://foo.bar',
     'http://',
+    '#/$defs/stringMap',
+    '#/$defs/string%20Map',
+    '#/$defs/string Map',
     '//?json=%7B%22foo%22%3A%22bar%22%7D'
     //  'mailto:chris@example.com'-203845,
     //  'mailto:infobot@example.com?subject=current-issue',
@@ -108,6 +111,10 @@ test('compatibility serialize', (t) => {
       host: 'example.com',
       resourceName: '/foo?bar',
       secure: true
+    },
+    {
+      scheme: 'scheme',
+      path: 'with:colon'
     }
   ]
   toSerialize.forEach((x) => {