@soleil-se/app-util 5.12.0 → 5.12.2

package/CHANGELOG.md

@@ -7,6 +7,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.12.2] - 2025-12-03
+
+- Better type definitions for Svelte render functions.
+
+## [5.12.1] - 2025-10-15
+
+- Return identifier for Node instances in `toString` function in `app-data` and `global-app-data`.
+
 ## [5.12.0] - 2025-10-09
 
 - Add `iteratorToArray`, `nodeIteratorToArray`, `listToArray` and `setToArray` utility functions to convert these data structures into arrays.

package/client/index.d.ts

@@ -1,3 +1,3 @@
-export { default as preventDefault } from "./prevent-default";
-export { getUrlParam, getUrlParams, setUrlParams, updateUrlParams, clearUrlParams } from "./url-params";
-export { default as fetchJson, FetchError } from "./fetch-json";
+export { default as preventDefault } from "./prevent-default";
+export { getUrlParam, getUrlParams, setUrlParams, updateUrlParams, clearUrlParams } from "./url-params";
+export { default as fetchJson, FetchError } from "./fetch-json";

package/client/prevent-default/index.d.ts

@@ -1 +1 @@
-export default function preventDefault(fn: any): (...args: any[]) => any;
+export default function preventDefault(fn: any): (...args: any[]) => any;

package/client/svelte/3/index.d.ts

@@ -1 +1 @@
-export { render } from "../4";
+export { render } from "../4";

package/client/svelte/4/index.d.ts

@@ -1,21 +1,21 @@
-/** @typedef {import('svelte').SvelteComponent} Component */
-/**
- * Renders a client side Svelte application.
- * @param {Component<any>} App Svelte app root component.
- * @param {object} [settings={}] Settings object.
- * @param {HTMLElement} [settings.target] Target where app should be mounted.
- * @param {Record<string, any>} [settings.props] Root component props.
- * @param {boolean} [settings.hydrate=target.hasChildNodes()] Instructs Svelte to upgrade existing
- * DOM (usually from server-side rendering) rather than creating new elements. By default the app
- * will hydrate when the target has any child nodes.
- * @param {boolean} [settings.intro=false] If true, will play transitions on initial render,
- * rather than waiting for subsequent state changes.
- * @return {Component} Initialized Svelte component.
- */
-export function render(App: any, { target, props, intro, hydrate, }?: {
-    target?: HTMLElement;
-    props?: Record<string, any>;
-    hydrate?: boolean;
-    intro?: boolean;
-}): Component;
-export type Component = import('svelte').SvelteComponent;
+/** @typedef {import('svelte').SvelteComponent} Component */
+/**
+ * Renders a client side Svelte application.
+ * @param {Component<any>} App Svelte app root component.
+ * @param {object} [settings={}] Settings object.
+ * @param {HTMLElement} [settings.target] Target where app should be mounted.
+ * @param {Record<string, any>} [settings.props] Root component props.
+ * @param {boolean} [settings.hydrate=target.hasChildNodes()] Instructs Svelte to upgrade existing
+ * DOM (usually from server-side rendering) rather than creating new elements. By default the app
+ * will hydrate when the target has any child nodes.
+ * @param {boolean} [settings.intro=false] If true, will play transitions on initial render,
+ * rather than waiting for subsequent state changes.
+ * @return {Component} Initialized Svelte component.
+ */
+export function render(App: any, { target, props, intro, hydrate, }?: {
+    target?: HTMLElement;
+    props?: Record<string, any>;
+    hydrate?: boolean;
+    intro?: boolean;
+}): Component;
+export type Component = import('svelte').SvelteComponent;

package/client/svelte/5/index.d.ts

