fast-uri 2.2.0 → 2.3.0

package/.gitattributes

@@ -0,0 +1,2 @@
+# Set default behavior to automatically convert line endings
+* text=auto eol=lf

package/.github/workflows/ci.yml

@@ -2,6 +2,11 @@ name: CI
 
 on:
   push:
+    branches:
+     - main
+     - master
+     - next
+     - 'v*'
     paths-ignore:
       - 'docs/**'
       - '*.md'

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

@@ -3,64 +3,18 @@ name: package-manager-ci
 on:
   push:
     branches:
-      - master
-
-permissions:
-  contents: read
+     - main
+     - master
+     - next
+     - 'v*'
+    paths-ignore:
+      - 'docs/**'
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '*.md'
 
 jobs:
-  pnpm:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        # Maintenance and active LTS
-        node-version: [14, 16]
-        os: [ubuntu-18.04]
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          persist-credentials: false
-
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install with pnpm
-        run: |
-          curl -L https://unpkg.com/@pnpm/self-installer | node
-          pnpm install
-
-      - name: Run tests
-        run: |
-          pnpm run test
-
-  yarn:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        # Maintenance and active LTS
-        node-version: [14, 16]
-        os: [ubuntu-18.04]
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          persist-credentials: false
-
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install with yarn
-        run: |
-          curl -o- -L https://yarnpkg.com/install.sh | bash
-          yarn install --ignore-engines
-
-      - name: Run tests
-        run: |
-          yarn run test
+  test:
+    uses: fastify/workflows/.github/workflows/plugins-ci-package-manager.yml@v3

package/benchmark.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const benchmark = require('benchmark')
 const suite = new benchmark.Suite()
 const fasturi = require('./')

package/index.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const URL = require('url')
+const URL = require('node:url')
 const { normalizeIPv6, normalizeIPv4, removeDotSegments, recomposeAuthority, normalizeComponentEncoding } = require('./lib/utils')
 const SCHEMES = require('./lib/schemes')
 
@@ -160,7 +160,7 @@ function serialize (cmpts, opts) {
     }
 
     if (authority === undefined) {
-      s = s.replace(/^\/\//, '/%2F') // don't allow the path to start with "//"
+      s = s.replace(/^\/\//u, '/%2F') // don't allow the path to start with "//"
     }
 
     uriTokens.push(s)
@@ -178,7 +178,20 @@ function serialize (cmpts, opts) {
   return uriTokens.join('')
 }
 
-const URI_PARSE = /^(?:([^:/?#]+):)?(?:\/\/((?:([^/?#@]*)@)?(\[[^/?#\]]+\]|[^/?#:]*)(?::(\d*))?))?([^?#]*)(?:\?([^#]*))?(?:#((?:.|\n|\r)*))?/i
+const hexLookUp = Array.from({ length: 127 }, (v, k) => /[^!"$&'()*+,\-.;=_`a-z{}~]/u.test(String.fromCharCode(k)))
+
+function nonSimpleDomain (value) {
+  let code = 0
+  for (let i = 0, len = value.length; i < len; ++i) {
+    code = value.charCodeAt(i)
+    if (code > 126 || hexLookUp[code]) {
+      return true
+    }
+  }
+  return false
+}
+
+const URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u
 
 function parse (uri, opts) {
   const options = Object.assign({}, opts)
@@ -239,7 +252,7 @@ function parse (uri, opts) {
     // check if scheme can't handle IRIs
     if (!options.unicodeSupport && (!schemeHandler || !schemeHandler.unicodeSupport)) {
       // if host component is a domain name
-      if (parsed.host && (options.domainHost || (schemeHandler && schemeHandler.domainHost))) {
+      if (parsed.host && (options.domainHost || (schemeHandler && schemeHandler.domainHost)) && nonSimpleDomain(parsed.host)) {
         // convert Unicode IDN -> ASCII IDN
         try {
           parsed.host = URL.domainToASCII(parsed.host.toLowerCase())

package/lib/schemes.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const UUID_REG = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/
-const URN_REG = /([A-Za-z0-9][A-Za-z0-9-]{0,31}):(([A-Za-z0-9()+,\-.:=@;$_!*']|%[0-9A-Fa-f]{2})+)/
+const UUID_REG = /^[\da-f]{8}\b-[\da-f]{4}\b-[\da-f]{4}\b-[\da-f]{4}\b-[\da-f]{12}$/iu
+const URN_REG = /([\da-z][\d\-a-z]{0,31}):((?:[\w!$'()*+,\-.:;=@]|%[\da-f]{2})+)/iu
 
 function isSecure (wsComponents) {
   return typeof wsComponents.secure === 'boolean' ? wsComponents.secure : String(wsComponents.scheme).toLowerCase() === 'wss'

package/lib/utils.js

@@ -4,7 +4,7 @@ const { HEX } = require('./scopedChars')
 
 function normalizeIPv4 (host) {
   if (findToken(host, '.') < 3) { return { host, isIPV4: false } }
-  const matches = host.match(/^(\b25[0-5]|\b2[0-4][0-9]|\b[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/) || []
+  const matches = host.match(/^(\b[01]?\d{1,2}|\b2[0-4]\d|\b25[0-5])(\.([01]?\d{1,2}|2[0-4]\d|25[0-5])){3}$/u) || []
   const [address] = matches
   if (address) {
     return { host: stripLeadingZeros(address, '.'), isIPV4: true }
@@ -138,10 +138,10 @@ function findToken (str, token) {
   return ind
 }
 
-const RDS1 = /^\.\.?\//
-const RDS2 = /^\/\.(\/|$)/
-const RDS3 = /^\/\.\.(\/|$)/
-const RDS5 = /^\/?(?:.|\n)*?(?=\/|$)/
+const RDS1 = /^\.\.?\//u
+const RDS2 = /^\/\.(?:\/|$)/u
+const RDS3 = /^\/\.\.(?:\/|$)/u
+const RDS5 = /^\/?(?:.|\n)*?(?=\/|$)/u
 
 function removeDotSegments (input) {
   const output = []

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fast-uri",
   "description": "Dependency free RFC 3986 URI toolbox",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "main": "index.js",
   "type": "commonjs",
   "types": "types/index.d.ts",
@@ -14,7 +14,7 @@
   "bugs": {
     "url": "https://github.com/fastify/fast-uri/issues"
   },
-  "homepage":"https://github.com/fastify/fast-uri",
+  "homepage": "https://github.com/fastify/fast-uri",
   "scripts": {
     "bench": "node benchmark.js",
     "lint:fix": "standard --fix",
@@ -31,7 +31,7 @@
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",
     "tap": "^16.0.0",
-    "tsd": "^0.24.1",
+    "tsd": "^0.29.0",
     "uri-js": "^4.4.1"
   },
   "dependencies": {},