fast-uri 3.0.6 → 3.1.1

package/test/util.test.js

@@ -2,22 +2,37 @@
 
 const test = require('tape')
 const {
-  stringArrayToHexStripped
+  stringArrayToHexStripped,
+  removeDotSegments
 } = require('../lib/utils')
 
 test('stringArrayToHexStripped', (t) => {
   const testCases = [
-    [[['0', '0', '0', '0']], ''],
-    [[['0', '0', '0', '0'], false], ''],
-    [[['0', '0', '0', '0'], true], '0'],
-    [[['0', '1', '0', '0'], false], '100'],
-    [[['1', '0', '0', '0'], false], '1000'],
-    [[['1', '0', '0', '0'], true], '1000']
+    [['0', '0', '0', '0'], ''],
+    [['0', '0', '0', '1'], '1'],
+    [['0', '0', '1', '0'], '10'],
+    [['0', '1', '0', '0'], '100'],
+    [['1', '0', '0', '0'], '1000'],
+    [['1', '0', '0', '1'], '1001'],
   ]
 
   t.plan(testCases.length)
 
   testCases.forEach(([input, expected]) => {
-    t.same(stringArrayToHexStripped(input[0], input[1]), expected)
+    t.same(stringArrayToHexStripped(input), expected)
+  })
+})
+
+// Just fixtures, because this function already tested by resolve
+test('removeDotSegments', (t) => {
+  const testCases = []
+  // https://github.com/fastify/fast-uri/issues/139
+  testCases.push(['WS:/WS://1305G130505:1&%0D:1&C(XXXXX*)))))))XXX130505:UUVUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$aaaaaaaaaaaa13a',
+    'WS:/WS://1305G130505:1&%0D:1&C(XXXXX*)))))))XXX130505:UUVUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$aaaaaaaaaaaa13a'])
+
+  t.plan(testCases.length)
+
+  testCases.forEach(([input, expected]) => {
+    t.same(removeDotSegments(input), expected)
   })
 })

package/tsconfig.json

@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+        "allowJs": true,
+        "checkJs": true,
+        "strict": true,
+        "noImplicitAny": true,
+        "target": "es2015"
+    }
+}

package/types/index.d.ts

