identifier-js 0.0.8 → 0.0.10

package/index.js

@@ -2,10 +2,11 @@
 // a valid URI is always a valid IRI
 const { recursiveCompile } = require('url-templates');
 const patterns = new Map();
+const implemented_schemes = '(?:[hH][tT][tT][pP][sS]?|[wW][sS][sS]?|[fF][iI][lL][eE])';
 // RFC3986/RFC3987 common rules + https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2:~:text=DNS%29%2E-,A,of%20%5BRFC1123%5D%2E
 const commonRules = {
-    implemented_schemes: '(?:[hH][tT][tT][pP][sS]?|[wW][sS][sS]?|[fF][iI][lL][eE]):',
-    scheme: '(?!{implemented_schemes})[a-zA-Z][a-zA-Z0-9+.-]*',
+    implemented_schemes,
+    scheme: '(?!{implemented_schemes}:)[a-zA-Z][a-zA-Z0-9+.-]*',
     port: '(?:0|[1-9]\\d{0,3}|[1-5]\\d{4}|6[0-4]\\d{3}|65[0-4]\\d{2}|655[0-2]\\d|6553[0-5])?',
     IP_literal: '\\[(?:{IPv6address}|{IPvFuture})\\]',
     IPv6address: '(?:(?:{h16}:){6}{ls32}|::(?:{h16}:){5}{ls32}|(?:(?:{h16})?)::(?:{h16}:){4}{ls32}|(?:(?:{h16}:)?{h16})?::(?:{h16}:){3}{ls32}|(?:(?:{h16}:){0,2}{h16})?::(?:{h16}:){2}{ls32}|(?:(?:{h16}:){0,3}{h16})?::(?:{h16}:){1}{ls32}|(?:(?:{h16}:){0,4}{h16})?::{ls32}|(?:(?:{h16}:){0,5}{h16})?::{h16}|(?:(?:{h16}:){0,6}{h16})?::)',
@@ -79,7 +80,7 @@ const iriRules = {
 };
 // scheme specific URI reg_name and IRI ireg_name
 const schemeSpecificRules = {
-    scheme: '(?:https?|wss?|file)',
+    scheme: implemented_schemes,
     reg_name: '(?:(?=.{1,255}(?:[:/?#]|$))(?:{a_label})(?:\\.{a_label})*)',
     a_label: '(?:{alpha_digit})(?:(?:{alpha_digit}|-){0,61}(?:{alpha_digit}))?',
     ireg_name: '(?:(?=.{1,255}(?:[:/?#]|$))(?:{u_label})(?:{u_separator}(?:{u_label}))*)',
@@ -113,8 +114,8 @@ const groupNames = {
     ipath_empty: 'path',
 };
 // all rules into one map
-const isSpecificScheme = (string) => new RegExp('^' + schemeSpecificRules.scheme + ':').test(string);
-const rules = (specific) => specific ? Object.assign({}, commonRules, uriRules, iriRules, schemeSpecificRules) : Object.assign({}, commonRules, uriRules, iriRules);
+const isSpecificScheme = (string) => new RegExp('^' + implemented_schemes + ':').test(string);
+const rules = (specific) => (specific ? Object.assign({}, commonRules, uriRules, iriRules, schemeSpecificRules) : Object.assign({}, commonRules, uriRules, iriRules));
 // parse (slower, it uses regex.exec and includes named capture groups)
 const parse = (string, rule) => {
     if (typeof string !== 'string') throw new TypeError(`Invalid ${rule.replace('_', '-')} type: must be a string.`);
@@ -283,8 +284,9 @@ module.exports = {
     parseIri: (string) => parse(string, 'IRI'),
     parseIriReference: (string) => parse(string, 'IRI_reference'),
     parseAbsoluteIri: (string) => parse(string, 'absolute_IRI'),
-    resolveReference, // not yet decided if the return should be normalized or not, and in what extent
+    resolveReference,
     normalizeReference: (string) => string, // not done yet
     toAbsoluteReference: (string) => resolveReference('', string),
     toRelativeReference,
 };
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "identifier-js",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "A RFC3986 / RFC3987 compliant fast parser/validator/resolver/composer for NodeJS and browser.",
   "keywords": [
     "IRI",
@@ -12,10 +12,8 @@
     "uuid",
     "parser",
     "validator",
-    "RFC",
-    "3987",
-    "RFC",
-    "3986"
+    "RFC3986",
+    "RFC3987"
   ],
   "homepage": "https://github.com/SorinGFS/identifier-js#readme",
   "bugs": {

package/readme.md

@@ -8,7 +8,14 @@ description: A RFC3986 / RFC3987 compliant fast parser/validator/resolver/compos
 
 ## Overview
 
-A fully RFC [3986](https://datatracker.ietf.org/doc/html/rfc3986.html)/[3897](https://datatracker.ietf.org/doc/html/rfc3987.html) compliant URI/IRI parser, validator, resolver and composer, along with other identifier utilities.
+A fully RFC [3986](https://datatracker.ietf.org/doc/html/rfc3986.html)/[3897](https://datatracker.ietf.org/doc/html/rfc3987.html) compliant URI/IRI parser, validator, resolver and composer, along with other identifier utilities. This library implements the following [IANA registered](https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml) schemes:
+- `http` defined by [RFC9110, Section 4.2.1](https://datatracker.ietf.org/doc/html/rfc9110#section-4.2.1)
+- `https` defined by [RFC9110, Section 4.2.2](https://datatracker.ietf.org/doc/html/rfc9110#section-4.2.2)
+- `ws` defined by [RFC6455, Section 3](https://datatracker.ietf.org/doc/html/rfc6455#section-3)
+- `wss` defined by [RFC6455, Section 3](https://datatracker.ietf.org/doc/html/rfc6455#section-3)
+- `file` defined by [RFC8089, Section 2](https://datatracker.ietf.org/doc/html/rfc8089#section-2)
+
+Other schemes that are `IANA registered` schemes and compliant with the generic `URI` or `IRI` syntax are also supported. As for the identifiers that are not `IANA registered`, but compliant with the generic `URI` or `IRI` syntax, the preferred schemes are `uri` and respectively `iri`.
 
 ## Install
 
@@ -81,8 +88,8 @@ Resolve a reference against a base identifier:
 - resolveReference: (reference: string, base: string, strict?: boolean, returnParts?: boolean) => string
 
 **Note:** 
-- strict enables strict resolution behavior.
-- returnParts returns structured components instead of a string.
+- strict (default: `true`) enables strict resolution behavior.
+- returnParts (default: `false`) returns structured components instead of a string.
 
 Convert a reference into absolute form:
 - toAbsoluteReference: (reference: string) => string

package/tests/validation-scheme-specific.test.js

@@ -269,6 +269,27 @@ describe('isUri with hostnames', () => {
     test('Invalid - = character (sub-delims) in file reg_name', () => {
         expect(() => id.isUri('file://exa=mple')).to.throw(Error, 'Invalid URI: file://exa=mple');
     });
+
+    test('Valid case insensitive http scheme', () => {
+        expect(id.isUri('httP://example')).to.equal(true);
+    });
+
+    test('Valid case insensitive https scheme', () => {
+        expect(id.isUri('httPs://example')).to.equal(true);
+    });
+
+    test('Valid case insensitive ws scheme', () => {
+        expect(id.isUri('WS://example')).to.equal(true);
+    });
+
+    test('Valid case insensitive wss scheme', () => {
+        expect(id.isUri('WSs://example')).to.equal(true);
+    });
+
+    test('Valid case insensitive file scheme', () => {
+        expect(id.isUri('fILE://example')).to.equal(true);
+    });
+
 });
 
 describe('isIri with hostnames', () => {
@@ -551,4 +572,25 @@ describe('isIri with hostnames', () => {
     test('Invalid - = character (sub-delims) in file reg_name', () => {
         expect(() => id.isIri('file://exa=mple')).to.throw(Error, 'Invalid IRI: file://exa=mple');
     });
+
+    test('Valid case insensitive http scheme', () => {
+        expect(id.isIri('httP://example')).to.equal(true);
+    });
+
+    test('Valid case insensitive https scheme', () => {
+        expect(id.isIri('httPs://example')).to.equal(true);
+    });
+
+    test('Valid case insensitive ws scheme', () => {
+        expect(id.isIri('WS://example')).to.equal(true);
+    });
+
+    test('Valid case insensitive wss scheme', () => {
+        expect(id.isIri('WSs://example')).to.equal(true);
+    });
+
+    test('Valid case insensitive file scheme', () => {
+        expect(id.isIri('fILE://example')).to.equal(true);
+    });
+
 });