@@ -1,18 +1,40 @@
-/**
- * Renders a client side Svelte application.
- * @param {import('svelte').Component<any>} App Svelte app root component.
- * @param {object} [settings={}] Settings object.
- * @param {HTMLElement} [settings.target] Target where app should be mounted.
- * @param {Record<string, any>} [settings.props] Root component props.
- * @param {boolean} [settings.hydrate=target.hasChildNodes()] Instructs Svelte to upgrade existing
- * DOM (usually from server-side rendering) rather than creating new elements. By default the app
- * will hydrate when the target has any child nodes.
- * @param {boolean} [settings.intro=false] If true, will play transitions on initial render,
- * rather than waiting for subsequent state changes.
- */
-export function render(App: import('svelte').Component<any>, { target, props, hydrate, intro, }?: {
-    target?: HTMLElement;
-    props?: Record<string, any>;
-    hydrate?: boolean;
-    intro?: boolean;
-}): void;
+/// <reference types="svelte" />
+/**
+ * @template {Record<string, unknown>} TProps
+ * @typedef {object} RenderSettings
+ * @property {HTMLElement} [target] Target where app should be mounted.
+ * @property {TProps} [props] Root component props.
+ * @property {boolean} [hydrate=target.hasChildNodes()] Instructs Svelte to upgrade existing DOM
+ * (usually from server-side rendering) rather than creating new elements. By default the app will
+ * hydrate when the target has any child nodes.
+ * @property {boolean} [intro=false] If true, will play transitions on initial render, rather than
+ * waiting for subsequent state changes.
+ */
+/**
+ * Renders a client side Svelte application.
+ * @template {Record<string, unknown>} [TProps=Record<string, unknown>]
+ * @param {import('svelte').Component<TProps>} App Svelte app root component.
+ * @param {RenderSettings<TProps>} [settings={}] Settings object.
+ */
+export function render<TProps extends Record<string, unknown> = Record<string, unknown>>(App: import("svelte").Component<TProps, any, string>, { target, props, hydrate, intro, }?: RenderSettings<TProps>): void;
+export type RenderSettings<TProps extends Record<string, unknown>> = {
+    /**
+     * Target where app should be mounted.
+     */
+    target?: HTMLElement;
+    /**
+     * Root component props.
+     */
+    props?: TProps;
+    /**
+     * Instructs Svelte to upgrade existing DOM
+     * (usually from server-side rendering) rather than creating new elements. By default the app will
+     * hydrate when the target has any child nodes.
+     */
+    hydrate?: boolean;
+    /**
+     * If true, will play transitions on initial render, rather than
+     * waiting for subsequent state changes.
+     */
+    intro?: boolean;
+};

package/client/svelte/5/index.js

@@ -3,17 +3,23 @@ import { mount as svelteMount, hydrate as svelteHydrate } from 'svelte';
 
 import { setAppProps } from '../../../common';
 
