Resolve circular dependencies for Rollup/Vite CJS build

lib/NameAddrHeader.d.ts

@@ -1,6 +1,4 @@
 import {Parameters, URI} from './URI'
-import {Grammar} from './Grammar'
-
 export class NameAddrHeader {
   get display_name(): string;
   set display_name(value: string);
@@ -23,5 +21,5 @@ export class NameAddrHeader {
 
   toString(): string;
 
-  static parse(uri: string): Grammar | undefined;
+  static parse(uri: string): string | undefined;
 }

lib/NameAddrHeader.js

@@ -1,5 +1,4 @@
-const URI = require('./URI');
-const Grammar = require('./Grammar');
+const Utils = require('./Utils');
 
 module.exports = class NameAddrHeader
 {
@@ -9,22 +8,13 @@ module.exports = class NameAddrHeader
    */
   static parse(name_addr_header)
   {
-    name_addr_header = Grammar.parse(name_addr_header, 'Name_Addr_Header');
-
-    if (name_addr_header !== -1)
-    {
-      return name_addr_header;
-    }
-    else
-    {
-      return undefined;
-    }
+    return Utils.parseNameAddrHeader(name_addr_header);
   }
 
   constructor(uri, display_name, parameters)
   {
     // Checks.
-    if (!uri || !(uri instanceof URI))
+    if (!Utils.isValidURI(uri))
     {
       throw new TypeError('missing or invalid "uri" parameter');
     }

lib/URI.d.ts

@@ -1,5 +1,3 @@
-import {Grammar} from './Grammar'
-
 export type URIScheme = 'sip' | string;
 
 export type Parameters = Record<string, string | null>;
@@ -40,5 +38,5 @@ export class URI {
 
   toAor(): string;
 
-  static parse(uri: string): Grammar | undefined;
+  static parse(uri: string): string | undefined;
 }

lib/URI.js

@@ -1,6 +1,5 @@
 const JsSIP_C = require('./Constants');
 const Utils = require('./Utils');
-const Grammar = require('./Grammar');
 
 /**
  * -param {String} [scheme]
@@ -19,16 +18,7 @@ module.exports = class URI
     */
   static parse(uri)
   {
-    uri = Grammar.parse(uri, 'SIP_URI');
-
-    if (uri !== -1)
-    {
-      return uri;
-    }
-    else
-    {
-      return undefined;
-    }
+    return Utils.parseUri(uri)
   }
 
   constructor(scheme, user, host, port, parameters = {}, headers = {})

lib/Utils.d.ts

@@ -34,3 +34,7 @@ export function closeMediaStream(stream?: MediaStream): void;
 export function cloneArray<T = unknown>(arr: T[]): T[];
 
 export function cloneObject<T>(obj: T, fallback?: T): T;
+
+export function parseUri(uri: string): string | undefined;
+
+export function parseNameAddrHeader(nameAddrHeader: string): string | undefined;

lib/Utils.js

@@ -175,7 +175,7 @@ exports.normalizeTarget = (target, domain) =>
     // Finally parse the resulting URI.
     let uri;
 
-    if ((uri = URI.parse(target)))
+    if ((uri = parseUri(target)))
     {
       return uri;
     }
@@ -550,3 +550,41 @@ exports.cloneObject = (obj, fallback = {}) =>
 {
   return (obj && Object.assign({}, obj)) || fallback;
 };
+
+/**
+* Parse the given string and returns a JsSIP.URI instance or undefined if
+* it is an invalid URI.
+*/
+const parseUri = (uri) => 
+{
+  uri = Grammar.parse(uri, 'SIP_URI');
+
+  if (uri !== -1)
+  {
+    return uri;
+  }
+  else
+  {
+    return undefined;
+  }
+}
+exports.parseUri = parseUri
+
+exports.parseNameAddrHeader = (name_addr_header) =>
+{
+  name_addr_header = Grammar.parse(name_addr_header, 'Name_Addr_Header');
+
+  if (name_addr_header !== -1)
+  {
+    return name_addr_header;
+  }
+  else
+  {
+    return undefined;
+  }
+}
+
+exports.isValidURI = (instance) => 
+{
+  return instance && (instance instanceof URI)
+}