@shopware-ag/dive 1.19.1-beta.0 → 1.19.1-beta.2

package/src/helper/getObjectDelta/getObjectDelta.ts

@@ -1,105 +0,0 @@
-/**
- * Find the difference between two objects.
- */
-
-export const getObjectDelta = <T extends object>(
-    a: T,
-    b: Partial<T>,
-): Partial<T> => {
-    // if a and b have no entries we have no delta
-    if (Object.keys(a).length === 0 && Object.keys(b).length === 0) {
-        return {};
-    }
-
-    // if a or b is not an object we have a delta
-    if (typeof a !== 'object' || typeof b !== 'object') {
-        return b;
-    }
-
-    let delta = {};
-
-    Object.keys(b).forEach((key) => {
-        // if key is not in a we have a delta
-        if (!Object.keys(a).includes(key)) {
-            delta = { ...delta, [key]: b[key as keyof object] };
-            return;
-        }
-
-        // assumption: b[key] is an array
-        if (Array.isArray(b[key as keyof object])) {
-            // if a[key] is not an array we have a delta
-            if (!Array.isArray(a[key as keyof object])) {
-                delta = { ...delta, [key]: b[key as keyof object] };
-                return;
-            }
-
-            // create arrays (for TS types to be correct)
-            const aArray = a[key as keyof object] as [];
-            const bArray = b[key as keyof object] as [];
-
-            // if both arrays are empty we have no delta
-            if (aArray.length === 0 && bArray.length === 0) {
-                delta = { ...delta };
-                return;
-            }
-
-            // if array length is different we have a delta
-            if (aArray.length !== bArray.length) {
-                delta = { ...delta, [key]: b[key as keyof object] };
-                return;
-            }
-
-            // create array for deltas
-            const arrayDeltas: [] = [];
-
-            bArray.forEach((entry, index) => {
-                // getObjectDelta in array
-                const inArrayDelta = getObjectDelta(
-                    aArray[index],
-                    bArray[index],
-                );
-
-                // if inArrayDelta has more then 0 entries we have a delta
-                if (Object.keys(inArrayDelta).length) {
-                    arrayDeltas.push(bArray[index]);
-                }
-            });
-
-            // if arrayDeltas has more than 0 entries we have a delta
-            if (Object.keys(arrayDeltas).length) {
-                delta = { ...delta, [key]: arrayDeltas };
-                return;
-            }
-
-            return;
-        }
-
-        // assumption: b[key] is an object
-        if (typeof b[key as keyof object] === 'object') {
-            // if a[key] is not an object we have a delta
-            if (typeof a[key as keyof object] !== 'object') {
-                delta = { ...delta, [key]: b[key as keyof object] };
-                return;
-            }
-
-            // recursive: find objectDelta in a and b
-            const objectDelta = getObjectDelta(
-                a[key as keyof object],
-                b[key as keyof object],
-            );
-
-            // if objectDelta has more than 0 entries we have a delta
-            if (Object.keys(objectDelta).length) {
-                delta = { ...delta, [key]: objectDelta };
-                return;
-            }
-        }
-
-        // if a[key] is not equal to b[key] we have a delta
-        if (a[key as keyof object] !== b[key as keyof object]) {
-            delta = { ...delta, [key]: b[key as keyof object] };
-        }
-    });
-
-    return delta;
-};

package/src/helper/isInterface/__test__/implementsInterface.test.ts

@@ -1,19 +0,0 @@
-import { Object3D } from 'three';
-import { implementsInterface } from '../implementsInterface.ts';
-
-describe('dive/helper/implementsInterface', () => {
-    it('should not find interface', () => {
-        expect(implementsInterface(undefined, 'isInterface')).toBe(false);
-
-        expect(implementsInterface(null, 'isInterface')).toBe(false);
-
-        const obj = {} as unknown as Object3D;
-
-        expect(implementsInterface(obj, 'isInterface')).toBe(false);
-    });
-
-    it('should find interface', () => {
-        const obj = { isInterface: true } as unknown as Object3D;
-        expect(implementsInterface(obj, 'isInterface')).toBe(true);
-    });
-});