+/**
+ * @template {Record<string, unknown>} TProps
+ * @typedef {object} RenderSettings
+ * @property {HTMLElement} [target] Target where app should be mounted.
+ * @property {TProps} [props] Root component props.
+ * @property {boolean} [hydrate=target.hasChildNodes()] Instructs Svelte to upgrade existing DOM
+ * (usually from server-side rendering) rather than creating new elements. By default the app will
+ * hydrate when the target has any child nodes.
+ * @property {boolean} [intro=false] If true, will play transitions on initial render, rather than
+ * waiting for subsequent state changes.
+ */
+
 /**
  * Renders a client side Svelte application.
- * @param {import('svelte').Component<any>} App Svelte app root component.
- * @param {object} [settings={}] Settings object.
- * @param {HTMLElement} [settings.target] Target where app should be mounted.
- * @param {Record<string, any>} [settings.props] Root component props.
- * @param {boolean} [settings.hydrate=target.hasChildNodes()] Instructs Svelte to upgrade existing
- * DOM (usually from server-side rendering) rather than creating new elements. By default the app
- * will hydrate when the target has any child nodes.
- * @param {boolean} [settings.intro=false] If true, will play transitions on initial render,
- * rather than waiting for subsequent state changes.
+ * @template {Record<string, unknown>} [TProps=Record<string, unknown>]
+ * @param {import('svelte').Component<TProps>} App Svelte app root component.
+ * @param {RenderSettings<TProps>} [settings={}] Settings object.
  */
 export function render(App, {
   target,

package/client/svelte/index.d.ts

@@ -1,21 +1,21 @@
-/**
- * Renders a client side Svelte 3 or 4 application.
- * @deprecated Use rendering function for specific Svelte version instead.
- * `import { render } from '@soleil-api/webapp-util/client/svelte/{3|4|5}';`
- * @param {import('svelte').SvelteComponent<any>} App Svelte app root component.
- * @param {object} [settings={}] Settings object.
- * @param {string} [settings.target] Target where app should be mounted.
- * @param {string} [settings.props] Root component props.
- * @param {boolean} [settings.hydrate=target.hasChildNodes()] Instructs Svelte to upgrade existing
- * DOM (usually from server-side rendering) rather than creating new elements. By default the app
- * will hydrate when the target has any child nodes.
- * @param {boolean} [settings.intro=false] If true, will play transitions on initial render,
- * rather than waiting for subsequent state changes.
- * @return {import('svelte').SvelteComponent} Initialized Svelte component.
- */
-export function render(App: import('svelte').SvelteComponent<any>, settings?: {
-    target?: string;
-    props?: string;
-    hydrate?: boolean;
-    intro?: boolean;
-}): import('svelte').SvelteComponent;
+/**
+ * Renders a client side Svelte 3 or 4 application.
+ * @deprecated Use rendering function for specific Svelte version instead.
+ * `import { render } from '@soleil-api/webapp-util/client/svelte/{3|4|5}';`
+ * @param {import('svelte').SvelteComponent<any>} App Svelte app root component.
+ * @param {object} [settings={}] Settings object.
+ * @param {string} [settings.target] Target where app should be mounted.
+ * @param {string} [settings.props] Root component props.
+ * @param {boolean} [settings.hydrate=target.hasChildNodes()] Instructs Svelte to upgrade existing
+ * DOM (usually from server-side rendering) rather than creating new elements. By default the app
+ * will hydrate when the target has any child nodes.
+ * @param {boolean} [settings.intro=false] If true, will play transitions on initial render,
+ * rather than waiting for subsequent state changes.
+ * @return {import('svelte').SvelteComponent} Initialized Svelte component.
+ */
+export function render(App: import('svelte').SvelteComponent<any>, settings?: {
+    target?: string;
+    props?: string;
+    hydrate?: boolean;
+    intro?: boolean;
+}): import('svelte').SvelteComponent;

package/common/index.d.ts

@@ -1,81 +1,81 @@
-/**
- * Get a prefixed namespace unique for app.
- * @param {string} [prefix='app']
- * @return {string} - Prefixed namespace.
- */
-export function getNamespace(prefix?: string): string;
-/**
- * Generate a unique identifier with a random UUID without dashes.
- * @param {string} prefix Prefix for the identifier.
- * @returns {string} Unique identifier.
- */
-export function generateId(prefix?: string): string;
-/**
- * Stringify an object to a query string compatible with Sitevision.
- * @param {Object} params Object with parameters to stringify.
- * @param {Object} [options] Optional options.
- * @param {Boolean} [options.addQueryPrefix = false] If a leading ? should be added to the string.
- * @returns Stringified parameters.
- */
-export function stringifyParams(params?: any, { addQueryPrefix }?: {
-    addQueryPrefix?: boolean;
-}): string;
-/**
- * Parse an URL or URI to an object containing its query parameters.
- * @param {String} url URL or URI to be parsed, must start with or contain "?".
- * @returns Object with parsed parameters.
- */
-export function parseParams(url?: string): {};
-/**
- * Get URI for a route, same as `getStandaloneUrl` in Sitevision router.
- * @param {string} route A route.
- * @param {object} params Query parameters.
- * @returns {string} URI for route.
- */
-export function getRouteUri(route?: string, params?: object): string;
-/**
- * Get URI for a view, same as `getUrl` in Sitevision router.
- * @deprecated Not used in WebApps 2.
- * @param {string} route A route.
- * @returns {string} URI for view.
- */
-export function getViewUri(route?: string, params?: any): string;
-/**
- * Get URI for a resource.
- * @param {string} resource A resource.
- * @returns {string} URI for a resource.
- */
-export function getResourceUri(resource?: string): string;
-export function setAppProps(data: any): void;
-/**
- * Get appData value or object that is passed to app when rendering.
- * @export
- * @param {string} [key] - Key for value.
- * @return {*|object} - Value or object.
- */
-export function getAppProps(key?: string): any | object;
-/**
- * If the current code is running on the server.
- * @constant {boolean}
- */
-export const isServer: any;
-/**
- * If the current code is running in the browser.
- * @constant {boolean}
- */
-export const isBrowser: boolean;
-/**
- * DOM friendly unique identifier for the WebApp.
- * @constant {string}
- */
-export const appId: string;
-/**
- * If the WebApp is running in offline mode or not.
- * @constant {boolean}
- */
-export const isOffline: boolean;
-/**
- * If the WebApp is running in online mode or not.
- * @constant {boolean}
- */
-export const isOnline: boolean;
+/**
+ * Get a prefixed namespace unique for app.
+ * @param {string} [prefix='app']
+ * @return {string} - Prefixed namespace.
+ */
+export function getNamespace(prefix?: string): string;
+/**
+ * Generate a unique identifier with a random UUID without dashes.
+ * @param {string} prefix Prefix for the identifier.
+ * @returns {string} Unique identifier.
+ */
+export function generateId(prefix?: string): string;
+/**
+ * Stringify an object to a query string compatible with Sitevision.
+ * @param {Object} params Object with parameters to stringify.
+ * @param {Object} [options] Optional options.
+ * @param {Boolean} [options.addQueryPrefix = false] If a leading ? should be added to the string.
+ * @returns Stringified parameters.
+ */
+export function stringifyParams(params?: any, { addQueryPrefix }?: {
+    addQueryPrefix?: boolean;
+}): string;
+/**
+ * Parse an URL or URI to an object containing its query parameters.
+ * @param {String} url URL or URI to be parsed, must start with or contain "?".
+ * @returns Object with parsed parameters.
+ */
+export function parseParams(url?: string): {};
+/**
+ * Get URI for a route, same as `getStandaloneUrl` in Sitevision router.
+ * @param {string} route A route.
+ * @param {object} params Query parameters.
+ * @returns {string} URI for route.
+ */
+export function getRouteUri(route?: string, params?: object): string;
+/**
+ * Get URI for a view, same as `getUrl` in Sitevision router.
+ * @deprecated Not used in WebApps 2.
+ * @param {string} route A route.
+ * @returns {string} URI for view.
+ */
+export function getViewUri(route?: string, params?: any): string;
+/**
+ * Get URI for a resource.
+ * @param {string} resource A resource.
+ * @returns {string} URI for a resource.
+ */
+export function getResourceUri(resource?: string): string;
+export function setAppProps(data: any): void;
+/**
+ * Get appData value or object that is passed to app when rendering.
+ * @export
+ * @param {string} [key] - Key for value.
+ * @return {*|object} - Value or object.
+ */
+export function getAppProps(key?: string): any | object;
+/**
+ * If the current code is running on the server.
+ * @constant {boolean}
+ */
+export const isServer: any;
+/**
+ * If the current code is running in the browser.
+ * @constant {boolean}
+ */
+export const isBrowser: boolean;
+/**
+ * DOM friendly unique identifier for the WebApp.
+ * @constant {string}
+ */
+export const appId: string;
+/**
+ * If the WebApp is running in offline mode or not.
+ * @constant {boolean}
+ */
+export const isOffline: boolean;
+/**
+ * If the WebApp is running in online mode or not.
+ * @constant {boolean}
+ */
+export const isOnline: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soleil-se/app-util",
-  "version": "5.12.0",
+  "version": "5.12.2",
   "description": "Utility functions for WebApps, RESTApps and Widgets in Sitevision.",
   "main": "./common/index.js",
   "author": "Soleil AB",
@@ -25,5 +25,5 @@
   "scripts": {
     "create-type-definitions": "node ../../utils/createTypeDefinitions.js ./common/index.js ./client/index.js ./client/svelte/index.js ./client/svelte/3/index.js ./client/svelte/4/index.js ./client/svelte/5/index.js ./server/index.js ./server/svelte/index.js ./server/svelte/3/index.js ./server/svelte/4/index.js ./server/svelte/5/index.js ./server/app-data/index.js ./server/global-app-data/index.js"
   },
-  "gitHead": "b307141c40e0116c6f2f2c3354656904d9fedb79"
+  "gitHead": "090c22c4eee4dc2f68096f8f50cca8015a91acf7"
 }

package/server/app-data/index.d.ts

@@ -1,84 +1,84 @@
-export default appData;
-declare namespace appData {
-    /**
-     * Get a value from app data, same as get in \@sitevision/api/server/appData.
-     * @param {string} key - The key of app data to retrieve.
-     * @param {...string} [properties] - The keys of the properties to retrieve from a JCR Node.
-     * @returns {unknown} The value of the app data or a properties of a JCR Node.
-     */
-    function get(key: string, ...properties?: string[]): unknown;
-    /**
-     * Get a value from app data as an array, same as getArray in \@sitevision/api/server/appData.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node[] | string[]} An array of JCR
-     * Nodes for list components or value wrapped in an array for single type components.
-     */
-    function getArray(key: string): string[] | import("@sitevision/api/types/javax/jcr/Node").Node[];
-    /**
-     * Get a string value from app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {string | undefined} The string value or undefined if not set.
-     */
-    function getString(key: string): string | undefined;
-    /**
-     * Get a boolean value from app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {boolean | undefined} The boolean value or undefined if not set.
-     */
-    function getBoolean(key: string): boolean | undefined;
-    /**
-     * Get a number value from app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {number | undefined} The number value, undefined if not set or not a number.
-     */
-    function getNumber(key: string): number | undefined;
-    /**
-     * Get an array of nodes from app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node[]} The array of nodes or an
-     * empty array if not set.
-     */
-    function getNodes(key: string): import("@sitevision/api/types/javax/jcr/Node").Node[];
-    /**
-     * Get an array of strings from app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {string[]} The array of strings or an empty array if not set.
-     */
-    function getStrings(key: string): string[];
-    /**
-     * Get a JCR Node from app data.
-     * @param {string} key - The key of the property to retrieve.
-     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node | undefined} The JCR Node or
-     * undefined if not set.
-     */
-    function getNode(key: string): import("@sitevision/api/types/javax/jcr/Node").Node;
-    /**
-     * Get a string property from a JCR Node referenced in app data.
-     * @param {string} key - The key of the app data value.
-     * @param {string} property - The property to retrieve from the node.
-     * @returns {string | undefined} The string property value or undefined if not set.
-     */
-    function getStringProperty(key: string, property: string): string | undefined;
-    /**
-     * Get a string array property or a single string wrapped in an array from a JCR Node referenced
-     * in app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @param {string} property - The property to retrieve from the node.
-     * @returns {string[]} The array of strings or an empty array if not set.
-     */
-    function getStringsProperty(key: string, property: string): string[];
-    /**
-     * Get a boolean property from a JCR Node referenced in app data.
-     * @param {string} key - The key of the app data value.
-     * @param {string} property - The property to retrieve from the node.
-     * @returns {boolean | undefined} The boolean property value or undefined if not set.
-     */
-    function getBooleanProperty(key: string, property: string): boolean | undefined;
-    /**
-     * Get a number property from a JCR Node referenced in app data.
-     * @param {string} key - The key of the app data value.
-     * @param {string} property - The property to retrieve from the node.
-     * @returns {number | undefined} The number property value, undefined if not set or not a number.
-     */
-    function getNumberProperty(key: string, property: string): number | undefined;
-}
+export default appData;
+declare namespace appData {
+    /**
+     * Get a value from app data, same as get in \@sitevision/api/server/appData.
+     * @param {string} key - The key of app data to retrieve.
+     * @param {...string} [properties] - The keys of the properties to retrieve from a JCR Node.
+     * @returns {unknown} The value of the app data or a properties of a JCR Node.
+     */
+    function get(key: string, ...properties?: string[]): unknown;
+    /**
+     * Get a value from app data as an array, same as getArray in \@sitevision/api/server/appData.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node[] | string[]} An array of JCR
+     * Nodes for list components or value wrapped in an array for single type components.
+     */
+    function getArray(key: string): string[] | import("@sitevision/api/types/javax/jcr/Node").Node[];
+    /**
+     * Get a string value from app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {string | undefined} The string value or undefined if not set.
+     */
+    function getString(key: string): string | undefined;
+    /**
+     * Get a boolean value from app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {boolean | undefined} The boolean value or undefined if not set.
+     */
+    function getBoolean(key: string): boolean | undefined;
+    /**
+     * Get a number value from app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {number | undefined} The number value, undefined if not set or not a number.
+     */
+    function getNumber(key: string): number | undefined;
+    /**
+     * Get an array of nodes from app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node[]} The array of nodes or an
+     * empty array if not set.
+     */
+    function getNodes(key: string): import("@sitevision/api/types/javax/jcr/Node").Node[];
+    /**
+     * Get an array of strings from app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {string[]} The array of strings or an empty array if not set.
+     */
+    function getStrings(key: string): string[];
+    /**
+     * Get a JCR Node from app data.
+     * @param {string} key - The key of the property to retrieve.
+     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node | undefined} The JCR Node or
+     * undefined if not set.
+     */
+    function getNode(key: string): import("@sitevision/api/types/javax/jcr/Node").Node;
+    /**
+     * Get a string property from a JCR Node referenced in app data.
+     * @param {string} key - The key of the app data value.
+     * @param {string} property - The property to retrieve from the node.
+     * @returns {string | undefined} The string property value or undefined if not set.
+     */
+    function getStringProperty(key: string, property: string): string | undefined;
+    /**
+     * Get a string array property or a single string wrapped in an array from a JCR Node referenced
+     * in app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @param {string} property - The property to retrieve from the node.
+     * @returns {string[]} The array of strings or an empty array if not set.
+     */
+    function getStringsProperty(key: string, property: string): string[];
+    /**
+     * Get a boolean property from a JCR Node referenced in app data.
+     * @param {string} key - The key of the app data value.
+     * @param {string} property - The property to retrieve from the node.
+     * @returns {boolean | undefined} The boolean property value or undefined if not set.
+     */
+    function getBooleanProperty(key: string, property: string): boolean | undefined;
+    /**
+     * Get a number property from a JCR Node referenced in app data.
+     * @param {string} key - The key of the app data value.
+     * @param {string} property - The property to retrieve from the node.
+     * @returns {number | undefined} The number property value, undefined if not set or not a number.
+     */
+    function getNumberProperty(key: string, property: string): number | undefined;
+}

package/server/app-data/index.js

@@ -9,6 +9,7 @@ import InstanceTypeUtil from '@sitevision/api/server/InstanceTypeUtil';
  */
 function toString(value) {
   if (value === null || value === undefined) return undefined;
+  if (InstanceTypeUtil.isNode(value)) return value.getIdentifier();
   return value.toString();
 }
 

package/server/global-app-data/index.d.ts

@@ -1,84 +1,84 @@
-export default globalAppData;
-declare namespace globalAppData {
-    /**
-       * Get a value from app data, same as get in \@sitevision/api/server/appData.
-       * @param {string} key - The key of app data to retrieve.
-       * @param {...string} [properties] - The keys of the properties to retrieve from a JCR Node.
-       * @returns {unknown} The value of the app data or a properties of a JCR Node.
-       */
-    function get(key: string, ...properties?: string[]): unknown;
-    /**
-     * Get a value from app data as an array, same as getArray in \@sitevision/api/server/appData.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node[] | string[]} An array of JCR
-     * Nodes for list components or value wrapped in an array for single type components.
-     */
-    function getArray(key: string): string[] | import("@sitevision/api/types/javax/jcr/Node").Node[];
-    /**
-     * Get a string value from app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {string | undefined} The string value or undefined if not set.
-     */
-    function getString(key: string): string | undefined;
-    /**
-     * Get a boolean value from app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {boolean | undefined} The boolean value or undefined if not set.
-     */
-    function getBoolean(key: string): boolean | undefined;
-    /**
-     * Get a number value from app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {number | undefined} The number value, undefined if not set or not a number.
-     */
-    function getNumber(key: string): number | undefined;
-    /**
-     * Get an array of nodes from app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node[]} The array of nodes or an
-     * empty array if not set.
-     */
-    function getNodes(key: string): import("@sitevision/api/types/javax/jcr/Node").Node[];
-    /**
-     * Get an array of strings from app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @returns {string[]} The array of strings or an empty array if not set.
-     */
-    function getStrings(key: string): string[];
-    /**
-     * Get a JCR Node from app data.
-     * @param {string} key - The key of the property to retrieve.
-     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node | undefined} The JCR Node or
-     * undefined if not set.
-     */
-    function getNode(key: string): import("@sitevision/api/types/javax/jcr/Node").Node;
-    /**
-     * Get a string property from a JCR Node referenced in app data.
-     * @param {string} key - The key of the app data value.
-     * @param {string} property - The property to retrieve from the node.
-     * @returns {string | undefined} The string property value or undefined if not set.
-     */
-    function getStringProperty(key: string, property: string): string | undefined;
-    /**
-     * Get a string array property or a single string wrapped in an array from a JCR Node referenced
-     * in app data.
-     * @param {string} key - The key of app data to retrieve.
-     * @param {string} property - The property to retrieve from the node.
-     * @returns {string[]} The array of strings or an empty array if not set.
-     */
-    function getStringsProperty(key: string, property: string): string[];
-    /**
-     * Get a boolean property from a JCR Node referenced in app data.
-     * @param {string} key - The key of the app data value.
-     * @param {string} property - The property to retrieve from the node.
-     * @returns {boolean | undefined} The boolean property value or undefined if not set.
-     */
-    function getBooleanProperty(key: string, property: string): boolean | undefined;
-    /**
-     * Get a number property from a JCR Node referenced in app data.
-     * @param {string} key - The key of the app data value.
-     * @param {string} property - The property to retrieve from the node.
-     * @returns {number | undefined} The number property value, undefined if not set or not a number.
-     */
-    function getNumberProperty(key: string, property: string): number | undefined;
-}
+export default globalAppData;
+declare namespace globalAppData {
+    /**
+       * Get a value from app data, same as get in \@sitevision/api/server/appData.
+       * @param {string} key - The key of app data to retrieve.
+       * @param {...string} [properties] - The keys of the properties to retrieve from a JCR Node.
+       * @returns {unknown} The value of the app data or a properties of a JCR Node.
+       */
+    function get(key: string, ...properties?: string[]): unknown;
+    /**
+     * Get a value from app data as an array, same as getArray in \@sitevision/api/server/appData.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node[] | string[]} An array of JCR
+     * Nodes for list components or value wrapped in an array for single type components.
+     */
+    function getArray(key: string): string[] | import("@sitevision/api/types/javax/jcr/Node").Node[];
+    /**
+     * Get a string value from app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {string | undefined} The string value or undefined if not set.
+     */
+    function getString(key: string): string | undefined;
+    /**
+     * Get a boolean value from app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {boolean | undefined} The boolean value or undefined if not set.
+     */
+    function getBoolean(key: string): boolean | undefined;
+    /**
+     * Get a number value from app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {number | undefined} The number value, undefined if not set or not a number.
+     */
+    function getNumber(key: string): number | undefined;
+    /**
+     * Get an array of nodes from app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node[]} The array of nodes or an
+     * empty array if not set.
+     */
+    function getNodes(key: string): import("@sitevision/api/types/javax/jcr/Node").Node[];
+    /**
+     * Get an array of strings from app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @returns {string[]} The array of strings or an empty array if not set.
+     */
+    function getStrings(key: string): string[];
+    /**
+     * Get a JCR Node from app data.
+     * @param {string} key - The key of the property to retrieve.
+     * @returns {import('@sitevision/api/types/javax/jcr/Node').Node | undefined} The JCR Node or
+     * undefined if not set.
+     */
+    function getNode(key: string): import("@sitevision/api/types/javax/jcr/Node").Node;
+    /**
+     * Get a string property from a JCR Node referenced in app data.
+     * @param {string} key - The key of the app data value.
+     * @param {string} property - The property to retrieve from the node.
+     * @returns {string | undefined} The string property value or undefined if not set.
+     */
+    function getStringProperty(key: string, property: string): string | undefined;
+    /**
+     * Get a string array property or a single string wrapped in an array from a JCR Node referenced
+     * in app data.
+     * @param {string} key - The key of app data to retrieve.
+     * @param {string} property - The property to retrieve from the node.
+     * @returns {string[]} The array of strings or an empty array if not set.
+     */
+    function getStringsProperty(key: string, property: string): string[];
+    /**
+     * Get a boolean property from a JCR Node referenced in app data.
+     * @param {string} key - The key of the app data value.
+     * @param {string} property - The property to retrieve from the node.
+     * @returns {boolean | undefined} The boolean property value or undefined if not set.
+     */
+    function getBooleanProperty(key: string, property: string): boolean | undefined;
+    /**
+     * Get a number property from a JCR Node referenced in app data.
+     * @param {string} key - The key of the app data value.
+     * @param {string} property - The property to retrieve from the node.
+     * @returns {number | undefined} The number property value, undefined if not set or not a number.
+     */
+    function getNumberProperty(key: string, property: string): number | undefined;
+}

package/server/global-app-data/index.js

@@ -9,6 +9,7 @@ import InstanceTypeUtil from '@sitevision/api/server/InstanceTypeUtil';
  */
 function toString(value) {
   if (value === null || value === undefined) return undefined;
+  if (InstanceTypeUtil.isNode(value)) return value.getIdentifier();
   return value.toString();
 }
 

package/server/svelte/3/index.d.ts

@@ -1 +1 @@
-export { render } from "../4";
+export { render } from "../4";

package/server/svelte/4/index.d.ts

@@ -1,9 +1,9 @@
-/** @typedef {import('svelte').SvelteComponent} Component */
-/**
- * Returns HTML for a server rendered Svelte app.
- * @param {Component<any>} App Svelte component that is root of app.
- * @param {Record<string, any>} props Props passed to root component.
- * @return {string} HTML for the server rendered app.
- */
-export function render(App: any, props: Record<string, any>): string;
-export type Component = import('svelte').SvelteComponent;
+/** @typedef {import('svelte').SvelteComponent} Component */
+/**
+ * Returns HTML for a server rendered Svelte app.
+ * @param {Component<any>} App Svelte component that is root of app.
+ * @param {Record<string, any>} props Props passed to root component.
+ * @return {string} HTML for the server rendered app.
+ */
+export function render(App: any, props: Record<string, any>): string;
+export type Component = import('svelte').SvelteComponent;

package/server/svelte/5/index.d.ts

@@ -1,7 +1,9 @@
-/**
- * Returns HTML for a server rendered Svelte app.
- * @param {import('svelte').Component<any>} App Svelte component that is root of app.
- * @param {Record<string, any>} props Props passed to root component.
- * @return {string} HTML for the server rendered app.
- */
-export function render(App: import('svelte').Component<any>, props: Record<string, any>): string;
+/// <reference types="svelte" />
+/**
+ * Returns HTML for a server rendered Svelte app.
+ * @template {Record<string, unknown>} [TProps=Record<string, unknown>]
+ * @param {import('svelte').Component<TProps>} App Svelte component that is root of app.
+ * @param {TProps} props Props passed to root component.
+ * @return {string} HTML for the server rendered app.
+ */
+export function render<TProps extends Record<string, unknown> = Record<string, unknown>>(App: import("svelte").Component<TProps, any, string>, props: TProps): string;

package/server/svelte/5/index.js

@@ -3,8 +3,9 @@ import { appId, setAppProps } from '../../../common';
 
 /**
  * Returns HTML for a server rendered Svelte app.
- * @param {import('svelte').Component<any>} App Svelte component that is root of app.
- * @param {Record<string, any>} props Props passed to root component.
+ * @template {Record<string, unknown>} [TProps=Record<string, unknown>]
+ * @param {import('svelte').Component<TProps>} App Svelte component that is root of app.
+ * @param {TProps} props Props passed to root component.
  * @return {string} HTML for the server rendered app.
  */
 export function render(App, props) {

package/server/svelte/index.d.ts

@@ -1,9 +1,9 @@
-/**
- * Returns HTML for a server rendered Svelte 3 or 4 app.
- * @deprecated Use rendering function for specific Svelte version instead.
- * `import { render } from '@soleil-api/webapp-util/server/svelte/{3|4|5}';`
- * @param {import('svelte').SvelteComponent<any>} App Svelte component that is root of app.
- * @param {object} props Props passed to root component.
- * @return {string} HTML for the server rendered app.
- */
-export function render(App: import('svelte').SvelteComponent<any>, props: object): string;
+/**
+ * Returns HTML for a server rendered Svelte 3 or 4 app.
+ * @deprecated Use rendering function for specific Svelte version instead.
+ * `import { render } from '@soleil-api/webapp-util/server/svelte/{3|4|5}';`
+ * @param {import('svelte').SvelteComponent<any>} App Svelte component that is root of app.
+ * @param {object} props Props passed to root component.
+ * @return {string} HTML for the server rendered app.
+ */
+export function render(App: import('svelte').SvelteComponent<any>, props: object): string;