Fix #1537 export a serviceUrl function

src/main/resources/lib/enonic/react4xp/assetUrl.ts

@@ -0,0 +1,26 @@
+import type { AssetUrlParams } from '@enonic-types/lib-portal'; // Might be deprecated in XP8.
+
+import { getUrlType } from '/lib/enonic/react4xp/React4xp/utils/getUrlType';
+import { serviceUrl } from '/lib/enonic/react4xp/serviceUrl';
+
+
+export interface R4xAssetUrlParams extends AssetUrlParams {
+	service?: string;
+}
+
+
+export function assetUrl({
+	application = app.name,
+	params,
+	path = '/',
+	service = 'asset',
+	type = getUrlType()
+}: R4xAssetUrlParams): string {
+	return serviceUrl({
+		application,
+		params,
+		path,
+		service,
+		type
+	});
+}

src/main/resources/lib/enonic/react4xp/dependencies/initServiceUrlRoot.ts

@@ -2,34 +2,22 @@ import type { UrlType } from '@enonic-types/lib-react4xp';
 
 import { getUrlType } from '/lib/enonic/react4xp/React4xp/utils/getUrlType';
 
-interface ServiceUrlBuilder {
-	setApplication(value: string): void;
-
-	setPath(value: string): void;
-
-	setType(value: string): void;
-
-	setServiceName(value: string): void;
-
-	createUrl(): string;
-}
+import { serviceUrl } from '/lib/enonic/react4xp/serviceUrl';
 
 /*
 * Initialize the root path of a service URL for a site mount.
 */
 export function initServiceUrlRoot({
 	serviceName = '',
-	urlType // default is app.config['react4xp.urlType'] || 'server'
+	urlType = getUrlType()
 }: {
 	serviceName?: string,
 	urlType?: UrlType
 } = {}) {
-	const bean: ServiceUrlBuilder = __.newBean('com.enonic.lib.react4xp.url.ServiceUrlBuilder');
-
-	bean.setApplication(app.name);
-	bean.setPath('/');
-	bean.setType(getUrlType(urlType));
-	bean.setServiceName(serviceName);
-
-	return bean.createUrl();
+	return serviceUrl({
+		application: app.name,
+		path: '/',
+		service: serviceName,
+		type: urlType
+	});
 }

src/main/resources/lib/enonic/react4xp/index.ts

@@ -5,4 +5,6 @@ export {
 	getExecutorUrl,
 	render,
 } from '/lib/enonic/react4xp/React4xp';
+export {assetUrl} from '/lib/enonic/react4xp/assetUrl';
 export {DataFetcher} from '/lib/enonic/react4xp/DataFetcher';
+export {serviceUrl} from '/lib/enonic/react4xp/serviceUrl';

src/main/resources/lib/enonic/react4xp/serviceUrl.ts

@@ -0,0 +1,37 @@
+import type { ServiceUrlParams } from '@enonic-types/lib-portal'; // Might be deprecated in XP8.
+
+import { getUrlType } from '/lib/enonic/react4xp/React4xp/utils/getUrlType';
+
+
+interface ServiceUrlBuilder {
+	setApplication(value: string): void;
+	setParams(value: object): void;
+	setPath(value: string): void;
+	setType(value: string): void;
+	setServiceName(value: string): void;
+	createUrl(): string;
+}
+
+
+export interface R4xServiceUrlParams extends ServiceUrlParams {
+	path?: string;
+}
+
+
+export function serviceUrl({
+	application = app.name,
+	params,
+	path = '/',
+	service,
+	type = getUrlType()
+}: R4xServiceUrlParams): string {
+	const bean: ServiceUrlBuilder = __.newBean('com.enonic.lib.react4xp.url.ServiceUrlBuilder');
+
+	bean.setApplication(application);
+	bean.setParams(params);
+	bean.setPath(path);
+	bean.setType(type);
+	bean.setServiceName(service);
+
+	return bean.createUrl();
+}

src/main/resources/types/React4xp.d.ts

@@ -3,7 +3,7 @@ import type {
 	PageContributions,
 	Request
 } from '@enonic-types/core';
-import type { AssetUrlParams } from '@enonic-types/lib-portal';
+import type { AssetUrlParams } from '@enonic-types/lib-portal'; // Might be deprecated in XP8.
 import type { Cache } from './Cache';
 
 type OneOrMore<T> = T | T[]