fix: Add globalThis to references of window

- Also made small performance change in how URL-building functions work.
WJSoftware · Feb 20, 2023 · 3bce5bd · 3bce5bd
1 parent 3cffc61
commit 3bce5bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Builder.ts b/src/Builder.ts
@@ -256,7 +256,7 @@ export default class Builder implements IBuilder {
             urlData.wsPropertyNames.forEach((value) => {
                 const obj = wjConfig[value];
                 if (isConfig(obj)) {
-                    makeWsUrlFunctions(obj, urlData.routeValuesRegExp, window && window.location !== undefined);
+                    makeWsUrlFunctions(obj, urlData.routeValuesRegExp, globalThis.window && globalThis.window.location !== undefined);
                 }
                 else {
                     throw new Error(`The level 1 property "${value}" is not a node value (object), but it was specified as being an object containing URL-building information.`);

diff --git a/src/makeWsUrlFunctions.ts b/src/makeWsUrlFunctions.ts
@@ -30,7 +30,7 @@ function buildUrlImpl(
     const rp = (this[rootPathFn] ?? noop)();
     let url = `${rp}${(path ?? '')}`;
     // Replace any replaceable route values.
-    if (routeRegex && routeRegex.test(url) && routeValuesFn) {
+    if (routeRegex && routeValuesFn && routeRegex.test(url)) {
         url = url.replace(routeRegex, (m, g1) => encodeURIComponent((routeValuesFn ?? noop)(g1)));
     }
     // Add query string values, if provided.
@@ -71,7 +71,7 @@ function parentRootPath(this: IWsParent, isBrowser: boolean) {
         // build a relative URL starting with the root path.
         return this.rootPath ?? '';
     }
-    return `${(this.scheme ?? 'http')}://${(this.host ?? window?.location?.hostname ?? '')}${(this.port ? `:${this.port}` : '')}${(this.rootPath ?? '')}`;
+    return `${(this.scheme ?? 'http')}://${(this.host ?? globalThis.window?.location?.hostname ?? '')}${(this.port ? `:${this.port}` : '')}${(this.rootPath ?? '')}`;
 }
 
 function pathRootPath(this: IWsPath, parent: IWsPath) {