package/src/helper/isInterface/implementsInterface.ts

@@ -1,9 +0,0 @@
-import { type Object3D } from 'three';
-
-export function implementsInterface<T>(
-    object: Object3D | null | undefined,
-    discriminator: string,
-): object is Object3D & T {
-    if (!object) return false;
-    return discriminator in object;
-}

package/src/info/Info.ts

@@ -1,178 +0,0 @@
-import { ESystem, EWebXRUnsupportedReason } from '../types/info';
-
-export class SystemInfo {
-    private static _supportsWebXR: boolean = false;
-    private static _webXRUnsupportedReason: EWebXRUnsupportedReason | null =
-        null;
-
-    /**
-     * Gets the current system (iOS, Android, Windows, etc.)
-     * @returns DIVESystem The current system
-     */
-    public static GetSystem(): ESystem {
-        if (typeof window === 'undefined' || !window.navigator) {
-            return ESystem.UNKNOWN;
-        }
-
-        const userAgent = window.navigator.userAgent.toLowerCase();
-        if (userAgent.includes('iphone') || userAgent.includes('ipad')) {
-            return ESystem.IOS;
-        }
-        if (userAgent.includes('android')) {
-            return ESystem.ANDROID;
-        }
-        if (userAgent.includes('windows')) {
-            return ESystem.WINDOWS;
-        }
-        if (userAgent.includes('macintosh')) {
-            return ESystem.MACOS;
-        }
-        if (userAgent.includes('linux')) {
-            return ESystem.LINUX;
-        }
-        return ESystem.UNKNOWN;
-    }
-
-    /**
-     * @returns A promise that resolves to a boolean indicating whether the user's device supports WebXR.
-     */
-    public static async GetSupportsWebXR(): Promise<boolean> {
-        if (this._supportsWebXR !== false) {
-            return this._supportsWebXR;
-        }
-
-        // Check if we're in a secure context (HTTPS)
-        if (!window.isSecureContext) {
-            this._supportsWebXR = false;
-            this._webXRUnsupportedReason = EWebXRUnsupportedReason.NO_HTTPS;
-            return this._supportsWebXR;
-        }
-
-        // Check if XRSystem is available
-        if (!navigator.xr) {
-            this._supportsWebXR = false;
-            this._webXRUnsupportedReason = EWebXRUnsupportedReason.NO_WEBXR_API;
-            return this._supportsWebXR;
-        }
-
-        try {
-            // Check specifically for immersive-ar support
-            const arSupported =
-                await navigator.xr.isSessionSupported('immersive-ar');
-            this._supportsWebXR = arSupported;
-
-            if (!this._supportsWebXR) {
-                this._webXRUnsupportedReason =
-                    EWebXRUnsupportedReason.IMMERSIVE_AR_NOT_SUPPORTED_BY_DEVICE;
-            }
-        } catch (error) {
-            this._supportsWebXR = false;
-            this._webXRUnsupportedReason =
-                EWebXRUnsupportedReason.AR_PERMISSION_DENIED;
-        }
-
-        return this._supportsWebXR;
-    }
-
-    /**
-     * @returns The reason why WebXR is not supported on the user's device. Returns null if WebXR is supported.
-     */
-    public static GetWebXRUnsupportedReason(): EWebXRUnsupportedReason | null {
-        if (this._supportsWebXR) {
-            console.log('WebXR is supported.');
-            return null;
-        }
-        return this._webXRUnsupportedReason;
-    }
-
-    /**
-     * Checks if ARQuickLook is supported on the current device
-     * This checks for:
-     * 1. AR support via relList
-     *
-     * Requirements:
-     * - iOS 13.0 or later
-     * - Safari browser (ARQuickLook is only supported in Safari)
-     * - Device with AR capabilities (iPhone/iPad with LiDAR scanner or ARKit support)
-     *
-     * Note: ARQuickLook is only available in Safari on iOS. Other browsers
-     * (Chrome, Firefox, etc.) do not support ARQuickLook, even on iOS.
-     *
-     * @returns boolean indicating if ARQuickLook is supported
-     */
-    public static GetSupportsARQuickLook(): boolean {
-        const a = document.createElement('a');
-        return a.relList.supports('ar');
-    }
-
-    /**
-     * Checks if SceneViewer is supported on the current device
-     * This checks for:
-     * 1. Android device
-     * 2. Chrome browser (version 89 or later)
-     *
-     * Requirements:
-     * - Android 7.0 (API level 24) or later
-     * - Chrome for Android 89 or later
-     *
-     * Note: According to Google's documentation, if these requirements are met,
-     * SceneViewer will be available. If ARCore is not installed, SceneViewer will
-     * fall back to showing the model in 3D.
-     *
-     * @returns boolean indicating if SceneViewer is supported
-     */
-    public static GetSupportsSceneViewer(): boolean {
-        // Check if we're in a browser environment
-        if (typeof window === 'undefined' || !window.navigator) {
-            return false;
-        }
-
-        const userAgent = window.navigator.userAgent.toLowerCase();
-
-        // Check if we're on Android
-        if (!userAgent.includes('android')) {
-            return false;
-        }
-
-        // Check if we're using Chrome
-        if (!userAgent.includes('chrome')) {
-            return false;
-        }
-
-        // Check Chrome version (89 or later)
-        const chromeVersion = userAgent.match(/chrome\/(\d+)/);
-        if (!chromeVersion || parseInt(chromeVersion[1]) < 89) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @returns A boolean indicating whether the user's device is a mobile device.
-     */
-    public static get isMobile(): boolean {
-        return (
-            this.GetSystem() === ESystem.ANDROID ||
-            this.GetSystem() === ESystem.IOS
-        );
-    }
-
-    /**
-     * @returns A boolean indicating whether the user's device is a desktop device.
-     */
-    public static get isDesktop(): boolean {
-        return !this.isMobile;
-    }
-
-    /**
-     * @returns A promise that resolves to a boolean indicating whether the user's device is capable of AR.
-     */
-    public static async GetIsARCapable(): Promise<boolean> {
-        if (this.GetSupportsARQuickLook()) {
-            return true;
-        }
-
-        return await this.GetSupportsWebXR();
-    }
-}

package/src/info/__test__/Info.test.ts

@@ -1,346 +0,0 @@
-import { SystemInfo } from '../Info';
-import { ESystem, EWebXRUnsupportedReason } from '../../types/info';
-
-const mockNavigator = (navigator: any) => {
-    Object.defineProperty(global, 'navigator', {
-        value: navigator,
-        writable: true,
-    });
-};
-
-describe('dive/info/DIVEInfo', () => {
-    beforeEach(() => {
-        SystemInfo['_supportsWebXR'] = false;
-        jest.clearAllMocks();
-    });
-
-    it('should get system: Windows', () => {
-        mockNavigator({
-            userAgent:
-                'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.153 Safari/537.36',
-        });
-        expect(SystemInfo.GetSystem()).toBe(ESystem.WINDOWS);
-    });
-
-    it('should get system: MacOS', () => {
-        mockNavigator({
-            userAgent:
-                'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.153 Safari/537.36',
-        });
-        expect(SystemInfo.GetSystem()).toBe(ESystem.MACOS);
-    });
-
-    it('should get system: Linux', () => {
-        mockNavigator({
-            userAgent:
-                'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.153 Safari/537.36',
-        });
-        expect(SystemInfo.GetSystem()).toBe(ESystem.LINUX);
-    });
-
-    it('should get system: Android', () => {
-        mockNavigator({
-            userAgent:
-                'Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.153 Mobile Safari/537.36',
-        });
-        expect(SystemInfo.GetSystem()).toBe(ESystem.ANDROID);
-    });
-
-    it('should get system: iOS', () => {
-        mockNavigator({
-            userAgent:
-                'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1',
-        });
-        expect(SystemInfo.GetSystem()).toBe(ESystem.IOS);
-    });
-
-    it('should get system: Unknown', () => {
-        mockNavigator({
-            userAgent: 'Unknown Browser',
-        });
-        expect(SystemInfo.GetSystem()).toBe(ESystem.UNKNOWN);
-    });
-
-    it('should get system: Unknown when window is undefined', () => {
-        const originalNavigator = window.navigator;
-        window.navigator = undefined as any;
-        expect(SystemInfo.GetSystem()).toBe(ESystem.UNKNOWN);
-        window.navigator = originalNavigator;
-    });
-
-    it('should support webXR', async () => {
-        mockNavigator({
-            xr: {
-                isSessionSupported: jest.fn().mockResolvedValue(true),
-            },
-        });
-        const restoreSecureContext = window.isSecureContext;
-        window.isSecureContext = true;
-
-        const supports = await SystemInfo.GetSupportsWebXR();
-        expect(supports).toBe(true);
-
-        window.isSecureContext = restoreSecureContext;
-    });
-
-    it('should not support webXR (xr undefined)', async () => {
-        mockNavigator({
-            xr: undefined,
-        });
-        const restoreSecureContext = window.isSecureContext;
-        window.isSecureContext = true;
-
-        const supports = await SystemInfo.GetSupportsWebXR();
-        expect(supports).toBe(false);
-
-        const reason = SystemInfo.GetWebXRUnsupportedReason();
-        expect(reason).toBe(EWebXRUnsupportedReason.NO_WEBXR_API);
-
-        window.isSecureContext = restoreSecureContext;
-    });
-
-    it('should not support webXR (xr undefined & isSecureContext false)', async () => {
-        window.isSecureContext = false;
-        mockNavigator({
-            xr: undefined,
-        });
-        const supports = await SystemInfo.GetSupportsWebXR();
-        expect(supports).toBe(false);
-
-        const reason = SystemInfo.GetWebXRUnsupportedReason();
-        expect(reason).toBe(EWebXRUnsupportedReason.NO_HTTPS);
-    });
-
-    it('should get empty reason (not checked)', async () => {
-        mockNavigator({
-            xr: {
-                isSessionSupported: jest.fn().mockResolvedValue(true),
-            },
-        });
-        const restoreSecureContext = window.isSecureContext;
-        window.isSecureContext = true;
-
-        await SystemInfo.GetSupportsWebXR();
-        console.log = jest.fn();
-        const reason = SystemInfo.GetWebXRUnsupportedReason();
-        expect(reason).toBe(null);
-
-        window.isSecureContext = restoreSecureContext;
-    });
-
-    it('should get empty reason (webXR supported)', async () => {
-        mockNavigator({
-            xr: {
-                isSessionSupported: jest.fn().mockResolvedValue(true),
-            },
-        });
-        const restoreSecureContext = window.isSecureContext;
-        window.isSecureContext = true;
-
-        await SystemInfo.GetSupportsWebXR();
-        const reason = SystemInfo.GetWebXRUnsupportedReason();
-        expect(reason).toBe(null);
-
-        window.isSecureContext = restoreSecureContext;
-    });
-
-    it('should not support webXR', async () => {
-        mockNavigator({
-            xr: {
-                isSessionSupported: jest.fn().mockResolvedValue(false),
-            },
-        });
-        const restoreSecureContext = window.isSecureContext;
-        window.isSecureContext = true;
-
-        const supports = await SystemInfo.GetSupportsWebXR();
-        expect(supports).toBe(false);
-
-        const reason = SystemInfo.GetWebXRUnsupportedReason();
-        expect(reason).toBe(
-            EWebXRUnsupportedReason.IMMERSIVE_AR_NOT_SUPPORTED_BY_DEVICE,
-        );
-
-        window.isSecureContext = restoreSecureContext;
-    });
-
-    it('should not support webXR on error', async () => {
-        mockNavigator({
-            xr: {
-                isSessionSupported: jest.fn().mockRejectedValue('error'),
-            },
-        });
-        const restoreSecureContext = window.isSecureContext;
-        window.isSecureContext = true;
-
-        const supports = await SystemInfo.GetSupportsWebXR();
-        expect(supports).toBe(false);
-
-        const reason = SystemInfo.GetWebXRUnsupportedReason();
-        expect(reason).toBe(EWebXRUnsupportedReason.AR_PERMISSION_DENIED);
-
-        window.isSecureContext = restoreSecureContext;
-    });
-
-    it('should return cached value', async () => {
-        SystemInfo['_supportsWebXR'] = true;
-        mockNavigator({
-            xr: {
-                isSessionSupported: jest.fn().mockRejectedValue('error'),
-            },
-        });
-        const supports = await SystemInfo.GetSupportsWebXR();
-        expect(supports).toBe(true);
-    });
-
-    it('should return cached value (false)', async () => {
-        SystemInfo['_supportsWebXR'] = false;
-        mockNavigator({
-            xr: {
-                isSessionSupported: jest.fn().mockRejectedValue('error'),
-            },
-        });
-        const supports = await SystemInfo.GetSupportsWebXR();
-        expect(supports).toBe(false);
-    });
-
-    it('should support ARQuickLook when relList supports AR', () => {
-        jest.spyOn(document, 'createElement').mockReturnValue({
-            relList: { supports: () => true },
-        } as unknown as HTMLAnchorElement);
-        const supports = SystemInfo.GetSupportsARQuickLook();
-        expect(supports).toBe(true);
-    });
-
-    it('should not support ARQuickLook when relList does not support AR', () => {
-        jest.spyOn(document, 'createElement').mockReturnValue({
-            relList: { supports: () => false },
-        } as unknown as HTMLAnchorElement);
-        const supports = SystemInfo.GetSupportsARQuickLook();
-        expect(supports).toBe(false);
-    });
-
-    it('should be mobile (iOS)', () => {
-        jest.spyOn(SystemInfo, 'GetSystem').mockReturnValue(ESystem.IOS);
-        expect(SystemInfo.isMobile).toBe(true);
-        expect(SystemInfo.isDesktop).toBe(false);
-    });
-
-    it('should be mobile (Android)', () => {
-        jest.spyOn(SystemInfo, 'GetSystem').mockReturnValue(ESystem.ANDROID);
-        expect(SystemInfo.isMobile).toBe(true);
-        expect(SystemInfo.isDesktop).toBe(false);
-    });
-
-    it('should be desktop (Windows)', () => {
-        jest.spyOn(SystemInfo, 'GetSystem').mockReturnValue(ESystem.WINDOWS);
-        expect(SystemInfo.isMobile).toBe(false);
-        expect(SystemInfo.isDesktop).toBe(true);
-    });
-
-    it('should be desktop (MacOS)', () => {
-        jest.spyOn(SystemInfo, 'GetSystem').mockReturnValue(ESystem.MACOS);
-        expect(SystemInfo.isMobile).toBe(false);
-        expect(SystemInfo.isDesktop).toBe(true);
-    });
-
-    it('should be desktop (Linux)', () => {
-        jest.spyOn(SystemInfo, 'GetSystem').mockReturnValue(ESystem.LINUX);
-        expect(SystemInfo.isMobile).toBe(false);
-        expect(SystemInfo.isDesktop).toBe(true);
-    });
-
-    it('should be desktop (Unknown)', () => {
-        jest.spyOn(SystemInfo, 'GetSystem').mockReturnValue(ESystem.UNKNOWN);
-        expect(SystemInfo.isMobile).toBe(false);
-        expect(SystemInfo.isDesktop).toBe(true);
-    });
-
-    it('should be capable of AR (ARQuickLook)', async () => {
-        jest.spyOn(SystemInfo, 'GetSupportsARQuickLook').mockReturnValue(true);
-        jest.spyOn(SystemInfo, 'GetSupportsWebXR').mockResolvedValue(false);
-        expect(await SystemInfo.GetIsARCapable()).toBe(true);
-    });
-
-    it('should be capable of AR (WebXR)', async () => {
-        jest.spyOn(SystemInfo, 'GetSupportsARQuickLook').mockReturnValue(false);
-        jest.spyOn(SystemInfo, 'GetSupportsWebXR').mockResolvedValue(true);
-        expect(await SystemInfo.GetIsARCapable()).toBe(true);
-    });
-
-    it('should not be capable of AR', async () => {
-        jest.spyOn(SystemInfo, 'GetSupportsARQuickLook').mockReturnValue(false);
-        jest.spyOn(SystemInfo, 'GetSupportsWebXR').mockResolvedValue(false);
-        expect(await SystemInfo.GetIsARCapable()).toBe(false);
-    });
-
-    it('should support SceneViewer (Android, Chrome 89+)', () => {
-        mockNavigator({
-            userAgent:
-                'Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.72 Mobile Safari/537.36',
-        });
-        const supports = SystemInfo.GetSupportsSceneViewer();
-        expect(supports).toBe(true);
-    });
-
-    it('should support SceneViewer (Android, Chrome 126+)', () => {
-        mockNavigator({
-            userAgent:
-                'Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.153 Mobile Safari/537.36',
-        });
-        const supports = SystemInfo.GetSupportsSceneViewer();
-        expect(supports).toBe(true);
-    });
-
-    it('should not support SceneViewer (Android, Chrome <89)', () => {
-        mockNavigator({
-            userAgent:
-                'Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4389.72 Mobile Safari/537.36',
-        });
-        const supports = SystemInfo.GetSupportsSceneViewer();
-        expect(supports).toBe(false);
-    });
-
-    it('should not support SceneViewer (Android, no Chrome)', () => {
-        mockNavigator({
-            userAgent:
-                'Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Mobile Safari/537.36',
-        });
-        const supports = SystemInfo.GetSupportsSceneViewer();
-        expect(supports).toBe(false);
-    });
-
-    it('should not support SceneViewer (iOS)', () => {
-        mockNavigator({
-            userAgent:
-                'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1',
-        });
-        const supports = SystemInfo.GetSupportsSceneViewer();
-        expect(supports).toBe(false);
-    });
-
-    it('should not support SceneViewer (Windows)', () => {
-        mockNavigator({
-            userAgent:
-                'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.153 Safari/537.36',
-        });
-        const supports = SystemInfo.GetSupportsSceneViewer();
-        expect(supports).toBe(false);
-    });
-
-    it('should not support SceneViewer (no window)', () => {
-        const originalWindow = global.window;
-        global.window = undefined as any;
-        const supports = SystemInfo.GetSupportsSceneViewer();
-        expect(supports).toBe(false);
-        global.window = originalWindow;
-    });
-
-    it('should not support SceneViewer (no navigator)', () => {
-        const originalNavigator = global.navigator;
-        global.navigator = undefined as any;
-        const supports = SystemInfo.GetSupportsSceneViewer();
-        expect(supports).toBe(false);
-        global.navigator = originalNavigator;
-    });
-});

package/src/interface/Draggable.ts

@@ -1,14 +0,0 @@
-/**
- * Interface for objects that can be hovered in the scene.
- *
- * @module
- */
-
-import { type DraggableEvent } from '../toolbox/BaseTool';
-
-export interface DIVEDraggable {
-    isDraggable: true;
-    onDragStart?: (e: DraggableEvent) => void;
-    onDrag?: (e: DraggableEvent) => void;
-    onDragEnd?: (e: DraggableEvent) => void;
-}

package/src/interface/Hoverable.ts

@@ -1,14 +0,0 @@
-/**
- * Interface for objects that can be hovered in the scene.
- *
- * @module
- */
-
-import { type Intersection } from 'three';
-
-export interface DIVEHoverable {
-    isHoverable: true;
-    onPointerEnter?: (i: Intersection) => void;
-    onPointerOver?: (i: Intersection) => void;
-    onPointerLeave?: () => void;
-}