identifier-js 0.0.3 → 0.0.4

package/index.js

@@ -11,7 +11,7 @@ const commonRules = {
     ls32: '(?:{h16}:{h16}|{IPv4address})',
     h16: '{hexdig}{1,4}',
     IPv4address: '(?:{dec_octet}\\.){3}{dec_octet}',
-    dec_octet: '(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)',
+    dec_octet: '(?:\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])',
     IPvFuture: 'v{hexdig}+\\.(?:{unreserved}|{sub_delims}|:)+',
     unreserved: '[a-zA-Z0-9_.~-]',
     reserved: '(?:{gen_delims}|{sub_delims})',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "identifier-js",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "A RFC3986 / RFC3987 compliant fast parser/validator/resolver/composer for NodeJS and browser.",
   "keywords": [
     "IRI",

package/tests/resolve.test.js

@@ -2,23 +2,21 @@ import { describe, expect, test } from 'vitest';
 import id from '../index.js';
 
 const resolveTests = [
-    // ['', 'urn:some:ip:prop', 'urn:some:ip:prop'], // invalid base (resolveReference throw)
-    // ['#', 'urn:some:ip:prop', 'urn:some:ip:prop'], // invalid base (resolveReference throw)
     ['urn:some:ip:prop', 'urn:some:ip:prop', 'urn:some:ip:prop'],
-    ['urn:some:other:prop', 'urn:some:ip:prop', 'urn:some:ip:prop'],
-    ['hTTp://example.com/b/c/d/e', '', 'http://example.com/b/c/d/e'], // scheme to lowercase
-    ['http://eXaMpLe.com/b/c/d/e', '', 'http://example.com/b/c/d/e'], // authority to lowercase
-    ['http://example.com/b%2Ec/d/e', '', 'http://example.com/b.c/d/e'], // Unnecessary encoding segment
-    ['http://example.com/b%2Fc/d/e', '', 'http://example.com/b%2Fc/d/e'], // Necessary encoding segment
-    ['http://example.com/b%2fc/d/e', '', 'http://example.com/b%2Fc/d/e'], // Case normalization of encoding segment
-    ['http://example.com/b?c%2Fd%3Fe', '', 'http://example.com/b?c/d?e'], // Unnecessary encoding query
-    ['http://example.com/b', '#c%2Fd%3Fe', 'http://example.com/b#c/d?e'], // Unnecessary encoding fragment
+    ['urn:some:ip:prop', 'urn:some:other:prop', 'urn:some:ip:prop'],
+    ['', 'hTTp://example.com/b/c/d/e', 'http://example.com/b/c/d/e'], // scheme to lowercase
+    ['', 'http://eXaMpLe.com/b/c/d/e', 'http://example.com/b/c/d/e'], // authority to lowercase
+    ['', 'http://example.com/b%2Ec/d/e', 'http://example.com/b.c/d/e'], // Unnecessary encoding segment
+    ['', 'http://example.com/b%2Fc/d/e', 'http://example.com/b%2Fc/d/e'], // Necessary encoding segment
+    ['', 'http://example.com/b%2fc/d/e', 'http://example.com/b%2Fc/d/e'], // Case normalization of encoding segment
+    ['', 'http://example.com/b?c%2Fd%3Fe', 'http://example.com/b?c/d?e'], // Unnecessary encoding query
+    ['#c%2Fd%3Fe', 'http://example.com/b', 'http://example.com/b#c/d?e'], // Unnecessary encoding fragment
 ];
 
 describe('resolveReference', () => {
-    resolveTests.forEach(([baseIri, iriReference, expected]) => {
-        test(`resolveReference('${iriReference}', '${baseIri}') === '${expected}'`, () => {
-            const subject = id.resolveReference(iriReference, baseIri);
+    resolveTests.forEach(([reference, base, expected]) => {
+        test(`resolveReference('${reference}', '${base}') === '${expected}'`, () => {
+            const subject = id.resolveReference(reference, base);
             expect(subject).to.equal(expected);
         });
     });