@@ -10,6 +10,11 @@ declare namespace fastUri {
     query?: string;
     fragment?: string;
     reference?: string;
+    nid?: string;
+    nss?: string;
+    resourceName?: string;
+    secure?: boolean;
+    uuid?: string;
     error?: string;
   }
   export interface Options {
@@ -19,6 +24,8 @@ declare namespace fastUri {
     domainHost?: boolean;
     absolutePath?: boolean;
     tolerant?: boolean;
+    skipEscape?: boolean;
+    nid?: string;
   }
 
   /**

package/.github/.stale.yml

@@ -1,21 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 15
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - "discussion"
-  - "feature request"
-  - "bug"
-  - "help wanted"
-  - "plugin suggestion"
-  - "good first issue"
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

package/.github/tests_checker.yml

@@ -1,8 +0,0 @@
-comment: |
-  Hello! Thank you for contributing!
-  It appears that you have changed the code, but the tests that verify your change are missing. Could you please add them?
-fileExtensions:
-  - '.ts'
-  - '.js'
-
-testDir: 'test'

package/benchmark.js

@@ -1,105 +0,0 @@
-'use strict'
-
-const benchmark = require('benchmark')
-const suite = new benchmark.Suite()
-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(domain)
-urijs.parse(domain)
-
-suite.add('fast-uri: parse domain', function () {
-  fasturi.parse(domain)
-})
-suite.add('urijs: parse domain', function () {
-  urijs.parse(domain)
-})
-suite.add('WHATWG URL: parse domain', function () {
-  // eslint-disable-next-line
-  new URL(domain)
-})
-suite.add('fast-uri: parse IPv4', function () {
-  fasturi.parse(ipv4)
-})
-suite.add('urijs: parse IPv4', function () {
-  urijs.parse(ipv4)
-})
-suite.add('fast-uri: parse IPv6', function () {
-  fasturi.parse(ipv6)
-})
-suite.add('urijs: parse IPv6', function () {
-  urijs.parse(ipv6)
-})
-suite.add('fast-uri: parse URN', function () {
-  fasturi.parse(urn)
-})
-suite.add('urijs: parse URN', function () {
-  urijs.parse(urn)
-})
-suite.add('WHATWG URL: parse URN', function () {
-  // eslint-disable-next-line
-  new URL(urn)
-})
-suite.add('fast-uri: parse URN uuid', function () {
-  fasturi.parse(urnuuid)
-})
-suite.add('urijs: parse URN uuid', function () {
-  urijs.parse(urnuuid)
-})
-suite.add('fast-uri: serialize uri', function () {
-  fasturi.serialize({
-    scheme: 'uri',
-    userinfo: 'foo:bar',
-    host: 'example.com',
-    port: 1,
-    path: 'path',
-    query: 'query',
-    fragment: 'fragment'
-  })
-})
-suite.add('urijs: serialize uri', function () {
-  urijs.serialize({
-    scheme: 'uri',
-    userinfo: 'foo:bar',
-    host: 'example.com',
-    port: 1,
-    path: 'path',
-    query: 'query',
-    fragment: 'fragment'
-  })
-})
-suite.add('fast-uri: serialize IPv6', function () {
-  fasturi.serialize({ host: '2606:2800:220:1:248:1893:25c8:1946' })
-})
-suite.add('urijs: serialize IPv6', function () {
-  urijs.serialize({ host: '2606:2800:220:1:248:1893:25c8:1946' })
-})
-suite.add('fast-uri: serialize ws', function () {
-  fasturi.serialize({ scheme: 'ws', host: 'example.com', resourceName: '/foo?bar', secure: true })
-})
-suite.add('urijs: serialize ws', function () {
-  urijs.serialize({ scheme: 'ws', host: 'example.com', resourceName: '/foo?bar', secure: true })
-})
-suite.add('fast-uri: resolve', function () {
-  fasturi.resolve(base, '../../../g')
-})
-suite.add('urijs: resolve', function () {
-  urijs.resolve(base, '../../../g')
-})
-suite.on('cycle', cycle)
-
-suite.run()
-
-function cycle (e) {
-  console.log(e.target.toString())
-}

package/lib/scopedChars.js

@@ -1,30 +0,0 @@
-'use strict'
-
-const HEX = {
-  0: 0,
-  1: 1,
-  2: 2,
-  3: 3,
-  4: 4,
-  5: 5,
-  6: 6,
-  7: 7,
-  8: 8,
-  9: 9,
-  a: 10,
-  A: 10,
-  b: 11,
-  B: 11,
-  c: 12,
-  C: 12,
-  d: 13,
-  D: 13,
-  e: 14,
-  E: 14,
-  f: 15,
-  F: 15
-}
-
-module.exports = {
-  HEX
-}

package/test/compatibility.test.js

@@ -1,131 +0,0 @@
-'use strict'
-
-const test = require('tape')
-const fastifyURI = require('../')
-const urijs = require('uri-js')
-
-test('compatibility Parse', (t) => {
-  const toParse = [
-    '//www.g.com/error\n/bleh/bleh',
-    'https://fastify.org',
-    '/definitions/Record%3Cstring%2CPerson%3E',
-    '//10.10.10.10',
-    // '//10.10.000.10', <-- not a valid URI per URI spec: https://datatracker.ietf.org/doc/html/rfc5954#section-4.1
-    '//[2001:db8::7%en0]',
-    '//[2001:dbZ::1]:80',
-    '//[2001:db8::1]:80',
-    '//[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',
-    'ws://example.com/chat',
-    'ws://example.com/foo?bar=baz',
-    'wss://example.com/?bar=baz',
-    'wss://example.com/chat',
-    'wss://example.com/foo?bar=baz',
-    'wss://example.com/?bar=baz',
-    'urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6',
-    'urn:uuid:notauuid-7dec-11d0-a765-00a0c91e6bf6',
-    'urn:example:%D0%B0123,z456',
-    '//[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',
-    //  'mailto:infobot@example.com?body=send%20current-issue',
-    //  'mailto:infobot@example.com?body=send%20current-issue%0D%0Asend%20index',
-    //  'mailto:list@example.org?In-Reply-To=%3C3469A91.D10AF4C@example.com%3E',
-    //  'mailto:majordomo@example.com?body=subscribe%20bamboo-l',
-    //  'mailto:joe@example.com?cc=bob@example.com&body=hello',
-    //  'mailto:gorby%25kremvax@example.com',
-    //  'mailto:unlikely%3Faddress@example.com?blat=foop',
-    //  'mailto:Mike%26family@example.org',
-    //  'mailto:%22not%40me%22@example.org',
-    //  'mailto:%22oh%5C%5Cno%22@example.org',
-    //  'mailto:%22%5C%5C%5C%22it\'s%5C%20ugly%5C%5C%5C%22%22@example.org',
-    //  'mailto:user@example.org?subject=caf%C3%A9',
-    //  'mailto:user@example.org?subject=%3D%3Futf-8%3FQ%3Fcaf%3DC3%3DA9%3F%3D',
-    //  'mailto:user@example.org?subject=%3D%3Fiso-8859-1%3FQ%3Fcaf%3DE9%3F%3D',
-    //  'mailto:user@example.org?subject=caf%C3%A9&body=caf%C3%A9',
-    //  'mailto:user@%E7%B4%8D%E8%B1%86.example.org?subject=Test&body=NATTO'
-  ]
-  toParse.forEach((x) => {
-    t.same(fastifyURI.parse(x), urijs.parse(x), 'Compatibility parse: ' + x)
-  })
-  t.end()
-})
-
-test('compatibility serialize', (t) => {
-  const toSerialize = [
-    { host: '10.10.10.10.example.com' },
-    { host: '2001:db8::7' },
-    { host: '::ffff:129.144.52.38' },
-    { host: '2606:2800:220:1:248:1893:25c8:1946' },
-    { host: '10.10.10.10.example.com' },
-    { host: '10.10.10.10' },
-    { path: '?query' },
-    { path: 'foo:bar' },
-    { path: '//path' },
-    {
-      scheme: 'uri',
-      host: 'example.com',
-      port: '9000'
-    },
-    {
-      scheme: 'uri',
-      userinfo: 'foo:bar',
-      host: 'example.com',
-      port: 1,
-      path: 'path',
-      query: 'query',
-      fragment: 'fragment'
-    },
-    {
-      scheme: '',
-      userinfo: '',
-      host: '',
-      port: 0,
-      path: '',
-      query: '',
-      fragment: ''
-    },
-    {
-      scheme: undefined,
-      userinfo: undefined,
-      host: undefined,
-      port: undefined,
-      path: undefined,
-      query: undefined,
-      fragment: undefined
-    },
-    { host: 'fe80::a%en1' },
-    { host: 'fe80::a%25en1' },
-    {
-      scheme: 'ws',
-      host: 'example.com',
-      resourceName: '/foo?bar',
-      secure: true
-    },
-    {
-      scheme: 'scheme',
-      path: 'with:colon'
-    }
-  ]
-  toSerialize.forEach((x) => {
-    const r = JSON.stringify(x)
-    t.same(
-      fastifyURI.serialize(x),
-      urijs.serialize(x),
-      'Compatibility serialize: ' + JSON.stringify(r)
-    )
-  })
-  t.end()
-})