@shapediver/viewer.shared.services 2.7.10 → 2.8.1

package/src/system-info/SystemInfo.ts

@@ -1,15 +1,20 @@
-import { singleton } from 'tsyringe'
 import UAParser from 'ua-parser-js';
 
-@singleton()
 export class SystemInfo {
+    // #region Properties (5)
 
     private readonly _isBrowser: boolean;
     private readonly _isIframe: boolean;
     private readonly _origin: string;
     private readonly _parser: UAParser;
 
-    constructor() {
+    private static _instance: SystemInfo;
+
+    // #endregion Properties (5)
+
+    // #region Constructors (1)
+
+    private constructor() {
         this._parser = new UAParser();
         const isInternetExplorer = typeof window !== 'undefined' && window.navigator && window.navigator.userAgent.indexOf('Trident') > -1;
         this._isBrowser = isInternetExplorer ||
@@ -29,22 +34,17 @@ export class SystemInfo {
         }
     }
 
-    /**
-     * Check if we are on a Mac OS device
-     */
-    public get isMacOS(): boolean {
-        const osName = this._parser.getOS().name;
-        return osName === 'Mac OS';
-    };
+    // #endregion Constructors (1)
 
-    /**
-     * Check if we are on an IOS device
-     */
-    public get isIOS(): boolean {
-        const osName = this._parser.getOS().name;
-        return osName === 'iOS' || 
-        (window.navigator && window.navigator.maxTouchPoints === 5 && window.navigator.platform === 'MacIntel');
-    };
+    // #region Public Static Accessors (1)
+
+    public static get instance() {
+        return this._instance || (this._instance = new this());
+    }
+
+    // #endregion Public Static Accessors (1)
+
+    // #region Public Accessors (11)
 
     /**
      * Check if we are on an Android device
@@ -52,23 +52,14 @@ export class SystemInfo {
     public get isAndroid(): boolean {
         const osName = this._parser.getOS().name;
         return osName === 'Android';
-    };
-
-    /**
-     * Check if we are on a mobile device
-     */
-    public get isMobile(): boolean {
-        const type = this._parser.getDevice().type;
-        return type === 'mobile' || type === 'tablet';
-    };
+    }
 
     /**
-     * Check if we are running in internet explorer (arrrggghhhh!!!!)
+     * Check if we are running in a browser
      */
-    public get isIE(): boolean {
-        const browserName = this._parser.getBrowser().name;
-        return !!(browserName && browserName.includes('IE'));
-    };
+    public get isBrowser(): boolean {
+        return this._isBrowser;
+    }
 
     /**
      * Check if we are running in Safari
@@ -76,42 +67,70 @@ export class SystemInfo {
     public get isChrome(): boolean {
         const browserName = this._parser.getBrowser().name;
         return !!(browserName && browserName.includes('Chrome'));
-    };
+    }
 
     /**
-     * Check if we are running in Safari
+     * Check if we are running in Firefox
      */
-    public get isSafari(): boolean {
+    public get isFirefox(): boolean {
         const browserName = this._parser.getBrowser().name;
-        return !!(browserName && browserName.includes('Safari'));
-    };
+        return !!(browserName && browserName.includes('Firefox'));
+    }
 
     /**
-     * Check if we are running in Firefox
+     * Check if we are running in internet explorer (arrrggghhhh!!!!)
      */
-    public get isFirefox(): boolean {
+    public get isIE(): boolean {
         const browserName = this._parser.getBrowser().name;
-        return !!(browserName && browserName.includes('Firefox'));
-    };
+        return !!(browserName && browserName.includes('IE'));
+    }
 
     /**
-     * Check if we are running in a browser
+     * Check if we are on an IOS device
      */
-    public get isBrowser(): boolean {
-        return this._isBrowser;
-    };
+    public get isIOS(): boolean {
+        const osName = this._parser.getOS().name;
+        return osName === 'iOS' || 
+        (window.navigator && window.navigator.maxTouchPoints === 5 && window.navigator.platform === 'MacIntel');
+    }
 
     /**
      * Check if we are running in an iframe
      */
     public get isIframe(): boolean {
         return this._isIframe;
-    };
+    }
+
+    /**
+     * Check if we are on a Mac OS device
+     */
+    public get isMacOS(): boolean {
+        const osName = this._parser.getOS().name;
+        return osName === 'Mac OS';
+    }
+
+    /**
+     * Check if we are on a mobile device
+     */
+    public get isMobile(): boolean {
+        const type = this._parser.getDevice().type;
+        return type === 'mobile' || type === 'tablet';
+    }
+
+    /**
+     * Check if we are running in Safari
+     */
+    public get isSafari(): boolean {
+        const browserName = this._parser.getBrowser().name;
+        return !!(browserName && browserName.includes('Safari'));
+    }
 
     /**
      * Get guessed origin of embedding website
      */
     public get origin(): string {
         return this._origin + '';
-    };
+    }
+
+    // #endregion Public Accessors (11)
 }

package/src/type-check/TypeChecker.ts

@@ -1,13 +1,27 @@
-import { singleton } from 'tsyringe'
-
-@singleton()
 export class TypeChecker {
+    // #region Properties (1)
 
-    public isTypeOf(value: any, type: string): boolean {
-        return typeof value === type;
+    private static _instance: TypeChecker;
+
+    // #endregion Properties (1)
+
+    // #region Public Static Accessors (1)
+
+    public static get instance() {
+        return this._instance || (this._instance = new this());
     }
 
+    // #endregion Public Static Accessors (1)
+
+    // #region Public Methods (2)
+
     public isHTMLCanvasElement(value: any): boolean {
         return value instanceof HTMLCanvasElement;
     }
+
+    public isTypeOf(value: any, type: string): boolean {
+        return typeof value === type;
+    }
+
+    // #endregion Public Methods (2)
 }

package/src/uuid-generator/UuidGenerator.ts

@@ -1,23 +1,28 @@
-import { singleton } from 'tsyringe'
 import { parse as parseUUID, stringify as stringifyUUID, v4, validate as validateUUID } from 'uuid'
 
-@singleton()
 export class UuidGenerator {
+    // #region Properties (1)
+
+    private static _instance: UuidGenerator;
+
+    // #endregion Properties (1)
+
+    // #region Public Static Accessors (1)
+
+    public static get instance() {
+        return this._instance || (this._instance = new this());
+    }
+
+    // #endregion Public Static Accessors (1)
+
+    // #region Public Methods (4)
+
     /**
      * Creates a new uuid v4.
      */
     public create(): string {
         return v4();
-    };
-
-    /**
-     * Checks if the provided string is a valid uuid.
-     * 
-     * @param uuid the uuid to check
-     */
-    public validate(uuid: string): boolean {
-        return validateUUID(uuid);
-    };
+    }
 
     /**
      * Parse the uuid to array of bytes
@@ -27,7 +32,7 @@ export class UuidGenerator {
      */
     public parse(uuid: string): ArrayLike<number> {
         return parseUUID(uuid);
-    };
+    }
 
     /**
      * Stringify an array of bytes to an uuid
@@ -37,5 +42,16 @@ export class UuidGenerator {
      */
     public stringify(uuid: ArrayLike<number>): string {
         return stringifyUUID(uuid);
-    };
+    }
+
+    /**
+     * Checks if the provided string is a valid uuid.
+     * 
+     * @param uuid the uuid to check
+     */
+    public validate(uuid: string): boolean {
+        return validateUUID(uuid);
+    }
+
+    // #endregion Public Methods (4)
 }