fast-uri 3.0.0 → 3.0.2

package/.github/workflows/ci.yml

@@ -17,7 +17,7 @@ on:
 
 jobs:
   test:
-    uses: fastify/workflows/.github/workflows/plugins-ci.yml@v4.2.0
+    uses: fastify/workflows/.github/workflows/plugins-ci.yml@v5.0.0
     with:
       license-check: true
-      node-versions: '["16", "18", "20"]'
+      node-versions: '["16", "18", "20", "22"]'

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

@@ -17,4 +17,4 @@ on:
 
 jobs:
   test:
-    uses: fastify/workflows/.github/workflows/plugins-ci-package-manager.yml@v4.1.0
+    uses: fastify/workflows/.github/workflows/plugins-ci-package-manager.yml@v5.0.0

package/index.js

@@ -135,8 +135,7 @@ function serialize (cmpts, opts) {
   }
 
   if (options.reference !== 'suffix' && components.scheme) {
-    uriTokens.push(components.scheme)
-    uriTokens.push(':')
+    uriTokens.push(components.scheme, ':')
   }
 
   const authority = recomposeAuthority(components, options)
@@ -166,13 +165,11 @@ function serialize (cmpts, opts) {
   }
 
   if (components.query !== undefined) {
-    uriTokens.push('?')
-    uriTokens.push(components.query)
+    uriTokens.push('?', components.query)
   }
 
   if (components.fragment !== undefined) {
-    uriTokens.push('#')
-    uriTokens.push(components.fragment)
+    uriTokens.push('#', components.fragment)
   }
   return uriTokens.join('')
 }
@@ -270,9 +267,6 @@ function parse (uri, opts) {
       if (gotEncoding && parsed.scheme !== undefined) {
         parsed.scheme = unescape(parsed.scheme)
       }
-      if (gotEncoding && parsed.userinfo !== undefined) {
-        parsed.userinfo = unescape(parsed.userinfo)
-      }
       if (gotEncoding && parsed.host !== undefined) {
         parsed.host = unescape(parsed.host)
       }
@@ -280,7 +274,7 @@ function parse (uri, opts) {
         parsed.path = escape(unescape(parsed.path))
       }
       if (parsed.fragment !== undefined && parsed.fragment.length) {
-        parsed.fragment = encodeURI(decodeURI(parsed.fragment))
+        parsed.fragment = encodeURI(decodeURIComponent(parsed.fragment))
       }
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fast-uri",
   "description": "Dependency free RFC 3986 URI toolbox",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "main": "index.js",
   "type": "commonjs",
   "types": "types/index.d.ts",
@@ -21,17 +21,18 @@
     "lint:fix": "standard --fix",
     "test": "npm run lint && npm run test:unit && npm run test:typescript",
     "test:ci": "npm run lint && npm run test:unit -- --coverage-report=lcovonly && npm run test:typescript",
-    "test:unit": "tap",
+    "test:unit": "npx tape test/**/*.js",
     "test:unit:dev": "npm run test:unit -- --coverage-report=html",
     "test:typescript": "tsd"
   },
   "devDependencies": {
     "@fastify/pre-commit": "^2.1.0",
+    "ajv": "^8.16.0",
     "benchmark": "^2.1.4",
     "coveralls": "^3.1.1",
     "snazzy": "^9.0.0",
     "standard": "^17.1.0",
-    "tap": "^18.7.2",
+    "tape": "^5.8.1",
     "tsd": "^0.31.0",
     "uri-js": "^4.4.1"
   }

package/test/ajv.test.js

@@ -0,0 +1,39 @@
+const AJV = require('ajv')
+const fastUri = require('../')
+const ajv = new AJV({
+  uriResolver: fastUri // comment this line to see it works with uri-js
+})
+const test = require('tape')
+
+test('ajv', t => {
+  t.plan(1)
+  const schema = {
+    $ref: '#/definitions/Record%3Cstring%2CPerson%3E',
+    definitions: {
+      Person: {
+        type: 'object',
+        properties: {
+          firstName: {
+            type: 'string'
+          }
+        }
+      },
+      'Record<string,Person>': {
+        type: 'object',
+        additionalProperties: {
+          $ref: '#/definitions/Person'
+        }
+      }
+    }
+  }
+
+  const data = {
+    joe: {
+      firstName: 'Joe'
+    }
+
+  }
+
+  const validate = ajv.compile(schema)
+  t.ok(validate(data))
+})

package/test/compatibility.test.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const tap = require('tap')
-const test = tap.test
+const test = require('tape')
 const fastifyURI = require('../')
 const urijs = require('uri-js')
 
@@ -18,6 +17,8 @@ test('compatibility Parse', (t) => {
     '//[2001:db8::001]:80',
     'uri://user:pass@example.com:123/one/two.three?q1=a1&q2=a2#body',
     'http://user:pass@example.com:123/one/space in.url?q1=a1&q2=a2#body',
+    'http://User:Pass@example.com:123/one/space in.url?q1=a1&q2=a2#body',
+    'http://A%3AB@example.com:123/one/space',
     '//[::ffff:129.144.52.38]',
     'uri://10.10.10.10.example.com/en/process',
     '//[2606:2800:220:1:248:1893:25c8:1946]/test',

package/test/equal.test.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const tap = require('tap')
-const test = tap.test
+const test = require('tape')
 const URI = require('../')
 
 const fn = URI.equal

package/test/parse.test.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const tap = require('tap')
-const test = tap.test
+const test = require('tape')
 const URI = require('../')
 
 test('URI parse', (t) => {

package/test/resolve.test.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const tap = require('tap')
-const test = tap.test
+const test = require('tape')
 const URI = require('../')
 
 test('URI Resolving', (t) => {

package/test/serialize.test.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const tap = require('tap')
-const test = tap.test
+const test = require('tape')
 const URI = require('../')
 
 test('URI Serialize', (t) => {