test: isBrowser()

src/fund/main-client.ts

@@ -34,3 +34,19 @@ export function clientSideFund(pointer?: WMAddress, options: fundOptions = {}):
   }
   throw FundmeError(invalidAddress)
 }
+
+let forceBrowser: boolean = false
+export function forceFundmeOnBrowser() {
+  forceBrowser = true
+}
+
+export const isBrowser = (options: fundOptions = {}): boolean => {
+  if (options.force === 'server') return false
+
+  if (forceBrowser || options.force === 'client') {
+    forceBrowser = false
+    return true
+  }
+
+  return require === undefined && module === undefined
+}

src/fund/main.ts

@@ -6,7 +6,7 @@ import {
   getCurrentPointerAddressMustClientSide,
   FundmeError,
 } from './errors'
-import { clientSideFund } from './main-client'
+import { clientSideFund, isBrowser, forceFundmeOnBrowser } from './main-client'
 import { serverSideFund } from './main-server'
 
 export let defaultAddress: WMAddress
@@ -33,19 +33,6 @@ export function fund(pointer?: WMAddress, options: fundOptions = {}): FundType |
   }
 }
 
-let forceBrowser: boolean = false
-export function forceFundmeOnBrowser() {
-  forceBrowser = true
-}
-
-export const isBrowser = (options: fundOptions = {}): boolean => {
-  if (forceBrowser || options.force === 'client') {
-    forceBrowser = false
-    return true
-  }
-  return require === undefined && module === undefined
-}
-
 export function setDefaultAddress(address: WMAddress): void {
   if (Array.isArray(address)) {
     defaultAddress = createPool(address)
@@ -96,3 +83,5 @@ export function convertToPointerPool(pointer: WMAddress): Array<string | WMPoint
 
   return pointer
 }
+
+export { isBrowser, forceFundmeOnBrowser }

src/fund/set-pointer-template.ts

@@ -14,11 +14,11 @@ export const FUNDME_JSON_SELECTOR = 'script[fundme]'
 
 type JSONTemplate = Array<WMPointer | string>
 
-export function setPointerFromTemplates(): void {
+export function setPointerFromTemplates(options: fundOptions = {}): void {
   const pointers: Array<WMPointer> = [...scrapeTemplate(), ...scrapeJson(), ...scrapeCustomSyntax()]
 
   if (pointers.length) {
-    setPointerMultiple(pointers)
+    setPointerMultiple(pointers, options)
   } else {
     throw FundmeError(noTemplateFound)
   }

tests/fund/client-side/fundme-force-browser.spec.ts

@@ -1,4 +1,4 @@
-import { fund } from '../../../src/fund/main'
+import { fund, isBrowser } from '../../../src/fund/main'
 
 import { toBeInTheDocument, toHaveAttribute } from '@testing-library/jest-dom/matchers'
 
@@ -31,3 +31,15 @@ describe('force fund() on browser', () => {
     expect(meta.content).toContain('$wallet.example.com/test')
   })
 })
+
+describe('test isBrowser()', () => {
+  test('force client is enabled', () => {
+    expect(isBrowser({ force: 'client' })).toBeTruthy()
+  })
+  test('force server is enabled', () => {
+    expect(isBrowser({ force: 'server' })).toBeFalsy()
+  })
+  test('without forcing in node environment', () => {
+    expect(isBrowser()).toBeFalsy()
+  })
+})